From b4359e8bf97799f83dc1ca62744db7cfcc81bc87 Mon Sep 17 00:00:00 2001 From: François Andriot Date: Mon, 24 Jun 2013 19:50:32 +0200 Subject: RPM Packaging: rename directories --- opensuse/core/dependencies | 1 + opensuse/core/qt3/qt3-3.5.13.2.spec | 89 +- ...de-guidance-3.5.13-fix_wine_create_prefix.patch | 73 - .../kde-guidance/trinity-guidance-3.5.13.1.spec | 414 - .../kde-guidance/trinity-guidance-3.5.13.spec | 390 - .../trinity-kde-style-lipstik-3.5.12.spec | 108 - .../trinity-kde-style-lipstik-3.5.13.1.spec | 129 - .../trinity-kde-style-lipstik-3.5.13.spec | 120 - .../kde-style-qtcurve-1.6.2-libsuffix.patch | 11 - ...kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch | 101 - ...-qtcurve-3.5.13-fix_kde_style_compilation.patch | 243 - ...kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch | 237 - .../trinity-kde-style-qtcurve-3.5.13.1.spec | 141 - .../trinity-kde-style-qtcurve-3.5.13.spec | 140 - .../trinity-kde-systemsettings-3.5.13.1.spec | 159 - .../trinity-kde-systemsettings-3.5.13.spec | 150 - .../kdesudo/trinity-kdesudo-3.5.13.1.spec | 139 - .../kdesudo/trinity-kdesudo-3.5.13.spec | 130 - .../kdesvn-3.5.13-fix_gcc47_compilation.patch | 11 - ...svn-3.5.13-fix_not_a_string_literal_error.patch | 127 - .../kdesvn/trinity-kdesvn-3.5.13.1.spec | 287 - .../applications/kdesvn/trinity-kdesvn-3.5.13.spec | 274 - .../kdmtheme/trinity-kdmtheme-3.5.13.1.spec | 130 - .../kdmtheme/trinity-kdmtheme-3.5.13.spec | 121 - .../kio-locate-3.5.13-fix_gcc47_compilation.patch | 40 - .../kio-locate/trinity-kio-locate-3.5.12.spec | 111 - .../kio-locate/trinity-kio-locate-3.5.13.1.spec | 135 - .../kio-locate/trinity-kio-locate-3.5.13.spec | 113 - .../kio-umountwrapper/media_safelyremove.desktop | 74 - .../trinity-kio-umountwrapper-3.5.13.1.spec | 157 - .../trinity-kio-umountwrapper-3.5.13.spec | 140 - .../kradio/kradio-3.5.13.1-updated_preset.patch | 26417 ---- .../kradio/trinity-kradio-3.5.13.1.spec | 182 - .../applications/kradio/trinity-kradio-3.5.13.spec | 164 - ...de-guidance-3.5.13-fix_wine_create_prefix.patch | 73 + .../tde-guidance/trinity-guidance-3.5.13.1.spec | 414 + .../tde-guidance/trinity-guidance-3.5.13.spec | 390 + .../trinity-kde-style-lipstik-3.5.12.spec | 108 + .../trinity-kde-style-lipstik-3.5.13.1.spec | 129 + .../trinity-kde-style-lipstik-3.5.13.spec | 120 + .../kde-style-qtcurve-1.6.2-libsuffix.patch | 11 + ...kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch | 101 + ...-qtcurve-3.5.13-fix_kde_style_compilation.patch | 243 + ...kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch | 237 + .../trinity-kde-style-qtcurve-3.5.13.1.spec | 141 + .../trinity-kde-style-qtcurve-3.5.13.spec | 140 + .../kde-settings-laptops.directory | 13 + .../trinity-kde-systemsettings-3.5.13.1.spec | 159 + .../trinity-kde-systemsettings-3.5.13.spec | 150 + .../kio-locate-3.5.13-fix_gcc47_compilation.patch | 40 + .../tdeio-locate/trinity-kio-locate-3.5.12.spec | 111 + .../tdeio-locate/trinity-kio-locate-3.5.13.1.spec | 135 + .../tdeio-locate/trinity-kio-locate-3.5.13.spec | 113 + .../tdeio-umountwrapper/media_safelyremove.desktop | 74 + .../trinity-kio-umountwrapper-3.5.13.1.spec | 157 + .../trinity-kio-umountwrapper-3.5.13.spec | 140 + .../tderadio/kradio-3.5.13.1-updated_preset.patch | 26417 ++++ .../tderadio/trinity-kradio-3.5.13.1.spec | 182 + .../tderadio/trinity-kradio-3.5.13.spec | 164 + .../tdesudo/trinity-kdesudo-3.5.13.1.spec | 139 + .../tdesudo/trinity-kdesudo-3.5.13.spec | 130 + .../kdesvn-3.5.13-fix_gcc47_compilation.patch | 11 + ...svn-3.5.13-fix_not_a_string_literal_error.patch | 127 + .../tdesvn/trinity-kdesvn-3.5.13.1.spec | 287 + .../applications/tdesvn/trinity-kdesvn-3.5.13.spec | 274 + .../tdmtheme/trinity-kdmtheme-3.5.13.1.spec | 130 + .../tdmtheme/trinity-kdmtheme-3.5.13.spec | 121 + .../kde-i18n-3.5.13-add_french_translations.patch | 1113 - .../kde-i18n-3.5.13-add_zh_TW_translations.patch | 136888 ------------------ redhat/kde-i18n/kde-i18n-kdesu.patch | 45 - redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz | Bin 1335843 -> 0 bytes redhat/kde-i18n/trinity-i18n-3.5.13.1.spec | 1274 - redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec | 1195 - redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec | 1193 - .../trinity-kde-i18n-fr-openterminalhere.patch | 16 - .../kdeaccessibility-3.5.13-missing_ldflags.patch | 22 - .../trinity-kdeaccessibility-3.5.12.spec | 180 - .../trinity-kdeaccessibility-3.5.13.1.spec | 525 - .../trinity-kdeaccessibility-3.5.13.spec | 523 - .../kdeaddons-3.5.13-sru-20120809.patch.gz | Bin 56127 -> 0 bytes redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch | 64 - redhat/kdeaddons/metabar-fedora.tar.bz2 | Bin 143074 -> 0 bytes redhat/kdeaddons/metabarrc | 7 - redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec | 249 - redhat/kdeaddons/trinity-kdeaddons-3.5.13.1.spec | 730 - redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec | 757 - redhat/kdeadmin/bp004-1f719050.diff | 32 - .../kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch | 307 - ...n-3.5.13-remove_more_applications_in_menu.patch | 17 - redhat/kdeadmin/kpackagerc | 33 - redhat/kdeadmin/ksysvrc | 8 - redhat/kdeadmin/kuser.pam | 3 - redhat/kdeadmin/kuser.pamd | 4 - redhat/kdeadmin/kuserrc | 6 - redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec | 197 - redhat/kdeadmin/trinity-kdeadmin-3.5.13.1.spec | 482 - redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 506 - ...rtwork-3.5.13.1-fix_locolor_theme_name.patch.gz | Bin 555259 -> 0 bytes redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec | 186 - redhat/kdeartwork/trinity-kdeartwork-3.5.13.1.spec | 701 - redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec | 666 - redhat/kdeartwork/webcollagerc | 3 - .../kdebase-3.5.12-desktop-openterminalhere.patch | 19 - redhat/kdebase/kdebase-3.5.12-disable-krandr.patch | 36 - .../kdebase/kdebase-3.5.12-halmountoptions.patch | 78 - .../kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch | 22 - .../kdebase-3.5.12-kdesu-noignorebutton.patch | 45 - .../kdebase-3.5.12-kdm_hide_menu_button.patch | 29 - redhat/kdebase/kdebase-3.5.12-kickerfix.patch | 13 - .../kdebase/kdebase-3.5.12-kickoff_unstable.patch | 428 - redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch | 40 - .../kdebase-3.5.12-konq_menu_tab_background.patch | 136 - redhat/kdebase/kdebase-3.5.12-r1220927.patch | 29 - redhat/kdebase/kdebase-3.5.12-r1220975.patch | 19 - .../kdebase-3.5.12-shutdowndlg-dbus-include.patch | 20 - .../kdebase-3.5.12-startkde_directories.patch | 19 - ...ebase-3.5.13-add_disable_composite_option.patch | 81 - ...se-3.5.13-add_drag_drop_to_kate_file_list.patch | 33 - ...base-3.5.13-add_reorder_documents_in_kate.patch | 167 - .../kdebase-3.5.13-add_usbstorage_panel.patch | 1278 - .../kdebase-3.5.13-add_xscreensaver_support.patch | 76 - ...al_window_interaction_inside_lock_process.patch | 372 - .../kdebase-3.5.13-build_without_consolekit.patch | 22 - .../kdebase-3.5.13-build_without_dbustqt.patch | 97 - ...yboard_shortcuts_for_file_location_moving.patch | 22 - ...e-3.5.13-disable_tsak_dialog_if_not_built.patch | 50 - ...-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | 37 - .../kdebase-3.5.13-enable_xtest_support.patch | 135 - ...base-3.5.13-engage_lock_in_near_real_time.patch | 252 - ...3-engage_lock_in_near_real_time_continued.patch | 356 - ...-3.5.13-ensure_pagersettings_is_installed.patch | 19 - .../kdebase/kdebase-3.5.13-fix_dbus_include.patch | 10 - .../kdebase-3.5.13-fix_device_icon_placement.patch | 30 - .../kdebase/kdebase-3.5.13-fix_fancy_logout.patch | 162 - .../kdebase/kdebase-3.5.13-fix_fqdn_in_title.patch | 46 - ...e-3.5.13-fix_kdesktop_lock_security_issue.patch | 157 - ...-fix_kdesu_kdesudo_argument_compatibility.patch | 18 - .../kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch | 47 - ...kdebase-3.5.13-fix_khtml_smooth_scrolling.patch | 38 - redhat/kdebase/kdebase-3.5.13-fix_kio_sftp.patch | 57 - ...ase-3.5.13-fix_kio_sftp_nonstandard_ports.patch | 23 - .../kdebase-3.5.13-fix_kxdglauncher_document.patch | 18 - .../kdebase/kdebase-3.5.13-fix_lib_detection.patch | 102 - .../kdebase/kdebase-3.5.13-fix_lock_failure.patch | 84 - ....5.13-fix_menu_crash_with_disabled_search.patch | 20 - ...kdebase-3.5.13-fix_multihead_desktop_lock.patch | 297 - ...e-3.5.13-fix_potential_ABI_compat_problem.patch | 24 - .../kdebase-3.5.13-fix_race_condition.patch | 22 - .../kdebase-3.5.13-fix_rhel4_compilation.patch | 152 - .../kdebase/kdebase-3.5.13-fix_tooltip_lock.patch | 29 - ...-3.5.13-fix_translations_in_desktop_files.patch | 105 - redhat/kdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch | 12 - ...ebase-3.5.13-genkdmconf_Xsession_location.patch | 11 - ...e-3.5.13-genkdmconf_Xsession_location_xdm.patch | 11 - redhat/kdebase/kdebase-3.5.13-kate_focus_fix.patch | 133 - redhat/kdebase/kdebase-3.5.13-kate_mru.patch | 71 - .../kdebase-3.5.13-kdesu-noignorebutton.patch | 45 - .../kdebase-3.5.13-kdesu_showkeeppassword.patch | 11 - redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch | 43 - .../kdebase/kdebase-3.5.13-kicker-easyvector.patch | 29 - .../kdebase/kdebase-3.5.13-kickoff_unstable.patch | 442 - redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch | 40 - .../kdebase/kdebase-3.5.13-konq_icon_effect.patch | 19 - .../kdebase-3.5.13-konq_menu_tab_background.patch | 160 - .../kdebase-3.5.13-konqsidebar_documents.patch | 11 - ...-3.5.13-kpersonalizer_default_doubleclick.patch | 41 - .../kdebase-3.5.13-kwin-keramic-pics-emb.patch | 62 - .../kdebase-3.5.13-mediamanager_ftbfs.patch | 10 - ...e-3.5.13-option_to_disable_scroll_desktop.patch | 101 - ...se-3.5.13-prevent_tooltip_over_lockscreen.patch | 137 - ....13-randrtray_merge_x11_reconfig_requests.patch | 51 - ...-replicate_led_status_on_virtual_keyboard.patch | 95 - .../kdebase-3.5.13-restore_kde3_clock.patch | 104 - .../kdebase/kdebase-3.5.13-start_dcop_in_tdm.patch | 34 - .../kdebase-3.5.13-startkde_directories.patch | 118 - redhat/kdebase/kdebase-3.5.13-startkde_icon.patch | 19 - .../kdebase-3.5.13-startkde_ldpreload.patch | 13 - redhat/kdebase/kdebase-3.5.13-support_hal_04.patch | 1033 - .../kdebase-3.5.13-tsak_keyboard_hotplug.patch | 641 - ...3-update_default_konq_max_image_prev_size.patch | 49 - ...kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz | Bin 302981 -> 0 bytes .../kdebase-3.5.13.1-fix_displayconfig_icon.patch | 20 - .../kdebase-3.5.13.1-fix_startkde_path.patch | 107 - .../kdebase-3.5.13.1-fix_tdm_pid_file.patch | 11 - .../kdebase/kdebase-3.5.13.1-startkde_icon.patch | 19 - redhat/kdebase/kdebase-bp126-553923b2.diff | 135 - redhat/kdebase/kdebase-bp127-57f5c069.diff | 159 - redhat/kdebase/kdebase-bp128-1f33dc8f.diff | 58 - redhat/kdebase/pamd.kcheckpass-trinity.el4 | 11 - redhat/kdebase/pamd.kcheckpass-trinity.el5 | 9 - redhat/kdebase/pamd.kcheckpass-trinity.el6 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.fc15 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.fc16 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.fc17 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.0 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.mga2 | 5 - .../kdebase/pamd.kcheckpass-trinity.opensuse1220 | 5 - redhat/kdebase/pamd.kcheckpass-trinity.pclos2012 | 5 - redhat/kdebase/pamd.kdm-trinity-np.el4 | 9 - redhat/kdebase/pamd.kdm-trinity-np.el5 | 11 - redhat/kdebase/pamd.kdm-trinity-np.el6 | 13 - redhat/kdebase/pamd.kdm-trinity-np.fc15 | 15 - redhat/kdebase/pamd.kdm-trinity-np.fc16 | 15 - redhat/kdebase/pamd.kdm-trinity-np.fc17 | 15 - redhat/kdebase/pamd.kdm-trinity-np.mdv2011.0 | 7 - redhat/kdebase/pamd.kdm-trinity-np.mga2 | 10 - redhat/kdebase/pamd.kdm-trinity-np.pclos2012 | 7 - redhat/kdebase/pamd.kdm-trinity.el4 | 11 - redhat/kdebase/pamd.kdm-trinity.el5 | 10 - redhat/kdebase/pamd.kdm-trinity.el6 | 16 - redhat/kdebase/pamd.kdm-trinity.fc15 | 18 - redhat/kdebase/pamd.kdm-trinity.fc16 | 18 - redhat/kdebase/pamd.kdm-trinity.fc17 | 18 - redhat/kdebase/pamd.kdm-trinity.mdv2011.0 | 8 - redhat/kdebase/pamd.kdm-trinity.mga2 | 13 - redhat/kdebase/pamd.kdm-trinity.pclos2012 | 8 - redhat/kdebase/pamd.kscreensaver-trinity.el4 | 11 - redhat/kdebase/pamd.kscreensaver-trinity.el5 | 9 - redhat/kdebase/pamd.kscreensaver-trinity.el6 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.fc15 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.fc16 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.fc17 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.0 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.mga2 | 5 - redhat/kdebase/pamd.kscreensaver-trinity.pclos2012 | 5 - redhat/kdebase/plasma-desktop | 9 - redhat/kdebase/r1182808.diff | 29 - redhat/kdebase/r1201523.diff | 31 - redhat/kdebase/r1201705.diff | 43 - redhat/kdebase/r1221326.diff | 13 - redhat/kdebase/suse-displaymanagers-tdm | 21 - .../kdebase/tdebase-3.5.13.1-missing_ldflags.patch | 10 - redhat/kdebase/tdebase-r14.spec | 648 - redhat/kdebase/tiles-fixed-png-images.tar.gz | Bin 50550 -> 0 bytes redhat/kdebase/trinity-kdebase-3.5.12.spec | 757 - redhat/kdebase/trinity-kdebase-3.5.13.1.spec | 3266 - redhat/kdebase/trinity-kdebase-3.5.13.spec | 3467 - ...bindings-3.5.13-fix_dcopc_header_location.patch | 12 - redhat/kdebindings/kdebindings-3.5.13-fixes.patch | 80 - .../kdebindings-3.5.13-missing_ldflags.patch | 32 - ...indings-3.5.13-openjdk_remove_hpi_support.patch | 41 - .../kdebindings/kdebindings-3.5.13-ruby_1.9.patch | 691 - .../kdebindings-3.5.13.1-detect_ruby_pkg.patch | 86 - ...dings-3.5.13.1-fallback_to_ruby19_pc_file.patch | 34 - ...kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch | 11 - .../kdebindings-3.5.13.1-fix_ftbfs_on_x86.patch | 82 - .../kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch | 56 - .../kdebindings-3.5.13.1-fix_ftbfs_ruby19.patch | 683 - .../kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch | 31 - ...5.13.1-fix_ruby_detect_when_pc_file_is_19.patch | 55 - .../kdebindings-3.5.13.1-set_have_ruby19.patch | 30 - ...bindings-3.5.13.1-use_cflags_from_pc_file.patch | 78 - redhat/kdebindings/kdebindings-3.5.6-libgcj.patch | 48 - redhat/kdebindings/trinity-kdebindings-3.5.12.spec | 295 - .../kdebindings/trinity-kdebindings-3.5.13.1.spec | 1112 - redhat/kdebindings/trinity-kdebindings-3.5.13.spec | 1061 - .../kdeedu-3.5.13-fix_gcc47_compilation.patch | 17 - .../kdeedu-3.5.13-fix_kbruch_build_error.patch | 18 - .../kdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch | 51 - .../kdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch | 17 - redhat/kdeedu/kdeedu-3.5.13-missing_ldflags.patch | 55 - redhat/kdeedu/trinity-kdeedu-3.5.12.spec | 235 - redhat/kdeedu/trinity-kdeedu-3.5.13.1.spec | 1400 - redhat/kdeedu/trinity-kdeedu-3.5.13.spec | 1429 - ...games-3.5.13-ktuberling_fail_load_picture.patch | 11 - .../kdegames/kdegames-3.5.13-missing_ldflags.patch | 44 - .../kdegames/kdegames-3.5.13-sru-20120827.patch.gz | Bin 129535 -> 0 bytes redhat/kdegames/trinity-kdegames-3.5.12.spec | 196 - redhat/kdegames/trinity-kdegames-3.5.13.1.spec | 1604 - redhat/kdegames/trinity-kdegames-3.5.13.spec | 1610 - .../kdegraphics-3.5.13-add_poppler_tqt_pc.patch | 41 - .../kdegraphics-3.5.13-disable_kuickshow_doc.patch | 10 - .../kdegraphics-3.5.13-disable_poppler.patch | 11 - ...kdegraphics-3.5.13-fix_corrupt_image_file.patch | 17 - .../kdegraphics-3.5.13-fix_gcc47_compilation.patch | 307 - ...degraphics-3.5.13-fix_poppler_include_dir.patch | 11 - .../kdegraphics-3.5.13-fix_poppler_support.patch | 27 - .../kdegraphics-3.5.13-kpovmodeler_check_glu.patch | 16 - ...ics-3.5.13-kpovmodeler_missing_gl_ldflags.patch | 10 - .../kdegraphics-3.5.13-ksnapshot_ldflags.patch | 11 - .../kdegraphics-3.5.13-xpdf_disable_mkstemps.patch | 11 - ...degraphics-3.5.13.1-fix_poppler_pkgconfig.patch | 12 - .../kdegraphics-3.5.13.1-fix_rhel4_libraries.patch | 38 - redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec | 369 - .../kdegraphics/trinity-kdegraphics-3.5.13.1.spec | 1312 - redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 1007 - redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch | 21 - .../kdelibs-3.5.12-kstandarddirs_trinity.patch | 29 - ...ibs-3.5.13-add_dynamic_label_to_kpassword.patch | 139 - .../kdelibs-3.5.13-add_inotify_support.patch | 67 - .../kdelibs/kdelibs-3.5.13-enable_fam_gamin.patch | 79 - redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch | 67 - ...-fix_UTF8_encoding_for_WebDAV_directories.patch | 45 - .../kdelibs/kdelibs-3.5.13-fix_add_printer.patch | 20 - ...ibs-3.5.13-fix_all_languages_installation.patch | 20 - .../kdelibs/kdelibs-3.5.13-fix_build_kspell2.patch | 27 - ....5.13-fix_composition_extension_detection.patch | 159 - ...-3.5.13-fix_creation_of_profile_directory.patch | 12 - .../kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch | 22 - .../kdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch | 20 - ...kioslave_not_parsing_large_image_properly.patch | 171 - redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch | 20 - .../kdelibs/kdelibs-3.5.13-fix_konq_filter.patch | 83 - ...kdelibs-3.5.13-fix_ktempfile_special_bits.patch | 27 - .../kdelibs/kdelibs-3.5.13-fix_slide_drawing.patch | 52 - ...3-fix_spinbox_text_entry_when_base_not_10.patch | 35 - ...kdelibs-3.5.13-fix_tdesu_internal_pathing.patch | 33 - ...5.13-fix_x11_threading_when_kinit_is_used.patch | 20 - .../kdelibs-3.5.13-fix_xrender_libdir.patch | 987 - redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz | Bin 195241 -> 0 bytes redhat/kdelibs/kdelibs-3.5.13-maxlinelength.patch | 40 - ...5.13-prevent_xdg_autostart_multiple_times.patch | 53 - .../kdelibs-3.5.13-reduce_more_applications.patch | 41 - ...store_tdesu_keeppassword_default_disabled.patch | 21 - ...te_iso_kioslave_better_handle_large_image.patch | 115 - ...disable_invalid_certificate_always_prompt.patch | 15 - redhat/kdelibs/tdelibs-r14.spec | 316 - redhat/kdelibs/trinity-kdelibs-3.5.12.spec | 369 - redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec | 434 - redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 520 - redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch | 10 - .../kdemultimedia-3.5.13-fix_autostart_again.patch | 31 - .../kdemultimedia-3.5.13-fix_kmix_autostart.patch | 34 - .../kdemultimedia-3.5.13-fix_linear_alphabet.patch | 19 - .../kdemultimedia-3.5.13-fix_mmx_detection.patch | 12 - .../kdemultimedia-3.5.13-missing_ldflags.patch | 133 - ...ultimedia-3.5.13-remove_more_applications.patch | 49 - .../kdemultimedia-3.5.7-pthread.patch | 11 - .../trinity-kdemultimedia-3.5.12.spec | 396 - .../trinity-kdemultimedia-3.5.13.1.spec | 1185 - .../trinity-kdemultimedia-3.5.13.spec | 1204 - redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch | 26 - redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp | 3 - ...enetwork-3.5.13-fix_a_fatal_error_message.patch | 20 - ...enetwork-3.5.13-fix_alphabet_string_error.patch | 97 - ...x_html_specialchar_in_kopete_nowlistening.patch | 46 - ...html_specialchar_in_kopete_nowlistening_2.patch | 46 - .../kdenetwork-3.5.13-fix_parallel_build.patch | 19 - ...e_kaffeine_support_in_nowlistening_plugin.patch | 66 - .../kdenetwork-3.5.13-kopete_jabber_protocol.patch | 30 - ...work-3.5.13-kopete_motionawayplugin_ftbfs.patch | 15 - .../kdenetwork-3.5.13-kopete_msn_protocol.patch | 10 - .../kdenetwork-3.5.13-kopete_sms_protocol.patch | 11 - .../kdenetwork-3.5.13-missing_ldflags.patch | 10 - .../kdenetwork-3.5.13-reference_to_qmake_h.patch | 108 - ...3.5.13-remove_more_applications_from_menu.patch | 39 - .../kdenetwork-3.5.13.1-add_cmake_macro.patch | 24 - .../kdenetwork-3.5.13.1-fix_rhel4_libraries.patch | 9 - .../kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch | 58 - redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff | 14 - redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch | 9 - .../kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch | 33 - redhat/kdenetwork/kdenetwork-kopete-gcc45.patch | 57 - redhat/kdenetwork/kppp.pamd | 4 - redhat/kdenetwork/ktalk | 12 - redhat/kdenetwork/lisa.redhat | 91 - redhat/kdenetwork/lisarc | 10 - redhat/kdenetwork/r1243951.diff | 42 - redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec | 502 - redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec | 1188 - redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec | 1182 - ...depim-3.5.13-disable_fsync_in_cached_imap.patch | 19 - redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch | 21 - .../kdepim/kdepim-3.5.13-fix_composer_crash.patch | 20 - .../kdepim-3.5.13-fix_gcc47_compilation.patch | 64 - .../kdepim-3.5.13-fix_include_directory.patch | 219 - .../kdepim-3.5.13-fix_kalarm_icon_reference.patch | 19 - .../kdepim-3.5.13-fix_kio_imap4_addquotes.patch | 61 - ...kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch | 17 - .../kdepim-3.5.13-fix_knotes_after_restored.patch | 21 - .../kdepim-3.5.13-fix_knotes_on_suspend.patch | 20 - .../kdepim/kdepim-3.5.13-fix_linear_alphabet.patch | 71 - redhat/kdepim/kdepim-3.5.13-fix_segv.patch | 33 - .../kdepim/kdepim-3.5.13-fix_systray_count.patch | 20 - redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch | 10 - .../kdepim-3.5.13.1-fix_imapparser_segv.patch | 44 - .../kdepim-3.5.13.1-fix_imapparser_segv_2.patch | 15 - .../kdepim-3.5.13.1-kmime_utils_quotes.patch | 41 - redhat/kdepim/trinity-kdepim-3.5.12.spec | 153 - redhat/kdepim/trinity-kdepim-3.5.13.1.spec | 2166 - redhat/kdepim/trinity-kdepim-3.5.13.spec | 2198 - .../kdesdk-3.5.13-add_forgotten_cmake_files.patch | 1921 - redhat/kdesdk/kdesdk-3.5.13-cmake_port.patch | 100 - .../kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch | 32 - redhat/kdesdk/kdesdk-3.5.13-misc_ftbfs.patch | 10 - .../kdesdk/kdesdk-3.5.13.1-add_missing_files.patch | 309 - .../kdesdk/kdesdk-3.5.13.1-fix_cmake_macros.patch | 17 - .../kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch | 39683 ----- ...desdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch.gz | Bin 500738 -> 0 bytes .../kdesdk-3.5.13.1-fix_various_cmake_issues.patch | 159 - ...dk-3.5.13.1-fix_xkcachegrind_installation.patch | 13 - .../kdesdk-3.5.13.1-use_flex_instead_of_lex.patch | 11 - redhat/kdesdk/kdesdk-3.5.7-subversion.patch | 21 - redhat/kdesdk/trinity-kdesdk-3.5.12.spec | 245 - redhat/kdesdk/trinity-kdesdk-3.5.13.1.spec | 1161 - redhat/kdesdk/trinity-kdesdk-3.5.13.spec | 1130 - .../kdetoys/kdetoys-3.5.13-missing_ldflags.patch | 21 - redhat/kdetoys/trinity-kdetoys-3.5.12.spec | 165 - redhat/kdetoys/trinity-kdetoys-3.5.13.1.spec | 450 - redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 459 - redhat/kdeutils/kcmlaptoprc | 114 - redhat/kdeutils/kdeutils-3.5.13-ark_fix_utf8.patch | 63 - ...deutils-3.5.13-ark_repairs_and_extensions.patch | 1281 - .../kdeutils-3.5.13-fix_ark_embedding.patch | 16 - .../kdeutils-3.5.13-further_organise_menu.patch | 49 - ...deutils-3.5.13-klaptopdaemon_dpkg_command.patch | 31 - .../kdeutils/kdeutils-3.5.13-missing_ldflags.patch | 61 - .../kdeutils-3.5.13-remove_more_applications.patch | 46 - ...tils-3.5.13-reorganize_kcontrol_menu_tree.patch | 57 - redhat/kdeutils/kdf-3.0.2-label.patch | 13 - redhat/kdeutils/klaptop_acpi_helper.console | 1 - redhat/kdeutils/klaptop_acpi_helper.pam | 4 - redhat/kdeutils/trinity-kdeutils-3.5.12.spec | 361 - redhat/kdeutils/trinity-kdeutils-3.5.13.1.spec | 1038 - redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 1076 - redhat/kdevelop/c_cpp_reference-2.0.2-config.patch | 11 - .../kdevelop/c_cpp_reference-2.0.2-install.patch | 9 - .../c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 | Bin 1096541 -> 0 bytes .../kdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch | 19 - redhat/kdevelop/kdevelop-3.5.13-gcc47.patch | 22 - .../kdevelop-3.5.13-kdevdesigner-ftbfs.patch | 11 - redhat/kdevelop/kdevelop-3.5.2-kde4template.patch | 144 - redhat/kdevelop/trinity-kdevelop-3.5.12.spec | 254 - redhat/kdevelop/trinity-kdevelop-3.5.13.1.spec | 636 - redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 292 - redhat/kdewebdev/css.tar.bz2 | Bin 121295 -> 0 bytes redhat/kdewebdev/hi48-app-kxsldbg.png | Bin 2652 -> 0 bytes redhat/kdewebdev/html.tar.bz2 | Bin 93345 -> 0 bytes redhat/kdewebdev/javascript.patch | Bin 239 -> 0 bytes redhat/kdewebdev/javascript.tar.bz2 | Bin 336563 -> 0 bytes redhat/kdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch | 22 - .../kdewebdev/kdewebdev-3.5.4-kxsldbg-icons.patch | 11 - redhat/kdewebdev/php_manual_en_20030401.tar.bz2 | Bin 1346608 -> 0 bytes redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec | 228 - redhat/kdewebdev/trinity-kdewebdev-3.5.13.1.spec | 566 - redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec | 556 - ...pykdeextensions-3.5.13-do_not_link_stdc++.patch | 31 - ...kdeextensions-3.5.13-fix_extra_module_dir.patch | 19 - .../pykdeextensions-3.5.13-fix_include_dir.patch | 11 - .../pykdeextensions-3.5.13-fix_libsuffix.patch | 53 - .../pykdeextensions-3.5.13-fix_libtool.patch | 20 - ...eextensions-3.5.13.1-fix_extra_module_dir.patch | 18 - ...eextensions-3.5.13.1-fix_libgcc_detection.patch | 62 - .../trinity-pykdeextensions-3.5.13.1.spec | 212 - .../trinity-pykdeextensions-3.5.13.spec | 215 - ...pykdeextensions-3.5.13-do_not_link_stdc++.patch | 31 + ...kdeextensions-3.5.13-fix_extra_module_dir.patch | 19 + .../pykdeextensions-3.5.13-fix_include_dir.patch | 11 + .../pykdeextensions-3.5.13-fix_libsuffix.patch | 53 + .../pykdeextensions-3.5.13-fix_libtool.patch | 20 + ...eextensions-3.5.13.1-fix_extra_module_dir.patch | 18 + ...eextensions-3.5.13.1-fix_libgcc_detection.patch | 62 + .../trinity-pykdeextensions-3.5.13.1.spec | 212 + .../trinity-pykdeextensions-3.5.13.spec | 215 + .../kde-i18n-3.5.13-add_french_translations.patch | 1113 + .../kde-i18n-3.5.13-add_zh_TW_translations.patch | 136888 ++++++++++++++++++ redhat/tde-i18n/kde-i18n-kdesu.patch | 45 + redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz | Bin 0 -> 1335843 bytes redhat/tde-i18n/trinity-i18n-3.5.13.1.spec | 1274 + redhat/tde-i18n/trinity-kde-i18n-3.5.12.spec | 1195 + redhat/tde-i18n/trinity-kde-i18n-3.5.13.spec | 1193 + .../trinity-kde-i18n-fr-openterminalhere.patch | 16 + .../kdeaccessibility-3.5.13-missing_ldflags.patch | 22 + .../trinity-kdeaccessibility-3.5.12.spec | 180 + .../trinity-kdeaccessibility-3.5.13.1.spec | 525 + .../trinity-kdeaccessibility-3.5.13.spec | 523 + .../kdeaddons-3.5.13-sru-20120809.patch.gz | Bin 0 -> 56127 bytes redhat/tdeaddons/kdeaddons-3.5.3-sdl.patch | 64 + redhat/tdeaddons/metabar-fedora.tar.bz2 | Bin 0 -> 143074 bytes redhat/tdeaddons/metabarrc | 7 + redhat/tdeaddons/trinity-kdeaddons-3.5.12.spec | 249 + redhat/tdeaddons/trinity-kdeaddons-3.5.13.1.spec | 730 + redhat/tdeaddons/trinity-kdeaddons-3.5.13.spec | 757 + redhat/tdeadmin/bp004-1f719050.diff | 32 + .../tdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch | 307 + ...n-3.5.13-remove_more_applications_in_menu.patch | 17 + redhat/tdeadmin/kpackagerc | 33 + redhat/tdeadmin/ksysvrc | 8 + redhat/tdeadmin/kuser.pam | 3 + redhat/tdeadmin/kuser.pamd | 4 + redhat/tdeadmin/kuserrc | 6 + redhat/tdeadmin/trinity-kdeadmin-3.5.12.spec | 197 + redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec | 482 + redhat/tdeadmin/trinity-kdeadmin-3.5.13.spec | 506 + ...rtwork-3.5.13.1-fix_locolor_theme_name.patch.gz | Bin 0 -> 555259 bytes redhat/tdeartwork/trinity-kdeartwork-3.5.12.spec | 186 + redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec | 701 + redhat/tdeartwork/trinity-kdeartwork-3.5.13.spec | 666 + redhat/tdeartwork/webcollagerc | 3 + .../kdebase-3.5.12-desktop-openterminalhere.patch | 19 + redhat/tdebase/kdebase-3.5.12-disable-krandr.patch | 36 + .../tdebase/kdebase-3.5.12-halmountoptions.patch | 78 + .../tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch | 22 + .../kdebase-3.5.12-kdesu-noignorebutton.patch | 45 + .../kdebase-3.5.12-kdm_hide_menu_button.patch | 29 + redhat/tdebase/kdebase-3.5.12-kickerfix.patch | 13 + .../tdebase/kdebase-3.5.12-kickoff_unstable.patch | 428 + redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch | 40 + .../kdebase-3.5.12-konq_menu_tab_background.patch | 136 + redhat/tdebase/kdebase-3.5.12-r1220927.patch | 29 + redhat/tdebase/kdebase-3.5.12-r1220975.patch | 19 + .../kdebase-3.5.12-shutdowndlg-dbus-include.patch | 20 + .../kdebase-3.5.12-startkde_directories.patch | 19 + ...ebase-3.5.13-add_disable_composite_option.patch | 81 + ...se-3.5.13-add_drag_drop_to_kate_file_list.patch | 33 + ...base-3.5.13-add_reorder_documents_in_kate.patch | 167 + .../kdebase-3.5.13-add_usbstorage_panel.patch | 1278 + .../kdebase-3.5.13-add_xscreensaver_support.patch | 76 + ...al_window_interaction_inside_lock_process.patch | 372 + .../kdebase-3.5.13-build_without_consolekit.patch | 22 + .../kdebase-3.5.13-build_without_dbustqt.patch | 97 + ...yboard_shortcuts_for_file_location_moving.patch | 22 + ...e-3.5.13-disable_tsak_dialog_if_not_built.patch | 50 + ...-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | 37 + .../kdebase-3.5.13-enable_xtest_support.patch | 135 + ...base-3.5.13-engage_lock_in_near_real_time.patch | 252 + ...3-engage_lock_in_near_real_time_continued.patch | 356 + ...-3.5.13-ensure_pagersettings_is_installed.patch | 19 + .../tdebase/kdebase-3.5.13-fix_dbus_include.patch | 10 + .../kdebase-3.5.13-fix_device_icon_placement.patch | 30 + .../tdebase/kdebase-3.5.13-fix_fancy_logout.patch | 162 + .../tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch | 46 + ...e-3.5.13-fix_kdesktop_lock_security_issue.patch | 157 + ...-fix_kdesu_kdesudo_argument_compatibility.patch | 18 + .../tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch | 47 + ...kdebase-3.5.13-fix_khtml_smooth_scrolling.patch | 38 + redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch | 57 + ...ase-3.5.13-fix_kio_sftp_nonstandard_ports.patch | 23 + .../kdebase-3.5.13-fix_kxdglauncher_document.patch | 18 + .../tdebase/kdebase-3.5.13-fix_lib_detection.patch | 102 + .../tdebase/kdebase-3.5.13-fix_lock_failure.patch | 84 + ....5.13-fix_menu_crash_with_disabled_search.patch | 20 + ...kdebase-3.5.13-fix_multihead_desktop_lock.patch | 297 + ...e-3.5.13-fix_potential_ABI_compat_problem.patch | 24 + .../kdebase-3.5.13-fix_race_condition.patch | 22 + .../kdebase-3.5.13-fix_rhel4_compilation.patch | 152 + .../tdebase/kdebase-3.5.13-fix_tooltip_lock.patch | 29 + ...-3.5.13-fix_translations_in_desktop_files.patch | 105 + redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch | 12 + ...ebase-3.5.13-genkdmconf_Xsession_location.patch | 11 + ...e-3.5.13-genkdmconf_Xsession_location_xdm.patch | 11 + redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch | 133 + redhat/tdebase/kdebase-3.5.13-kate_mru.patch | 71 + .../kdebase-3.5.13-kdesu-noignorebutton.patch | 45 + .../kdebase-3.5.13-kdesu_showkeeppassword.patch | 11 + redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch | 43 + .../tdebase/kdebase-3.5.13-kicker-easyvector.patch | 29 + .../tdebase/kdebase-3.5.13-kickoff_unstable.patch | 442 + redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch | 40 + .../tdebase/kdebase-3.5.13-konq_icon_effect.patch | 19 + .../kdebase-3.5.13-konq_menu_tab_background.patch | 160 + .../kdebase-3.5.13-konqsidebar_documents.patch | 11 + ...-3.5.13-kpersonalizer_default_doubleclick.patch | 41 + .../kdebase-3.5.13-kwin-keramic-pics-emb.patch | 62 + .../kdebase-3.5.13-mediamanager_ftbfs.patch | 10 + ...e-3.5.13-option_to_disable_scroll_desktop.patch | 101 + ...se-3.5.13-prevent_tooltip_over_lockscreen.patch | 137 + ....13-randrtray_merge_x11_reconfig_requests.patch | 51 + ...-replicate_led_status_on_virtual_keyboard.patch | 95 + .../kdebase-3.5.13-restore_kde3_clock.patch | 104 + .../tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch | 34 + .../kdebase-3.5.13-startkde_directories.patch | 118 + redhat/tdebase/kdebase-3.5.13-startkde_icon.patch | 19 + .../kdebase-3.5.13-startkde_ldpreload.patch | 13 + redhat/tdebase/kdebase-3.5.13-support_hal_04.patch | 1033 + .../kdebase-3.5.13-tsak_keyboard_hotplug.patch | 641 + ...3-update_default_konq_max_image_prev_size.patch | 49 + ...kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz | Bin 0 -> 302981 bytes .../kdebase-3.5.13.1-fix_displayconfig_icon.patch | 20 + .../kdebase-3.5.13.1-fix_startkde_path.patch | 107 + .../kdebase-3.5.13.1-fix_tdm_pid_file.patch | 11 + .../tdebase/kdebase-3.5.13.1-startkde_icon.patch | 19 + redhat/tdebase/kdebase-bp126-553923b2.diff | 135 + redhat/tdebase/kdebase-bp127-57f5c069.diff | 159 + redhat/tdebase/kdebase-bp128-1f33dc8f.diff | 58 + redhat/tdebase/pamd.kcheckpass-trinity.el4 | 11 + redhat/tdebase/pamd.kcheckpass-trinity.el5 | 9 + redhat/tdebase/pamd.kcheckpass-trinity.el6 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.fc15 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.fc16 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.fc17 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.mdv2011.0 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.mga2 | 5 + .../tdebase/pamd.kcheckpass-trinity.opensuse1220 | 5 + redhat/tdebase/pamd.kcheckpass-trinity.pclos2012 | 5 + redhat/tdebase/pamd.kdm-trinity-np.el4 | 9 + redhat/tdebase/pamd.kdm-trinity-np.el5 | 11 + redhat/tdebase/pamd.kdm-trinity-np.el6 | 13 + redhat/tdebase/pamd.kdm-trinity-np.fc15 | 15 + redhat/tdebase/pamd.kdm-trinity-np.fc16 | 15 + redhat/tdebase/pamd.kdm-trinity-np.fc17 | 15 + redhat/tdebase/pamd.kdm-trinity-np.mdv2011.0 | 7 + redhat/tdebase/pamd.kdm-trinity-np.mga2 | 10 + redhat/tdebase/pamd.kdm-trinity-np.pclos2012 | 7 + redhat/tdebase/pamd.kdm-trinity.el4 | 11 + redhat/tdebase/pamd.kdm-trinity.el5 | 10 + redhat/tdebase/pamd.kdm-trinity.el6 | 16 + redhat/tdebase/pamd.kdm-trinity.fc15 | 18 + redhat/tdebase/pamd.kdm-trinity.fc16 | 18 + redhat/tdebase/pamd.kdm-trinity.fc17 | 18 + redhat/tdebase/pamd.kdm-trinity.mdv2011.0 | 8 + redhat/tdebase/pamd.kdm-trinity.mga2 | 13 + redhat/tdebase/pamd.kdm-trinity.pclos2012 | 8 + redhat/tdebase/pamd.kscreensaver-trinity.el4 | 11 + redhat/tdebase/pamd.kscreensaver-trinity.el5 | 9 + redhat/tdebase/pamd.kscreensaver-trinity.el6 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.fc15 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.fc16 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.fc17 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.mdv2011.0 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.mga2 | 5 + redhat/tdebase/pamd.kscreensaver-trinity.pclos2012 | 5 + redhat/tdebase/plasma-desktop | 9 + redhat/tdebase/r1182808.diff | 29 + redhat/tdebase/r1201523.diff | 31 + redhat/tdebase/r1201705.diff | 43 + redhat/tdebase/r1221326.diff | 13 + redhat/tdebase/suse-displaymanagers-tdm | 21 + .../tdebase/tdebase-3.5.13.1-missing_ldflags.patch | 10 + redhat/tdebase/tdebase-r14.spec | 648 + redhat/tdebase/tiles-fixed-png-images.tar.gz | Bin 0 -> 50550 bytes redhat/tdebase/trinity-kdebase-3.5.12.spec | 757 + redhat/tdebase/trinity-kdebase-3.5.13.1.spec | 3266 + redhat/tdebase/trinity-kdebase-3.5.13.spec | 3467 + ...bindings-3.5.13-fix_dcopc_header_location.patch | 12 + redhat/tdebindings/kdebindings-3.5.13-fixes.patch | 80 + .../kdebindings-3.5.13-missing_ldflags.patch | 32 + ...indings-3.5.13-openjdk_remove_hpi_support.patch | 41 + .../tdebindings/kdebindings-3.5.13-ruby_1.9.patch | 691 + .../kdebindings-3.5.13.1-detect_ruby_pkg.patch | 86 + ...dings-3.5.13.1-fallback_to_ruby19_pc_file.patch | 34 + ...kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch | 11 + .../kdebindings-3.5.13.1-fix_ftbfs_on_x86.patch | 82 + .../kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch | 56 + .../kdebindings-3.5.13.1-fix_ftbfs_ruby19.patch | 683 + .../kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch | 31 + ...5.13.1-fix_ruby_detect_when_pc_file_is_19.patch | 55 + .../kdebindings-3.5.13.1-set_have_ruby19.patch | 30 + ...bindings-3.5.13.1-use_cflags_from_pc_file.patch | 78 + redhat/tdebindings/kdebindings-3.5.6-libgcj.patch | 48 + redhat/tdebindings/trinity-kdebindings-3.5.12.spec | 295 + .../tdebindings/trinity-kdebindings-3.5.13.1.spec | 1112 + redhat/tdebindings/trinity-kdebindings-3.5.13.spec | 1061 + .../kdeedu-3.5.13-fix_gcc47_compilation.patch | 17 + .../kdeedu-3.5.13-fix_kbruch_build_error.patch | 18 + .../tdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch | 51 + .../tdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch | 17 + redhat/tdeedu/kdeedu-3.5.13-missing_ldflags.patch | 55 + redhat/tdeedu/trinity-kdeedu-3.5.12.spec | 235 + redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec | 1400 + redhat/tdeedu/trinity-kdeedu-3.5.13.spec | 1429 + ...games-3.5.13-ktuberling_fail_load_picture.patch | 11 + .../tdegames/kdegames-3.5.13-missing_ldflags.patch | 44 + .../tdegames/kdegames-3.5.13-sru-20120827.patch.gz | Bin 0 -> 129535 bytes redhat/tdegames/trinity-kdegames-3.5.12.spec | 196 + redhat/tdegames/trinity-kdegames-3.5.13.1.spec | 1604 + redhat/tdegames/trinity-kdegames-3.5.13.spec | 1610 + .../kdegraphics-3.5.13-add_poppler_tqt_pc.patch | 41 + .../kdegraphics-3.5.13-disable_kuickshow_doc.patch | 10 + .../kdegraphics-3.5.13-disable_poppler.patch | 11 + ...kdegraphics-3.5.13-fix_corrupt_image_file.patch | 17 + .../kdegraphics-3.5.13-fix_gcc47_compilation.patch | 307 + ...degraphics-3.5.13-fix_poppler_include_dir.patch | 11 + .../kdegraphics-3.5.13-fix_poppler_support.patch | 27 + .../kdegraphics-3.5.13-kpovmodeler_check_glu.patch | 16 + ...ics-3.5.13-kpovmodeler_missing_gl_ldflags.patch | 10 + .../kdegraphics-3.5.13-ksnapshot_ldflags.patch | 11 + .../kdegraphics-3.5.13-xpdf_disable_mkstemps.patch | 11 + ...degraphics-3.5.13.1-fix_poppler_pkgconfig.patch | 12 + .../kdegraphics-3.5.13.1-fix_rhel4_libraries.patch | 38 + redhat/tdegraphics/trinity-kdegraphics-3.5.12.spec | 369 + .../tdegraphics/trinity-kdegraphics-3.5.13.1.spec | 1312 + redhat/tdegraphics/trinity-kdegraphics-3.5.13.spec | 1007 + redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch | 21 + .../kdelibs-3.5.12-kstandarddirs_trinity.patch | 29 + ...ibs-3.5.13-add_dynamic_label_to_kpassword.patch | 139 + .../kdelibs-3.5.13-add_inotify_support.patch | 67 + .../tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch | 79 + redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch | 67 + ...-fix_UTF8_encoding_for_WebDAV_directories.patch | 45 + .../tdelibs/kdelibs-3.5.13-fix_add_printer.patch | 20 + ...ibs-3.5.13-fix_all_languages_installation.patch | 20 + .../tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch | 27 + ....5.13-fix_composition_extension_detection.patch | 159 + ...-3.5.13-fix_creation_of_profile_directory.patch | 12 + .../tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch | 22 + .../tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch | 20 + ...kioslave_not_parsing_large_image_properly.patch | 171 + redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch | 20 + .../tdelibs/kdelibs-3.5.13-fix_konq_filter.patch | 83 + ...kdelibs-3.5.13-fix_ktempfile_special_bits.patch | 27 + .../tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch | 52 + ...3-fix_spinbox_text_entry_when_base_not_10.patch | 35 + ...kdelibs-3.5.13-fix_tdesu_internal_pathing.patch | 33 + ...5.13-fix_x11_threading_when_kinit_is_used.patch | 20 + .../kdelibs-3.5.13-fix_xrender_libdir.patch | 987 + redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz | Bin 0 -> 195241 bytes redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch | 40 + ...5.13-prevent_xdg_autostart_multiple_times.patch | 53 + .../kdelibs-3.5.13-reduce_more_applications.patch | 41 + ...store_tdesu_keeppassword_default_disabled.patch | 21 + ...te_iso_kioslave_better_handle_large_image.patch | 115 + ...disable_invalid_certificate_always_prompt.patch | 15 + redhat/tdelibs/tdelibs-r14.spec | 316 + redhat/tdelibs/trinity-kdelibs-3.5.12.spec | 369 + redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec | 434 + redhat/tdelibs/trinity-kdelibs-3.5.13.spec | 520 + redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch | 10 + .../kdemultimedia-3.5.13-fix_autostart_again.patch | 31 + .../kdemultimedia-3.5.13-fix_kmix_autostart.patch | 34 + .../kdemultimedia-3.5.13-fix_linear_alphabet.patch | 19 + .../kdemultimedia-3.5.13-fix_mmx_detection.patch | 12 + .../kdemultimedia-3.5.13-missing_ldflags.patch | 133 + ...ultimedia-3.5.13-remove_more_applications.patch | 49 + .../kdemultimedia-3.5.7-pthread.patch | 11 + .../trinity-kdemultimedia-3.5.12.spec | 396 + .../trinity-kdemultimedia-3.5.13.1.spec | 1185 + .../trinity-kdemultimedia-3.5.13.spec | 1204 + redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch | 26 + redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp | 3 + ...enetwork-3.5.13-fix_a_fatal_error_message.patch | 20 + ...enetwork-3.5.13-fix_alphabet_string_error.patch | 97 + ...x_html_specialchar_in_kopete_nowlistening.patch | 46 + ...html_specialchar_in_kopete_nowlistening_2.patch | 46 + .../kdenetwork-3.5.13-fix_parallel_build.patch | 19 + ...e_kaffeine_support_in_nowlistening_plugin.patch | 66 + .../kdenetwork-3.5.13-kopete_jabber_protocol.patch | 30 + ...work-3.5.13-kopete_motionawayplugin_ftbfs.patch | 15 + .../kdenetwork-3.5.13-kopete_msn_protocol.patch | 10 + .../kdenetwork-3.5.13-kopete_sms_protocol.patch | 11 + .../kdenetwork-3.5.13-missing_ldflags.patch | 10 + .../kdenetwork-3.5.13-reference_to_qmake_h.patch | 108 + ...3.5.13-remove_more_applications_from_menu.patch | 39 + .../kdenetwork-3.5.13.1-add_cmake_macro.patch | 24 + .../kdenetwork-3.5.13.1-fix_rhel4_libraries.patch | 9 + .../kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch | 58 + redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff | 14 + redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch | 9 + .../tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch | 33 + redhat/tdenetwork/kdenetwork-kopete-gcc45.patch | 57 + redhat/tdenetwork/kppp.pamd | 4 + redhat/tdenetwork/ktalk | 12 + redhat/tdenetwork/lisa.redhat | 91 + redhat/tdenetwork/lisarc | 10 + redhat/tdenetwork/r1243951.diff | 42 + redhat/tdenetwork/trinity-kdenetwork-3.5.12.spec | 502 + redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec | 1188 + redhat/tdenetwork/trinity-kdenetwork-3.5.13.spec | 1182 + ...depim-3.5.13-disable_fsync_in_cached_imap.patch | 19 + redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch | 21 + .../tdepim/kdepim-3.5.13-fix_composer_crash.patch | 20 + .../kdepim-3.5.13-fix_gcc47_compilation.patch | 64 + .../kdepim-3.5.13-fix_include_directory.patch | 219 + .../kdepim-3.5.13-fix_kalarm_icon_reference.patch | 19 + .../kdepim-3.5.13-fix_kio_imap4_addquotes.patch | 61 + ...kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch | 17 + .../kdepim-3.5.13-fix_knotes_after_restored.patch | 21 + .../kdepim-3.5.13-fix_knotes_on_suspend.patch | 20 + .../tdepim/kdepim-3.5.13-fix_linear_alphabet.patch | 71 + redhat/tdepim/kdepim-3.5.13-fix_segv.patch | 33 + .../tdepim/kdepim-3.5.13-fix_systray_count.patch | 20 + redhat/tdepim/kdepim-3.5.13-missing_ldflags.patch | 10 + .../kdepim-3.5.13.1-fix_imapparser_segv.patch | 44 + .../kdepim-3.5.13.1-fix_imapparser_segv_2.patch | 15 + .../kdepim-3.5.13.1-kmime_utils_quotes.patch | 41 + redhat/tdepim/trinity-kdepim-3.5.12.spec | 153 + redhat/tdepim/trinity-kdepim-3.5.13.1.spec | 2166 + redhat/tdepim/trinity-kdepim-3.5.13.spec | 2198 + .../kdesdk-3.5.13-add_forgotten_cmake_files.patch | 1921 + redhat/tdesdk/kdesdk-3.5.13-cmake_port.patch | 100 + .../kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch | 32 + redhat/tdesdk/kdesdk-3.5.13-misc_ftbfs.patch | 10 + .../tdesdk/kdesdk-3.5.13.1-add_missing_files.patch | 309 + .../tdesdk/kdesdk-3.5.13.1-fix_cmake_macros.patch | 17 + .../kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch | 39683 +++++ ...desdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch.gz | Bin 0 -> 500738 bytes .../kdesdk-3.5.13.1-fix_various_cmake_issues.patch | 159 + ...dk-3.5.13.1-fix_xkcachegrind_installation.patch | 13 + .../kdesdk-3.5.13.1-use_flex_instead_of_lex.patch | 11 + redhat/tdesdk/kdesdk-3.5.7-subversion.patch | 21 + redhat/tdesdk/trinity-kdesdk-3.5.12.spec | 245 + redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec | 1161 + redhat/tdesdk/trinity-kdesdk-3.5.13.spec | 1130 + .../tdetoys/kdetoys-3.5.13-missing_ldflags.patch | 21 + redhat/tdetoys/trinity-kdetoys-3.5.12.spec | 165 + redhat/tdetoys/trinity-kdetoys-3.5.13.1.spec | 450 + redhat/tdetoys/trinity-kdetoys-3.5.13.spec | 459 + redhat/tdeutils/kcmlaptoprc | 114 + redhat/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch | 63 + ...deutils-3.5.13-ark_repairs_and_extensions.patch | 1281 + .../kdeutils-3.5.13-fix_ark_embedding.patch | 16 + .../kdeutils-3.5.13-further_organise_menu.patch | 49 + ...deutils-3.5.13-klaptopdaemon_dpkg_command.patch | 31 + .../tdeutils/kdeutils-3.5.13-missing_ldflags.patch | 61 + .../kdeutils-3.5.13-remove_more_applications.patch | 46 + ...tils-3.5.13-reorganize_kcontrol_menu_tree.patch | 57 + redhat/tdeutils/kdf-3.0.2-label.patch | 13 + redhat/tdeutils/klaptop_acpi_helper.console | 1 + redhat/tdeutils/klaptop_acpi_helper.pam | 4 + redhat/tdeutils/trinity-kdeutils-3.5.12.spec | 361 + redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec | 1038 + redhat/tdeutils/trinity-kdeutils-3.5.13.spec | 1076 + redhat/tdevelop/c_cpp_reference-2.0.2-config.patch | 11 + .../tdevelop/c_cpp_reference-2.0.2-install.patch | 9 + .../c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 | Bin 0 -> 1096541 bytes .../tdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch | 19 + redhat/tdevelop/kdevelop-3.5.13-gcc47.patch | 22 + .../kdevelop-3.5.13-kdevdesigner-ftbfs.patch | 11 + redhat/tdevelop/kdevelop-3.5.2-kde4template.patch | 144 + redhat/tdevelop/trinity-kdevelop-3.5.12.spec | 254 + redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec | 636 + redhat/tdevelop/trinity-kdevelop-3.5.13.spec | 292 + redhat/tdewebdev/css.tar.bz2 | Bin 0 -> 121295 bytes redhat/tdewebdev/hi48-app-kxsldbg.png | Bin 0 -> 2652 bytes redhat/tdewebdev/html.tar.bz2 | Bin 0 -> 93345 bytes redhat/tdewebdev/javascript.patch | Bin 0 -> 239 bytes redhat/tdewebdev/javascript.tar.bz2 | Bin 0 -> 336563 bytes redhat/tdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch | 22 + .../tdewebdev/kdewebdev-3.5.4-kxsldbg-icons.patch | 11 + redhat/tdewebdev/php_manual_en_20030401.tar.bz2 | Bin 0 -> 1346608 bytes redhat/tdewebdev/trinity-kdewebdev-3.5.12.spec | 228 + redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec | 566 + redhat/tdewebdev/trinity-kdewebdev-3.5.13.spec | 556 + 823 files changed, 281351 insertions(+), 281328 deletions(-) create mode 120000 opensuse/core/dependencies delete mode 100644 redhat/applications/kde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch delete mode 100644 redhat/applications/kde-guidance/trinity-guidance-3.5.13.1.spec delete mode 100644 redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec delete mode 100644 redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec delete mode 100644 redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec delete mode 100644 redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec delete mode 100644 redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch delete mode 100644 redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch delete mode 100644 redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch delete mode 100644 redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch delete mode 100644 redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec delete mode 100644 redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec delete mode 100644 redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec delete mode 100644 redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.spec delete mode 100644 redhat/applications/kdesudo/trinity-kdesudo-3.5.13.1.spec delete mode 100644 redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec delete mode 100644 redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch delete mode 100644 redhat/applications/kdesvn/trinity-kdesvn-3.5.13.1.spec delete mode 100644 redhat/applications/kdesvn/trinity-kdesvn-3.5.13.spec delete mode 100644 redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.1.spec delete mode 100644 redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.spec delete mode 100644 redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec delete mode 100644 redhat/applications/kio-locate/trinity-kio-locate-3.5.13.1.spec delete mode 100644 redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec delete mode 100644 redhat/applications/kio-umountwrapper/media_safelyremove.desktop delete mode 100644 redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec delete mode 100644 redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec delete mode 100644 redhat/applications/kradio/kradio-3.5.13.1-updated_preset.patch delete mode 100644 redhat/applications/kradio/trinity-kradio-3.5.13.1.spec delete mode 100644 redhat/applications/kradio/trinity-kradio-3.5.13.spec create mode 100644 redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch create mode 100644 redhat/applications/tde-guidance/trinity-guidance-3.5.13.1.spec create mode 100644 redhat/applications/tde-guidance/trinity-guidance-3.5.13.spec create mode 100644 redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec create mode 100644 redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec create mode 100644 redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec create mode 100644 redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch create mode 100644 redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch create mode 100644 redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch create mode 100644 redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch create mode 100644 redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec create mode 100644 redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec create mode 100644 redhat/applications/tde-systemsettings/kde-settings-laptops.directory create mode 100644 redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec create mode 100644 redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.spec create mode 100644 redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/applications/tdeio-locate/trinity-kio-locate-3.5.12.spec create mode 100644 redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.1.spec create mode 100644 redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.spec create mode 100644 redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop create mode 100644 redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec create mode 100644 redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec create mode 100644 redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch create mode 100644 redhat/applications/tderadio/trinity-kradio-3.5.13.1.spec create mode 100644 redhat/applications/tderadio/trinity-kradio-3.5.13.spec create mode 100644 redhat/applications/tdesudo/trinity-kdesudo-3.5.13.1.spec create mode 100644 redhat/applications/tdesudo/trinity-kdesudo-3.5.13.spec create mode 100644 redhat/applications/tdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/applications/tdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch create mode 100644 redhat/applications/tdesvn/trinity-kdesvn-3.5.13.1.spec create mode 100644 redhat/applications/tdesvn/trinity-kdesvn-3.5.13.spec create mode 100644 redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.1.spec create mode 100644 redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.spec delete mode 100644 redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch delete mode 100644 redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch delete mode 100644 redhat/kde-i18n/kde-i18n-kdesu.patch delete mode 100644 redhat/kde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz delete mode 100644 redhat/kde-i18n/trinity-i18n-3.5.13.1.spec delete mode 100644 redhat/kde-i18n/trinity-kde-i18n-3.5.12.spec delete mode 100644 redhat/kde-i18n/trinity-kde-i18n-3.5.13.spec delete mode 100644 redhat/kde-i18n/trinity-kde-i18n-fr-openterminalhere.patch delete mode 100644 redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.12.spec delete mode 100644 redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec delete mode 100644 redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec delete mode 100644 redhat/kdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz delete mode 100644 redhat/kdeaddons/kdeaddons-3.5.3-sdl.patch delete mode 100644 redhat/kdeaddons/metabar-fedora.tar.bz2 delete mode 100644 redhat/kdeaddons/metabarrc delete mode 100644 redhat/kdeaddons/trinity-kdeaddons-3.5.12.spec delete mode 100644 redhat/kdeaddons/trinity-kdeaddons-3.5.13.1.spec delete mode 100644 redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec delete mode 100644 redhat/kdeadmin/bp004-1f719050.diff delete mode 100644 redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch delete mode 100644 redhat/kdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch delete mode 100644 redhat/kdeadmin/kpackagerc delete mode 100644 redhat/kdeadmin/ksysvrc delete mode 100644 redhat/kdeadmin/kuser.pam delete mode 100644 redhat/kdeadmin/kuser.pamd delete mode 100644 redhat/kdeadmin/kuserrc delete mode 100644 redhat/kdeadmin/trinity-kdeadmin-3.5.12.spec delete mode 100644 redhat/kdeadmin/trinity-kdeadmin-3.5.13.1.spec delete mode 100644 redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec delete mode 100644 redhat/kdeartwork/kdeartwork-3.5.13.1-fix_locolor_theme_name.patch.gz delete mode 100644 redhat/kdeartwork/trinity-kdeartwork-3.5.12.spec delete mode 100644 redhat/kdeartwork/trinity-kdeartwork-3.5.13.1.spec delete mode 100644 redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec delete mode 100644 redhat/kdeartwork/webcollagerc delete mode 100644 redhat/kdebase/kdebase-3.5.12-desktop-openterminalhere.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-disable-krandr.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-halmountoptions.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kdesu-noignorebutton.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kdm_hide_menu_button.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kickerfix.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kickoff_unstable.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-kio_man_utf8.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-r1220927.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-r1220975.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch delete mode 100644 redhat/kdebase/kdebase-3.5.12-startkde_directories.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-add_disable_composite_option.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-add_usbstorage_panel.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-add_xscreensaver_support.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-build_without_consolekit.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-build_without_dbustqt.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-enable_xtest_support.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_dbus_include.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_device_icon_placement.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_fancy_logout.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_fqdn_in_title.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kio_sftp.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_lib_detection.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_race_condition.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_rhel4_compilation.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_tooltip_lock.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kate_focus_fix.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kate_mru.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kdesu-noignorebutton.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kicker-easyvector.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kickoff_unstable.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-konq_icon_effect.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-mediamanager_ftbfs.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-restore_kde3_clock.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-start_dcop_in_tdm.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-startkde_directories.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-startkde_icon.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-support_hal_04.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz delete mode 100644 redhat/kdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13.1-fix_startkde_path.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch delete mode 100644 redhat/kdebase/kdebase-3.5.13.1-startkde_icon.patch delete mode 100644 redhat/kdebase/kdebase-bp126-553923b2.diff delete mode 100644 redhat/kdebase/kdebase-bp127-57f5c069.diff delete mode 100644 redhat/kdebase/kdebase-bp128-1f33dc8f.diff delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.el4 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.el5 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.el6 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc15 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc16 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.fc17 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.0 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.mga2 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.opensuse1220 delete mode 100644 redhat/kdebase/pamd.kcheckpass-trinity.pclos2012 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.el4 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.el5 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.el6 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc15 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc16 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.fc17 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.mdv2011.0 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.mga2 delete mode 100644 redhat/kdebase/pamd.kdm-trinity-np.pclos2012 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.el4 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.el5 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.el6 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.fc15 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.fc16 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.fc17 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.mdv2011.0 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.mga2 delete mode 100644 redhat/kdebase/pamd.kdm-trinity.pclos2012 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.el4 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.el5 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.el6 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc15 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc16 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.fc17 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.0 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.mga2 delete mode 100644 redhat/kdebase/pamd.kscreensaver-trinity.pclos2012 delete mode 100644 redhat/kdebase/plasma-desktop delete mode 100644 redhat/kdebase/r1182808.diff delete mode 100644 redhat/kdebase/r1201523.diff delete mode 100644 redhat/kdebase/r1201705.diff delete mode 100644 redhat/kdebase/r1221326.diff delete mode 100644 redhat/kdebase/suse-displaymanagers-tdm delete mode 100644 redhat/kdebase/tdebase-3.5.13.1-missing_ldflags.patch delete mode 100644 redhat/kdebase/tdebase-r14.spec delete mode 100644 redhat/kdebase/tiles-fixed-png-images.tar.gz delete mode 100644 redhat/kdebase/trinity-kdebase-3.5.12.spec delete mode 100644 redhat/kdebase/trinity-kdebase-3.5.13.1.spec delete mode 100644 redhat/kdebase/trinity-kdebase-3.5.13.spec delete mode 100644 redhat/kdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13-fixes.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13-openjdk_remove_hpi_support.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13-ruby_1.9.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-detect_ruby_pkg.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_ftbfs_on_x86.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby19.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-fix_ruby_detect_when_pc_file_is_19.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-set_have_ruby19.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.13.1-use_cflags_from_pc_file.patch delete mode 100644 redhat/kdebindings/kdebindings-3.5.6-libgcj.patch delete mode 100644 redhat/kdebindings/trinity-kdebindings-3.5.12.spec delete mode 100644 redhat/kdebindings/trinity-kdebindings-3.5.13.1.spec delete mode 100644 redhat/kdebindings/trinity-kdebindings-3.5.13.spec delete mode 100644 redhat/kdeedu/kdeedu-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/kdeedu/kdeedu-3.5.13-fix_kbruch_build_error.patch delete mode 100644 redhat/kdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch delete mode 100644 redhat/kdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch delete mode 100644 redhat/kdeedu/kdeedu-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdeedu/trinity-kdeedu-3.5.12.spec delete mode 100644 redhat/kdeedu/trinity-kdeedu-3.5.13.1.spec delete mode 100644 redhat/kdeedu/trinity-kdeedu-3.5.13.spec delete mode 100644 redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch delete mode 100644 redhat/kdegames/kdegames-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdegames/kdegames-3.5.13-sru-20120827.patch.gz delete mode 100644 redhat/kdegames/trinity-kdegames-3.5.12.spec delete mode 100644 redhat/kdegames/trinity-kdegames-3.5.13.1.spec delete mode 100644 redhat/kdegames/trinity-kdegames-3.5.13.spec delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-disable_poppler.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-fix_corrupt_image_file.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch delete mode 100644 redhat/kdegraphics/kdegraphics-3.5.13.1-fix_rhel4_libraries.patch delete mode 100644 redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec delete mode 100644 redhat/kdegraphics/trinity-kdegraphics-3.5.13.1.spec delete mode 100644 redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec delete mode 100644 redhat/kdelibs/kdelibs-3.5.12-fixx11h.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-add_inotify_support.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-enable_fam_gamin.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_add_printer.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_build_kspell2.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_kdirwatch.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_konq_filter.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_slide_drawing.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-maxlinelength.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-reduce_more_applications.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch delete mode 100644 redhat/kdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch delete mode 100755 redhat/kdelibs/tdelibs-r14.spec delete mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.12.spec delete mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.13.1.spec delete mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.13.spec delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.4.0-xdg.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch delete mode 100644 redhat/kdemultimedia/kdemultimedia-3.5.7-pthread.patch delete mode 100644 redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec delete mode 100644 redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.1.spec delete mode 100644 redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec delete mode 100644 redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.13.1-wifi3.diff delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.8-kppp.patch delete mode 100644 redhat/kdenetwork/kdenetwork-3.5.9-krfb_httpd.patch delete mode 100644 redhat/kdenetwork/kdenetwork-kopete-gcc45.patch delete mode 100644 redhat/kdenetwork/kppp.pamd delete mode 100644 redhat/kdenetwork/ktalk delete mode 100644 redhat/kdenetwork/lisa.redhat delete mode 100644 redhat/kdenetwork/lisarc delete mode 100644 redhat/kdenetwork/r1243951.diff delete mode 100644 redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec delete mode 100644 redhat/kdenetwork/trinity-kdenetwork-3.5.13.1.spec delete mode 100644 redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec delete mode 100644 redhat/kdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_include_directory.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_knotes_after_restored.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_linear_alphabet.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_segv.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-fix_systray_count.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch delete mode 100644 redhat/kdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch delete mode 100644 redhat/kdepim/trinity-kdepim-3.5.12.spec delete mode 100644 redhat/kdepim/trinity-kdepim-3.5.13.1.spec delete mode 100644 redhat/kdepim/trinity-kdepim-3.5.13.spec delete mode 100644 redhat/kdesdk/kdesdk-3.5.13-add_forgotten_cmake_files.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13-cmake_port.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13-misc_ftbfs.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-add_missing_files.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-fix_cmake_macros.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch.gz delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-fix_various_cmake_issues.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-fix_xkcachegrind_installation.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.13.1-use_flex_instead_of_lex.patch delete mode 100644 redhat/kdesdk/kdesdk-3.5.7-subversion.patch delete mode 100644 redhat/kdesdk/trinity-kdesdk-3.5.12.spec delete mode 100644 redhat/kdesdk/trinity-kdesdk-3.5.13.1.spec delete mode 100644 redhat/kdesdk/trinity-kdesdk-3.5.13.spec delete mode 100644 redhat/kdetoys/kdetoys-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdetoys/trinity-kdetoys-3.5.12.spec delete mode 100644 redhat/kdetoys/trinity-kdetoys-3.5.13.1.spec delete mode 100644 redhat/kdetoys/trinity-kdetoys-3.5.13.spec delete mode 100644 redhat/kdeutils/kcmlaptoprc delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-ark_fix_utf8.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-fix_ark_embedding.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-further_organise_menu.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-missing_ldflags.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-remove_more_applications.patch delete mode 100644 redhat/kdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch delete mode 100644 redhat/kdeutils/kdf-3.0.2-label.patch delete mode 100644 redhat/kdeutils/klaptop_acpi_helper.console delete mode 100644 redhat/kdeutils/klaptop_acpi_helper.pam delete mode 100755 redhat/kdeutils/trinity-kdeutils-3.5.12.spec delete mode 100755 redhat/kdeutils/trinity-kdeutils-3.5.13.1.spec delete mode 100755 redhat/kdeutils/trinity-kdeutils-3.5.13.spec delete mode 100644 redhat/kdevelop/c_cpp_reference-2.0.2-config.patch delete mode 100644 redhat/kdevelop/c_cpp_reference-2.0.2-install.patch delete mode 100644 redhat/kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 delete mode 100644 redhat/kdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch delete mode 100644 redhat/kdevelop/kdevelop-3.5.13-gcc47.patch delete mode 100644 redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch delete mode 100644 redhat/kdevelop/kdevelop-3.5.2-kde4template.patch delete mode 100644 redhat/kdevelop/trinity-kdevelop-3.5.12.spec delete mode 100644 redhat/kdevelop/trinity-kdevelop-3.5.13.1.spec delete mode 100644 redhat/kdevelop/trinity-kdevelop-3.5.13.spec delete mode 100644 redhat/kdewebdev/css.tar.bz2 delete mode 100644 redhat/kdewebdev/hi48-app-kxsldbg.png delete mode 100644 redhat/kdewebdev/html.tar.bz2 delete mode 100644 redhat/kdewebdev/javascript.patch delete mode 100644 redhat/kdewebdev/javascript.tar.bz2 delete mode 100644 redhat/kdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch delete mode 100644 redhat/kdewebdev/kdewebdev-3.5.4-kxsldbg-icons.patch delete mode 100644 redhat/kdewebdev/php_manual_en_20030401.tar.bz2 delete mode 100644 redhat/kdewebdev/trinity-kdewebdev-3.5.12.spec delete mode 100644 redhat/kdewebdev/trinity-kdewebdev-3.5.13.1.spec delete mode 100644 redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libtool.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch delete mode 100644 redhat/libraries/pykdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch delete mode 100644 redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.1.spec delete mode 100644 redhat/libraries/pykdeextensions/trinity-pykdeextensions-3.5.13.spec create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch create mode 100644 redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch create mode 100644 redhat/libraries/pytdeextensions/trinity-pykdeextensions-3.5.13.1.spec create mode 100644 redhat/libraries/pytdeextensions/trinity-pykdeextensions-3.5.13.spec create mode 100644 redhat/tde-i18n/kde-i18n-3.5.13-add_french_translations.patch create mode 100644 redhat/tde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch create mode 100644 redhat/tde-i18n/kde-i18n-kdesu.patch create mode 100644 redhat/tde-i18n/kde-i18n-zh_TW-3.5.10.patch.gz create mode 100644 redhat/tde-i18n/trinity-i18n-3.5.13.1.spec create mode 100644 redhat/tde-i18n/trinity-kde-i18n-3.5.12.spec create mode 100644 redhat/tde-i18n/trinity-kde-i18n-3.5.13.spec create mode 100644 redhat/tde-i18n/trinity-kde-i18n-fr-openterminalhere.patch create mode 100644 redhat/tdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.12.spec create mode 100644 redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.1.spec create mode 100644 redhat/tdeaccessibility/trinity-kdeaccessibility-3.5.13.spec create mode 100644 redhat/tdeaddons/kdeaddons-3.5.13-sru-20120809.patch.gz create mode 100644 redhat/tdeaddons/kdeaddons-3.5.3-sdl.patch create mode 100644 redhat/tdeaddons/metabar-fedora.tar.bz2 create mode 100644 redhat/tdeaddons/metabarrc create mode 100644 redhat/tdeaddons/trinity-kdeaddons-3.5.12.spec create mode 100644 redhat/tdeaddons/trinity-kdeaddons-3.5.13.1.spec create mode 100644 redhat/tdeaddons/trinity-kdeaddons-3.5.13.spec create mode 100644 redhat/tdeadmin/bp004-1f719050.diff create mode 100644 redhat/tdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch create mode 100644 redhat/tdeadmin/kdeadmin-3.5.13-remove_more_applications_in_menu.patch create mode 100644 redhat/tdeadmin/kpackagerc create mode 100644 redhat/tdeadmin/ksysvrc create mode 100644 redhat/tdeadmin/kuser.pam create mode 100644 redhat/tdeadmin/kuser.pamd create mode 100644 redhat/tdeadmin/kuserrc create mode 100644 redhat/tdeadmin/trinity-kdeadmin-3.5.12.spec create mode 100644 redhat/tdeadmin/trinity-kdeadmin-3.5.13.1.spec create mode 100644 redhat/tdeadmin/trinity-kdeadmin-3.5.13.spec create mode 100644 redhat/tdeartwork/kdeartwork-3.5.13.1-fix_locolor_theme_name.patch.gz create mode 100644 redhat/tdeartwork/trinity-kdeartwork-3.5.12.spec create mode 100644 redhat/tdeartwork/trinity-kdeartwork-3.5.13.1.spec create mode 100644 redhat/tdeartwork/trinity-kdeartwork-3.5.13.spec create mode 100644 redhat/tdeartwork/webcollagerc create mode 100644 redhat/tdebase/kdebase-3.5.12-desktop-openterminalhere.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-disable-krandr.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-halmountoptions.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kdesktop_lock_fix.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kdesu-noignorebutton.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kdm_hide_menu_button.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kickerfix.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kickoff_unstable.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-kio_man_utf8.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-konq_menu_tab_background.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-r1220927.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-r1220975.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch create mode 100644 redhat/tdebase/kdebase-3.5.12-startkde_directories.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-add_disable_composite_option.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-add_drag_drop_to_kate_file_list.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-add_reorder_documents_in_kate.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-add_usbstorage_panel.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-add_xscreensaver_support.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-allow_minimal_window_interaction_inside_lock_process.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-build_without_consolekit.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-build_without_dbustqt.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-disable_keyboard_shortcuts_for_file_location_moving.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-enable_xtest_support.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-engage_lock_in_near_real_time_continued.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-ensure_pagersettings_is_installed.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_dbus_include.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_device_icon_placement.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_fancy_logout.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_fqdn_in_title.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdesktop_lock_security_issue.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdesu_kdesudo_argument_compatibility.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kdm_cpu_usage.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_khtml_smooth_scrolling.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kio_sftp.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kio_sftp_nonstandard_ports.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_kxdglauncher_document.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_lib_detection.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_lock_failure.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_menu_crash_with_disabled_search.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_multihead_desktop_lock.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_potential_ABI_compat_problem.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_race_condition.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_rhel4_compilation.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_tooltip_lock.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_translations_in_desktop_files.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-fix_tsak_ftbfs.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-genkdmconf_Xsession_location_xdm.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kate_focus_fix.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kate_mru.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kdesu-noignorebutton.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kdesu_showkeeppassword.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kdm-crypt.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kicker-easyvector.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kickoff_unstable.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kio_man_utf8.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-konq_icon_effect.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-konq_menu_tab_background.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-konqsidebar_documents.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kpersonalizer_default_doubleclick.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-kwin-keramic-pics-emb.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-mediamanager_ftbfs.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-option_to_disable_scroll_desktop.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-prevent_tooltip_over_lockscreen.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-replicate_led_status_on_virtual_keyboard.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-restore_kde3_clock.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-start_dcop_in_tdm.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_directories.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_icon.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-startkde_ldpreload.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-support_hal_04.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-tsak_keyboard_hotplug.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-update_default_konq_max_image_prev_size.patch create mode 100644 redhat/tdebase/kdebase-3.5.13-upgrade_to_sru_20120806.patch.gz create mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_displayconfig_icon.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_startkde_path.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.1-fix_tdm_pid_file.patch create mode 100644 redhat/tdebase/kdebase-3.5.13.1-startkde_icon.patch create mode 100644 redhat/tdebase/kdebase-bp126-553923b2.diff create mode 100644 redhat/tdebase/kdebase-bp127-57f5c069.diff create mode 100644 redhat/tdebase/kdebase-bp128-1f33dc8f.diff create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.el4 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.el5 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.el6 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.fc15 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.fc16 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.fc17 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.mdv2011.0 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.mga2 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.opensuse1220 create mode 100644 redhat/tdebase/pamd.kcheckpass-trinity.pclos2012 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.el4 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.el5 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.el6 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.fc15 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.fc16 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.fc17 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.mdv2011.0 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.mga2 create mode 100644 redhat/tdebase/pamd.kdm-trinity-np.pclos2012 create mode 100644 redhat/tdebase/pamd.kdm-trinity.el4 create mode 100644 redhat/tdebase/pamd.kdm-trinity.el5 create mode 100644 redhat/tdebase/pamd.kdm-trinity.el6 create mode 100644 redhat/tdebase/pamd.kdm-trinity.fc15 create mode 100644 redhat/tdebase/pamd.kdm-trinity.fc16 create mode 100644 redhat/tdebase/pamd.kdm-trinity.fc17 create mode 100644 redhat/tdebase/pamd.kdm-trinity.mdv2011.0 create mode 100644 redhat/tdebase/pamd.kdm-trinity.mga2 create mode 100644 redhat/tdebase/pamd.kdm-trinity.pclos2012 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.el4 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.el5 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.el6 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.fc15 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.fc16 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.fc17 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.mdv2011.0 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.mga2 create mode 100644 redhat/tdebase/pamd.kscreensaver-trinity.pclos2012 create mode 100644 redhat/tdebase/plasma-desktop create mode 100644 redhat/tdebase/r1182808.diff create mode 100644 redhat/tdebase/r1201523.diff create mode 100644 redhat/tdebase/r1201705.diff create mode 100644 redhat/tdebase/r1221326.diff create mode 100644 redhat/tdebase/suse-displaymanagers-tdm create mode 100644 redhat/tdebase/tdebase-3.5.13.1-missing_ldflags.patch create mode 100644 redhat/tdebase/tdebase-r14.spec create mode 100644 redhat/tdebase/tiles-fixed-png-images.tar.gz create mode 100644 redhat/tdebase/trinity-kdebase-3.5.12.spec create mode 100644 redhat/tdebase/trinity-kdebase-3.5.13.1.spec create mode 100644 redhat/tdebase/trinity-kdebase-3.5.13.spec create mode 100644 redhat/tdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13-fixes.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13-openjdk_remove_hpi_support.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13-ruby_1.9.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-detect_ruby_pkg.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_dcopjava_ldflags.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_on_x86.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby19.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_rhel5_ftbfs.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-fix_ruby_detect_when_pc_file_is_19.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-set_have_ruby19.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.13.1-use_cflags_from_pc_file.patch create mode 100644 redhat/tdebindings/kdebindings-3.5.6-libgcj.patch create mode 100644 redhat/tdebindings/trinity-kdebindings-3.5.12.spec create mode 100644 redhat/tdebindings/trinity-kdebindings-3.5.13.1.spec create mode 100644 redhat/tdebindings/trinity-kdebindings-3.5.13.spec create mode 100644 redhat/tdeedu/kdeedu-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/tdeedu/kdeedu-3.5.13-fix_kbruch_build_error.patch create mode 100644 redhat/tdeedu/kdeedu-3.5.13-fix_linear_alphabet.patch create mode 100644 redhat/tdeedu/kdeedu-3.5.13-fix_makefile_glitch.patch create mode 100644 redhat/tdeedu/kdeedu-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdeedu/trinity-kdeedu-3.5.12.spec create mode 100644 redhat/tdeedu/trinity-kdeedu-3.5.13.1.spec create mode 100644 redhat/tdeedu/trinity-kdeedu-3.5.13.spec create mode 100644 redhat/tdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch create mode 100644 redhat/tdegames/kdegames-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdegames/kdegames-3.5.13-sru-20120827.patch.gz create mode 100644 redhat/tdegames/trinity-kdegames-3.5.12.spec create mode 100644 redhat/tdegames/trinity-kdegames-3.5.13.1.spec create mode 100644 redhat/tdegames/trinity-kdegames-3.5.13.spec create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-add_poppler_tqt_pc.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-disable_poppler.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-fix_corrupt_image_file.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_include_dir.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-fix_poppler_support.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_check_glu.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-ksnapshot_ldflags.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13-xpdf_disable_mkstemps.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13.1-fix_poppler_pkgconfig.patch create mode 100644 redhat/tdegraphics/kdegraphics-3.5.13.1-fix_rhel4_libraries.patch create mode 100644 redhat/tdegraphics/trinity-kdegraphics-3.5.12.spec create mode 100644 redhat/tdegraphics/trinity-kdegraphics-3.5.13.1.spec create mode 100644 redhat/tdegraphics/trinity-kdegraphics-3.5.13.spec create mode 100644 redhat/tdelibs/kdelibs-3.5.12-fixx11h.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.12-kstandarddirs_trinity.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-enable_fam_gamin.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-enable_pcre.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_add_printer.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_build_kspell2.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_composition_extension_detection.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_creation_of_profile_directory.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_dcoptypes_h.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_kdirwatch.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_konq_filter.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_ktempfile_special_bits.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_slide_drawing.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-fix_xrender_libdir.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-kate_syntax.patch.gz create mode 100644 redhat/tdelibs/kdelibs-3.5.13-maxlinelength.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-reduce_more_applications.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch create mode 100644 redhat/tdelibs/kdelibs-3.5.13.1-disable_invalid_certificate_always_prompt.patch create mode 100755 redhat/tdelibs/tdelibs-r14.spec create mode 100755 redhat/tdelibs/trinity-kdelibs-3.5.12.spec create mode 100755 redhat/tdelibs/trinity-kdelibs-3.5.13.1.spec create mode 100755 redhat/tdelibs/trinity-kdelibs-3.5.13.spec create mode 100644 redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch create mode 100644 redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch create mode 100644 redhat/tdemultimedia/trinity-kdemultimedia-3.5.12.spec create mode 100644 redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.1.spec create mode 100644 redhat/tdemultimedia/trinity-kdemultimedia-3.5.13.spec create mode 100644 redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff create mode 100644 redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch create mode 100644 redhat/tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch create mode 100644 redhat/tdenetwork/kdenetwork-kopete-gcc45.patch create mode 100644 redhat/tdenetwork/kppp.pamd create mode 100644 redhat/tdenetwork/ktalk create mode 100644 redhat/tdenetwork/lisa.redhat create mode 100644 redhat/tdenetwork/lisarc create mode 100644 redhat/tdenetwork/r1243951.diff create mode 100644 redhat/tdenetwork/trinity-kdenetwork-3.5.12.spec create mode 100644 redhat/tdenetwork/trinity-kdenetwork-3.5.13.1.spec create mode 100644 redhat/tdenetwork/trinity-kdenetwork-3.5.13.spec create mode 100644 redhat/tdepim/kdepim-3.5.13-disable_fsync_in_cached_imap.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_check_mail.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_composer_crash.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_gcc47_compilation.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_include_directory.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kalarm_icon_reference.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_addquotes.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_knotes_after_restored.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_knotes_on_suspend.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_linear_alphabet.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_segv.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-fix_systray_count.patch create mode 100644 redhat/tdepim/kdepim-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv.patch create mode 100644 redhat/tdepim/kdepim-3.5.13.1-fix_imapparser_segv_2.patch create mode 100644 redhat/tdepim/kdepim-3.5.13.1-kmime_utils_quotes.patch create mode 100644 redhat/tdepim/trinity-kdepim-3.5.12.spec create mode 100644 redhat/tdepim/trinity-kdepim-3.5.13.1.spec create mode 100644 redhat/tdepim/trinity-kdepim-3.5.13.spec create mode 100644 redhat/tdesdk/kdesdk-3.5.13-add_forgotten_cmake_files.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13-cmake_port.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13-misc_ftbfs.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-add_missing_files.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-fix_cmake_macros.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-fix_kdecachegrind_ftbfs.patch.gz create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-fix_various_cmake_issues.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-fix_xkcachegrind_installation.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.13.1-use_flex_instead_of_lex.patch create mode 100644 redhat/tdesdk/kdesdk-3.5.7-subversion.patch create mode 100644 redhat/tdesdk/trinity-kdesdk-3.5.12.spec create mode 100644 redhat/tdesdk/trinity-kdesdk-3.5.13.1.spec create mode 100644 redhat/tdesdk/trinity-kdesdk-3.5.13.spec create mode 100644 redhat/tdetoys/kdetoys-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdetoys/trinity-kdetoys-3.5.12.spec create mode 100644 redhat/tdetoys/trinity-kdetoys-3.5.13.1.spec create mode 100644 redhat/tdetoys/trinity-kdetoys-3.5.13.spec create mode 100644 redhat/tdeutils/kcmlaptoprc create mode 100644 redhat/tdeutils/kdeutils-3.5.13-ark_fix_utf8.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-ark_repairs_and_extensions.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-fix_ark_embedding.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-further_organise_menu.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-missing_ldflags.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-remove_more_applications.patch create mode 100644 redhat/tdeutils/kdeutils-3.5.13-reorganize_kcontrol_menu_tree.patch create mode 100644 redhat/tdeutils/kdf-3.0.2-label.patch create mode 100644 redhat/tdeutils/klaptop_acpi_helper.console create mode 100644 redhat/tdeutils/klaptop_acpi_helper.pam create mode 100755 redhat/tdeutils/trinity-kdeutils-3.5.12.spec create mode 100755 redhat/tdeutils/trinity-kdeutils-3.5.13.1.spec create mode 100755 redhat/tdeutils/trinity-kdeutils-3.5.13.spec create mode 100644 redhat/tdevelop/c_cpp_reference-2.0.2-config.patch create mode 100644 redhat/tdevelop/c_cpp_reference-2.0.2-install.patch create mode 100644 redhat/tdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 create mode 100644 redhat/tdevelop/kdevelop-2.1.5_for_KDE_3.1-doc.patch create mode 100644 redhat/tdevelop/kdevelop-3.5.13-gcc47.patch create mode 100644 redhat/tdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch create mode 100644 redhat/tdevelop/kdevelop-3.5.2-kde4template.patch create mode 100644 redhat/tdevelop/trinity-kdevelop-3.5.12.spec create mode 100644 redhat/tdevelop/trinity-kdevelop-3.5.13.1.spec create mode 100644 redhat/tdevelop/trinity-kdevelop-3.5.13.spec create mode 100644 redhat/tdewebdev/css.tar.bz2 create mode 100644 redhat/tdewebdev/hi48-app-kxsldbg.png create mode 100644 redhat/tdewebdev/html.tar.bz2 create mode 100644 redhat/tdewebdev/javascript.patch create mode 100644 redhat/tdewebdev/javascript.tar.bz2 create mode 100644 redhat/tdewebdev/kdewebdev-3.5.13-fix_ftbfs.patch create mode 100644 redhat/tdewebdev/kdewebdev-3.5.4-kxsldbg-icons.patch create mode 100644 redhat/tdewebdev/php_manual_en_20030401.tar.bz2 create mode 100644 redhat/tdewebdev/trinity-kdewebdev-3.5.12.spec create mode 100644 redhat/tdewebdev/trinity-kdewebdev-3.5.13.1.spec create mode 100644 redhat/tdewebdev/trinity-kdewebdev-3.5.13.spec diff --git a/opensuse/core/dependencies b/opensuse/core/dependencies new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/opensuse/core/dependencies @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/opensuse/core/qt3/qt3-3.5.13.2.spec b/opensuse/core/qt3/qt3-3.5.13.2.spec index 0260cd10f..4c78ad2f2 100644 --- a/opensuse/core/qt3/qt3-3.5.13.2.spec +++ b/opensuse/core/qt3/qt3-3.5.13.2.spec @@ -3,40 +3,17 @@ # Name: qt3 -#Remember also to modify Requires in -devel package -BuildRequires: Mesa-devel -BuildRequires: c++_compiler -BuildRequires: cups-devel -BuildRequires: freetype2-devel -BuildRequires: libjpeg-devel -BuildRequires: libmng-devel -BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -BuildRequires: tar -Url: http://www.trolltech.com/ -%if %suse_version > 1220 -BuildRequires: libpng15-compat-devel -%else -BuildRequires: libpng14-compat-devel -%endif -# bug437293 -%ifarch ppc64 -Obsoletes: qt3-64bit -%endif -# Summary: A library for developing applications with graphical user interfaces +Url: http://www.trolltech.com/ License: GPL-2.0 or GPL-3.0 or QPL-1.0 Group: System/Libraries Version: 3.3.8d -Release: 2 +Release: 2%{?dist} Provides: qt_library_%version -Recommends: kdelibs3-default-style PreReq: /bin/grep # COMMON-BEGIN %define x11_free -x11-free- -%define rversion 3.3.8b -Source0: trinity-qt3-3.5.13.2.tar.gz +Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz Source1: build_script.sh Source2: qtconfig3.desktop Source3: qtrc @@ -68,7 +45,6 @@ Patch23: fix-accessible.diff # From http://www.freedesktop.org/wiki/Software_2fImmoduleQtDownload # Current version from http://freedesktop.org/~daisuke/qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2 Patch31: limit-image-size.diff -Patch35: qt-transparency.patch Patch37: 0055-qtextedit_zoom.patch Patch39: fix-qtranslator-crash.diff Patch42: add_qexport_visibility.patch @@ -85,6 +61,36 @@ Patch139: gcc46.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +#Remember also to modify Requires in -devel package +BuildRequires: c++_compiler +BuildRequires: cups-devel +BuildRequires: freetype2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +BuildRequires: tar + +# OPENGL support +BuildRequires: Mesa-devel +%if 0%{?suse_version} >= 1230 +BuildRequires: glu-devel +%endif + +# PNG support +%if %suse_version > 1220 +BuildRequires: libpng15-compat-devel +%else +BuildRequires: libpng14-compat-devel +%endif + +# bug437293 +%ifarch ppc64 +Obsoletes: qt3-64bit +%endif +# + %description Qt is a program library for developing applications with graphical user interfaces. It allows you to rapidly develop professional programs. The @@ -98,10 +104,12 @@ be acquired from sales@trolltech.com. See /usr/share/doc/packages/qt3 for details about the new features of the current Qt library! -%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial +%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial tools/linguist/lrelease + +%debug_package %prep -%setup -q -n trinity-qt3-3.5.13.2 +%setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} %patch1 %patch2 %patch4 @@ -115,7 +123,6 @@ fi %patch19 %patch23 %patch31 -%patch35 %patch37 %patch39 %patch42 @@ -145,6 +152,7 @@ cd .. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/X11 +Requires: %{name} = %{version}-%{release} Requires: c++_compiler Requires: cups-devel Requires: freetype2-devel @@ -155,16 +163,9 @@ Requires: qt3 = %version Requires: xorg-x11-devel %if %suse_version > 1120 Recommends: libpng14-compat-devel -Requires: libpng-devel -%else -Requires: libpng-devel -%endif -%if %suse_version > 1000 -Requires: Mesa-devel -%else -Requires: xorg-x11-Mesa -Requires: xorg-x11-Mesa-devel %endif +Requires: libpng-devel + %ifnarch x86_64 s390x sparc64 ppc64 mips64 Conflicts: devel_libs-32bit %endif @@ -174,6 +175,13 @@ Obsoletes: qt3-devel-64bit %endif # +%if %suse_version > 1000 +Requires: Mesa-devel +%else +Requires: xorg-x11-Mesa +Requires: xorg-x11-Mesa-devel +%endif + %description devel You need this package if you want to compile programs with Qt 3. It contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3 @@ -219,7 +227,7 @@ sed -i -e 's, on: .*,,' $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.la # # copy additional files # -install -m 0755 bin/qmake bin/moc ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ +install -m 0755 bin/qmake bin/moc bin/lrelease ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ install -m 0755 -d ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/ install -m 0644 translations/*.qm ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/ if [ %_lib = lib64 ]; then @@ -333,6 +341,7 @@ fi %defattr(-,root,root,755) # FIXME provide new changelog if kb9vqf will give one %doc changes-3.3.8b +/usr/lib/qt3/bin/lrelease /usr/lib/qt3/bin/moc /usr/lib/qt3/bin/qmake /usr/lib/qt3/bin/uic diff --git a/redhat/applications/kde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch b/redhat/applications/kde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch deleted file mode 100644 index 9bb5fa5b4..000000000 --- a/redhat/applications/kde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- kde-guidance/wineconfig/winewrite.py.wine 2010-08-12 05:25:24.000000000 +0200 -+++ kde-guidance/wineconfig/winewrite.py 2012-08-07 18:43:48.291577133 +0200 -@@ -60,14 +60,14 @@ - SetShellLinks(drives[26:]) - - def SetShellLinks(shelllinks): -- existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) -+ existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER']) - set(existingshelllinks) - shellregistry = wineread.GetShellRegistry() - - for link in shelllinks: - createLink = False - if link[1] in existingshelllinks: # The link exists -- linkpath = wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1] -+ linkpath = wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'] + "/" + link[1] - if link[2]: # The folder is mapped - # Compare for changes - changed = False -@@ -98,7 +98,7 @@ - continue - - if createLink: -- os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1]) -+ os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/users/" + os.environ['USER'] + "/" + link[1]) - if shellregistry.has_key(link[1]): - SetShellRegistry(link) - -@@ -426,7 +426,7 @@ - if not path: - path = wineread.default_winepath - -- os.system("WINEPREFIX=" + path + " wineprefixcreate --wait") -+ os.system("WINEPREFIX=" + path + " wineboot") - - # ----- Theming ----- - -@@ -486,4 +486,4 @@ - winport = ports_translation[port.rstrip("012345678")] +\ - str(int(port.lstrip("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")) + 1) - os.symlink("/dev/" + port, wineread.winepath + "/dosdevices/" + winport) -- -\ Pas de fin de ligne à la fin du fichier -+ ---- kde-guidance/wineconfig/wineread.py.ORI 2012-08-07 18:44:08.910051574 +0200 -+++ kde-guidance/wineconfig/wineread.py 2012-08-07 18:44:38.675294351 +0200 -@@ -23,7 +23,7 @@ - # Assumes the fake windows is installed in ~/.wine - default_winepath = os.environ['HOME'] + "/.wine" - winepath = default_winepath --defaultwinfolderspath = "c:\\windows\\profiles\\" + os.environ['USER'] -+defaultwinfolderspath = "c:\\users\\" + os.environ['USER'] - - # Where the dll's are - default_winebuildpath = "/usr/lib/wine" -@@ -113,7 +113,7 @@ - [30,"My Video","","","",""]) - - folder_nonexistent = "This folder does not exist, please map it." --profilesdirectory = winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] -+profilesdirectory = winepath + "/dosdevices/c:/users/" + os.environ['USER'] - - def GetEmptyShellLinks(): - """ Returns a list of important windows folders """ -@@ -537,7 +537,7 @@ - if not path: - path = self.default_winepath - -- return os.path.exists(path + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) and \ -+ return os.path.exists(path + "/dosdevices/c:/users/" + os.environ['USER']) and \ - os.path.exists(path + "/dosdevices/c:/windows/system32") and \ - os.path.exists(path + "/system.reg") and os.path.exists(path + "/userdef.reg") and \ - os.path.exists(path + "/user.reg") diff --git a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.1.spec b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.1.spec deleted file mode 100644 index c0a61ba05..000000000 --- a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.1.spec +++ /dev/null @@ -1,414 +0,0 @@ -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%define __arch_install_post %{nil} - -Name: trinity-guidance -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.simonzone.com/software/guidance - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kde-guidance-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: trinity-pytdeextensions -BuildRequires: trinity-libpythonize0-devel -BuildRequires: python-trinity -BuildRequires: chrpath -BuildRequires: gcc-c++ - -# SIP support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip -%endif -%if 0%{?suse_version} -BuildRequires: python-sip-devel -%endif -%if 0%{?rhel} == 5 -BuildRequires: trinity-sip-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel -%endif - -# PYTHON-QT support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-qt -Requires: python-qt -%endif -%if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: trinity-PyQt-devel -Requires: trinity-PyQt -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: PyQt-devel -Requires: PyQt -%endif - - -Requires: python-trinity -Requires: trinity-pytdeextensions -Requires: %{name}-backends -Requires: python -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif - - -%if "%{tde_prefix}" == "/usr" -Conflicts: guidance-power-manager -Conflicts: kde-guidance-powermanager -%endif - -%description -Guidance currently consists of four programs designed to help you -look after your system: - o userconfig - User and Group administration - o serviceconfig - Service/daemon administration - o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration - -These tools are available in Trinity Control Center, System Settings -or can be run as standalone applications. - - - -%package backends -Group: Applications/Utilities -Summary: collection of system administration tools for GNU/Linux [Trinity] -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif -Requires: python - -%description backends -This package contains the platform neutral backends used in the -Guidance configuration tools. - - -%package powermanager -Group: Applications/Utilities -Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} - -%description powermanager -A power management applet to indicate battery levels and perform hibernate or -suspend using HAL. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n kde-guidance-3.5.13.1 - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" -export KDEDIR=%{tde_prefix} - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -./setup.py build - - -%install -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} -./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix building directories stored inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png -%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# fix executable-not-elf-or-script -%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png - -# move python modules in %{python_sitearch} -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name} - -# fix the link properly -%__rm -f %{buildroot}%{tde_bindir}/* -#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig -%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig -%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig - -# (obsolete) put this here since gnome people probably don't want it by default -#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py - -%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop - -##### BACKENDS INSTALLATION -# install displayconfig-hwprobe.py script -%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ - %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%endif - - -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <%{buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name} -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; - -# Removes obsolete display config manager -%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%post powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -#%{tde_bindir}/displayconfig -#%{tde_bindir}/displayconfig-restore -%{tde_bindir}/grubconfig -%{tde_bindir}/mountconfig -%{tde_bindir}/serviceconfig -%{tde_bindir}/userconfig -%{tde_bindir}/wineconfig -%attr(0644,root,root) %{tde_tdelibdir}/*.so -%attr(0644,root,root) %{tde_tdelibdir}/*.la -%{tde_datadir}/apps/guidance/ -%{tde_datadir}/applications/kde/*.desktop -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/grubconfig.py* -%{python_sitearch}/%{name}/ktimerdialog.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/servertestdialog.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* -%{python_sitearch}/%{name}/wineconfig.py* -%{tde_tdedocdir}/HTML/en/guidance/ - -# Files from backends -%exclude %{tde_datadir}/apps/guidance/vesamodes -%exclude %{tde_datadir}/apps/guidance/extramodes -%exclude %{tde_datadir}/apps/guidance/widescreenmodes -%exclude %{tde_datadir}/apps/guidance/Cards+ -%exclude %{tde_datadir}/apps/guidance/pcitable -%exclude %{tde_datadir}/apps/guidance/MonitorsDB - -# Files from powermanager -%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png -%exclude %{tde_datadir}/apps/guidance/pics/battery*.png -%exclude %{tde_datadir}/apps/guidance/pics/processor.png - -%files -n trinity-guidance-backends -%defattr(-,root,root,-) -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/ScanPCI.py* -%{python_sitearch}/%{name}/infimport.py* -%{python_sitearch}/%{name}/displayconfigabstraction.py* -%{python_sitearch}/%{name}/displayconfig-hwprobe.py* -%{python_sitearch}/%{name}/displayconfig-restore.py* -%{python_sitearch}/%{name}/drivedetect.py* -%{python_sitearch}/%{name}/execwithcapture.py* -%{python_sitearch}/%{name}/wineread.py* -%{python_sitearch}/%{name}/winewrite.py* -%{python_sitearch}/%{name}/xf86misc.py* -%{python_sitearch}/%{name}/xorgconfig.py* -%{python_sitearch}/ixf86misc.so -%{tde_datadir}/apps/guidance/vesamodes -%{tde_datadir}/apps/guidance/extramodes -%{tde_datadir}/apps/guidance/widescreenmodes -%{tde_datadir}/apps/guidance/Cards+ -%{tde_datadir}/apps/guidance/pcitable -%{tde_datadir}/apps/guidance/MonitorsDB - - - -%files powermanager -%defattr(-,root,root,-) -%{tde_bindir}/guidance-power-manager -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%{tde_datadir}/apps/guidance/pics/ac-adapter.png -%{tde_datadir}/apps/guidance/pics/battery*.png -%{tde_datadir}/apps/guidance/pics/processor.png -%{tde_datadir}/autostart/guidance-power-manager.desktop - - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.8.0svn20080103-4 -- Initial build for TDE 3.5.13.1 - -* Fri May 11 2012 Francois Andriot - 0.8.0svn20080103-3 -- Fix Python search dir - -* Tue May 01 2012 Francois Andriot - 0.8.0svn20080103-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix library locations - -* Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec b/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec deleted file mode 100644 index 4d9452f32..000000000 --- a/redhat/applications/kde-guidance/trinity-guidance-3.5.13.spec +++ /dev/null @@ -1,390 +0,0 @@ -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%define __arch_install_post %{nil} - -Name: trinity-guidance -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.simonzone.com/software/guidance - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kde-guidance-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: trinity-pykdeextensions -BuildRequires: trinity-libpythonize0-devel -BuildRequires: python-trinity -BuildRequires: chrpath -BuildRequires: gcc-c++ - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip -BuildRequires: python-qt -Requires: python-qt -%else -%if 0%{?rhel} == 5 -BuildRequires: trinity-PyQt-devel -BuildRequires: trinity-sip-devel -Requires: trinity-PyQt -%else -BuildRequires: PyQt-devel -BuildRequires: sip-devel -Requires: PyQt -%endif -%endif - - -Requires: python-trinity -Requires: %{name}-backends -Requires: hwdata -Requires: python - -%if "%{tde_prefix}" == "/usr" -Conflicts: guidance-power-manager -Conflicts: kde-guidance-powermanager -%endif - -%description -Guidance currently consists of four programs designed to help you -look after your system: - o userconfig - User and Group administration - o serviceconfig - Service/daemon administration - o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration - -These tools are available in Trinity Control Center, System Settings -or can be run as standalone applications. - - - -%package backends -Group: Applications/Utilities -Summary: collection of system administration tools for GNU/Linux [Trinity] -Requires: hwdata -Requires: python - -%description backends -This package contains the platform neutral backends used in the -Guidance configuration tools. - - -%package powermanager -Group: Applications/Utilities -Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} - -%description powermanager -A power management applet to indicate battery levels and perform hibernate or -suspend using HAL. - - -%prep -%setup -q -n applications/kde-guidance - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" -export KDEDIR=%{tde_prefix} - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -./setup.py build - - -%install -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} -./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix building directories stored inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png -%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# fix executable-not-elf-or-script -%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png - -# move python modules in %{python_sitearch} -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name} - -# fix the link properly -%__rm -f %{buildroot}%{tde_bindir}/* -#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig -%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig -%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig - -# (obsolete) put this here since gnome people probably don't want it by default -#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py - -%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop - -##### BACKENDS INSTALLATION -# install displayconfig-hwprobe.py script -%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ - %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} - -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB - - - -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <%{buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name} -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -#find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \; - -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo - -# Removes obsolete display config manager -%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%post powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -#%{tde_bindir}/displayconfig -#%{tde_bindir}/displayconfig-restore -%{tde_bindir}/grubconfig -%{tde_bindir}/mountconfig -%{tde_bindir}/serviceconfig -%{tde_bindir}/userconfig -%{tde_bindir}/wineconfig -%attr(0644,root,root) %{tde_tdelibdir}/*.so -%attr(0644,root,root) %{tde_tdelibdir}/*.la -%{tde_datadir}/apps/guidance/ -%{tde_datadir}/applications/kde/*.desktop -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg -%{python_sitearch}/%{name}/SMBShareSelectDialog.py -%{python_sitearch}/%{name}/SimpleCommandRunner.py -%{python_sitearch}/%{name}/fuser.py -%{python_sitearch}/%{name}/fuser_ui.py -%{python_sitearch}/%{name}/grubconfig.py -%{python_sitearch}/%{name}/ktimerdialog.py -%{python_sitearch}/%{name}/mountconfig.py -%{python_sitearch}/%{name}/servertestdialog.py -%{python_sitearch}/%{name}/serviceconfig.py -%{python_sitearch}/%{name}/sizeview.py -%{python_sitearch}/%{name}/unixauthdb.py -%{python_sitearch}/%{name}/userconfig.py -%{python_sitearch}/%{name}/wineconfig.py -%{tde_tdedocdir}/HTML/en/guidance/ - -# Files from backends -%exclude %{tde_datadir}/apps/guidance/vesamodes -%exclude %{tde_datadir}/apps/guidance/extramodes -%exclude %{tde_datadir}/apps/guidance/widescreenmodes -%exclude %{tde_datadir}/apps/guidance/Cards+ -%exclude %{tde_datadir}/apps/guidance/pcitable -%exclude %{tde_datadir}/apps/guidance/MonitorsDB - -# Files from powermanager -%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png -%exclude %{tde_datadir}/apps/guidance/pics/battery*.png -%exclude %{tde_datadir}/apps/guidance/pics/processor.png - -%files -n trinity-guidance-backends -%defattr(-,root,root,-) -%{python_sitearch}/%{name}/MicroHAL.py -%{python_sitearch}/%{name}/ScanPCI.py -%{python_sitearch}/%{name}/infimport.py -%{python_sitearch}/%{name}/displayconfigabstraction.py -%{python_sitearch}/%{name}/displayconfig-hwprobe.py -%{python_sitearch}/%{name}/displayconfig-restore.py -%{python_sitearch}/%{name}/drivedetect.py -%{python_sitearch}/%{name}/execwithcapture.py -%{python_sitearch}/%{name}/wineread.py -%{python_sitearch}/%{name}/winewrite.py -%{python_sitearch}/%{name}/xf86misc.py -%{python_sitearch}/%{name}/xorgconfig.py -%{python_sitearch}/ixf86misc.so -%{tde_datadir}/apps/guidance/vesamodes -%{tde_datadir}/apps/guidance/extramodes -%{tde_datadir}/apps/guidance/widescreenmodes -%{tde_datadir}/apps/guidance/Cards+ -%{tde_datadir}/apps/guidance/pcitable -%{tde_datadir}/apps/guidance/MonitorsDB - - - -%files powermanager -%defattr(-,root,root,-) -%{tde_bindir}/guidance-power-manager -%{python_sitearch}/%{name}/MicroHAL.py -%{python_sitearch}/%{name}/guidance-power-manager.py -%{python_sitearch}/%{name}/powermanage.py -%{python_sitearch}/%{name}/gpmhelper.py -%{python_sitearch}/%{name}/powermanager_ui.py -%{python_sitearch}/%{name}/guidance_power_manager_ui.py -%{python_sitearch}/%{name}/notify.py -%{python_sitearch}/%{name}/tooltip.py -%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%{tde_datadir}/apps/guidance/pics/ac-adapter.png -%{tde_datadir}/apps/guidance/pics/battery*.png -%{tde_datadir}/apps/guidance/pics/processor.png -%{tde_datadir}/autostart/guidance-power-manager.desktop - - - -%Changelog -* Fri May 11 2012 Francois Andriot - 0.8.0svn20080103-3 -- Fix Python search dir - -* Tue May 01 2012 Francois Andriot - 0.8.0svn20080103-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix library locations - -* Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec deleted file mode 100644 index 30f8e8a67..000000000 --- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec +++ /dev/null @@ -1,108 +0,0 @@ -# Default version for this component -%define kdecomp kde-style-lipstik -%define version 2.2.3 -%define release 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 - - -Name: trinity-%{kdecomp} -Summary: Lipstik style for TDE -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.12.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -Based on the plastik style, Lipstik is a purified style with many options to -tune your desktop look. - -Lipstik also provides Lipstik-color-schemes - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_libdir}/kstyle_lipstik_config.la -%{tde_libdir}/kstyle_lipstik_config.so -%{tde_libdir}/plugins/styles/lipstik.la -%{tde_libdir}/plugins/styles/lipstik.so -%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc -%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc -%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc -%{_datadir}/apps/kstyle/themes/lipstik.themerc - - -%Changelog -* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec deleted file mode 100644 index d23300c5a..000000000 --- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec +++ /dev/null @@ -1,129 +0,0 @@ -# Default version for this component -%define kdecomp kde-style-lipstik - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -Obsoletes: trinity-kde-style-lipstik - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -Based on the plastik style, Lipstik is a purified style with many options to -tune your desktop look. - -Lipstik also provides Lipstik-color-schemes - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_lipstik_config.la -%{tde_tdelibdir}/kstyle_lipstik_config.so -%{tde_tdelibdir}/plugins/styles/lipstik.la -%{tde_tdelibdir}/plugins/styles/lipstik.so -%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc -%{tde_datadir}/apps/kstyle/themes/lipstik.themerc - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 2.2.3-3 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 2.2.3-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec deleted file mode 100644 index 8834e935a..000000000 --- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec +++ /dev/null @@ -1,120 +0,0 @@ -# Default version for this component -%define kdecomp kde-style-lipstik - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -Obsoletes: trinity-kde-style-lipstik - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -Based on the plastik style, Lipstik is a purified style with many options to -tune your desktop look. - -Lipstik also provides Lipstik-color-schemes - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_lipstik_config.la -%{tde_tdelibdir}/kstyle_lipstik_config.so -%{tde_tdelibdir}/plugins/styles/lipstik.la -%{tde_tdelibdir}/plugins/styles/lipstik.so -%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc -%{tde_datadir}/apps/kstyle/themes/lipstik.themerc - - -%Changelog -* Tue May 01 2012 Francois Andriot - 2.2.3-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch deleted file mode 100644 index d7e8df30c..000000000 --- a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kde-style-qtcurve/CMakeLists.txt.ORI 2011-11-20 22:37:40.050443616 +0100 -+++ kde-style-qtcurve/CMakeLists.txt 2011-11-20 22:40:04.355439569 +0100 -@@ -46,7 +46,7 @@ - if (QT_PLUGINS_DIR MATCHES NOTFOUND) - MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") - SET(QT_INCLUDE_DIR "/usr/include/qt4") -- SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib/trinity/plugins") -+ SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins") - endif (QT_PLUGINS_DIR MATCHES NOTFOUND) - endif (NOT QTC_QT_ONLY) - diff --git a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch deleted file mode 100644 index 18c9e9ee7..000000000 --- a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/config/qtcurveconfig.cpp.ORI 2012-08-29 22:09:16.845292598 +0200 -+++ a/config/qtcurveconfig.cpp 2012-08-29 22:13:35.992935999 +0200 -@@ -671,7 +671,7 @@ - connect(activeTabAppearance, SIGNAL(activated(int)), SLOT(activeTabAppearanceChanged())); - connect(toolbarSeparators, SIGNAL(activated(int)), SLOT(updateChanged())); - connect(splitters, SIGNAL(activated(int)), SLOT(updateChanged())); -- connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged())); -+// connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(fillSlider, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(sliderStyle, SIGNAL(activated(int)), SLOT(updateChanged())); - connect(roundMbTopOnly, SIGNAL(toggled(bool)), SLOT(updateChanged())); -@@ -749,10 +749,10 @@ - connect(gtkButtonOrder, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(mapKdeIcons, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(passwordChar, SIGNAL(clicked()), SLOT(passwordCharClicked())); -- connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged())); -+// connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(colorMenubarMouseOver, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(useHighlightForMenu, SIGNAL(toggled(bool)), SLOT(updateChanged())); -- connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged())); -+// connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(fadeLines, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(menuIcons, SIGNAL(toggled(bool)), SLOT(updateChanged())); - connect(stdBtnSizes, SIGNAL(toggled(bool)), SLOT(updateChanged())); -@@ -1436,7 +1436,7 @@ - opts.shadeMenubarOnlyWhenActive=shadeMenubarOnlyWhenActive->isChecked(); - opts.thinnerMenuItems=thinnerMenuItems->isChecked(); - opts.thinnerBtns=thinnerBtns->isChecked(); -- opts.fixParentlessDialogs=fixParentlessDialogs->isChecked(); -+// opts.fixParentlessDialogs=fixParentlessDialogs->isChecked(); - opts.animatedProgress=animatedProgress->isChecked(); - opts.stripedProgress=(EStripe)stripedProgress->currentItem(); - opts.lighterPopupMenuBgnd=lighterPopupMenuBgnd->value(); -@@ -1526,11 +1526,11 @@ - opts.gtkButtonOrder=gtkButtonOrder->isChecked(); - opts.mapKdeIcons=mapKdeIcons->isChecked(); - opts.passwordChar=toInt(passwordChar->text()); -- opts.framelessGroupBoxes=framelessGroupBoxes->isChecked(); -+// opts.framelessGroupBoxes=framelessGroupBoxes->isChecked(); - opts.customGradient=customGradient; - opts.colorMenubarMouseOver=colorMenubarMouseOver->isChecked(); - opts.useHighlightForMenu=useHighlightForMenu->isChecked(); -- opts.groupBoxLine=groupBoxLine->isChecked(); -+// opts.groupBoxLine=groupBoxLine->isChecked(); - opts.fadeLines=fadeLines->isChecked(); - opts.menuIcons=menuIcons->isChecked(); - opts.stdBtnSizes=stdBtnSizes->isChecked(); -@@ -1575,7 +1575,7 @@ - shadeMenubarOnlyWhenActive->setChecked(opts.shadeMenubarOnlyWhenActive); - thinnerMenuItems->setChecked(opts.thinnerMenuItems); - thinnerBtns->setChecked(opts.thinnerBtns); -- fixParentlessDialogs->setChecked(opts.fixParentlessDialogs); -+// fixParentlessDialogs->setChecked(opts.fixParentlessDialogs); - animatedProgress->setChecked(opts.animatedProgress); - stripedProgress->setCurrentItem(opts.stripedProgress); - embolden->setChecked(opts.embolden); -@@ -1651,7 +1651,7 @@ - customCheckRadioColor->setColor(opts.customCheckRadioColor); - colorMenubarMouseOver->setChecked(opts.colorMenubarMouseOver); - useHighlightForMenu->setChecked(opts.useHighlightForMenu); -- groupBoxLine->setChecked(opts.groupBoxLine); -+// groupBoxLine->setChecked(opts.groupBoxLine); - fadeLines->setChecked(opts.fadeLines); - menuIcons->setChecked(opts.menuIcons); - stdBtnSizes->setChecked(opts.stdBtnSizes); -@@ -1678,7 +1678,7 @@ - gtkButtonOrder->setChecked(opts.gtkButtonOrder); - mapKdeIcons->setChecked(opts.mapKdeIcons); - setPasswordChar(opts.passwordChar); -- framelessGroupBoxes->setChecked(opts.framelessGroupBoxes); -+// framelessGroupBoxes->setChecked(opts.framelessGroupBoxes); - customGradient=opts.customGradient; - gradCombo->setCurrentItem(APPEARANCE_CUSTOM1); - -@@ -1731,7 +1731,7 @@ - shadeMenubarOnlyWhenActive->isChecked()!=currentStyle.shadeMenubarOnlyWhenActive || - thinnerMenuItems->isChecked()!=currentStyle.thinnerMenuItems || - thinnerBtns->isChecked()!=currentStyle.thinnerBtns || -- fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs || -+// fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs || - animatedProgress->isChecked()!=currentStyle.animatedProgress || - stripedProgress->currentItem()!=currentStyle.stripedProgress || - lighterPopupMenuBgnd->value()!=currentStyle.lighterPopupMenuBgnd || -@@ -1796,7 +1796,7 @@ - splitters->currentItem()!=currentStyle.splitters || - colorMenubarMouseOver->isChecked()!=currentStyle.colorMenubarMouseOver || - useHighlightForMenu->isChecked()!=currentStyle.useHighlightForMenu || -- groupBoxLine->isChecked()!=currentStyle.groupBoxLine || -+// groupBoxLine->isChecked()!=currentStyle.groupBoxLine || - fadeLines->isChecked()!=currentStyle.fadeLines || - menuIcons->isChecked()!=currentStyle.menuIcons || - stdBtnSizes->isChecked()!=currentStyle.stdBtnSizes || -@@ -1819,7 +1819,7 @@ - gtkComboMenus->isChecked()!=currentStyle.gtkComboMenus || - gtkButtonOrder->isChecked()!=currentStyle.gtkButtonOrder || - mapKdeIcons->isChecked()!=currentStyle.mapKdeIcons || -- framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes || -+// framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes || - - getSquareFlags()!=currentStyle.square || - getWindowBorderFlags()!=currentStyle.windowBorder|| diff --git a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch deleted file mode 100644 index f328720a7..000000000 --- a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch +++ /dev/null @@ -1,243 +0,0 @@ ---- kde-style-qtcurve/cmake/QtCurveQt3.cmake.ORI 2012-08-29 19:47:59.470536207 +0200 -+++ kde-style-qtcurve/cmake/QtCurveQt3.cmake 2012-08-29 19:48:50.268522398 +0200 -@@ -1,5 +1,5 @@ - FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/) --FIND_PATH(QT_PLUGINS_DIR imageformats -+FIND_PATH(QT_PLUGINS_DIR designer - $ENV{QTDIR}/plugins - ${GLOB_PATHS_BIN} - /usr/local/qt/plugins ---- a/config/CMakeLists.txt.module 2011-08-22 00:39:00.000000000 +0200 -+++ a/config/CMakeLists.txt 2012-08-29 22:21:41.673500945 +0200 -@@ -4,9 +4,23 @@ - set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp) - endif (QTC_STYLE_SUPPORT) - --include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}) --trinity_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui) --trinity_add_kpart(kstyle_qtcurve_config ${kstyle_qtcurve_config_PART_SRCS}) --trinity_automoc(${kstyle_qtcurve_config_PART_SRCS}) --target_link_libraries(kstyle_qtcurve_config ${QT_AND_KDECORE_LIBS} kio kdeui) --install(TARGETS kstyle_qtcurve_config DESTINATION ${KDE3_LIB_DIR}/trinity) -+include_directories( -+ ${CMAKE_SOURCE_DIR} -+ ${CMAKE_SOURCE_DIR}/common -+ ${CMAKE_CURRENT_BINARY_DIR} -+ ${CMAKE_BINARY_DIR} -+ ${TDE_INCLUDE_DIR} -+ ${QT_INCLUDE_DIR} -+) -+ -+link_directories( -+ ${TQT_LIBRARY_DIRS} -+) -+ -+tde_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui) -+tde_add_kpart(kstyle_qtcurve_config -+ MODULE -+ SOURCES ${kstyle_qtcurve_config_PART_SRCS} -+ LINK ${QT_AND_KDECORE_LIBS} kio kdeui -+ DESTINATION ${TDE_LIB_DIR}/trinity) -+tde_automoc(${kstyle_qtcurve_config_PART_SRCS}) ---- a/CMakeLists.txt.module 2012-08-29 20:30:59.679915086 +0200 -+++ b/CMakeLists.txt 2012-08-29 22:09:03.118576286 +0200 -@@ -3,7 +3,7 @@ - - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") - set(CPACK_GENERATOR "DEB;RPM;TGZ") --set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/KDE3") -+set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/TDE") - set(DEBIAN_PACKAGE_SECTION "kde") - set(CPACK_SOURCE_GENERATOR "TBZ2") - set(CPACK_PACKAGE_VERSION_MAJOR "1") -@@ -16,39 +16,64 @@ - set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}") - include(CPack) - -+##### include essential cmake modules ########### -+ -+include( FindPkgConfig ) -+include( CheckIncludeFile ) -+include( CheckSymbolExists ) -+include( CheckFunctionExists ) -+include( CheckCSourceCompiles ) -+include( CheckCXXSourceCompiles ) -+include( CheckTypeSize ) -+include( CheckCSourceRuns ) -+include( CheckLibraryExists ) -+ -+##### include our cmake modules ################# -+ -+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) -+include( TDEMacros ) -+include( TDESetupPaths ) -+ -+##### setup and find essential stuff ############ -+ -+tde_setup_paths( ) -+find_package( TQt ) -+ -+ - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) - - if (QTC_BUILD_CONFIG_MODULE) - if (NOT QTC_QT_ONLY) -- find_package(KDE3) -- if (NOT KDE3_FOUND) -+ find_package(TDE) -+ if (NOT TDE_VERSION) - set(QTC_QT_ONLY true) -- message("INFO: KDE3 not found! Compiling for Qt only! (Not building the config module)") -- endif (NOT KDE3_FOUND) -+ message("INFO: Trinity not found! Compiling for Qt only! (Not building the config module)") -+ endif (NOT TDE_VERSION) - endif (NOT QTC_QT_ONLY) - else (QTC_BUILD_CONFIG_MODULE) - set(QTC_QT_ONLY true) - endif (QTC_BUILD_CONFIG_MODULE) - - if (NOT QTC_QT_ONLY) -- include(KDE3Macros) -+ include(TDEMacros) - else (NOT QTC_QT_ONLY) -- if (NOT KDE3PREFIX) -- SET(KDE3PREFIX "/opt/trinity") -- endif (NOT KDE3PREFIX) -+ if (NOT TDEPREFIX) -+ SET(TDEPREFIX "/opt/trinity") -+ endif (NOT TDEPREFIX) -+endif (NOT QTC_QT_ONLY) - - set(QT_MT_REQUIRED TRUE) - find_package(Qt3 REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) - include(QtCurveQt3) -+ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) - if (QT_PLUGINS_DIR MATCHES NOTFOUND) - MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") - SET(QT_INCLUDE_DIR "/usr/include/qt4") -- SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins") -+ SET(QT_PLUGINS_DIR "${TDEPREFIX}/lib${LIB_SUFFIX}/trinity/plugins") - endif (QT_PLUGINS_DIR MATCHES NOTFOUND) --endif (NOT QTC_QT_ONLY) - - #if (NOT QTC_QT_ONLY) - exec_program(kde-config -@@ -56,18 +81,15 @@ - OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX) - #endif (NOT QTC_QT_ONLY) - --SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT") -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT") - - # NASTY HACK TO FORCE COMPILATION - # REMOVE WHEN FIXED - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include") - --SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "") --SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "") -- - exec_program(kde-config - ARGS --install locale --expandvars -- OUTPUT_VARIABLE KDE3_LOCALE_PREFIX) -+ OUTPUT_VARIABLE TDE_LOCALE_PREFIX) - - file(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS) - -@@ -87,31 +109,31 @@ - endif(KDE4_KDECONFIG_EXECUTABLE) - - if(NOT KDE4PREFIX) -- set(KDE4PREFIX ${KDE3PREFIX}) -+ set(KDE4PREFIX ${TDEPREFIX}) - endif(NOT KDE4PREFIX) - - configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h) - #if (NOT QTC_QT_ONLY) -- add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS}) -- include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDES}) -+ add_definitions(${QT_DEFINITIONS} ${TDE_DEFINITIONS}) -+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDES}) - #else (NOT QTC_QT_ONLY) - # add_definitions(${QT_DEFINITIONS}) - # include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) - #endif (NOT QTC_QT_ONLY) - --set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps) -+set(DATA_INSTALL_DIR ${TDEPREFIX}/share/apps) - --if(QTC_DEFAULT_TO_KDE3) -- message("INFO: Defaulting to reading KDE3 settings if KDE_SESSION_VERSION is not set") --else(QTC_DEFAULT_TO_KDE3) -+if(QTC_DEFAULT_TO_TDE) -+ message("INFO: Defaulting to reading TDE settings if KDE_SESSION_VERSION is not set") -+else(QTC_DEFAULT_TO_TDE) - message("INFO: Defaulting to reading KDE4 settings if KDE_SESSION_VERSION is not set") --endif(QTC_DEFAULT_TO_KDE3) -+endif(QTC_DEFAULT_TO_TDE) - - add_subdirectory(style) - #if (NOT QTC_QT_ONLY) - if (QTC_BUILD_CONFIG_MODULE) - message("**************************************************************\n" -- "Warning: The KDE3 config module is deprecated, and is no longer\n" -+ "Warning: The TDE config module is deprecated, and is no longer\n" - " actively maintained. This module NO LONGER COMPILES!\n" - " It is recommended to use the KDE4 version instead.\n" - "**************************************************************\n") ---- kde-style-qtcurve/po/CMakeLists.txt.ORI 2012-08-30 20:03:49.306967361 +0200 -+++ kde-style-qtcurve/po/CMakeLists.txt 2012-08-30 20:03:55.714827822 +0200 -@@ -18,7 +18,7 @@ - add_custom_command(TARGET translations - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile} - DEPENDS ${_poFile}) -- install(FILES ${_gmoFile} DESTINATION ${KDE3_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) -+ install(FILES ${_gmoFile} DESTINATION ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) - endif( _langCode ) - endforeach(_poFile ${PO_FILES}) - endif(NOT GETTEXT_MSGFMT_EXECUTABLE) ---- kde-style-qtcurve/style/CMakeLists.txt.cmake 2011-08-22 00:39:00.000000000 +0200 -+++ kde-style-qtcurve/style/CMakeLists.txt 2012-08-30 20:20:04.645840572 +0200 -@@ -1,14 +1,25 @@ - if (NOT QTC_QT_ONLY) - set(qtcurve_SRCS qtcurve.cpp pixmaps.h) - add_definitions(-DQT_PLUGIN) -- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/common) -- link_directories(${KDE3_LIB_DIR}) -- trinity_automoc(${qtcurve_SRCS}) -- add_library(qtcurve MODULE ${qtcurve_SRCS}) -- set_target_properties(qtcurve PROPERTIES PREFIX "") -- target_link_libraries(qtcurve ${QT_LIBRARIES} kdefx) -- install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/trinity/plugins/styles) -- install(FILES qtcurve.themerc DESTINATION ${KDE3PREFIX}/share/apps/kstyle/themes) -+ include_directories( -+ ${CMAKE_SOURCE_DIR} -+ ${CMAKE_CURRENT_BINARY_DIR} -+ ${CMAKE_BINARY_DIR} -+ ${TDE_INCLUDE_DIR} -+ ${QT_INCLUDE_DIR} -+ ${CMAKE_SOURCE_DIR}/common -+ ) -+ link_directories( -+ ${TDE_LIB_DIR} -+ ) -+ tde_add_library(qtcurve -+ MODULE -+ PROPERTIES PREFIX "" -+ SOURCES ${qtcurve_SRCS} -+ LINK ${QT_LIBRARIES} kdefx -+ DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles -+ ) -+ install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes) - else (NOT QTC_QT_ONLY) - set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h) - QTCURVE_QT_WRAP_CPP(qtcurve_MOC_SRCS ${qtcurve_MOC_CLASSES}) ---- a/style/qtcurve.cpp.ORI 2012-08-30 20:57:36.256639146 +0200 -+++ a/style/qtcurve.cpp 2012-08-30 20:57:40.338552798 +0200 -@@ -8684,4 +8684,3 @@ - resetHover(); - } - --#include "qtcurve.moc" diff --git a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch b/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch deleted file mode 100644 index c12fa1ebb..000000000 --- a/redhat/applications/kde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch +++ /dev/null @@ -1,237 +0,0 @@ ---- a/style/qtcurve.h.ORI 2012-08-30 20:50:02.179242022 +0200 -+++ a/style/qtcurve.h 2012-08-30 20:51:22.372546460 +0200 -@@ -1,5 +1,5 @@ --#ifndef __TQTCURVE_H__ --#define __TQTCURVE_H__ -+#ifndef __QTCURVE_H__ -+#define __QTCURVE_H__ - - /* - TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com -@@ -51,7 +51,7 @@ - */ - - #include "config.h" --#ifdef TQTC_TQT_ONLY -+#ifdef QTC_QT_ONLY - #include "tqtc_kstyle.h" - #else - #include -@@ -68,7 +68,7 @@ - class TQTimer; - class TQSlider; - --#ifdef TQTC_TQT_ONLY -+#ifdef QTC_QT_ONLY - #define BASE_STYLE TQtCKStyle - #else - #define BASE_STYLE KStyle -@@ -126,7 +126,7 @@ - ENTRY_NONE - }; - --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - TQtCurveStyle(const TQString &name=TQString()); - #else - TQtCurveStyle(); -@@ -278,7 +278,7 @@ - mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1]; - EApp itsThemedApp; - mutable TQCache itsPixmapCache; --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - bool itsIsTransKicker; - #endif - EHover itsHover; ---- a/style/qtcurve.cpp.tqt 2012-08-30 21:28:00.664141509 +0200 -+++ a/style/qtcurve.cpp 2012-08-30 21:28:18.078781087 +0200 -@@ -62,7 +62,7 @@ - #include - - #include "config.h" --#ifndef TQTC_TQT_ONLY -+#ifndef QTC_QT_ONLY - #include - #endif - #include -@@ -196,7 +196,7 @@ - ? atoi(sessionVersion)<4 - ? 3 - : 4 --#ifdef TQTC_DEFAULT_TO_KDE3 -+#ifdef QTC_DEFAULT_TO_KDE3 - : 3; - #else - : getenv("TDE_FULL_SESSION") -@@ -292,7 +292,7 @@ - return kdeHome[trinity ? 0 : 1]; - } - --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - static void getStyles(const TQString &dir, const char *sub, TQStringList &styles) - { - TQDir d(dir+sub); -@@ -349,7 +349,7 @@ - TQStringList list; - list << "TQtCurve"; - --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - getStyles(kdeHome(useTQt3Settings()), list); - getStyles(kdeHome(!useTQt3Settings()), list); - getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list); -@@ -363,7 +363,7 @@ - { - return "qtcurve"==s.lower() - ? new TQtCurveStyle --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - : 0==s.find(THEME_PREFIX) - ? new TQtCurveStyle(s) - #endif -@@ -375,7 +375,7 @@ - - #define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp) - --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - #include - #endif - -@@ -393,7 +393,7 @@ - - #define DW_BGND 105 - --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - // Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent... - - static bool kickerIsTrans() -@@ -802,7 +802,7 @@ - p->restore(); - } - --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - TQtCurveStyle::TQtCurveStyle(const TQString &name) - #else - TQtCurveStyle::TQtCurveStyle() -@@ -820,7 +820,7 @@ - itsMdiColors(0L), - itsThemedApp(APP_OTHER), - itsPixmapCache(150000, 499), --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - itsIsTransKicker(false), - #endif - itsHover(HOVER_NONE), -@@ -835,7 +835,7 @@ - itsDragWidget(0L), - itsDragWidgetHadMouseTracking(false) - { --#ifdef TQTC_STYLE_SUPPORT -+#ifdef QTC_STYLE_SUPPORT - TQString rcFile; - if(!name.isEmpty()) - { -@@ -1161,7 +1161,7 @@ - if ("kicker"==appName || "appletproxy"==appName) - { - itsThemedApp=APP_KICKER; --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - itsIsTransKicker=kickerIsTrans(); - #endif - } -@@ -1196,7 +1196,7 @@ - else if ("korn"==appName) - { - itsThemedApp=APP_KORN; --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - itsIsTransKicker=kickerIsTrans(); - #endif - } -@@ -1236,7 +1236,7 @@ - - if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName)) - opts.menuStripe=SHADE_NONE; --#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT -+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT - if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde"))) - opts.fixParentlessDialogs=false; - #endif -@@ -1762,7 +1762,7 @@ - ((TQGroupBox *)widget)->setFlat(false); - ((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame); - } --#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT -+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT - else if(opts.fixParentlessDialogs && ::tqqt_cast(widget)) - { - TQDialog *dlg=(TQDialog *)widget; -@@ -1931,7 +1931,7 @@ - } - else if(widget->inherits("KTabCtl")) - widget->removeEventFilter(this); --#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT -+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT - else if(opts.fixParentlessDialogs && ::tqqt_cast(widget)) - widget->removeEventFilter(this); - #endif -@@ -2277,7 +2277,7 @@ - break; - } - --#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT -+#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT - if(opts.fixParentlessDialogs && ::tqqt_cast(object)) - { - TQDialog *dlg=(TQDialog *)object; -@@ -3152,7 +3152,7 @@ - if(flags&Style_Down) - flags=((flags|Style_Down)^Style_Down)| Style_Sunken; - flags|=Style_Enabled; --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - #if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 - if(HOVER_KICKER==itsHover && itsHoverWidget) // && itsHoverWidget==p->device()) - flags|=Style_MouseOver; -@@ -3161,7 +3161,7 @@ - #endif - drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL, - getFill(flags, use), use, true, false); --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - itsFormMode=false; - #endif - } -@@ -3313,7 +3313,7 @@ - ? cg.background().dark(DW_BGND) - : */cg.background(), - p, r, cg, glassMod ? flags : flags|Style_Horizontal, --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || - #endif - operaMdi || mdi -@@ -3345,7 +3345,7 @@ - - drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal, - flags&CHECK_BUTTON --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) - #endif - ? ROUNDED_NONE : ROUNDED_ALL, -@@ -5540,7 +5540,7 @@ - bflags|=NO_ETCH_BUTTON; - - // If we're pressed, on, or raised... --#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 -+#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 - if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons) - #else - if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) || diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec deleted file mode 100644 index f7f0f040c..000000000 --- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec +++ /dev/null @@ -1,141 +0,0 @@ -# Default version for this component -%define kdecomp kde-style-qtcurve - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-style-qtcurve -Summary: This is a set of widget styles for Trinity based apps -Version: 0.55.2 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -Obsoletes: trinity-kde-style-qtcurve -Provides: trinity-kde-style-qtcurve - -%description -This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using TDE and Gnome applications. - -This package is most useful when installed together with -gtk2-engines-qtcurve. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ - -DQTC_QT_ONLY=false \ - -DQTC_STYLE_SUPPORT=true \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang qtcurve - - -%clean -%__rm -rf %{buildroot} - - - -%files -f qtcurve.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_qtcurve_config.la -%{tde_tdelibdir}/kstyle_qtcurve_config.so -%{tde_tdelibdir}/plugins/styles/qtcurve.so -%{tde_tdelibdir}/plugins/styles/qtcurve.la -%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc -%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc -%{tde_datadir}/apps/QtCurve/*.qtcurve - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.55.2-4 -- Initial build for TDE 3.5.13.1 - -* Sun Sep 09 2012 Francois Andriot - 0.55.2-3 -- Switch to v3.5.13-sru branch - -* Tue May 01 2012 Francois Andriot - 0.55.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 0.55.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec deleted file mode 100644 index 2fcec0dd2..000000000 --- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec +++ /dev/null @@ -1,140 +0,0 @@ -# Default version for this component -%define kdecomp kde-style-qtcurve - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-style-qtcurve -Summary: This is a set of widget styles for Trinity based apps -Version: 0.55.2 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source1: cmake-3.5.13.tar.gz - -# [qtcurve] Version 3.5.13-sru -Patch0: kde-style-qtcurve-3.5.13-sru-20120909.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -Obsoletes: trinity-kde-style-qtcurve -Provides: trinity-kde-style-qtcurve - -%description -This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using TDE and Gnome applications. - -This package is most useful when installed together with -gtk2-engines-qtcurve. - - -%prep -%setup -q -n applications/%{kdecomp} -%setup -q -n applications/%{kdecomp} -a 1 -%__mv -f cmake-3.5.13/* cmake/ - -%patch0 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" - -%if 0%{?rhel} || 0%{?fedora} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ - -DQTC_QT_ONLY=false \ - -DQTC_STYLE_SUPPORT=true \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang qtcurve - - -%clean -%__rm -rf %{buildroot} - - - -%files -f qtcurve.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_qtcurve_config.la -%{tde_tdelibdir}/kstyle_qtcurve_config.so -%{tde_tdelibdir}/plugins/styles/qtcurve.so -%{tde_tdelibdir}/plugins/styles/qtcurve.la -%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc -%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc -%{tde_datadir}/apps/QtCurve/*.qtcurve - - -%Changelog -* Sun Sep 09 2012 Francois Andriot - 0.55.2-3 -- Switch to v3.5.13-sru branch - -* Tue May 01 2012 Francois Andriot - 0.55.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 0.55.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec deleted file mode 100644 index 2107afe79..000000000 --- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec +++ /dev/null @@ -1,159 +0,0 @@ -# Default version for this component -%define kdecomp kde-systemsettings - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -# Currently, menu files under /etc/xdg conflict with KDE4 -%define tde_sysconfdir %{tde_prefix}/etc -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: 5%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz -Source1: kde-settings-laptops.directory - -Provides: trinity-kde-systemsettings = %{version}-%{release} -Obsoletes: trinity-kde-systemsettings < %{version}-%{release} - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -Requires: trinity-guidance - -%description -System preferences is a replacement for the TDE -Control Centre with an improved user interface. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --sysconfdir=%{tde_sysconfdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/ - -# Unwanted files -%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update - -%files -%defattr(-,root,root,-) -%doc README TODO -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu -%{tde_bindir}/systemsettings -%{tde_datadir}/applications/kde/audioencoding.desktop -%{tde_datadir}/applications/kde/defaultapplication.desktop -%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop -%{tde_datadir}/applications/kde/laptoppowermanagement.desktop -%{tde_datadir}/applications/kde/medianotifications.desktop -%{tde_datadir}/applications/kde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/systemsettingsui.rc -%{tde_datadir}/config/systemsettingsrc -%{tde_datadir}/desktop-directories/*.directory -%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png - - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.0svn20070312-5 -- Initial build for TDE 3.5.13.1 - -* Wed Jul 11 2012 Francois Andriot - 0.0svn20070312-4 -- Fix XDG menu directory location (again) - -* Sun Jul 08 2012 Francois Andriot - 0.0svn20070312-3 -- Updates 'Requires: trinity-guidance' to reflect package renaming - -* Wed Dec 14 2011 Francois Andriot - 0.0svn20070312-2 -- Fix XDG menu directory location - -* Sat Dec 03 2011 Francois Andriot - 0.0svn20070312-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.spec deleted file mode 100644 index ed156aba8..000000000 --- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings-3.5.13.spec +++ /dev/null @@ -1,150 +0,0 @@ -# Default version for this component -%define kdecomp kde-systemsettings - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -# Currently, menu files under /etc/xdg conflict with KDE4 -%define tde_sysconfdir %{tde_prefix}/etc -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source1: kde-settings-laptops.directory - -Provides: trinity-kde-systemsettings = %{version}-%{release} -Obsoletes: trinity-kde-systemsettings < %{version}-%{release} - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -Requires: trinity-guidance - -%description -System preferences is a replacement for the TDE -Control Centre with an improved user interface. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --sysconfdir=%{tde_sysconfdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/ - -# Unwanted files -%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -xdg-user-dirs-update - -%files -%defattr(-,root,root,-) -%doc README TODO -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu -%{tde_bindir}/systemsettings -%{tde_datadir}/applications/kde/audioencoding.desktop -%{tde_datadir}/applications/kde/defaultapplication.desktop -%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop -%{tde_datadir}/applications/kde/laptoppowermanagement.desktop -%{tde_datadir}/applications/kde/medianotifications.desktop -%{tde_datadir}/applications/kde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/systemsettingsui.rc -%{tde_datadir}/config/systemsettingsrc -%{tde_datadir}/desktop-directories/*.directory -%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png - - - -%Changelog -* Wed Jul 11 2012 Francois Andriot - 0.0svn20070312-4 -- Fix XDG menu directory location (again) - -* Sun Jul 08 2012 Francois Andriot - 0.0svn20070312-3 -- Updates 'Requires: trinity-guidance' to reflect package renaming - -* Wed Dec 14 2011 Francois Andriot - 0.0svn20070312-2 -- Fix XDG menu directory location - -* Sat Dec 03 2011 Francois Andriot - 0.0svn20070312-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.1.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.1.spec deleted file mode 100644 index 41d24ea5c..000000000 --- a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.1.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define kdecomp kdesudo - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: sudo frontend for Trinity - -Version: 2.5.1 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - - -%description -KdeSudo is a graphical frontend for the sudo utility. -It allows you to run programs as another user by entering your password. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdesudo -%{tde_tdedocdir}/HTML/en/kdesudo/ - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 2.5.1-3 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 2.5.1-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Wed Nov 02 2011 Francois Andriot - 2.5.1-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec deleted file mode 100644 index da04bb7ef..000000000 --- a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec +++ /dev/null @@ -1,130 +0,0 @@ -# Default version for this component -%define kdecomp kdesudo - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: sudo frontend for Trinity - -Version: 2.5.1 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -KdeSudo is a graphical frontend for the sudo utility. -It allows you to run programs as another user by entering your password. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdesudo -%{tde_tdedocdir}/HTML/en/kdesudo/ - - -%Changelog -* Tue May 01 2012 Francois Andriot - 2.5.1-2 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Removes post and postun - -* Wed Nov 02 2011 Francois Andriot - 2.5.1-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 850d5c7c0..000000000 --- a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200 -+++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200 -@@ -23,7 +23,7 @@ - - SET_TARGET_PROPERTIES(kded_kdesvnd - PROPERTIES -- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module") -+ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}") - - INSTALL(TARGETS kded_kdesvnd - RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch deleted file mode 100644 index c912db32b..000000000 --- a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- kdesvn/src/svnqt/cache/LogCache.cpp.stringliteral 2011-08-17 23:41:23.000000000 +0200 -+++ kdesvn/src/svnqt/cache/LogCache.cpp 2012-08-05 12:44:59.038119225 +0200 -@@ -187,7 +187,7 @@ - TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key); - db->setDatabaseName(m_BasePath+"/maindb.db"); - if (!db->open()) { -- qWarning("Failed to open main database: " + db->lastError().text()); -+ qWarning("%s", (TQString("Failed to open main database: " + db->lastError().text())).ascii()); - } else { - m_mainDB.setLocalData(new ThreadDBStore); - m_mainDB.localData()->key = _key; -@@ -269,12 +269,12 @@ - #endif - TQDataBase mainDB = m_CacheData->getMainDB(); - if (!mainDB || !mainDB->open()) { -- qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")); -+ qWarning("%s", ("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii()); - } else { - TQSqlQuery q(TQString(), mainDB); - mainDB->transaction(); - if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) { -- qWarning("Failed create main database: " + mainDB->lastError().text()); -+ qWarning("%s", ("Failed create main database: " + mainDB->lastError().text()).ascii()); - } - mainDB->commit(); - } -@@ -321,7 +321,7 @@ - TQSqlQuery cur(TQString(),mainDB); - cur.prepare(s_q); - if (!cur.exec()) { -- qDebug(cur.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text()); - return _res; - } ---- kdesvn/src/svnqt/cache/ReposLog.cpp.ORI 2012-08-05 12:50:50.352685697 +0200 -+++ kdesvn/src/svnqt/cache/ReposLog.cpp 2012-08-05 12:55:39.515888432 +0200 -@@ -68,7 +68,7 @@ - TQString q("select revision from 'logentries' order by revision DESC limit 1"); - TQSqlQuery _q(TQString(), m_Database); - if (!_q.exec(q)) { -- qDebug(_q.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii()); - return svn::Revision::UNDEFINED; - } - int _r; -@@ -76,7 +76,7 @@ - //qDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data()); - _r = _q.value(0).toInt(); - } else { -- qDebug(_q.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii()); - return svn::Revision::UNDEFINED; - } - return _r; -@@ -197,7 +197,7 @@ - bcount.bindValue(0,TQ_LLONG(end.revnum())); - bcount.bindValue(1,TQ_LLONG(start.revnum())); - if (!bcount.exec()) { -- qDebug(bcount.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(bcount.lastError().text().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not retrieve count: ")+bcount.lastError().text()); - return false; - } -@@ -211,7 +211,7 @@ - bcur.bindValue(1,TQ_LLONG(start.revnum())); - - if (!bcur.exec()) { -- qDebug(bcur.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(bcur.lastError().text().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+bcur.lastError().text()); - return false; - } -@@ -220,7 +220,7 @@ - revision = bcur.value(0).toLongLong(); - cur.bindValue(0,revision); - if (!cur.exec()) { -- qDebug(cur.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text() - ,cur.lastError().number()); - return false; -@@ -264,7 +264,7 @@ - TQSqlQuery query("select revision,date from logentries order by revision desc limit 1",m_Database); - - if (query.lastError().type()!=TQSqlError::None) { -- qDebug(query.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii()); - } - bool must_remote=!noNetwork; - if (query.next()) { -@@ -283,7 +283,7 @@ - query.bindValue(0,TQ_LLONG(aRev.date())); - query.exec(); - if (query.lastError().type()!=TQSqlError::None) { -- qDebug(query.lastError().text().TOUTF8().data()); -+ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii()); - } - if (query.next()) { - return query.value(0).toInt(); -@@ -320,7 +320,7 @@ - if (!_q.exec()) { - m_Database->rollback(); - qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); -- qDebug(_q.lastQuery().TOUTF8().data()); -+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); - } - _q.prepare(qPathes); -@@ -334,7 +334,7 @@ - if (!_q.exec()) { - m_Database->rollback(); - qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); -- qDebug(_q.lastQuery().TOUTF8().data()); -+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); - } - } -@@ -375,7 +375,7 @@ - _q.prepare(query_string); - if (!_q.exec()) { - qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); -- qDebug(_q.lastQuery().TOUTF8().data()); -+ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); - throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number()); - } - while(_q.next()) { diff --git a/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.1.spec b/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.1.spec deleted file mode 100644 index c4b49483f..000000000 --- a/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.1.spec +++ /dev/null @@ -1,287 +0,0 @@ -# Default version for this component -%define kdecomp kdesvn - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: subversion client with tight KDE integration [Trinity] -Version: 1.0.4 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# [kdesvn] Fix "not a string literal" error -Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: subversion-devel -Requires: trinity-kdesvn-kio-plugins = %{version}-%{release} - - -%description -KDESvn is a graphical client for the subversion revision control -system (svn). - -Besides offering common and advanced svn operations, it features -a tight integration into KDE and can be embedded into other KDE -applications like konqueror via the KDE component technology KParts. - - -%package -n trinity-libsvnqt -Group: Development/Libraries -Summary: Qt wrapper library for subversion [Trinity] - -%description -n trinity-libsvnqt -This package provides svnqt, a Qt wrapper library around the -subversion library. - -It is based on the RapidSvn SvnCpp library, a subversion client API -written in C++. - -%package -n trinity-libsvnqt-devel -Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} -Requires: qt-devel -Requires: subversion-devel -Summary: Qt wrapper library for subversion (development files) [Trinity] - -%description -n trinity-libsvnqt-devel -This package contains the header files and symbolic links that developers -using svnqt will need. - - -%package kio-plugins -Group: Development/Libraries -Conflicts: trinity-kdesdk-kio-plugins -Summary: subversion I/O slaves for Trinity - -%description kio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, -svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled KDE application. - -This package is part of tdesvn-trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch2 -p1 -b .stringliteral - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -find . -name CMakeLists.txt -exec %__sed -i {} \ - -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ - -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ - -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ - \; - -# More ugly hack to add TQT include directory in CMakeLists.txt -%__sed -i CMakeLists.txt \ - -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt," - -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/kde/HTML,g" \ - \; - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%find_lang %{kdecomp} || touch %{kdecomp}.lang - -# Installs SVN protocols as alternatives -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn -%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol -%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol -%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol -%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol -%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%post -n trinity-libsvnqt -/sbin/ldconfig || : - -%post kio-plugins -for proto in svn+file svn+http svn+https svn+ssh svn; do -%if 0%{?suse_version} - update-alternatives --install \ -%else - alternatives --install \ -%endif - %{tde_datadir}/services/${proto}.protocol \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn \ - 20 -done - -%preun kio-plugins -if [ $1 -eq 0 ]; then - for proto in svn+file svn+http svn+https svn+ssh svn; do -%if 0%{?suse_version} - update-alternatives --remove \ -%else - alternatives --remove \ -%endif - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn - done -fi - - - -%postun -n trinity-libsvnqt -/sbin/ldconfig || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kdesvn -%{tde_bindir}/kdesvnaskpass -%{tde_tdelibdir}/libkdesvnpart.la -%{tde_tdelibdir}/libkdesvnpart.so -%{tde_datadir}/applications/kde/kdesvn.desktop -%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh -%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd -%{tde_datadir}/apps/kdesvn/kdesvnui.rc -%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc -%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/kdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/kdesvn.1 -%{tde_mandir}/man1/kdesvnaskpass.1 -%{tde_tdedocdir}/HTML/*/ - -%files -n trinity-libsvnqt -%{tde_libdir}/libsvnqt.so.4 -%{tde_libdir}/libsvnqt.so.4.2.2 - -%files -n trinity-libsvnqt-devel -%{tde_includedir}/svnqt -%{tde_libdir}/libsvnqt.so - -%files kio-plugins -%{tde_datadir}/services/kded/kdesvnd.desktop -%{tde_datadir}/services/ksvn+file.protocol -%{tde_datadir}/services/ksvn+http.protocol -%{tde_datadir}/services/ksvn+https.protocol -%{tde_datadir}/services/ksvn+ssh.protocol -%{tde_datadir}/services/ksvn.protocol -%{tde_datadir}/services/svn+file.protocol -%{tde_datadir}/services/svn+http.protocol -%{tde_datadir}/services/svn+https.protocol -%{tde_datadir}/services/svn+ssh.protocol -%{tde_datadir}/services/svn.protocol -%{tde_datadir}/services/svn+file.protocol_tdesvn -%{tde_datadir}/services/svn+http.protocol_tdesvn -%{tde_datadir}/services/svn+https.protocol_tdesvn -%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%{tde_datadir}/services/svn.protocol_tdesvn -%{tde_tdelibdir}/kio_ksvn.la -%{tde_tdelibdir}/kio_ksvn.so -%{tde_tdelibdir}/kded_kdesvnd.la -%{tde_tdelibdir}/kded_kdesvnd.so - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 1.0.4-4 -- Initial build for TDE 3.5.13.1 - -* Mon Jul 30 2012 Francois Andriot - 1.0.4-3 -- Installs SVN protocols as alternative, avoids conlict with TDESDK - -* Tue May 01 2012 Francois Andriot - 1.0.4-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix compilation with GCC 4.7 - -* Thu Dec 01 2011 Francois Andriot - 1.0.4-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.spec b/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.spec deleted file mode 100644 index ce67e8923..000000000 --- a/redhat/applications/kdesvn/trinity-kdesvn-3.5.13.spec +++ /dev/null @@ -1,274 +0,0 @@ -# Default version for this component -%define kdecomp kdesvn - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: subversion client with tight KDE integration [Trinity] -Version: 1.0.4 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [kdesvn] Fix compilation with GCC 4.7 -Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch -# [kdesvn] Fix "not a string literal" error -Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: subversion-devel -Requires: trinity-kdesvn-kio-plugins = %{version}-%{release} - - -%description -KDESvn is a graphical client for the subversion revision control -system (svn). - -Besides offering common and advanced svn operations, it features -a tight integration into KDE and can be embedded into other KDE -applications like konqueror via the KDE component technology KParts. - - -%package -n trinity-libsvnqt -Group: Development/Libraries -Summary: Qt wrapper library for subversion [Trinity] - -%description -n trinity-libsvnqt -This package provides svnqt, a Qt wrapper library around the -subversion library. - -It is based on the RapidSvn SvnCpp library, a subversion client API -written in C++. - -%package -n trinity-libsvnqt-devel -Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} -Requires: qt-devel -Requires: subversion-devel -Summary: Qt wrapper library for subversion (development files) [Trinity] - -%description -n trinity-libsvnqt-devel -This package contains the header files and symbolic links that developers -using svnqt will need. - - -%package kio-plugins -Group: Development/Libraries -Conflicts: trinity-kdesdk-kio-plugins -Summary: subversion I/O slaves for Trinity - -%description kio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, -svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled KDE application. - -This package is part of tdesvn-trinity. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 -%patch2 -p1 -b .stringliteral - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -find . -name CMakeLists.txt -exec %__sed -i {} \ - -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ - -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ - -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ - \; - -# More ugly hack to add TQT include directory in CMakeLists.txt -%__sed -i CMakeLists.txt \ - -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt," - -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/kde/HTML,g" \ - \; - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -%if 0%{?rhel} || 0%{?fedora} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%find_lang %{kdecomp} || touch %{kdecomp}.lang - -# Installs SVN protocols as alternatives -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn -%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol -%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol -%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol -%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol -%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%post -n trinity-libsvnqt -/sbin/ldconfig || : - -%post kio-plugins -for proto in svn+file svn+http svn+https svn+ssh svn; do - alternatives --install \ - %{tde_datadir}/services/${proto}.protocol \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn \ - 20 -done - -%preun kio-plugins -if [ $1 -eq 0 ]; then - for proto in svn+file svn+http svn+https svn+ssh svn; do - alternatives --remove \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn - done -fi - - - -%postun -n trinity-libsvnqt -/sbin/ldconfig || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kdesvn -%{tde_bindir}/kdesvnaskpass -%{tde_tdelibdir}/libkdesvnpart.la -%{tde_tdelibdir}/libkdesvnpart.so -%{tde_datadir}/applications/kde/kdesvn.desktop -%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh -%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd -%{tde_datadir}/apps/kdesvn/kdesvnui.rc -%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc -%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/kdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/kdesvn.1 -%{tde_mandir}/man1/kdesvnaskpass.1 -%{tde_tdedocdir}/HTML/*/ - -%files -n trinity-libsvnqt -%{tde_libdir}/libsvnqt.so.4 -%{tde_libdir}/libsvnqt.so.4.2.2 - -%files -n trinity-libsvnqt-devel -%{tde_includedir}/svnqt -%{tde_libdir}/libsvnqt.so - -%files kio-plugins -%{tde_datadir}/services/kded/kdesvnd.desktop -%{tde_datadir}/services/ksvn+file.protocol -%{tde_datadir}/services/ksvn+http.protocol -%{tde_datadir}/services/ksvn+https.protocol -%{tde_datadir}/services/ksvn+ssh.protocol -%{tde_datadir}/services/ksvn.protocol -%{tde_datadir}/services/svn+file.protocol -%{tde_datadir}/services/svn+http.protocol -%{tde_datadir}/services/svn+https.protocol -%{tde_datadir}/services/svn+ssh.protocol -%{tde_datadir}/services/svn.protocol -%{tde_datadir}/services/svn+file.protocol_tdesvn -%{tde_datadir}/services/svn+http.protocol_tdesvn -%{tde_datadir}/services/svn+https.protocol_tdesvn -%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%{tde_datadir}/services/svn.protocol_tdesvn -%{tde_tdelibdir}/kio_ksvn.la -%{tde_tdelibdir}/kio_ksvn.so -%{tde_tdelibdir}/kded_kdesvnd.la -%{tde_tdelibdir}/kded_kdesvnd.so - - -%Changelog -* Mon Jul 30 2012 Francois Andriot - 1.0.4-3 -- Installs SVN protocols as alternative, avoids conlict with TDESDK - -* Tue May 01 2012 Francois Andriot - 1.0.4-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix compilation with GCC 4.7 - -* Thu Dec 01 2011 Francois Andriot - 1.0.4-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.1.spec b/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.1.spec deleted file mode 100644 index bdd0aefab..000000000 --- a/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.1.spec +++ /dev/null @@ -1,130 +0,0 @@ -# Default version for this component -%define kdecomp kdmtheme - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: theme manager for KDM [Trinity] -Version: 1.2.2 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM) -that allows you to easily install, remove and change your KDM themes. - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kdmtheme.la -%{tde_tdelibdir}/kcm_kdmtheme.so -%{tde_tdeappdir}/kdmtheme.desktop -%{tde_tdedocdir}/HTML/en/kdmtheme/ - - -%post -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -update-desktop-database %{tde_appdir} &> /dev/null - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 1.2.2-3 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 1.2.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Removes the 'lintian' stuff from Debian - -* Fri Nov 25 2011 Francois Andriot - 1.2.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.spec b/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.spec deleted file mode 100644 index 71d5dbdf0..000000000 --- a/redhat/applications/kdmtheme/trinity-kdmtheme-3.5.13.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define kdecomp kdmtheme - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: theme manager for KDM [Trinity] -Version: 1.2.2 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM) -that allows you to easily install, remove and change your KDM themes. - - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kdmtheme.la -%{tde_tdelibdir}/kcm_kdmtheme.so -%{tde_tdeappdir}/kdmtheme.desktop -%{tde_tdedocdir}/HTML/en/kdmtheme/ - - -%post -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -update-desktop-database %{tde_appdir} &> /dev/null - - -%Changelog -* Tue May 01 2012 Francois Andriot - 1.2.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Removes the 'lintian' stuff from Debian - -* Fri Nov 25 2011 Francois Andriot - 1.2.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 00ca8561c..000000000 --- a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- kio-locate/src/SConscript.ORI 2012-05-02 00:23:36.637608539 +0200 -+++ kio-locate/src/SConscript 2012-05-02 00:23:44.142459165 +0200 -@@ -28,7 +28,7 @@ - pattern.cpp - """ - obj.libs='tqt kio' --obj.linkflags='-module' # add more link flags -+#obj.linkflags='-module' # add more link flags - obj.execute() - - # Install the protocol files ---- kio-locate/admin/kde.py.install 2011-07-07 08:10:05.000000000 +0200 -+++ kio-locate/admin/kde.py 2012-05-06 20:29:48.236024293 +0200 -@@ -337,7 +337,7 @@ - opts.Save(cachefile, env) - - ## set default variables, one can override them in sconscript files -- env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ], -+ env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ], - LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ]) - - env['QT_AUTOSCAN'] = 1 -@@ -773,7 +773,7 @@ - ## Define this to 1 if you are writing documentation else to 0 :) - #if lenv.has_key('i_am_a_documentation_writer'): - for file in docbook_list: -- lenv.Depends( folder+'index.cache.bz2', nodefile ) -+ lenv.Depends( folder+'index.cache.bz2', file ) - - if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder) - -@@ -781,7 +782,7 @@ - lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') ) - - if env['_INSTALL']: -- dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination) -+ dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination) - comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir) - lenv.Execute(comp) - diff --git a/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec b/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec deleted file mode 100644 index f24f3a2f7..000000000 --- a/redhat/applications/kio-locate/trinity-kio-locate-3.5.12.spec +++ /dev/null @@ -1,111 +0,0 @@ -# Default version for this component -%define kdecomp kio-locate - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.12.tar.gz - -# [kio-locate] Fix compilation with GCC 4.7 -Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: scons - -%description -Adds support for the "locate:" and "locater:" -protocols to Konqueror and other TDE applications. - -This enables you to perform locate searches as you -would in a terminal. The result is displayed just -as a directory. - - -%prep -%setup -q -n applications/%{kdecomp} -#patch1 -p1 -b .install - -# Ugly hack to modify TQT include directory inside SCONS files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/kde.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CXXFLAGS="-I%{tde_includedir}/tqt ${CXXFLAGS}" -scons configure -scons - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -scons install DESTDIR=%{buildroot} - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_tdelibdir}/kio_locate.la -%{tde_tdelibdir}/kio_locate.so -%{tde_tdedocdir}/HTML/en/kio-locate/ -%{tde_datadir}/services/locate.protocol -%{tde_datadir}/services/locater.protocol -%{tde_datadir}/services/rlocate.protocol -%{tde_datadir}/services/searchproviders/locate.desktop - - -%Changelog -* Tue May 01 2012 Francois Andriot - 0.4.5-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Fix compilation with GCC 4.7 - -* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.1.spec b/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.1.spec deleted file mode 100644 index f673baeb6..000000000 --- a/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.1.spec +++ /dev/null @@ -1,135 +0,0 @@ -# Default version for this component -%define kdecomp kio-locate - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -BuildRequires: cmake >= 2.8 - -%description -Adds support for the "locate:" and "locater:" -protocols to Konqueror and other TDE applications. - -This enables you to perform locate searches as you -would in a terminal. The result is displayed just -as a directory. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside SCONS files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/kde.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - -DBUILD_ALL=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_tdelibdir}/kio_locate.la -%{tde_tdelibdir}/kio_locate.so -%{tde_tdedocdir}/HTML/en/kio-locate/ -%{tde_datadir}/services/locate.protocol -%{tde_datadir}/services/locater.protocol -%{tde_datadir}/services/rlocate.protocol -%{tde_datadir}/services/searchproviders/locate.desktop - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.4.5-3 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 0.4.5-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Fix compilation with GCC 4.7 - -* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec b/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec deleted file mode 100644 index 72b4e1032..000000000 --- a/redhat/applications/kio-locate/trinity-kio-locate-3.5.13.spec +++ /dev/null @@ -1,113 +0,0 @@ -# Default version for this component -%define kdecomp kio-locate - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [kio-locate] Fix compilation with GCC 4.7 -Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch - -Patch2: kio-locate-3.5.13-downgrade_3512.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: scons - -%description -Adds support for the "locate:" and "locater:" -protocols to Konqueror and other TDE applications. - -This enables you to perform locate searches as you -would in a terminal. The result is displayed just -as a directory. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 -b .install -%patch2 -p7 - -# Ugly hack to modify TQT include directory inside SCONS files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/kde.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -scons configure -scons - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -scons install DESTDIR=%{buildroot} - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_tdelibdir}/kio_locate.la -%{tde_tdelibdir}/kio_locate.so -%{tde_tdedocdir}/HTML/en/kio-locate/ -%{tde_datadir}/services/locate.protocol -%{tde_datadir}/services/locater.protocol -%{tde_datadir}/services/rlocate.protocol -%{tde_datadir}/services/searchproviders/locate.desktop - - -%Changelog -* Tue May 01 2012 Francois Andriot - 0.4.5-2 -- Rebuilt for Fedora 17 -- Removes post and postun -- Fix compilation with GCC 4.7 - -* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kio-umountwrapper/media_safelyremove.desktop b/redhat/applications/kio-umountwrapper/media_safelyremove.desktop deleted file mode 100644 index 22b716ad5..000000000 --- a/redhat/applications/kio-umountwrapper/media_safelyremove.desktop +++ /dev/null @@ -1,74 +0,0 @@ -[Desktop Entry] -ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted -Actions=MediaSafelyRemove; -X-TDE-Priority=TopLevel -X-TDE-MediaNotifierHide=true - -[Desktop Action MediaSafelyRemove] -Name=Safely Remove -Name[af]=Verwyder veilig -Name[ar]=أحذف بأمان -Name[be]=Бяспечна адлучыць -Name[bg]=Безопасно изваждане -Name[bn]=নিরাপদভাবে সরাও -Name[bs]=Sigurno ukloni -Name[ca]=Extreu amb seguretat -Name[cs]=Bezpečně odstranit -Name[csb]=Remôj na bezpieczny ôrt -Name[da]=Fjern sikkert -Name[de]=Sicher entfernen -Name[el]=Ασφαλής αφαίρεση -Name[eo]=Sekura Forigo -Name[es]=Extracción segura -Name[et]=Eemalda turvaliselt -Name[eu]=Atera arriskurik gabe -Name[fa]=حذف امن -Name[fi]=Poista turvallisesti -Name[fr]=Enlever en toute sécurité -Name[fy]=Feilich ferwiderje -Name[ga]=Bain Amach go Sábháilte -Name[gl]=Eliminar de Maneira Segura -Name[he]=שליפה בבטחה -Name[hr]=Slobodno uklonite -Name[hu]=Biztonságos leválasztás -Name[is]=Fjarlægja öruggt -Name[it]=Rimozione sicura -Name[ja]=安全に取り除く -Name[kk]=Қауіпсіз алып шығу -Name[km]=យកចេញ​ដោយ​សុវត្ថិភាព -Name[lt]=Saugiai pašalinti -Name[mk]=Безбедно отстрани -Name[ms]=Buang Dengan Selamat -Name[nb]=Sikker fjerning -Name[nds]=Seker rutnehmen -Name[ne]=सुरक्षीत रुपमा हटाउनुहोस् -Name[nl]=Veilig verwijderen -Name[nn]=Trygg fjerning -Name[pa]=ਸੁਰੱਖਿਅਤ ਹਟਾਓ -Name[pl]=Usuń w sposób bezpieczny -Name[pt]=Retirar com Segurança -Name[pt_BR]=Remover de Modo Seguro -Name[ro]=Scoate în siguranță -Name[ru]=Безопасно извлечь -Name[rw]=Gukuramo Neza -Name[se]=Dorvvošlaš eretváldin -Name[sk]=Bezpečne odpojiť -Name[sl]=Varno odstrani -Name[sr]=Безбедно уклони -Name[sr@Latn]=Bezbedno ukloni -Name[sv]=Säker urkoppling -Name[ta]=பாதுகாப்பாக நீக்கு -Name[te]=జాగరత్తగా తియి -Name[tg]=Баровардани бехетар -Name[th]=ถอดออกอย่างปลอดภัย -Name[tr]=Güvenli Kaldır -Name[tt]=İmin Çığaru -Name[uk]=Безпечно вилучити -Name[uz]=Эҳтиётлик билан узиш -Name[vi]=Gỡ ra An toàn -Name[wa]=Ositer e såvrité -Name[zh_CN]=安全删除 -Name[zh_TW]=安全的移除 -Exec=kio_umountwrapper %u - -X-Ubuntu-Gettext-Domain=desktop_tdebase diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec deleted file mode 100644 index 20b3ceef4..000000000 --- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec +++ /dev/null @@ -1,157 +0,0 @@ -# Default version for this component -%define kdecomp kio-umountwrapper - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://frode.kde.no/misc/kio_umountwrapper/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz -Source1: media_safelyremove.desktop - - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - - -%description -Wrapper around kio_media_mountwrapper. -Provides a progress dialog for Safely Removing of devices in Trinity. - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%clean -%__rm -rf %{buildroot} - -%post -for f in konqueror d3lphin; do -%if 0%{?suse_version} - update-alternatives --install \ -%else - alternatives --install \ -%endif - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ - 20 -done - - -%postun -if [ $1 -eq 0 ]; then - for f in konqueror d3lphin; do -%if 0%{?suse_version} - update-alternatives --remove \ -%else - alternatives --remove \ -%endif - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper - done -fi - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kio_umountwrapper -%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.2-4 -- Initial build for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot - 0.2-3 -- Add 'desktop' file, to make this program useful :-) - -* Wed May 02 2012 Francois Andriot - 0.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Dec 03 2011 Francois Andriot - 0.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec deleted file mode 100644 index 352e39845..000000000 --- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec +++ /dev/null @@ -1,140 +0,0 @@ -# Default version for this component -%define kdecomp kio-umountwrapper - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://frode.kde.no/misc/kio_umountwrapper/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source1: media_safelyremove.desktop - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -Wrapper around kio_media_mountwrapper. -Provides a progress dialog for Safely Removing of devices in Trinity. - - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%clean -%__rm -rf %{buildroot} - -%post -for f in konqueror d3lphin; do - alternatives --install \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ - 20 -done - - -%postun -if [ $1 -eq 0 ]; then - for f in konqueror d3lphin; do - alternatives --remove \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper - done -fi - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kio_umountwrapper -%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - -%Changelog -* Sun Jul 08 2012 Francois Andriot - 0.2-3 -- Add 'desktop' file, to make this program useful :-) - -* Wed May 02 2012 Francois Andriot - 0.2-2 -- Rebuilt for Fedora 17 -- Removes post and postun - -* Sat Dec 03 2011 Francois Andriot - 0.2-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/kradio/kradio-3.5.13.1-updated_preset.patch b/redhat/applications/kradio/kradio-3.5.13.1-updated_preset.patch deleted file mode 100644 index fa36c7341..000000000 --- a/redhat/applications/kradio/kradio-3.5.13.1-updated_preset.patch +++ /dev/null @@ -1,26417 +0,0 @@ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am kradio-3.5.13.1/kradio3/presets/australia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/australia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,18 +1,19 @@ - SUBDIRS = --EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "sydney2.krp" "sydney.krp" -+EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "melbourne-antenna.krp" "sydney2.krp" "sydney.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/" -+ $(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" - $(INSTALL_DATA) "$(srcdir)/brisbane-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/brisbane.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp" -- $(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" -- $(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" -+ $(INSTALL_DATA) "$(srcdir)/melbourne-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/sydney2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,161 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Peter D. -+<p13@g-node.com.au> -+ 2007-12-12T17:01:51 -+ Australia -+ Melbourne -+ Antenna -+ Radio Stations for Melbourne, Australia -+ Contains merged Data -+ -+ -+ -+11974366782D0E540F17C02C9C4E20988BCD2C0C7100B2FC5ED1319E83350C0E4C0563EF35 -+ 3LIGHT FM community -+ light -+ -+ -0.01 -+ 89.9252 -+ -+ -+ -+1197436698FF15BCA070FB6227B18EBB68B9715621C393D7AF82C80F67F6E80CAB666759EC -+ 3SYN FM comminity -+ syn -+ -+ -0.01 -+ 90.7002 -+ -+ -+ -+1197436719C0EC401C5D0333A6E5B547782E8121B1901809FFD98F727201ADE6DB74303AE2 -+ 3VEGA FM -+ vega -+ -+ -0.01 -+ 91.5253 -+ -+ -+ -+1197436737017BC3859256567C06F74FC6AD3F7B1915F042A77FF112BED373F401AC4028B4 -+ 3ZZZ FM comminity -+ zzz -+ -+ -0.01 -+ 92.3003 -+ -+ -+ -+1197436756249596085B3207542A09E11A9C8C74ACB46070D13973A137F67B4136EE86C962 -+ 3SBS FM -+ sbs -+ -+ -0.01 -+ 93.1254 -+ -+ -+ -+1197436810A51A6903E91CFB581EF498645A805CD95387B9E149D05F4F5C0E57C69CFE6AB5 -+ 3GOLDEN DAY FM community -+ G' Day -+ -+ -0.01 -+ 95.6755 -+ -+ -+ -+119743691153837110B029B161953DDE804D73EA2E5861F76E507D7DA97C4FAFF5BEC1C2ED -+ 3NOVA FM -+ nova -+ -+ -0.01 -+ 100.326 -+ -+ -+ -+11974369293DC812D3A5A7BF790997A673EDAAEFEDD1A50135D09CEC74C0F2841593C9BBC8 -+ 3MIX FM -+ mix -+ -+ -0.01 -+ 101.101 -+ -+ -+ -+1197436948238C94F5ED52E042F96B82ED364BFECD1DE876F7DB212F590ADDA1BEBC6D7FE3 -+ 3FOX FM -+ fox -+ -+ -0.01 -+ 101.926 -+ -+ -+ -+1197437931AB81E5CE2324D406F215FA19A0B8C1927CD558960CFD9313FBE47E47A749C011 -+ 3RRR FM -+ rrr -+ -+ -0.01 -+ 102.751 -+ -+ -+ -+11974379481316966853D5FF30386493899394FFC3B3A8FAE73B28F93DD5E7DBB61F8CAC3E -+ 3MBS FM classical -+ mbs -+ -+ -0.01 -+ 103.476 -+ -+ -+ -+1197437004F27F07648029E5F0A761C4BBBF1408C189B69DCA872F9FDB68E6BCE1B3F8952A -+ 3GOLD FM -+ gold -+ -+ -0.01 -+ 104.301 -+ -+ -+ -+11974370239B06749375C9E77BB6AC1CADEAC4566B123E8E0C903EE4B9DB0C00A192400277 -+ 3MMM FM -+ mmm -+ -+ -0.01 -+ 105.151 -+ -+ -+ -+11974370423878D22E02EDF44D97ACEC2419689134C4700903D136AF45C56CE08F7D3E1CFE -+ ABC FM classical -+ abc classic -+ -+ -0.01 -+ 105.926 -+ -+ -+ -+119743706068B59CCAFF4E0462729EE829A55E3311AD32AEFFEF1067064919CCBD6AD1C465 -+ 3PBS FM community -+ pbs -+ -+ -0.01 -+ 106.701 -+ -+ -+ -+11974380497211583134DCDBC719C69479C5454C567A662FA3CC75A2EC69DECB6C4D440E7E -+ 3JJJ FM -+ jjj -+ -+ -0.01 -+ 107.526 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp kradio-3.5.13.1/kradio3/presets/belarus/brest.krp ---- kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/belarus/brest.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,258 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.1-rc1 -+ Blaze -+ 2010-08-08T09:00:13 -+ Belarus -+ Brest -+ -+ -+ -+ -+ 1207729347B95CF236E42587F6871F53D00304A13643B98948622764D589238FDFE6F550A1 -+ Першы нацыянальны -+ -+ -+ -0.01 -+ dontcare -+ 70.9 -+ -+ -+ 120772620854C001667C47982987BFB58FF2B485A2C828F99A875C28AD6C2A5FC61D587D2B -+ Культура -+ -+ -+ -0.01 -+ dontcare -+ 71.7 -+ -+ -+ 1207726041C55D9585D3A616D7E90CDB8AB1B343638DA19EFFB7DC7557602C2D76F312A07F -+ радыё Сталiца -+ -+ -+ -0.01 -+ dontcare -+ 72.5 -+ -+ -+ 1207725781B1CE695E03A103A33EA30C2AEE33B4FDB5757DAF907F0964F5A1EA23C553A8AD -+ radio 1 Polska -+ -+ -+ -0.01 -+ dontcare -+ 88.25 -+ -+ -+ 1195418551882952DFC8A3913F8D3C68504C0E93BF72377B5CD67E045D20F27280F00F25E1 -+ Культура -+ -+ -+ -0.01 -+ dontcare -+ 88.4 -+ -+ -+ 11954185650FE254953641925E551685E06E70EAD8660CF8C010FF4B5446BAFB8FB597D918 -+ radio 3 Polska -+ -+ -+ -0.01 -+ dontcare -+ 90.5 -+ -+ -+ 1194713996F0E7E992470C24D4CE8060E398D7B24CF79C675808B56A957BA315E32BA9D3A2 -+ RMF FM -+ -+ -+ -0.01 -+ dontcare -+ 91.9 -+ -+ -+ 1194713863838DF5C3D87638EA1BC0C2F69C8A18EBEC793462C87EB1097DDDB0DC02663030 -+ Новое радио -+ -+ -+ -0.01 -+ dontcare -+ 92.8004 -+ -+ -+ 1194713867D9F544C68EE0C5E183652BAB20149AB9DD906EE04173894C48A482E29C744AB5 -+ radio Belarus -+ -+ -+ -0.01 -+ dontcare -+ 96.4 -+ -+ -+ 12077294984C448D1D756B4422108C36E16C7249BF7B2ABEFA33119A5CB5BAEE6C417DAB58 -+ радыё Рацыя -+ -+ -+ -0.01 -+ dontcare -+ 99.2 -+ -+ -+ 1207687158AC1EFA6C9DD0FFFCEB20D5C4A1422DB3DB9EAA460E874326A65D4A9D1CC34C3E -+ Першы нацыянальны -+ -+ -+ -0.01 -+ dontcare -+ 99.9998 -+ -+ -+ 128051385121F1B431D096F125FCAF235ECCA45C414ABE8DC64C8F2E3D0A41A4C9A843 -+ радио Минск -+ -+ -+ -0.01 -+ dontcare -+ 100.4 -+ -+ -+ 1227190558E55550FD0D68E6DDC089D3DFF7FB85A40F0D37900E0680BF1A78667166E99C21 -+ Альфа радио -+ -+ -+ -0.01 -+ dontcare -+ 100.8 -+ -+ -+ 1202244062D3B1BD6E67E93C3D3186F73B8AE89D4FCCD9E3ECDD51E328F65036A365381747 -+ радио Рокс -+ -+ -+ -0.01 -+ dontcare -+ 101.201 -+ -+ -+ 1207729844804970DB985A067502CCD04CDB8CF67CDE973A3AC5C311998F80CA6212141C2D -+ radio Podlaśia -+ -+ -+ -0.01 -+ dontcare -+ 101.7 -+ -+ -+ 1202244168B63FB1467284BF12B788C73B54412EA827276731841EA311E5DB412E3D67CA73 -+ Unistar -+ -+ -+ -0.01 -+ dontcare -+ 102.3 -+ -+ -+ 12171720541E9003C323E0451C23BA71BA9F04DA8800CD68AFCD2F7ECCD5D5D1DA9609C3D2 -+ radio 2 Polska -+ -+ -+ -0.01 -+ dontcare -+ 102.55 -+ -+ -+ 1202245059AE9EBED37F3B7BA219E0733F6FEA9A2D2E4CE4A9D006BFC4723557997AF0D836 -+ Pilot fm -+ -+ -+ -0.01 -+ dontcare -+ 102.9 -+ -+ -+ 1202292997527C0FCFE4DA7276A2330178ECA3662FAF3EA3011796C416CABF38144D1033D2 -+ Radio dla ćiebię -+ -+ -+ -0.01 -+ dontcare -+ 103.4 -+ -+ -+ 120224528899157BF6DA7064D0D1325986522D67E3DB3D58B772CA8BF58F0EA566FE32BD74 -+ Радиус fm -+ -+ -+ -0.01 -+ dontcare -+ 103.7 -+ -+ -+ 1217172241D354DFEB01909925C0A8B485DBB22A3CC748619A388FF492F225D71D178C9C51 -+ radio 3 Polska -+ -+ -+ -0.01 -+ dontcare -+ 104.2 -+ -+ -+ 12171722879ACB44A1C2A18FFC543900D4F9C57067C662618247DD7BB7EE8FBC35FFAB0BB9 -+ radio Maria -+ -+ -+ -0.01 -+ dontcare -+ 104.45 -+ -+ -+ 1202245826D98B15CBF4743EBD4AC7C3244B952B551AB6CBBE876309603D97FFED2F1D5F05 -+ радио Брест -+ -+ -+ -0.01 -+ dontcare -+ 104.8 -+ -+ -+ 1194714022A97BEC079991179A7F6AB786705AB0DF6B834ED0C23B271D19E19CD7D702EF35 -+ radio Zet -+ -+ -+ -0.01 -+ dontcare -+ 105.4 -+ -+ -+ 1194714205A5F11E788B848B143CFA9E2350F74BD56902514359C51CD39AC07D1FC0FD786A -+ радио "ba" -+ -+ -+ -0.01 -+ dontcare -+ 106.2 -+ -+ -+ 1281248050E5DD39785E5EFE11D82C9436E6AA3A48E0F6D1B19CF029CF43EAA6922846 -+ радио Мир -+ -+ -+ -1 -+ dontcare -+ 106.6 -+ -+ -+ 121717241561F47D14C239BC8C669D47D567F9F82EF98251001C54207E8DD9AB2177D5D58E -+ radio Maria -+ -+ -+ -0.01 -+ dontcare -+ 107.7 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,9 @@ -+SUBDIRS = -+EXTRA_DIST = "brest.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/" -+ $(INSTALL_DATA) "$(srcdir)/brest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,133 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ -+ 2008-05-01T21:00:03 -+ Belgium -+ Antwerpen -+ Antenna -+ -+ -+ -+ -+1209668864D2A04359F84AB8D3733E1CCF1279310F0493587FB93BF7F74A854DC9EE0557BC -+ VRT Radio 1 -+ Radio 1 -+ -+ -1 -+ 94.2 -+ -+ -+ -+12096688808089E6109077979C4D5922F72F137891BE7D38EDB299D525C158F7327D572466 -+ VRT Radio 2 -+ Radio 2 -+ -+ -1 -+ 97.5 -+ -+ -+ -+120966879513F8100817BD88AA03A7C918008327682640E59AD2246DBBED22C6DB52078977 -+ VRT Radio Klara -+ Klara -+ -+ -1 -+ 92 -+ -+ -+ -+120966874819E4357D2D5E93338F402C2507FFEBCA071AB41A30CC5F896C6952354A73E2B3 -+ VRT Radio Donna -+ Donna -+ -+ -1 -+ 89 -+ -+ -+ -+1209668807766DF511EEBD78100CFC98FEEEBA67E6406CDCC92F0A81653F9A0C095C98C7FB -+ VRT Studio Brussel -+ StuBru -+ -+ -1 -+ 100.9 -+ -+ -+ -+120966871597D85D822EE8C9D809E676A272FC62AC0E3F341DB79144F45C256253BA386310 -+ Q-Music -+ Q-Music -+ -+ -1 -+ 92.9 -+ -+ -+ -+12096693197B8AC6F5BEF2CADB6CE975EA1905FC7A036C26B395D8F124021E86496E3E5C31 -+ 4FM -+ 4FM -+ -+ -1 -+ 103.4 -+ -+ -+ -+120966910628654CADD557C4BD8BD8F1562939C077433F6221B369C63BE717942C856647D7 -+ Radio Minerva -+ Minerva -+ -+ -1 -+ 98 -+ -+ -+ -+120966920982AE695B3C21D74EDB282A0D8BF32564BFFDD15F67D640AF26D2AD24DD74329B -+ Radio Nostalgie -+ Nostalgie -+ -+ -1 -+ 102.9 -+ -+ -+ -+1209669397A89F41C973ECA289106883F6D088775F413EC43F9682C7AA854800F994C25DEA -+ Crooze FM -+ Crooze FM -+ -+ -1 -+ 104.2 -+ -+ -+ -+1209669501A71E45127C44908BA58078E5F433C86E1A50E77981BDB0E7961CFCAF66B6BEFC -+ Be One -+ Be One -+ -+ -1 -+ 104.6 -+ -+ -+ -+12096695556FC4775E17AE0D976314928CB5B8097E33C695491B12A46CBD634F996C11376F -+ Cool FM Antwerpen -+ Cool FM -+ -+ -1 -+ 105.4 -+ -+ -+ -+120966965615DC568C10D8100275FBAB0E32892335B8627A158E0EFEBBBF6CDFE608D03FB3 -+ Radio Echo (TOPRadio) -+ -+ -+ -1 -+ 106.3 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp ---- kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,205 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Roeland Moors -+ 2008-07-05T14:57:10 -+ Belgie -+ Bilzen -+ -+ Contains merged Data -+ -+ -+ 1082619533D0EF312578B2C12F4D76EE3E45054110BED5B081ABF144AEAE7E0E23E51FCEB6 -+ Radio1 (VRT) -+ Radio1 (VRT) -+ -+ -0.01 -+ 94.5 -+ -+ -+ 121526266366A4F91967AAFD7340DFA2354AB1E0B0953070B481BD60DE45EB158429D9CE11 -+ Radio2 (VRT) -+ Radio2 (VRT) -+ -+ -1 -+ 95 -+ -+ -+ 1215262732B6CFFDFD9EE3DDA03BC69D81B3607BEE359C5782A6C5CF2600670A3476067C19 -+ Donna (VRT) -+ Donna (VRT) -+ -+ -1 -+ 93 -+ -+ -+ 1215262778F380B95C0963A856E4BCA4758D380E971B58C807E61054FED586B5697679FC06 -+ Studio Brussel (VRT) -+ Stubru (VRT) -+ -+ -1 -+ 92.7 -+ -+ -+ 12152628270707ED8F73E3365F315BF3F0197030E52CAE0AA84042712972E9FA0CC9C77D0A -+ Radio Vlaanderen Internationaal (VRT) -+ RVI (VRT) -+ -+ -1 -+ 94.1 -+ -+ -+ 1215262923ED9EC63654C6B06E16F90402F226CF58E3DCD28F8955F98C8379907DA2BD3547 -+ Klara (VRT) -+ Klara (VRT) -+ -+ -1 -+ 95.8 -+ -+ -+ 121526295602E09EEAB3D203004C4EFF337334F8F2CD1F5EB215BD3B9CE0C2D15CB1380E0A -+ Radio1 (NL) -+ Radio1 (NL) -+ -+ -1 -+ 97.4 -+ -+ -+ 12152630627C3408C0B9033C392BDBCDDCF6DDD41503B56474238AD1B7888BF535D0D327F0 -+ Radio2 (NL) -+ Radio2 (NL) -+ -+ -1 -+ 97.2 -+ -+ -+ 12152635620BF54DC6411AD7AC204ECF8D99A6C6539146C49BFDF75E9363996EC938AB9302 -+ Radio3 (NL) -+ Radio3 (NL) -+ -+ -1 -+ 97.6 -+ -+ -+ 1215263237792D55D9D3007EC6934A83E8A91906B3A011C9E11CD71882074A1F2CBF4F07EE -+ Radio4 (NL) -+ Radio4 (NL) -+ -+ -1 -+ 96.5 -+ -+ -+ 12152633215918E45416B70B36915C5447EF08FC2D698B1ADBB26FFDBE0E8B8C4BA60617C9 -+ 4FM -+ 4FM -+ -+ -1 -+ 96.2 -+ -+ -+ 12152633665237A15C2EDF4B82DCAD1414FB185F88EE629C94CB4201F4482B25DC9E55F893 -+ Q-music -+ Q-music -+ -+ -1 -+ 97.8 -+ -+ -+ 1215263397F320B0728B535D76E996EE0D6F5C0F9540BEBF2B8FAED6E9CF66AEDF356E1CD8 -+ BBC World -+ BBC World -+ -+ -1 -+ 90.3 -+ -+ -+ 1215263435410BB4AA6ABE12E2C3C9DB5D0DB850F7D3C415A3289A2D2B29509C1B6491A181 -+ BBC 2 -+ BBC 2 -+ -+ -1 -+ 95.4 -+ -+ -+ 12152634678854A21F1A0C01FFA3A5E6E235B37C0C306FAF5617F305D5F924E739B15D430C -+ BBC3 -+ BBC3 -+ -+ -1 -+ 100.3 -+ -+ -+ 12152632098F327814F8708422B8670F872234946D641AAFFA5A67C46947398C3CA7910071 -+ Classic 21 (RTBF) -+ Classic 21 (RTBF) -+ -+ -1 -+ 92.3 -+ -+ -+ 12152638141A9295AB35F2F119D0F5CB6EC63BA523A8256BB0A1E41432016D03B4BFB61BD7 -+ Musique 3 (RTBF) -+ Musique 3 (RTBF) -+ -+ -1 -+ 91.9 -+ -+ -+ 12152638542B98B42A3DD4AF0FB042498092849D753A1A6A9C28E098C5A4A498AD7AB94A46 -+ Viva Cite (RTBF) -+ -+ Viva Cite (RTBF) -+ -+ -+ -1 -+ 97.6 -+ -+ -+ 1215263895E17E4FC1BB559557C961B24DD5F77A1BA5CDB57891797D2B0D5E27E91C36ABC3 -+ Viva Cite -+ Viva Cite -+ -+ -1 -+ 91.4 -+ -+ -+ 12152640255FAE61BC958F1D9B0B77400462FB6309D5AC1BE3DB309A956FD09B034B9DA6E6 -+ BRF -+ -+ BRF -+ -+ -+ -1 -+ 99.9 -+ -+ -+ 1215264045475CC0A5EB09DBC99EFF53CE27532E793FF6A9EFF69CB86BCBC4A99A5BC6E78F -+ Deutsche Welle -+ -+ Deutsche Welle -+ -+ -+ -1 -+ 93.9 -+ -+ -+ 121526350496BB70933EDA4409C2127EB51B05C994C2D679D5A87C0B0DB93066F0B8ECFA2A -+ La premiere (RTBF) -+ La premiere (RTBF) -+ -+ -1 -+ 97.6 -+ -+ -+ 121526407469366F46B22C57462B698052BE78CB8947776AEBA38AA7CB78857EEC834466B3 -+ Sporza -+ Sporza -+ -+ -1 -+ 98.3 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,14 +1,17 @@ - SUBDIRS = --EXTRA_DIST = "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp" -+EXTRA_DIST = "antwerpen-antenna.krp" "bilzen.krp" "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/" -+ $(INSTALL_DATA) "$(srcdir)/antwerpen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/bilzen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp" -+ $(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/ieper-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp" - $(INSTALL_DATA) "$(srcdir)/limburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" -- - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp ---- kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,159 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0-rc2 -+ Hélio Polessi <hcpcamp@gmail.com> -+ 2010-02-14T23:00:00 -+ Brazil -+ Campinas-SP -+ -+ -+ -+ -+ 126618494637241F4F8061AEF9182D981F7B7468052284DFB1E6618F268A85B9341A9E -+ Notícia FM -+ -+ -+ -0.01 -+ dontcare -+ 88.9 -+ -+ -+ 126618501643BEDF9B833C1844F4BF68530E3D71D64610CEDCE25933824EF0941AA8B0 -+ Vox FM -+ -+ -+ -0.01 -+ dontcare -+ 90.3 -+ -+ -+ 12372390231F7155089C8FC8A96366D96D657AA4EAF8023A2F46C14594141F50B5C9E6 -+ Educadora -+ -+ -+ -0.01 -+ dontcare -+ 91.7 -+ -+ -+ 123723906031FBA978DAFC484F7EAEB3333FDD4CFFB2DDC7C832F26D2E60EB8510D26D -+ Cidade -+ -+ -+ -1 -+ dontcare -+ 92.5 -+ -+ -+ 1237239087A51A3D3B08532CFEDEE91EFCA74C037C11F14827452DB492C680B081C40C -+ Laser -+ -+ -+ -1 -+ dontcare -+ 93.3 -+ -+ -+ 12661850370C13437F6FF803AFE53C2E06EE0DA14DE34FAA8CFE0AD0EA744556CC3B92 -+ Oi FM -+ -+ -+ -1 -+ dontcare -+ 94.1 -+ -+ -+ 12661850830E51099D751D008F7F1AAFBBF4D5066EE30E30A7A174895460903AFDFBC5 -+ Mundial FM -+ -+ -+ -1 -+ dontcare -+ 95.7 -+ -+ -+ 123723911232AFC94ED9C86FE77C42754DEFF95019FF96C018B6F9E266ADF4CC311141 -+ CBN -+ -+ -+ -1 -+ dontcare -+ 99.1 -+ -+ -+ 12661851107493B0A58FD97F214400B5FCF30959E762E4FEB5A55FEC934F7EE1D78389 -+ Educativa -+ -+ -+ -1 -+ dontcare -+ 101.9 -+ -+ -+ 1237239133465FE65E06B9C09990FF2CF85417CDB3FD0442A38B6C0D761828F7F35AE0 -+ Nova FM -+ -+ -+ -1 -+ dontcare -+ 103.7 -+ -+ -+ 1237239162D54181C9DF565AEB384BEE8AB15519B0A0F537442B7B4FF6FC829DEAFDAB -+ Dumon FM -+ -+ -+ -1 -+ dontcare -+ 104.3 -+ -+ -+ 1237239193D67830A2911A6C35CA0949D66AFA4DBDF491A365682C4614B789A1C6D9C3 -+ 105 FM -+ -+ -+ -1 -+ dontcare -+ 105.1 -+ -+ -+ 12372392300091B35163BBF9C7C389AE885EA8131E1D519647A0A17E1FD0C580E4FA3B -+ Onda Livre -+ -+ -+ -1 -+ dontcare -+ 105.3 -+ -+ -+ 12661851466F2B4913E272B35C34ADF28EB2287050FF7A47A68A31CD45C82BCA63629D -+ Band News FM -+ -+ -+ -1 -+ dontcare -+ 106.7 -+ -+ -+ 12372392551C50902A4785BC42C95B2C4903991FFDBC61D0D328E517864920C8DF3003 -+ Antena 1 -+ -+ -+ -1 -+ dontcare -+ 107.5 -+ -+ -+ 1237239273DF9EC3314BAA3D7EF50884AB0B3BC0F7D929B9DCA4BD3A750A9663650B21 -+ Kiss FM -+ -+ -+ -1 -+ dontcare -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,14 +1,20 @@ - SUBDIRS = --EXTRA_DIST = "brasilia.krp" "rio-de-janeiro.krp" "sao-paulo.krp" -+EXTRA_DIST = "brasilia.krp" "campinas-sp.krp" "rio-de-janeiro2.krp" "rio-de-janeiro.krp" "sao-paulo2.krp" "sao-paulo.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/" -+ $(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" -+ $(INSTALL_DATA) "$(srcdir)/campinas-sp.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp" -+ $(INSTALL_DATA) "$(srcdir)/rio-de-janeiro2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp" - $(INSTALL_DATA) "$(srcdir)/rio-de-janeiro.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp" -+ $(INSTALL_DATA) "$(srcdir)/sao-paulo2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp" - $(INSTALL_DATA) "$(srcdir)/sao-paulo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp" -- $(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" -- - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp ---- kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,529 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.5 -+ Paulo Roma -+ 2012-04-26T07:20:16 -+ Brasil -+ Rio de Janeiro -+ FM -+ -+ -+ -+ 110852260463B1FF53E1CD96CF530D5073BBDC2E5E6D4E3CAB9B34065943518B4BAD5410A9 -+ Rede TV -+ Rede TV -+ -0.01 -+ dontcare -+ 87.65 -+ -+ -+ 1108522606CF0E16071B00E33871043B85546C70AA2AF543A71B4C24B9B04E1817131E5CCC -+ Rádio Globo -+ Globo -+ -1 -+ stereo -+ 89.5 -+ -+ -+ 11085226079713E38261AB9287D23763C4D825CBFAB4756409F233A41E405EDAAFF360E6CA -+ MPB -+ MPB -+ -1 -+ stereo -+ 90.3 -+ -+ -+ 1108522610E1E698C5DE74602CACD88D4BD92DB5A333FF31F77FACA15E10ACA36575E5B882 -+ CBN -+ CBN -+ -1 -+ stereo -+ 92.5 -+ -+ -+ 110852261107A4883E351F621F0ADEBADCF0BD45E7877F69B1DB48282598F8F6D0556C88BA -+ 93 FM -+ -+ -1 -+ stereo -+ 93.3 -+ -+ -+ 1143339804A5D28DF1EE170111D80B121BD62FEB305F0930127C1CC62B221F686E2ACF14A7 -+ Roquette Pinto -+ Roquete -+ -1 -+ stereo -+ 94.1 -+ -+ -+ 11085226135301AB1B95E41ACE07478D6F2C86942A06944D1BDD11C73CED9D3A56D0850081 -+ Band News FM -+ BandNews -+ -1 -+ stereo -+ 94.9 -+ -+ -+ 1108522621C91B5E7DFEC5C77575BF0B195FD21551C5BBB8A413C1CF0A129C7004CC7D7163 -+ Paradiso -+ Paradiso -+ -1 -+ stereo -+ 95.7 -+ -+ -+ 1108522615798A0B2E248B18387E6433FD51190E66587E9A13EEA19E005588B98DAFEFC51F -+ Tupi -+ Tupi -+ -1 -+ stereo -+ 96.5 -+ -+ -+ 11433383473BEC1138AFC3903343768372D4EB8FA0B5AB2718054CDE6B0F901A2DFE8CEA8C -+ Beat98 -+ Beat 98 -+ -1 -+ stereo -+ 98.1 -+ -+ -+ 110852261861A65E9E025217236634A2FED71D33BA90B39E7DBB47F575E638DDD14D6AA426 -+ Rádio MEC -+ MEC -+ -1 -+ stereo -+ 98.9 -+ -+ -+ 1108522619C23DF4E4945D4514733F38BD25957B583A8AE4F1BB703CFCE6E675892585D4FB -+ JB FM -+ JB -+ -1 -+ stereo -+ 99.7008 -+ -+ -+ 11433391060DF3E724233493F9D3C1C37F9136C26F8E9C32956A1CD4AA89929794DD7E2E28 -+ FM O Dia -+ O Dia -+ -1 -+ stereo -+ 100.5 -+ -+ -+ 1143339296D7F1D09A3AFAB2EBE6D36E9EFD26D78FE78FF7C9BBA969AAA9661E754898F806 -+ Transamérica Pop -+ Transamérica -+ -1 -+ stereo -+ 101.3 -+ -+ -+ 11085226228543DC58DACD263E20C489701FB95A1815555AB77BDA2BEF2D8F524D2CDC0680 -+ Mix -+ Mix -+ -1 -+ stereo -+ 102.1 -+ -+ -+ 1108522623AA9FD006C835CEB5488A4806543277E5A79D0C98EB07A1A0C4D39E223B5636D0 -+ Jovem Pan -+ JP -+ -0.01 -+ stereo -+ 102.9 -+ -+ -+ 1108522624E2D9B6ED883B4EAB1CE5CF9F97016D7D3AD176F6E2998D9765721D682E0937C2 -+ Nativa -+ Nativa -+ -0.01 -+ stereo -+ 103.7 -+ -+ -+ 1108522625CCA35BA2EE3A557BCCB3286C12658116BBC858D6673C1D88CA89B156851EE570 -+ RádioCom -+ -+ -1 -+ stereo -+ 104.5 -+ -+ -+ 1108522628F19FBF0FD0B62A4A7781AF7D8603BEB1215F1819E5028AA008748BBABFC34D39 -+ Catedral -+ Católica -+ -1 -+ stereo -+ 106.7 -+ -+ -+ 11085226298BC8211EE7A66460385578D487B6729DA83550DF85F2517F514D9C019A93FF34 -+ Gospel -+ Evangélica -+ -1 -+ stereo -+ 107.9 -+ -+ -+ 1335605678EE85AF1020B8DF8362741004FE16087079630F7DB4CB0CFB62DD2CD05FE0 -+ _______________________________ -+ -+ -1 -+ dontcare -+ 0 -+ -+ -+ 132964209102A9E373176AC345769BF95FCDDAED10FB54E88137B307776909426B6C56 -+ Rádio MEC AM 800 -+ -+ -0.01 -+ dontcare -+ http://radioslivres.radiobras.gov.br:8080/mecam.mp3 -+ -+ auto -+ auto -+ -+ -+ 1336644686598A6CE56A5C9830626FA81717D9A01E731EC60FA3B6AF59CD4AB5B3A732 -+ Tamoio AM 900 -+ -+ -1 -+ dontcare -+ http://187.110.226.22:8038/ -+ -+ auto -+ auto -+ -+ -+ 13284779563ADDF256BA86B8FC0F07902C774D4E69BF5C55175E5516936186668A1E0A -+ Rádio Nacional AM 1130 -+ Nacional -+ -1 -+ dontcare -+ http://radioslivres.radiobras.gov.br:8080/nacionalrio.mp3 -+ -+ auto -+ auto -+ -+ -+ 1238681020F4AA90589682D934172A4DB15EC4A4C4A424EDA082486D4B12937E556280 -+ Globo AM 1220 -+ -+ -0.01 -+ stereo -+ mms://wm-sgr-live.globo.com/sgr_off_globoamrj_live.wma -+ asf -+ auto -+ auto -+ -+ -+ 13356057218399B5BC913429CADDBA31F3BFA6BAC21E8937216AB392FE91E9809A7809 -+ _______________________________ -+ -+ -1 -+ dontcare -+ 0 -+ -+ -+ 1241912811385B06FDB95068194C12F870D6E306E21E52A93991673FD9A33EFD54FE66 -+ MPB FM 90.3 -+ MPB -+ -0.01 -+ stereo -+ http://69.31.54.133:3690/MPBFM903AAC -+ -+ auto -+ auto -+ -+ -+ 13374327174E01A225AE834F813CF5FDB60EEEB0412AE69F60A691A52776326CD37649 -+ Bradesco Esportes FM -+ Bradesco -+ -1 -+ dontcare -+ http://208.80.54.47:3690/94_1FMAAC -+ -+ auto -+ auto -+ -+ -+ 133522364599C458AA2A85B35A918926F023F98BE5BB28B91CF0D8694A0555EC9F538B -+ 93 FM -+ 93 -+ -1 -+ dontcare -+ http://208.80.52.116:3690/FM93AAC -+ -+ auto -+ auto -+ -+ -+ 1335405280FCCDE167E4908818F689FA3D41031FA10768F902A5ABCC2876A5EED361AA -+ CBN 92.5 -+ -+ -1 -+ dontcare -+ mms://wm-sgr-live.globo.com/sgr_off_cbnfmrj_live.wma -+ -+ auto -+ auto -+ -+ -+ 1241911980183645EA2E4C247D327AD84BF532AF96F33271106F18B8882403861A32E4 -+ Roquette Pinto 94.1 -+ -+ -0.01 -+ dontcare -+ mms://roquette.94fm.rj.gov.br:8000/ -+ -+ auto -+ auto -+ -+ -+ 13353557754B5172FDD46B8EB4D8BA35E9154441E9EC339FA9CD0A197374035E482AAE -+ Band News FM 94.9 -+ -+ -1 -+ dontcare -+ http://69.31.54.135:3690/NEWSRIOAAC -+ -+ auto -+ auto -+ -+ -+ 124191172671DC04E508F9A1D3362A912E1F854FA07FDB3ADA063131E4DD0AB040D5BB -+ Paradiso FM 95.7 -+ Paradiso -+ -1 -+ stereo -+ mms://p.mm.uol.com.br/paradisofm -+ -+ auto -+ auto -+ -+ -+ 132964185813145D4AD44B972E36DB138819AAE5DBF3CE5BB3473D7344BEB83F1A0ED8 -+ Rádio Nacional FM 96.1 -+ Nacional -+ -1 -+ stereo -+ http://radioslivres.radiobras.gov.br:8080/nacionalfm.mp3 -+ -+ auto -+ auto -+ -+ -+ 13355333701F162639AD78EE2E18697712D5F192ADF258987197C411D5AE1A34B9292E -+ Super Rádio Tupi AM 1280 + FM 96.5 -+ Tupi -+ -1 -+ dontcare -+ http://174.122.109.90:8888/;stream.nsv -+ -+ auto -+ auto -+ -+ -+ 13355348680B1FB972724DB59A39863C1C5D9B21EF95FF4EA1C3C90D39AC2E0D2842DE -+ Melodia 97.5 -+ -+ -1 -+ dontcare -+ mms://streaming3.joinhost.com.br:80/radio_melodia -+ -+ auto -+ auto -+ -+ -+ 13352238428A36568CBE8FE46E0C6B2CBD31197D3F5E6BDB12916A4A49F98165C43283 -+ Beat98 FM 98.1 -+ -+ -1 -+ dontcare -+ mms://wm-sgr-live.globo.com/sgr_off_98fmrj_live.wma -+ -+ auto -+ auto -+ -+ -+ 1244201041C189FB35391781907985642BA71B78711FC0CAE3A34D1F0D608D045257B3 -+ Rádio MEC FM 98.9 -+ MEC -+ -1 -+ stereo -+ http://radioslivres.radiobras.gov.br:8080/mecfm.mp3 -+ -+ auto -+ auto -+ -+ -+ 123868105729D7E1299035CBCBA570A5A24F356BE7D9D223BCA0C3BDDD6ECCCA2AE11B -+ JB FM 99.7 -+ JB -+ -0.01 -+ stereo -+ http://5923.live.streamtheworld.com:80/JBFMAAC1 -+ acc -+ auto -+ auto -+ -+ -+ 1335529955E1A22D934A874936D0D88353FBDFA33AF011B13156DD75C64F4C5483BCD5 -+ FM O Dia 100.5 -+ O DIa -+ -0.01 -+ dontcare -+ http://208.80.54.128/FMODIAAAC -+ -+ auto -+ auto -+ -+ -+ 13352190307C9B15684F734B7E4B18D36C631B14DF9E09A38B8727354C2584CF33712E -+ Mix FM 102.1 -+ Mix -+ -1 -+ dontcare -+ mms://p.mm.uol.com.br/mixriofm -+ -+ auto -+ auto -+ -+ -+ 1335353779649713E5D0A6BB8A85BC827406176719BCCB1B51AC83755B450738B932AA -+ Nativa FM 103.7 -+ Nativa -+ -1 -+ dontcare -+ http://174.122.109.82:8886/ -+ -+ auto -+ auto -+ -+ -+ 13355282288C45165B0BBDECB759392355069E5BE468AD7A55C30A1F1514358A762CB6 -+ RádioCom 104.5 FM -+ -+ -1 -+ dontcare -+ http://67.23.248.77:8000/aovivo.m3u -+ -+ auto -+ auto -+ -+ -+ 1335699232EAD8EF7FB5319FA0106BBDE01E023AFCA7617548C0BED9720F656C7038FA -+ Aleluia 105.1 FM -+ Aleluia -+ -1 -+ dontcare -+ http://servidor5.crossdigital.com.br:8016/;stream.nsv -+ -+ auto -+ auto -+ -+ -+ 1335698861C025BAFB1EF74C6A2C8DA652B1C34CDB5B75B799E3B2F86AA23B42A00FCA -+ Catedral FM 106.7 -+ Catedral -+ -1 -+ dontcare -+ http://67.205.76.171:8092 -+ -+ auto -+ auto -+ -+ -+ 13356959814BA482B505F6D897EC382C8B7815ABE593C6D2F0CF52E8A1934E32DE2212 -+ Gospel 107.9 FM -+ Gospel -+ -1 -+ dontcare -+ http://173.192.184.70:8358/live -+ -+ auto -+ auto -+ -+ -+ 133560574414161FAD76ADBCF1007E27A277E0AD8217CC4ED0A0E9F0171F236180826C -+ _______________________________ -+ -+ -1 -+ dontcare -+ 0 -+ -+ -+ 126182762802DF5F4526D4D07BB0BC6E56A040A7C4C9C7EC8CB2701522EB06BEA69A8F -+ Antena 1 -+ Antena 1 -+ -0.01 -+ dontcare -+ http://a1rj.streams.com.br:7801/stream -+ -+ auto -+ auto -+ -+ -+ 1238680874AB4FA8C5EA96C4654CBFE110206A226CFCB5B48C6941FE5D9453ECE7B65C -+ Globo FM -+ -+ 0.3 -+ stereo -+ mms://wm-sgr-live.globo.com/sgr_off_globofmrj_live.wma -+ asf -+ auto -+ auto -+ -+ -+ 13352802088D62569EA16EC2CD29B6F997067230DEC4294CFA2274B1253F297B47948D -+ Oi FM -+ Oi -+ -0.01 -+ dontcare -+ http://173.236.58.98:9470/;stream.mp3 -+ -+ auto -+ auto -+ -+ -+ 1238681086AABDFCAFFEDB4F0B52BCC889E6BDD5AC00AADB1DB9FF67CCA23685633656 -+ Transamérica -+ -+ -0.01 -+ stereo -+ mms://wmedia.telium.com.br/transrjpop -+ asf -+ auto -+ auto -+ -+ -+ 13284445512FDABAA1CA058AEAAD0E7A618DAAF8A3694549C7B185EB9291D3F1D3A55B -+ Tupi FM -+ -+ -1 -+ dontcare -+ mms://servidor10.crossdigital.com.br:8000/tupifm -+ -+ auto -+ auto -+ -+ -+ 13283722598C2F9B55731F7F7A4313A4F3A75BC13B5B983DFFFCA7B153803582085B0E -+ WestDeutscher Rundfunk -+ -+ -1 -+ dontcare -+ http://www.wdr.de/wdrlive/media/wdr5.m3u -+ -+ auto -+ auto -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp ---- kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,375 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.2 -+ Igor Isaias Banlian <igorisaiasbanlian@gmail.com> -+ 2011-06-21T16:25:53 -+ Brazil -+ São Paulo -+ -+ Fonte das informações: http://pt.wikipedia.org/wiki/Anexo:Lista_de_rádios_do_Brasil#S.C3.A3o_Paulo -+ -+ -+ 1068544851063A4998A78195FDC4F511AD5E39A77EDF4A99545FEFEE1BA09A5159FB2DFC85 -+ Gazeta (Popular) -+ -+ -+ -1 -+ dontcare -+ 88.1 -+ -+ -+ 1068544851FA44B51067379B772E91D69C3F36BFD1BE373BFAAB02FB267BB9E79745D094DD -+ Fast 89 FM (Antiga Rádio Rock) (Pop, Black, Dance) -+ -+ -+ -1 -+ dontcare -+ 89.1 -+ -+ -+ 106854485192E7A1C2D349D37CBD77495D3ADB558CD7D921C3160003AE475BF39F3F0CA024 -+ Nova Brasil FM (MPB) -+ -+ -+ -1 -+ dontcare -+ 89.7 -+ -+ -+ 1068544851D8831804C6159634263FC359AE57CB8B96FF009B4FB4CB79FF39DB2CBF31EEBF -+ Gospel FM -+ -+ -+ -1 -+ dontcare -+ 90.1 -+ -+ -+ 10685448518D7B45F6186E596C2A56A3F91C4FC1B773F7133E30BC2AA6FE1898DB34D5F4BA -+ CBN (Jornalismo) -+ -+ -+ -1 -+ dontcare -+ 90.5 -+ -+ -+ 10685448519B29A95C1A4F8B221A919B011D9296D15B5227225A5A7E27C9DA6703B1E3469A -+ Rádio Bandeirantes (Jornalismo, Esportes) -+ -+ -+ -1 -+ dontcare -+ 90.9 -+ -+ -+ 10685448517DD84085761847C094F78696B91D9B023BA80862F534827883165058CD06133E -+ Rádio Disney Brasil (Jovem, Pop, Rock, Dance) -+ -+ -+ -1 -+ dontcare -+ 91.3 -+ -+ -+ 1068544851707ADA489310244DA5D4FAB004D99CD01601FA9FF7F5424A4660A53D88D5ECBE -+ Rádio SulAmérica Trânsito (Trânsito de SP) -+ -+ -+ -1 -+ dontcare -+ 92.1 -+ -+ -+ 1068544851C9201AFEE47247B9A616E705AEAB7E3DAE707A43BD1824390AE427C12EB9B9FB -+ Mitsubishi FM -+ -+ -+ -1 -+ dontcare -+ 92.5 -+ -+ -+ 1068544851C5394861FBDFCE6794363776BC90E7F84124E8816818200879AD3CA2859D9632 -+ Estadão ESPN (Antiga Eldorado) (Jornalismo, Adulto) -+ -+ -+ -1 -+ dontcare -+ 92.9 -+ -+ -+ 1068544851D0289AC2B0AEFDED22C4D9341F534BF08DF140FE238FEA37C8A72639352C846D -+ USP FM (MPB, Alternativas, Informação) -+ -+ -+ -1 -+ dontcare -+ 93.7 -+ -+ -+ 1068544851F9AFD5FC0F3384511069DC8DCF2220A0F7A12D5501388F4D66F8A72180CF7873 -+ Oi FM -+ -+ -+ -1 -+ dontcare -+ 94.1 -+ -+ -+ 10685448518696F96431246C0E8811A76A86CE07D3ADEF74C0D19B888A8B826160DBFD203C -+ Rede Antena 1 (Flashback, Pop Romântico) -+ -+ -+ -1 -+ dontcare -+ 94.7 -+ -+ -+ 1068544851A8F04BB0725196CA919E38D5B9EF9A0DF5F0FF0C920636BFE7466E5C6FAF623E -+ Nativa FM (Popular, Sertanejo) -+ -+ -+ -1 -+ dontcare -+ 95.3 -+ -+ -+ 10685448512EF7D6A7AF70B101A36763BE25A3FB5C486C40C0B9BC29B17EBF2EA27536562E -+ Mundial (Esotérica) -+ -+ -+ -1 -+ dontcare -+ 95.7 -+ -+ -+ 10685448518BB559FF1125C773021E9DE13BA19BED84E488D4B73448D879DE9ECFF21C5DE7 -+ Band FM (Popular, Black, Pop, Dance) -+ -+ -+ -1 -+ dontcare -+ 96.1 -+ -+ -+ 106854485184EF62D3E00617144EDB7EF0E3160F9A94464D4E529D28B4E160C5A0B44A45D8 -+ Rádio Vida FM (Gospel) -+ -+ -+ -1 -+ dontcare -+ 96.5 -+ -+ -+ 10685448515838BB6F8E6831C577DB6BEF8B55E18F5A2179AE031EC4C4A76B809918137072 -+ BandNews FM (Jornalismo) -+ -+ -+ -1 -+ dontcare -+ 96.9 -+ -+ -+ 1068544851337DE5C347B8E19FF0E880A2B9E38392C48EE37BEF918272CCCCF4E084AFE46F -+ Energia 97 (Dance, House, Black, D&B, Techno) -+ -+ -+ -1 -+ dontcare -+ 97.7 -+ -+ -+ 10685448513711C1C26ADA91953A177554A9796A2B4BF879C198A82715BAB4D241F0BB73E6 -+ IMPD 98.1 FM -+ -+ -+ -1 -+ dontcare -+ 98.1 -+ -+ -+ 10685448516A0B12A86C5DAD2C72F95B4991D5A9B5D1A490DFF605544AD7972C0A484A0A5A -+ Metropolitana (Pop, Black, Dance) -+ -+ -+ -1 -+ dontcare -+ 98.5 -+ -+ -+ 1068544851AF15E6AD95800F485702F159914B0A93E46E5CD68DDB11EB583B3C37F08F02F4 -+ Rádio Terra FM (Sertanejo) -+ -+ -+ -1 -+ dontcare -+ 98.9 -+ -+ -+ 10685448519842A5E231775F250B013D3604832F184655D2BCEA1CFD1DCA1B572B9F26A4B3 -+ Rede Aleluia (Evangélica) -+ -+ -+ -1 -+ dontcare -+ 99.3 -+ -+ -+ 106854485168590AD0DB7DB99C33772D5B362AB8C2575DB634C5F44FE18158E50FDD895B3B -+ Transamérica (Pop, Black, Dance) -+ -+ -+ -1 -+ dontcare -+ 100.1 -+ -+ -+ 1068544851BDAF9DFE698BB91435D5C87510098BC54A6B834354B76112E5DB9F191BA03DAC -+ Jovem Pan 2 FM (Pop, Dance, Black) -+ -+ -+ -1 -+ dontcare -+ 100.9 -+ -+ -+ 1068544851218C33FE44396A6CDD072A46BFE3A2F19DF815140048DD499C8AF8CEFE4A2A70 -+ Alpha FM (Flashback, Pop Romântico, MPB) -+ -+ -+ -1 -+ dontcare -+ 101.7 -+ -+ -+ 1068544851D6B3C38519AC4F100AFBFF40437A2A057346EDF60B8807F52960204DD1CE389D -+ Kiss FM (Classic Rock) -+ -+ -+ -1 -+ dontcare -+ 102.1 -+ -+ -+ 13086474014771276F6D1BA9B00AFB695144042EDED6BB404D402F81B027F40384964F -+ Imprensa (Forró, Música Regional) -+ -+ -+ -1 -+ dontcare -+ 102.5 -+ -+ -+ 130864745047ED7EFBBF90962261A79A431A64CB0ECD2EAAABF66F8E5311C226B6A5A1 -+ Scalla FM -+ -+ -+ -1 -+ dontcare -+ 102.9 -+ -+ -+ 1308647468484F8C0F98D8735571D9B96214477C9DAB79D700CF25B9881D22115226FC -+ Cultura (Clássico, Jazz) -+ -+ -+ -1 -+ dontcare -+ 103.3 -+ -+ -+ 130864748710A1608AF577C02453814307DFD3655C0E861E79F78791ACD6CE495C96BB -+ Tupi FM (Sertanejo) -+ -+ -+ -1 -+ dontcare -+ 104.1 -+ -+ -+ 1308647494E822E4E85F316E1C17F8EC537A030FC331E04BAAF0CBBA6810992A66AE7B -+ Dumont FM (Pop, Rock, Dance, Black) -+ -+ -+ -1 -+ dontcare -+ 104.3 -+ -+ -+ 1308647510BDB203D6312D5A3BCC630E7BB8B0A4BC78BFEF1379F8F6199D24A09278A3 -+ Transcontinental (Pagode, Black) -+ -+ -+ -1 -+ dontcare -+ 104.7 -+ -+ -+ 1308647524F17E6261EFB800C8F3C8ADF362AFA88B11F34592467EEC7664D775156F51 -+ 105 FM (Samba, Pagode, Black, Soul, Rap) -+ -+ -+ -1 -+ dontcare -+ 105.1 -+ -+ -+ 130864754047125139D3E46F3A0C763A2BE51930358CEB355F4519F848AF19119760FE -+ Musical (Gospel) -+ -+ -+ -1 -+ dontcare -+ 105.7 -+ -+ -+ 130864756116CA5CC9C506A3261D2D4A41BB16A6AACC553A25126997731A6D0FE37FBE -+ Mix FM (Pop, Black, Dance) -+ -+ -+ -1 -+ dontcare -+ 106.3 -+ -+ -+ 130864756972F0365E169147F735A06E5B9725A745726FB42524895A11269E28536CF6 -+ RBR (Rede Brasil de Radiodifusão) (Popular) -+ -+ -+ -1 -+ dontcare -+ 106.7 -+ -+ -+ 1308647624EE4ABB9AA1AA1DEDFBFAA05A523E62E6CEE3DBB91670F11484C7C906FCC9 -+ Nossa Rádio FM (Evangélica) -+ -+ -+ -1 -+ dontcare -+ 106.9 -+ -+ -+ 1308647642AA11EFF0E0E71AB18CFCAB5956BD81E12BF480CDDB6410C67926DA129328 -+ Rádio Eldorado (Antiga Brasil 2000) (Pop, Rock) -+ -+ -+ -1 -+ dontcare -+ 107.3 -+ -+ -+ 13086476879578B3D1BB9352761178E199CF7CE9A3070997936A161A0B366E2F30DBFE -+ Tropical (Popular) -+ -+ -+ -1 -+ dontcare -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,12 +1,16 @@ - SUBDIRS = --EXTRA_DIST = "sofia.krp" "stara-zagora.krp" -+EXTRA_DIST = "plovdiv-antenna.krp" "sofia.krp" "stara-zagora.krp" "varna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/" -- $(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" -+ $(INSTALL_DATA) "$(srcdir)/plovdiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/sofia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp" -- -- -+ $(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" -+ $(INSTALL_DATA) "$(srcdir)/varna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/varna.krp" -+ - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,222 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Peter Georgiev -+ 2008-08-16T00:00:37 -+ Bulgaria -+ Plovdiv -+ FM Radio Stations -+ -+ -+ -+ -+1218755983103051C38B8B249D2344A212E4BBAC4C8252F16C03DBB01C2DBBB225CB1D23B4 -+ BNR Horizont -+ Horizont -+ -+ -0.01 -+ 88.1 -+ -+ -+ -+121875619304FD8AEAF0436E6E3F68691C3A88479AFE09B9BD072600BCFCC2B541E1E28911 -+ FM+ -+ -+ -+ -1 -+ 89.1 -+ -+ -+ -+1218756211F3F3933BDE80E7AA3C470335E9E28ABF237083FA40CF476A6A4DF1A68EA0488C -+ Focus -+ -+ -+ -1 -+ 89.9 -+ -+ -+ -+121875622134469FC01380505EAB32A823EC8AC6A57A03CF7C46293BC75F9A63522650C86E -+ NRJ -+ -+ -+ -1 -+ 90.6 -+ -+ -+ -+1218756506728FE149E449E172DA3CB5CEB06BB61319A661E1A678DB8F15BC5247159F639B -+ City -+ -+ -+ -1 -+ 91.1 -+ -+ -+ -+12187562445C4F4905B8D44257C83BE277C97E6C2CEB00D605E60FE1B34B677A38145BF53F -+ BNR Hristo Botev -+ -+ -+ -1 -+ 91.7 -+ -+ -+ -+1218756259D8B0B6FD38E46BA38AB996A5CC11308B08ED929A778D35EEB1A2727DA55EFB79 -+ Veronnica -+ -+ -+ -1 -+ 93.4 -+ -+ -+ -+12187562782B98DD0067A9F9BD9B433FA0A26DAD119D6B6720083F7382883AA06DA294A07C -+ BNR Plovdiv -+ Plovdiv -+ -+ -1 -+ 94 -+ -+ -+ -+12187562909F31EB8EA5C45271C58C673B169FD86C76D84B4C5CD8A6C5FEB302CE57A564A3 -+ BG Radio -+ -+ -+ -1 -+ 94.6 -+ -+ -+ -+1218756302BF3B89A8D4F7A36486490CCD7CA317A83507E5FEAA8B25795E9D48A45768FAA6 -+ Radio 1 -+ -+ -+ -1 -+ 95.5 -+ -+ -+ -+12187563157326C5907EFECE6A9812E710B63BAAEEE132ABE1B71A7F3F71E985AE56E7F0BE -+ Vitosha -+ -+ -+ -1 -+ 97 -+ -+ -+ -+1218756328DBB067CCDA069586C783D62CA7C81D48EEE4A006509008FB7086CFD553314FA2 -+ Atlantic -+ -+ -+ -1 -+ 97.7 -+ -+ -+ -+1218756337F1AC64F857AC04B4F13C7DAC79FF75C2013396341C1C2010DCDF11AFA47C95FF -+ Focus -+ -+ -+ -1 -+ 98.1 -+ -+ -+ -+12187563503316E105C2302EDA39CC05C368D8ADD46203A5F7256547BB31695448E6E45F1E -+ Katra FM -+ -+ -+ -1 -+ 100.4 -+ -+ -+ -+121875636546F1F7FED4FE10744198F3AB02D08D11B45112BD598346417ECD0B60C6294277 -+ BNR Horizont -+ -+ -+ -1 -+ 100.9 -+ -+ -+ -+1218756375FC8B5BAA8FAA6D96CA42868CFF96EC5717CBB4B06F0E316E1423CF84F5410A7B -+ N-JOY -+ -+ -+ -1 -+ 102 -+ -+ -+ -+1218756390D22E5095442D86638C8C0B2271F17C138E8FCA2BA92A3CEA1B324646BA3428EB -+ Star FM -+ -+ -+ -1 -+ 102.7 -+ -+ -+ -+1218756400104A27C8E187BC595602C7F4C7A99006883D31C6B41FAD0424275806C4DE7F50 -+ Fresh! -+ -+ -+ -1 -+ 103.3 -+ -+ -+ -+1218756409BB2AD6C9ED6AFB914064F854E57C2A96E8ACBEF1CFC62114A3D5E76F7C670822 -+ Z-Rock -+ -+ -+ -1 -+ 103.7 -+ -+ -+ -+12187564528FE4024BA8FF5D3A386E31BF6B3020DD542D510B1BBB8D15E65E8DDA41DE3E12 -+ Radio 1 Rock -+ -+ -+ -1 -+ 104.3 -+ -+ -+ -+12187564747011B06D9E28650DD839FA3B76A1FA6A021AF3D0083AFDB9AF63D5526242B601 -+ Darik -+ -+ -+ -1 -+ 105.4 -+ -+ -+ -+1218756491255B3BDC321998858D18DF9504D6B6F81431FACFE60073CB6754903B6B26030B -+ The Voice -+ -+ -+ -1 -+ 106 -+ -+ -+ -+12377236317EDEEEAEEA0ACF5224257DB772ECB06DEDD8763D3E15F8393C685BC0819D072B -+ Vesselina -+ -+ -+ -1 -+ 106.5 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp ---- kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,198 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Velislav Kolev -+ 2006-10-31T20:30:38 -+ Bulgaria -+ Varna -+ -+ Contains merged Data -+ -+ -+ -+1162318601827F4BDBFB0362A1D195E998F26869054B35EB2A4133F2B068DE1E87351E98CB -+ ����� -+ 1 -+ -+ -1 -+ 89.5002 -+ -+ -+ -+116231862165D42300AC75574DAD46E7381F9C93EB1FD9F04C49732B1B31BD89E352AA96DA -+ N-JOY -+ 2 -+ -+ -1 -+ 90.6 -+ -+ -+ -+116231898247C9A0A9FA6F41FA374BF8D9FADA75EB293AE78E20F5044AE5989F6AB16B638C -+ NRJ -+ -+ -+ -1 -+ 91.2 -+ -+ -+ -+11623190256F1A743C47333B5DBAC8EC95970F73319C494DFBE0D90199F853F6CC77959659 -+ ���� -+ -+ -+ -1 -+ 91.7 -+ -+ -+ -+1162319025C18D07591DBE40AE364CC03F7559CCE3EB0DBF667E767D0AB8D4A0B572D3086F -+ ������ -+ -+ -+ -1 -+ 92.6 -+ -+ -+ -+116231902528FD115D22B4CAB0F75E43F2C449518602931232AEFC4E9F643DA5B723D70152 -+ ����� 1 -+ -+ -+ -1 -+ 93.8 -+ -+ -+ -+1162319020974CF47AAC09D713E9BDE91F99518F10803F0CA237492B4D045A00B63D341151 -+ F�+ -+ -+ -+ -1 -+ 94.6 -+ -+ -+ -+116231852111FB56C8F8E8D463ADE5DA5176AEED10ECBCA3EC2F6EB9B73D6E4785BE1D33D1 -+ Z Rock -+ 1 -+ -+ -1 -+ 95.9005 -+ -+ -+ -+1162319026415C16452006790E85B0DB4FF2B600523F6F47D47235EEF7081EF3B29C18E700 -+ Bravo -+ -+ -+ -1 -+ 96.4 -+ -+ -+ -+1162319149B07AE40DE4E3B3C221C45C92834103E19B2EAE290F54417383AA9A6CB8C185C2 -+ ���� -+ -+ -+ -1 -+ 97.3 -+ -+ -+ -+116231852883AA85312F5A295E668B26009730955AB1B1A006FAAB7FC788B061F504CDAB40 -+ �� ����� -+ 2 -+ -+ -1 -+ 97.8257 -+ -+ -+ -+1162319151D21DAE9E87577C193EE4B1212F61FE7A1C8C169D13FBEFDEE1E17D678D6A2CDB -+ �ity -+ -+ -+ -1 -+ 98.6 -+ -+ -+ -+1162319151367F929877E122D879FEF5A43C27ADACCE22CD433A2A898F7F2B73D662E67DF7 -+ ����� -+ -+ -+ -1 -+ 99.3 -+ -+ -+ -+1162318536AE9D3E77D17C2E559FD9B91C654BB0F5380041C8FE423F92F76050D7A55EEDC9 -+ Fresh! -+ 3 -+ -+ -1 -+ 100.351 -+ -+ -+ -+1162319152F38CD5CCDABC8831D587FEE4D112D376BFFF6826DA0B7FF13B1725470CE93D92 -+ �������� ��� -+ -+ -+ -1 -+ 100.9 -+ -+ -+ -+11623186397EA1E3928F80CB55F77E8896255E9F314E389BA20FB7236EFE21484D7B0387E7 -+ Retro -+ 3 -+ -+ -1 -+ 101.501 -+ -+ -+ -+116231854791205EADF3CF6B3AB1B99504DFB800EB833FA840E32C324838B9CC809CA8E6D0 -+ ����� ��� -+ 4 -+ -+ -1 -+ 103.426 -+ -+ -+ -+1162318554BADC777E26831193C2AE2EFD0DC856441F623AF5C44A753914372AD84FDF486A -+ ���� -+ 5 -+ -+ -1 -+ 105.7 -+ -+ -+ -+1162319336A868FA0C3FF819F5F337E69A1A8CC90031DB64DFA4E828ACC791FBAEC19D8194 -+ ������� -+ -+ -+ -1 -+ 106.3 -+ -+ -+ -+1162319337ACD11AA2581E8EDCD9F7C4E20B2FF6639118CDEFBA59900D1503B896CBE6D72F -+ ����� -+ -+ -+ -1 -+ 106.8 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Alberta -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853787DD40C1BEEE3947B3134F34252210E517164CC5FDE203EAA19C29972D39B139B -+ News/Talk @ CHQR-AM -+ 15 -+ -+ 0.77 -+ -1 -+ -+ -+ 1063385378FE7442F39084CB89C3B5E38960A058F0B9D6B0AFC789AB4AF3EF8EC5470FE06F -+ Country @ CKGY-AM -+ 16 -+ -+ 1.17 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,126 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Alberta -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853778674CD580E00787E07AC1528B7CE8861157AB80B1ACBE1285D16CF68661D1EB9 -+ Country @ CFWE-FM -+ 1 -+ -+ 89.9 -+ -1 -+ -+ -+ 10633853774ABE9752541CE4B9628567B81024E05450628AB02E5E25E6942B9046C41F9ACF -+ Rhythmic Oldies @ CJSW-FM -+ 2 -+ -+ 90.9 -+ -1 -+ -+ -+ 106338537733E08552CF2DFD0C7925003F6EC2B02D2801E37F0C694335DB228F2E39CF35EE -+ Rock @ CJAY-FM -+ 3 -+ -+ 92.1 -+ -1 -+ -+ -+ 10633853776C25F86C70CCD31CEA23564BB708A57EF5F9085A7688B43DC6FD872014910FFB -+ Alternative @ CKNG-FM -+ 4 -+ -+ 92.5 -+ -1 -+ -+ -+ 10633853772A8F9E92C1CB29A7A59350909BED4BBFDF7F39660C352B878D9113D14013712D -+ Classic Hits @ CHHK-FM -+ 5 -+ -+ 93.3 -+ -1 -+ -+ -+ 10633853773611391247EE7FA954C7D9B66FF417A1608BCDB991260EC536CF043E5908BF78 -+ Country @ CHLB-FM -+ 6 -+ -+ 95.5 -+ -1 -+ -+ -+ 1063385377096D0B37514F6B02B594995C4461722DF8DEB8C60824F18245CA27A729986A3C -+ CHR @ CHFM-FM -+ 7 -+ -+ 95.9 -+ -1 -+ -+ -+ 10633853775B02D76F9E43FA4A53B9795FF14D1A1D22A970EDA59D3D43C9F507E715EE112E -+ CHR @ CJTS-FM -+ 8 -+ -+ 97.1 -+ -1 -+ -+ -+ 10633853770337181A7624FFA5AC1B478A0805106E22AB7FBAFB49A68C7D7AEE9534A97007 -+ Classic Rock @ CIRK-FM -+ 9 -+ -+ 97.3 -+ -1 -+ -+ -+ 1063385377A83A6C70A32728E42BE200437F2605AAFF3BFB342F0A7596AA60C88442F49700 -+ Hot AC @ CFGP-FM -+ 10 -+ -+ 97.7 -+ -1 -+ -+ -+ 106338537734C34BAC629451F47196D3C1E703AC8E6513CDD2740FBBFFA54CD6995FC0B642 -+ Classic Rock @ CFBR-FM -+ 11 -+ -+ 100.3 -+ -1 -+ -+ -+ 10633853770976EAE07E91233E016FB68C6D0EC2ECAEEB6662F974C444D3CA59F2958C9118 -+ New Country @ CISN-FM -+ 12 -+ -+ 103.9 -+ -1 -+ -+ -+ 10633853773DEE94D38AB8333A773EDFB9ADE76F0F8161D381D1A7AA36906EAD1DC10D39EF -+ AC @ CFMG-FM -+ 13 -+ -+ 104.9 -+ -1 -+ -+ -+ 10633853776C4C04904D4EBF1B4B6CF03AD5B98DF21541D8AF56F763E7D6935D45D34CDC64 -+ Rock @ CKIK-FM -+ 14 -+ -+ 107.3 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,142 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Alberta -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853780FAE1C6C25061440A80A603674BE0548BE72CF9FA55F35ED9EE4D5BD8C0363A0 -+ Country @ CFWE-FM -+ 1 -+ -+ 89.9 -+ -1 -+ -+ -+ 1063385378C0AADE85A43442C43CE31F22BFA5F05EAB2CEBE52AC7A0CA28965C42A8061F66 -+ Rhythmic Oldies @ CJSW-FM -+ 2 -+ -+ 90.9 -+ -1 -+ -+ -+ 10633853783A71CA9D83193792249CEE100AB8927715CAEA722FA7240A6744558DCB6C319F -+ Rock @ CJAY-FM -+ 3 -+ -+ 92.1 -+ -1 -+ -+ -+ 1063385378AD37014EE4E733A5ACA31247FE51168ACD129E2B22CE7FC884C06561EF1B22D2 -+ Alternative @ CKNG-FM -+ 4 -+ -+ 92.5 -+ -1 -+ -+ -+ 10633853785F2EB74C8B58F3AA9BCD474B30D7C13A78DB847009E914B1E0EB3F3D8C1A175A -+ Classic Hits @ CHHK-FM -+ 5 -+ -+ 93.3 -+ -1 -+ -+ -+ 1063385378F6E51ED3C76252FA6524D27E5109BFA743791D5C56A86B11AE5E14E4E9A254A6 -+ Country @ CHLB-FM -+ 6 -+ -+ 95.5 -+ -1 -+ -+ -+ 10633853787B2AA8D76B6F7627D521207BE1E1727C415C3CBCAC18CA22E29B5A83E60E973E -+ CHR @ CHFM-FM -+ 7 -+ -+ 95.9 -+ -1 -+ -+ -+ 1063385378CDF63872C81ED21D08337FC844CD89E7C95F5FB5AF367A8BE45F277B8A473423 -+ CHR @ CJTS-FM -+ 8 -+ -+ 97.1 -+ -1 -+ -+ -+ 10633853784B3D9C8D49E1503081AFEAF9F4E1AA3F4D00062F4711C58FDBED37A190BD7B53 -+ Classic Rock @ CIRK-FM -+ 9 -+ -+ 97.3 -+ -1 -+ -+ -+ 10633853780D4C3A7F642534552322E8E2D5BE2F913D8E94568FCE9B9A93B5A586740F4ABF -+ Hot AC @ CFGP-FM -+ 10 -+ -+ 97.7 -+ -1 -+ -+ -+ 1063385378A60ECF6358DA10AD893E14FF5F6EA521FEBC59BD8F4BD26CE0E041DBFF56C4F7 -+ Classic Rock @ CFBR-FM -+ 11 -+ -+ 100.3 -+ -1 -+ -+ -+ 1063385378312FBB264D4A90BBA83EF41FF6D5FB60F1933C759111D733CCC46D8010F38D48 -+ New Country @ CISN-FM -+ 12 -+ -+ 103.9 -+ -1 -+ -+ -+ 106338537844B72671AA9A88CA5D5934C4C15852741904DE3B6F7B93BDE3A49E88F270EC49 -+ AC @ CFMG-FM -+ 13 -+ -+ 104.9 -+ -1 -+ -+ -+ 1063385378FE4CE6C37EB5F1811CD58132512AE292849E04893DB76F057732703C8D64F89E -+ Rock @ CKIK-FM -+ 14 -+ -+ 107.3 -+ -1 -+ -+ -+ 1063385378E0379B23681449EB8C901A44454F0E59D23ED3B51D872513A1C89CD13F68E3EB -+ News/Talk @ CHQR-AM -+ 15 -+ -+ 0.77 -+ -1 -+ -+ -+ 10633853783FC783D1673373FF08C16C68DD4930E57F3DE24D1289E2E31D08EC123E749EAD -+ Country @ CKGY-AM -+ 16 -+ -+ 1.17 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,118 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ British Columbia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385359E5A2DBA3F6BFD77DD674D149FC604C4F7A0936A253710318B042B49A09995ABF -+ CHR @ CKPG-AM -+ 23 -+ -+ 0.55 -+ -1 -+ -+ -+ 1063385359DEECE66A5C95CE02E6FA5674424B3AFD9E4814AB5DC04DC6EDDDAFADF5429A72 -+ Country @ CJCI-AM -+ 24 -+ -+ 0.62 -+ -1 -+ -+ -+ 1063385359427537B107932F2983F3D1D0D44CA2506DCC66A5F53C1B83DE6045B010B40B97 -+ Oldies @ CISL-AM -+ 25 -+ -+ 0.65 -+ -1 -+ -+ -+ 1063385359F44A29C1C5F4DA4F3D073EF63EF6A55861CB5EA72D75EFAD5FF2881F33636C35 -+ Country @ CKQR-AM -+ 26 -+ -+ 0.76 -+ -1 -+ -+ -+ 106338535922F1BC67CE0B8A3E32521C82ACFDEB520AE5E4218C6632F10B598F407879ADD1 -+ CHR @ CKKC-AM -+ 27 -+ -+ 0.88 -+ -1 -+ -+ -+ 10633853599EFD17AD0095E71E572E37BB8B56588EBF6CAC82FA4065A5A2D29E663E9CD565 -+ News/Talk @ CJVI-AM -+ 28 -+ -+ 0.9 -+ -1 -+ -+ -+ 10633853596D496E7338CACD5A2A0D5823FEBC25DF8D3037DB3D5DF4D6CAC3C441322C98F4 -+ News/Talk @ CKNW-AM -+ 29 -+ -+ 0.98 -+ -1 -+ -+ -+ 10633853592EE5091A6A34B19E2C4A6EF25D0E241096F3F31DDF66F588E5033BF9D208F0D4 -+ Classic Hits @ CKST-AM -+ 30 -+ -+ 1.04 -+ -1 -+ -+ -+ 1063385359AC95EB6E19BCCA350D209B8BE4B23F27B5776EC48ADBC1E9396A50D6CF916DF5 -+ News/Talk @ CFAX-AM -+ 31 -+ -+ 1.07 -+ -1 -+ -+ -+ 1063385359C31F7F7ED4DE20DAB0166BA881C584F64C6E6E4330F234B5252BB1CFFED8F348 -+ News/Talk @ CKWX-AM -+ 32 -+ -+ 1.13 -+ -1 -+ -+ -+ 1063385359658EB256EC4AD36DD8F6A61BD1DE02EBA0814619463FC7B6D744D4D480E63268 -+ AC @ CJAV-AM -+ 33 -+ -+ 1.24 -+ -1 -+ -+ -+ 1063385359228FDE7DCE8C430CCF137F5F5AB3D1EB7AA95E1092A8EEE04F9264DB2F335185 -+ News/Talk @ CHMB-AM -+ 34 -+ -+ 1.32 -+ -1 -+ -+ -+ 10633853593F73FB4F279E229596A57660ABB5C7392D69FF785C19F2B362EAB67C1CD5F4D5 -+ Country @ CKGF-AM -+ 35 -+ -+ 1.34 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,190 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ British Columbia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853590D470913EFF51B2E353F3ADE718349C4AF7C0AFD4222586C8074F52E97281DAE -+ AC @ CJSU-FM -+ 1 -+ -+ 89.7 -+ -1 -+ -+ -+ 10633853598DEB5D6CCB6220FB51C87F8542D06F962F8F46FCEA7369CC6C62C7A1C1542EA7 -+ Country @ CJJR-FM -+ 2 -+ -+ 93.7 -+ -1 -+ -+ -+ 1063385359EC9F32C83C8CD51CA92EE014B64585F70B4795EF42F6F9BAE724190A2D382FD4 -+ Various @ CJSF-FM -+ 3 -+ -+ 93.9 -+ -1 -+ -+ -+ 1063385359407D77C53DC9D578813E568E34073FA92102C995570DC6FF13C7D015986B18F1 -+ Rock @ CIRX-FM -+ 4 -+ -+ 94.3 -+ -1 -+ -+ -+ 106338535932CD0CFF6C389736FA7CD3248111742DFC335DFF2D743DD5F272B85BEC177541 -+ CHR @ CKZZ-FM -+ 5 -+ -+ 95.3 -+ -1 -+ -+ -+ 10633853593166C89AD687C9854C5F92E569B032E78677E0E3BA1562B1913FC8ADA5541CE1 -+ CHR @ CJAT-FM -+ 6 -+ -+ 95.7 -+ -1 -+ -+ -+ 1063385359F067608C6F11E5DA3F31447A8AF5783D28BFB5C46A6FBB5A94B913FF77E399FC -+ AC @ CKKS-FM -+ 7 -+ -+ 96.9 -+ -1 -+ -+ -+ 10633853591D4B72FC5F5F6A0287A2933BAFD58E30CAAB997576EEE3665370CDB53101163B -+ Hot AC @ CJMG-FM -+ 8 -+ -+ 97.1 -+ -1 -+ -+ -+ 1063385359D582AA50D1BC56FC1064A087A25684950DDED72ECC3B54ED2A112A9925001C01 -+ AC @ CIOC-FM -+ 9 -+ -+ 98.5 -+ -1 -+ -+ -+ 10633853592D38CA7610711D5D51231A8AE8DE0EF88AAB7C9A24955420EB51A122C060EC32 -+ Rock @ CFOX-FM -+ 10 -+ -+ 99.3 -+ -1 -+ -+ -+ 1063385359B22CAF40A16FFC20B1BA2BB6F7D61336072726150F9DEE61FEF2241CD82C7D94 -+ CHR @ CHSU-FM -+ 11 -+ -+ 99.9 -+ -1 -+ -+ -+ 106338535902A7FCBBE58AAFD8D958D2E9661731AFA87E565A7F9CA40D72FF247BCCC79CF2 -+ Rock @ CKKQ-FM -+ 12 -+ -+ 100.3 -+ -1 -+ -+ -+ 10633853598C23C12C9F97E562E09D3EAF8173F6E28B6C129B84FBD940BB519FA1241D56DD -+ Classic Rock @ CFMI-FM -+ 13 -+ -+ 101.1 -+ -1 -+ -+ -+ 106338535998E0E628C51AB2DCBFD1061E392851023B8EB9B207D8D781F04CBFE0653606C9 -+ Hot AC @ CKKN-FM -+ 14 -+ -+ 101.3 -+ -1 -+ -+ -+ 1063385359680649EC02D1E110145649B23CCB744C33FA008846AD78598CD46CDABE40BA50 -+ Nostalgia @ CFUV-FM -+ 15 -+ -+ 101.9 -+ -1 -+ -+ -+ 1063385359DBCEAA7F0DC6E8C73261E912CAC0BFE60FC66692BC44BCBC8225B365CA17CFE2 -+ CHR @ CISW-FM -+ 16 -+ -+ 102.1 -+ -1 -+ -+ -+ 1063385359B368E35C2BBD3F01B51027029FCBDF631CE9B019CA9D58B55499ADA58E812C9E -+ Ethnic @ CKMO-FM -+ 17 -+ -+ 103.1 -+ -1 -+ -+ -+ 10633853599BD2AE95C3F9AB2B89997A030A18FFD39CCB35072A4945807960B8BEC5E06E51 -+ AC @ CHQM-FM -+ 18 -+ -+ 103.5 -+ -1 -+ -+ -+ 1063385359B54D9766475D0D613D1C5604ADDE7D0F49E91F7B56C22E524D94F156373CFCD9 -+ AC @ CKSR-FM -+ 19 -+ -+ 104.9 -+ -1 -+ -+ -+ 106338535905B485F99B1F3D8448C8EF1D69BE9473F472F7D58D47160F90E1668A570D7D1A -+ Classical @ CBU-FM -+ 20 -+ -+ 105.7 -+ -1 -+ -+ -+ 1063385359123885D3FDDD740756AD138F88B2676EB0D6324453529C5BB1F5C826090A2018 -+ AC @ CISQ-FM -+ 21 -+ -+ 107.1 -+ -1 -+ -+ -+ 10633853595E73E741DA155239CA2CD23C6BDEA442B856714F6CF309C70E573B062CD88A1C -+ AC @ CKIS-FM -+ 22 -+ -+ 107.5 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,294 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ British Columbia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385359D5F2CDD6F12A5F08FF862B6F04EA76E90E0991B9C7D7458CF70C393634632D94 -+ AC @ CJSU-FM -+ 1 -+ -+ 89.7 -+ -1 -+ -+ -+ 1063385359F6AC17F18E655860B8E7A65E0ACEA3DCEAF1CFBC707956A527D23FEF188F82E1 -+ Country @ CJJR-FM -+ 2 -+ -+ 93.7 -+ -1 -+ -+ -+ 1063385359F097F1B15886BD01849C57468F86A3DF45DB5CB8C9C99029C95731643002E89D -+ Various @ CJSF-FM -+ 3 -+ -+ 93.9 -+ -1 -+ -+ -+ 106338535915DBA56B6EDE5B843C04601D2FE4268B3268753DCF93F5163A854CCF922AC458 -+ Rock @ CIRX-FM -+ 4 -+ -+ 94.3 -+ -1 -+ -+ -+ 10633853593BCA4073FFDA7F36A62A318B05925FA115E4ACFBC36E577C9B117D7EA141D92D -+ CHR @ CKZZ-FM -+ 5 -+ -+ 95.3 -+ -1 -+ -+ -+ 1063385359A7EAAC3B45AA6CE4523502CD83FEC0F72BE631F30D8E4678C3BF3378233805B0 -+ CHR @ CJAT-FM -+ 6 -+ -+ 95.7 -+ -1 -+ -+ -+ 10633853592A292C842356FD1D291AEFD315BD4D7783C877CA847D3E3653A6388A4C9D1238 -+ AC @ CKKS-FM -+ 7 -+ -+ 96.9 -+ -1 -+ -+ -+ 106338535948C956430AA3776A8778C16544612BB332ED8200CA7E8AC3E75D1390F39F4E67 -+ Hot AC @ CJMG-FM -+ 8 -+ -+ 97.1 -+ -1 -+ -+ -+ 10633853598906ADEE03A37745D1E98FD6E7381F0EF6AB1263856188CD3DC3A69275AA5148 -+ AC @ CIOC-FM -+ 9 -+ -+ 98.5 -+ -1 -+ -+ -+ 1063385359BC752064BB4DCA331A9A0069107485A8F1D01BFDC7F65A9EDF34F798421C8CB6 -+ Rock @ CFOX-FM -+ 10 -+ -+ 99.3 -+ -1 -+ -+ -+ 1063385359560FB9E2053F54D71A04853510FD008F006060176BFE043D77BE11F5CD486A44 -+ CHR @ CHSU-FM -+ 11 -+ -+ 99.9 -+ -1 -+ -+ -+ 10633853594FDBC3B886FDCDBFF49FEE354B2BC4821D5689BEA38809EE8273D58BE6A3DB8B -+ Rock @ CKKQ-FM -+ 12 -+ -+ 100.3 -+ -1 -+ -+ -+ 106338535969D7D59575FFD8F0EC4CBF739E4639BDA43AE5C2EBAC6EAD9BC7D623D157DF4F -+ Classic Rock @ CFMI-FM -+ 13 -+ -+ 101.1 -+ -1 -+ -+ -+ 106338535995DF4F9F6E889895A10D733C97DFBBF922DF50AD582DF00330002ED3CED541AF -+ Hot AC @ CKKN-FM -+ 14 -+ -+ 101.3 -+ -1 -+ -+ -+ 1063385359CD92F5B64E70F31826D15141911D3765A9E610892208309C26C6C60294BD2BCD -+ Nostalgia @ CFUV-FM -+ 15 -+ -+ 101.9 -+ -1 -+ -+ -+ 1063385359A3CF06A48F737C1199BBDDF557FE48C66ECE84796B92EA76A29BA5B84B89BE19 -+ CHR @ CISW-FM -+ 16 -+ -+ 102.1 -+ -1 -+ -+ -+ 106338535959DDAA60D9DE068BC3EBD8D39F2D64376F3CD34B7E4DB871D99E4E90E7326900 -+ Ethnic @ CKMO-FM -+ 17 -+ -+ 103.1 -+ -1 -+ -+ -+ 1063385359E9D75073B921265DB610B1AC0E4EC4984B42A155EEECDFC4CE2F021F83984BE1 -+ AC @ CHQM-FM -+ 18 -+ -+ 103.5 -+ -1 -+ -+ -+ 1063385359A86C3AEDCD0A5B0F28BBEF316913D1B5DC58E60348B09D8A18E1F35B00498736 -+ AC @ CKSR-FM -+ 19 -+ -+ 104.9 -+ -1 -+ -+ -+ 1063385359D542249A6C677F5F03CE3A40DD5A2EE487CA792B44BEC9CFD7D3D2C73CF38FBF -+ Classical @ CBU-FM -+ 20 -+ -+ 105.7 -+ -1 -+ -+ -+ 10633853599FF38288DD86E0286B6161E6F3479C02B06D69B4286D4B7E95B6B0AF3EEB5DF0 -+ AC @ CISQ-FM -+ 21 -+ -+ 107.1 -+ -1 -+ -+ -+ 10633853597B45BBF753EF6A529D838E94FBFED83E44AA192B4ABC6B9653AFA84BCC6702D2 -+ AC @ CKIS-FM -+ 22 -+ -+ 107.5 -+ -1 -+ -+ -+ 1063385359C551EE7983FBE6F50676A1589616E8776CD1440F3A9CC531C77EA7D83E1B46C4 -+ CHR @ CKPG-AM -+ 23 -+ -+ 0.55 -+ -1 -+ -+ -+ 106338535928ECE0C3208B4C9F52EE381CAFEEC6DB8F5AF2C3167DD9D50932DCEA0BB8FCD9 -+ Country @ CJCI-AM -+ 24 -+ -+ 0.62 -+ -1 -+ -+ -+ 1063385359CE6FEA4D0940467DCAC059101954593CFF0BD234C58D8857B9527E9E4F3A03EC -+ Oldies @ CISL-AM -+ 25 -+ -+ 0.65 -+ -1 -+ -+ -+ 1063385359701D86995E780498A6FC3FD0772E8F5599BBC17FA8FF9EB7C202DE12D4ECFCF0 -+ Country @ CKQR-AM -+ 26 -+ -+ 0.76 -+ -1 -+ -+ -+ 1063385359740D66F68A08A73502B36460F77D6168494179F8C928CE9DA4104AAD5423E8A2 -+ CHR @ CKKC-AM -+ 27 -+ -+ 0.88 -+ -1 -+ -+ -+ 106338535962BD3E066AE7DBD6DDE0011ED9F372CB301FEAE8D57C38B065A5AA56081D69D7 -+ News/Talk @ CJVI-AM -+ 28 -+ -+ 0.9 -+ -1 -+ -+ -+ 1063385359EBEFAE79981DC478EDB0BAD7EF80A1206C7638F975AAFCDCE0627C6F724952DE -+ News/Talk @ CKNW-AM -+ 29 -+ -+ 0.98 -+ -1 -+ -+ -+ 1063385359349E399273A6FE830A43975752CDD50BC23546EDBE9075D597F25119DD274E4B -+ Classic Hits @ CKST-AM -+ 30 -+ -+ 1.04 -+ -1 -+ -+ -+ 1063385359B2E704463BC0D4C38CF3F3EAC9EB6E370FC9F6EB41BBC238539318D425E9F117 -+ News/Talk @ CFAX-AM -+ 31 -+ -+ 1.07 -+ -1 -+ -+ -+ 1063385359899124E77D5F886672AB575E45B1155B6F318E584D613582DF9CB2A2C0F52476 -+ News/Talk @ CKWX-AM -+ 32 -+ -+ 1.13 -+ -1 -+ -+ -+ 106338535953AE20D883ED79AB9F258DCAEF6D01D97445E45412C6397C06F7A2AA8F5B079A -+ AC @ CJAV-AM -+ 33 -+ -+ 1.24 -+ -1 -+ -+ -+ 1063385359A28D4D85FFC1AC307A2CA461DC1244D6C80D781E090AC6B6EED2D427563048AC -+ News/Talk @ CHMB-AM -+ 34 -+ -+ 1.32 -+ -1 -+ -+ -+ 1063385359278A3675076B786C676F1819843CFD9EC039C049A15DE1EE2CC3EF87FD3AAC97 -+ Country @ CKGF-AM -+ 35 -+ -+ 1.34 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am kradio-3.5.13.1/kradio3/presets/canada/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/canada/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,10 +1,64 @@ - SUBDIRS = --EXTRA_DIST = "montreal-antenna.krp" -+EXTRA_DIST = "Alberta_am.krp" "Alberta_fm.krp" Alberta.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "montreal-antenna.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/" -+ $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp" - $(INSTALL_DATA) "$(srcdir)/montreal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp" -+ $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp" - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp" -+ -\ Pas de fin de ligne à la fin du fichier -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,54 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Manitoba -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385372567FAEECC546FCB8B698C0DED0B9B7FC373F54964E7269E6F2097D2F6321EC32 -+ Rock @ CFAR-AM -+ 9 -+ -+ 0.59 -+ -1 -+ -+ -+ 1063385372679E852386AF719E9EC2C0601E13253D76516464D916D13E2E2218A53E35BA4D -+ News/Talk @ CJOB-AM -+ 10 -+ -+ 0.68 -+ -1 -+ -+ -+ 1063385372202F08C60092B519D009A5E700CAF1C11B3C09E77CE91F77E76455ADDB9DADBF -+ Country @ CKDM-AM -+ 11 -+ -+ 0.73 -+ -1 -+ -+ -+ 1063385372B5DA577EE59D667B19180D54335E981108E68BC90E0919C8CBA341B41CBC7893 -+ Ethnic @ CKJS-AM -+ 12 -+ -+ 0.81 -+ -1 -+ -+ -+ 1063385372AD587F819284AD479EEB5F9DC22F6E9943725A1B1D4947CC648E60D33D351EC9 -+ News/Talk @ CIFX-AM -+ 13 -+ -+ 1.29 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,78 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Manitoba -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338537233399A62D25D77EA4D8FCC8451783B38A249F29DAF3B7B03FAD172B65B4414FC -+ Rock @ CITI-FM -+ 1 -+ -+ 92.0 -+ -1 -+ -+ -+ 1063385372DFE8BDBA148E3963997DEF32EB5D5E93B957D65BB9ECFAF940EA366559D2CCE1 -+ Hot AC @ CHIQ-FM -+ 2 -+ -+ 94.3 -+ -1 -+ -+ -+ 1063385372D0B0F1A1389C0B2AB983EBD8A2C2CCAC76562832487F17212C24E460130E789F -+ Modern AC @ CKLF-FM -+ 3 -+ -+ 94.7 -+ -1 -+ -+ -+ 1063385372F0903CAA44A0BE6DEC41C707F448B54EC32CC456A7EF3BD8181D9F99FEFA2C46 -+ Rock @ CJKR-FM -+ 4 -+ -+ 97.5 -+ -1 -+ -+ -+ 10633853725B4397003ED0D58C0716AA707AFC1514FBD02743786B8046E096CE1EAB1F79AE -+ Classic Hits @ CFWM-FM -+ 5 -+ -+ 99.9 -+ -1 -+ -+ -+ 1063385372DA36B4034B53FC9324D0610397E9822DE88345715E3F76F05540630E30D84965 -+ CHR @ CKXA-FM -+ 6 -+ -+ 101.1 -+ -1 -+ -+ -+ 1063385372396A871B304FBF1790A2A9C8BDE4E0115996BB60EFB0A30F342E1AF1092E8F27 -+ CHR @ CKMM-FM -+ 7 -+ -+ 103.1 -+ -1 -+ -+ -+ 10633853725038DB07B1019C3E2BC42E00FD6F0B6ACCE0E4B964D44D13B9167B31185B0DDF -+ Country @ CFQX-FM -+ 8 -+ -+ 104.1 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,118 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Manitoba -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338537235DE40FE931DDE7AB4ACE93C959304E7BFA062E7E5B078E9E2A01CF696F2C8A7 -+ Rock @ CITI-FM -+ 1 -+ -+ 92.0 -+ -1 -+ -+ -+ 1063385372BE099D03BC51FBEBDE20CBC70FC10423AD5E613054C0DDF72E787FF8CF0E4F0B -+ Hot AC @ CHIQ-FM -+ 2 -+ -+ 94.3 -+ -1 -+ -+ -+ 106338537209A1EFF7611EAFD085F8936930DA9BBA09B829C7A6E6FD9BBE8C74694407A208 -+ Modern AC @ CKLF-FM -+ 3 -+ -+ 94.7 -+ -1 -+ -+ -+ 10633853728D66D9EE218394C91355E5D110E08F362D8B68BBD1F281EAD0F96C16A0BDED62 -+ Rock @ CJKR-FM -+ 4 -+ -+ 97.5 -+ -1 -+ -+ -+ 1063385372C40013266B5DD98E82519FBE4A396847FA9B64C7A303AE48FCA527F959CD69FD -+ Classic Hits @ CFWM-FM -+ 5 -+ -+ 99.9 -+ -1 -+ -+ -+ 1063385372D6F63A9BFC233D2F9662065C4724A4C512492F510295A78A5629A0292F4B4C02 -+ CHR @ CKXA-FM -+ 6 -+ -+ 101.1 -+ -1 -+ -+ -+ 106338537265D6BD981E58BCA3B70DD320903417E3E9FF7641AC4171E60AD659F904793636 -+ CHR @ CKMM-FM -+ 7 -+ -+ 103.1 -+ -1 -+ -+ -+ 106338537215E89F1BD490A98711E71261CFB0CF5DE9A9FF96DD0C3449E30AEC487EA1C7C0 -+ Country @ CFQX-FM -+ 8 -+ -+ 104.1 -+ -1 -+ -+ -+ 10633853723C92632B65EAA085F8ADA5C1A7E22F1B6B92B68D36C334D43C2356640AC20A59 -+ Rock @ CFAR-AM -+ 9 -+ -+ 0.59 -+ -1 -+ -+ -+ 1063385372D6D1E62FC77378744328333B87F77C3F55ED107D2104BFE45F4E2413407747A4 -+ News/Talk @ CJOB-AM -+ 10 -+ -+ 0.68 -+ -1 -+ -+ -+ 10633853729BE68A608EB4852F2FB94CFE385841CC1A8CCF6C0A2FD4821CFBABB967998978 -+ Country @ CKDM-AM -+ 11 -+ -+ 0.73 -+ -1 -+ -+ -+ 1063385372B082179F3FC50164F20D1A2EFB2BB65907F17A40B9D05FEE0D6EAACFBFC11252 -+ Ethnic @ CKJS-AM -+ 12 -+ -+ 0.81 -+ -1 -+ -+ -+ 1063385372ADE418EAF6819DDE4859A0610BCC0D3EE140129A23EBA859986E76B7EBF718AA -+ News/Talk @ CIFX-AM -+ 13 -+ -+ 1.29 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,22 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ New Brunswick -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385355CF17CC34E34861B4F07366466A551EFDCD3C87604508C1C731313F6A1D69874C -+ Country @ CKCW-AM -+ 6 -+ -+ 1.22 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,54 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ New Brunswick -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338537563FF343F7028276A4D0BFF553004AAF1257E6C11F66596198596FDFE45456169 -+ Pop/Alt @ CKUM-FM -+ 1 -+ -+ 93.5 -+ -1 -+ -+ -+ 1063385375B1927CA7E6D2FD84C8C6FDD9B726EF1EF99751E38B86269C516642CE4B375A34 -+ CHR @ CHSR-FM -+ 2 -+ -+ 97.9 -+ -1 -+ -+ -+ 10633853752D3E8314F46B5E97EA4E77C8FF16C17EDDDBF8D32F0D52DBE7B354746497682D -+ Rock @ CJMO-FM -+ 3 -+ -+ 103.1 -+ -1 -+ -+ -+ 1063385375B19B7BE82B799670C8A81C520BBFA43073BE523360FEDCD3C77EFB1A3E5DEAA3 -+ Country @ CFQM-FM -+ 4 -+ -+ 103.9 -+ -1 -+ -+ -+ 10633853757DD605858EE796661C1F97538865E8065BF849CA2F8440D084118B0B434F3A1E -+ Alternative @ CHMA-FM -+ 5 -+ -+ 106.9 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,62 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ New Brunswick -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385376727BBC1B83D1C2F21F016FA3C6FE07FF94C5943890D6204C290509F65F6F0106 -+ Pop/Alt @ CKUM-FM -+ 1 -+ -+ 93.5 -+ -1 -+ -+ -+ 1063385376925157412BAB49F3429F192B5B21AB1143E5E47CEF2AB3AD13FA2060D36B0816 -+ CHR @ CHSR-FM -+ 2 -+ -+ 97.9 -+ -1 -+ -+ -+ 106338537685E1131CEC97874856FC0B0C909388AD46A2E1BCB6A030DAB5B599F000DA370A -+ Rock @ CJMO-FM -+ 3 -+ -+ 103.1 -+ -1 -+ -+ -+ 1063385376F66B38C11B08AD05960B95CA93F34DBF9F296F090FB64E493B961D9F7870E86D -+ Country @ CFQM-FM -+ 4 -+ -+ 103.9 -+ -1 -+ -+ -+ 1063385376BD5CE49E5E3B5B55B5BACD887351669D2E469BC93AA63A6C900638D0E40D69A8 -+ Alternative @ CHMA-FM -+ 5 -+ -+ 106.9 -+ -1 -+ -+ -+ 106338537661A9F1D1C79A49DA630E16FBB7B98E764266736BEE7B3E8EA404537E60E6C747 -+ Country @ CKCW-AM -+ 6 -+ -+ 1.22 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,14 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Newfoundland -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,22 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Newfoundland -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338537789B29E90B35F99179A0AA91933650FC46E824CA5B6BF68F576B3182B55DD9056 -+ Rock @ CHOZ-FM -+ 1 -+ -+ 94.7 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,22 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:53 2003 -+ USA -+ Newfoundland -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385377D11D9B16595E641E697405179F8C6D5B562D2D0A7D84F70287AD185594E0FA2B -+ Rock @ CHOZ-FM -+ 1 -+ -+ 94.7 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,22 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Nova Scotia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853835DC9A764A70C2E9080B031E63EAFD6F705632BEC8F8F43860CFB55EA53C20AE5 -+ News/Talk @ CJCH-AM -+ 3 -+ -+ 0.92 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Nova Scotia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853833F7B08CF4B773E874FD58D80B7FA0043373DB324A256C12C866E5244AD386EB0 -+ Various @ CJLS-FM -+ 1 -+ -+ 96.3 -+ -1 -+ -+ -+ 10633853833C8F899020527563BD1F5DA705ED43D2A3FA9B43391135053FBBB273A7C0B3D0 -+ CHR @ CFRQ-FM -+ 2 -+ -+ 104.3 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,38 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Nova Scotia -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385383878D2D92A7691A444275FCF3189047A309CB29737D425D132E3C8976E9C05A4B -+ Various @ CJLS-FM -+ 1 -+ -+ 96.3 -+ -1 -+ -+ -+ 10633853839ECF21389639F415BDA39F7E8FBEFD0C6F5579F10594475BA801BD9CB1EED5C5 -+ CHR @ CFRQ-FM -+ 2 -+ -+ 104.3 -+ -1 -+ -+ -+ 106338538376D203B4C09F3B3B261D56F2F0617A7D339FD7432DD788E6D85A850461D0E6F0 -+ News/Talk @ CJCH-AM -+ 3 -+ -+ 0.92 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,222 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Ontario -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385387734E601B33CF7FEF66FC8FCC05F0446D3C26E705D641C4085E63983229A98AB7 -+ Oldies @ CFOS-AM -+ 51 -+ -+ 0.56 -+ -1 -+ -+ -+ 106338538710E0424C6B045B2192E52A41633294FBC4D6D0DCE9718E7767AD3CBBB64FF418 -+ CHR @ CKGL-AM -+ 52 -+ -+ 0.57 -+ -1 -+ -+ -+ 1063385387CA3C1F727A8B13541CEAB051C5D5336D7F23E176EA7D27B3836170FC8C5B9BE0 -+ News/Talk @ CKPR-AM -+ 53 -+ -+ 0.58 -+ -1 -+ -+ -+ 1063385387020E218DD974FB8F1AB6C6CB4D8B197FF37F614974BAFF0FF04D1DF9C9FAFBDA -+ Sports @ CJCL-AM -+ 54 -+ -+ 0.59 -+ -1 -+ -+ -+ 106338538700312BA43D080B58538D302DB860E404750984DD0074A916B39EC545CF1379CD -+ Oldies @ CFCO-AM -+ 55 -+ -+ 0.63 -+ -1 -+ -+ -+ 1063385387F68BD20A5BE999DE81DDEDDAA11FFC6752A43D51514986B902D70B410ACB4955 -+ News/Talk @ CHOG-AM -+ 56 -+ -+ 0.64 -+ -1 -+ -+ -+ 1063385387E1DE75E2BE0F5CE4D3D2ACB40AABFDFAE5C25084D6BF6FFB203FB792C27F3F14 -+ News @ CFTR-AM -+ 57 -+ -+ 0.68 -+ -1 -+ -+ -+ 10633853879B10E0A091EF756AFFECD007746EE2EEB4C3D64E3375308E0FCC45453FB047F9 -+ Country @ CJBQ-AM -+ 58 -+ -+ 0.8 -+ -1 -+ -+ -+ 10633853874C8509AF11B4F856F570DA531316397FBE7B222BE943BCDD051780EEC0124963 -+ Country @ CHAM-AM -+ 59 -+ -+ 0.82 -+ -1 -+ -+ -+ 1063385387E71997B442DCB3952D89AB290835AD5670783C9DA03A6AFCB50B2EACA5A981BB -+ Oldies @ CHML-AM -+ 60 -+ -+ 0.9 -+ -1 -+ -+ -+ 10633853873FD423C2E1562B89C4E345BD4A1B1B73C677BE771291E8DB38A9F17173B4846E -+ AC @ CFPL-AM -+ 61 -+ -+ 0.98 -+ -1 -+ -+ -+ 1063385387D001E4C61E6DE920B1575B190BD9B5B37B020977E04F38576F64BA3004AD06CC -+ News/Talk @ CFRB-AM -+ 62 -+ -+ 1.01 -+ -1 -+ -+ -+ 1063385387424294ACA2638A9FA5C88E253B77DD51925A1E90878FF04CC63E7C07F8487A69 -+ Oldies @ CHUM-AM -+ 63 -+ -+ 1.05 -+ -1 -+ -+ -+ 10633853875A66270416082CB4C06DCA096DB2B946C67D50326720D285714C28771A8CF959 -+ News/Talk @ CHOK-AM -+ 64 -+ -+ 1.07 -+ -1 -+ -+ -+ 10633853877193518E7AC5D4F38FF398E79985586E2C3760CCAFC0890073424B1D3D33CC9E -+ Oldies @ CKKW-AM -+ 65 -+ -+ 1.09 -+ -1 -+ -+ -+ 10633853872A8B3612D1E39C534F5656C13D01AAF4CDCBEA0F2D4CAAB2A4F411A8B9296CEB -+ Oldies @ CKOC-AM -+ 66 -+ -+ 1.15 -+ -1 -+ -+ -+ 1063385387876C5EB7785C42C34B17B6D5CDCD10459D37CEF452A533816684EA26C0AC8F07 -+ CHR @ CJTT-AM -+ 67 -+ -+ 1.23 -+ -1 -+ -+ -+ 10633853872BA99262573FDC126085ABAC358017391E5D5BF908BC54367785928491852922 -+ Oldies @ CJCS-AM -+ 68 -+ -+ 1.24 -+ -1 -+ -+ -+ 106338538751515E14FC1C0CAD503EA9C3A53AEE3A11A50A1D0D603C1B326586F08BD3526F -+ AC @ CJTN-AM -+ 69 -+ -+ 1.27 -+ -1 -+ -+ -+ 106338538758A816DDFEA98055904B262B12A86C5EDD86C30B93890A4AD0CF90B69C56549B -+ News/Talk @ CJBK-AM -+ 70 -+ -+ 1.29 -+ -1 -+ -+ -+ 106338538721ACEEACE356B2E0820D2EC3DF821EB31EBAB6CFFEFDEF2572DA4945DC923155 -+ Classic Hits @ CKPC-AM -+ 71 -+ -+ 1.38 -+ -1 -+ -+ -+ 10633853875B79C7F4383E6C762706370AEACF739D47C5712E7B832D36B04B47FC073F0186 -+ Oldies @ CKSL-AM -+ 72 -+ -+ 1.41 -+ -1 -+ -+ -+ 106338538752429D53A9F687C70E8E352F36219AD716D879F1AD41DC8FF5EE9C82EEE7734D -+ AC @ CKPT-AM -+ 73 -+ -+ 1.42 -+ -1 -+ -+ -+ 106338538724737608C2A2A616DE49B424135B50A4F242108E8F619DD35474EAA9AF6D517B -+ Oldies @ CJOY-AM -+ 74 -+ -+ 1.46 -+ -1 -+ -+ -+ 10633853875C1CE8727F5626C388394BF70085CE39E7B36CF507C902058A6CAD31C0FC32D5 -+ Oldies @ CFPS-AM -+ 75 -+ -+ 1.49 -+ -1 -+ -+ -+ 1063385387A9A9AEDC27F800BD96818465CFBB3423E08FD4C3C27B99B27644D01A0B56DC85 -+ Ethnic @ CHIN-AM -+ 76 -+ -+ 1.54 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,414 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Ontario -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385386BBD3399B483508CE617495612BC49B9EB8EEDDEC91D03918C1A7D9B78D05879F -+ Urban AC @ CKLN-FM -+ 1 -+ -+ 88.1 -+ -1 -+ -+ -+ 1063385386402F58A2FC9ACB1732F00E4AD6953A0ACAD6002D06D280C1448BBF25C2C7CBED -+ Alternative @ CKDX-FM -+ 2 -+ -+ 88.5 -+ -1 -+ -+ -+ 1063385386A6B5C6A56C654D1EF53FED84ECF71E7495689028C4209B738B97EDB64E6809C5 -+ CHR @ CIUT-FM -+ 3 -+ -+ 89.5 -+ -1 -+ -+ -+ 10633853862AC1C308E19A22CE8EDCFEA3A4694B6E75D0061BE24E5184D717EE80F1F5D648 -+ Classical @ CJRT-FM -+ 4 -+ -+ 91.1 -+ -1 -+ -+ -+ 10633853869940994CE36F56CC91E3755811501083CF75F3FA147B35C59EF501C6A9232BA5 -+ CHR @ CKPC-FM -+ 5 -+ -+ 92.1 -+ -1 -+ -+ -+ 1063385386C0B06FEBDC29742E738362C21488B6DC53E9C5467BEFF1FA1918066F33397CFF -+ CHR @ CISS-FM -+ 6 -+ -+ 92.5 -+ -1 -+ -+ -+ 1063385386767DEDBC4C618CE65EB00E1860D9CD677EB6D635AA871AAC88C2E2C15C69F453 -+ Rock @ CJRQ-FM -+ 7 -+ -+ 92.7 -+ -1 -+ -+ -+ 1063385386DB863E27395DD2F381433DE2A61E5D129CECCE4E0054420979979EA1839E2ABE -+ Community @ CKCU-FM -+ 8 -+ -+ 93.1 -+ -1 -+ -+ -+ 1063385386FAADF7AD44886F1E35744A0E93A4E52D8D4D8A28A788AC5BAE47478660A3F456 -+ AC @ CFRU-FM -+ 9 -+ -+ 93.3 -+ -1 -+ -+ -+ 106338538636200C8C40FE3BD9B35EDDD7376635BDB460DC2E212299F8F2F1382765D7F890 -+ Urban @ CFXL-FM -+ 10 -+ -+ 93.5 -+ -1 -+ -+ -+ 1063385386D7CE8D51E849BDB4DE57B733127F04B060F9C4B673440FFA7C6BDBD913028F56 -+ CHR @ CKKL-FM -+ 11 -+ -+ 93.9 -+ -1 -+ -+ -+ 10633853864100CBE1F6361692B6F3281A8439F7DE20DCE4DA62A2BCD12A08CCEEA8C5121C -+ Rock @ CJSD-FM -+ 12 -+ -+ 94.3 -+ -1 -+ -+ -+ 10633853866C8E41CC7F246EEFE0FC7B12D48CB32DED00F264AC4C5B0E5A41CE94A022E503 -+ Nostalgia @ CHRW-FM -+ 13 -+ -+ 94.7 -+ -1 -+ -+ -+ 1063385386168B69AB7EE5A725F393872C2E8D9D4A4CA1DA4B5AC15A9A0EE48A1425242D82 -+ Hot AC @ CKGE-FM -+ 14 -+ -+ 94.9 -+ -1 -+ -+ -+ 1063385386982D84F66D2D1D415FE025064382691931D36666BAD901546E8DD9C3AA5E1266 -+ AC @ CKSY-FM -+ 15 -+ -+ 95.1 -+ -1 -+ -+ -+ 10633853864E34CBBC7BB3CBFBEF03686C4DD8BFEB0F1BD15F978DBF3E604AC42458E23AF5 -+ Classic Rock @ CJXY-FM -+ 16 -+ -+ 95.3 -+ -1 -+ -+ -+ 106338538619435BCB06CD70B3E72F9FC66A82CF7174E4715995B1119B18A415B4CA86E010 -+ Rock @ CFJB-FM -+ 17 -+ -+ 95.7 -+ -1 -+ -+ -+ 1063385386F02EE0FE6FC1F7CC06BD0C51E16448BF0589256C1599B36B0AB1E6D559ABD829 -+ Rock @ CFPL-FM -+ 18 -+ -+ 95.9 -+ -1 -+ -+ -+ 1063385386D8F3258DB9CAD4B877B6436F47C1A8CDFE0A1D98357CFDB87B12ACE9569390B0 -+ Country @ CHVR-FM -+ 19 -+ -+ 96.7 -+ -1 -+ -+ -+ 1063385386FDA3B5B00A3CC38D48CBD83E67390B5739A60D9D4BF59648F5F1F39E7B629783 -+ AC @ CJEZ-FM -+ 20 -+ -+ 97.3 -+ -1 -+ -+ -+ 1063385386DCE128C871AE0B3E88AD8914186744CEC297E7FA2695A2576E624132CFEA57F8 -+ AC @ CIQM-FM -+ 21 -+ -+ 97.5 -+ -1 -+ -+ -+ 1063385386C478FABC579AC6F910B9F2145AFA3BE45A40C7780894B9A7D4C90B8C4C26BE35 -+ CHR @ CHFI-FM -+ 22 -+ -+ 98.1 -+ -1 -+ -+ -+ 106338538624D94F399AE7ACBF41F43E81FDA05AB1882D1059DA7BCFAEA87482B5DA5D376B -+ AC @ CFLY-FM -+ 23 -+ -+ 98.3 -+ -1 -+ -+ -+ 1063385386B4E7858A1C16F77774B6D60317734B9435A111C79867EAF33F5EEA019B2ED14A -+ Country @ CYSS-FM -+ 24 -+ -+ 99.5 -+ -1 -+ -+ -+ 106338538654DEA9EA7D68F0D485BB980FF9E387487FE9278A486C32D34FD052CF4732A621 -+ AC @ CKMX-FM -+ 25 -+ -+ 99.9 -+ -1 -+ -+ -+ 1063385386447C292FF745659014EF1F8DBF6B58414ACA6047FF9678E6DA5E5F2C7DA5A9FF -+ Ethnic @ CHIN-FM -+ 26 -+ -+ 100.7 -+ -1 -+ -+ -+ 106338538625ACB8C48033773DC6DAD8B8DB3A65944A10B7624E11D6C25D091B078217ACC8 -+ Alternative @ CFMO-FM -+ 27 -+ -+ 101.1 -+ -1 -+ -+ -+ 1063385386A164237B20FB1A881985DA52D64EFCC9D2057843BB88E3BA50B4E307BA4A86B1 -+ Rock @ CKWF-FM -+ 28 -+ -+ 101.5 -+ -1 -+ -+ -+ 106338538614A744DB3C84630BD3EA779761735CA6DF75FFB6E9FC2DCACCA1C25B531EA392 -+ AC @ CFRC-FM -+ 29 -+ -+ 101.9 -+ -1 -+ -+ -+ 10633853868D109D1121D6084BA5617FAFBF61511320C88427C243BCC345849F3E392133F1 -+ Alternative @ CFNY-FM -+ 30 -+ -+ 102.1 -+ -1 -+ -+ -+ 106338538690FB3CF0893E18C64F51903A11D73A99F4793CDBD16628E3CB2E39345FAA9B2D -+ Hot AC @ CHST-FM -+ 31 -+ -+ 102.3 -+ -1 -+ -+ -+ 10633853863DD41F785B586BD29B07CC961DBE78A8F850040EFA43E443195FEBFC9FA3F151 -+ CHR @ CFHK-FM -+ 32 -+ -+ 103.1 -+ -1 -+ -+ -+ 1063385386047F08B748ABA7CD3880814BF9F66C32342F7C80BFDC82DB99170F1B246BDC66 -+ AC @ CKLP-FM -+ 33 -+ -+ 103.3 -+ -1 -+ -+ -+ 1063385386637F85CB8ACF831AA1DF14A40AA9131182F2D8C4FFB4F3B15D88E9CD3B8F6614 -+ CHR @ CIDC-FM -+ 34 -+ -+ 103.5 -+ -1 -+ -+ -+ 1063385386907E950B4E21779DE4B34E4DEF7304C4519D2BB982DC9D366E14E741132BD337 -+ Rock @ CHXL-FM -+ 35 -+ -+ 103.7 -+ -1 -+ -+ -+ 1063385386787853E1D7749B900FC8BC37FBABF2E367DEF584D4CB213DF45252F9E3D8E16E -+ Nostalgia @ CKDK-FM -+ 36 -+ -+ 103.9 -+ -1 -+ -+ -+ 1063385386F831810F48B27ED2DC2C77C3416D074C11EA8BFBC21B2433C8B03A916AA544ED -+ Country @ CICZ-FM -+ 37 -+ -+ 104.1 -+ -1 -+ -+ -+ 10633853861CB5A9AEF68F8CAB403B2EB4ED350D89C35A007EF3C5046B1B334B55C430BB7D -+ Country @ CJQM-FM -+ 38 -+ -+ 104.3 -+ -1 -+ -+ -+ 1063385386CAA5542509AEBBCE1AB227BA3C8ED4AE99D4DEB801FF6A015F37190B0431E607 -+ AC @ CHUM-FM -+ 39 -+ -+ 104.5 -+ -1 -+ -+ -+ 1063385386965E058688936CD2A8F1AF38046DE6DA764D5B7F21F64BB0E2F0E80CFAF6A946 -+ Country @ CKQM-FM -+ 40 -+ -+ 105.1 -+ -1 -+ -+ -+ 1063385386A7CD1C9CF70CC34FF19A8EE55023FDE89ED1B6F4B2111C66D34EC3495BDABEFA -+ Classic Rock @ CFCA-FM -+ 41 -+ -+ 105.3 -+ -1 -+ -+ -+ 106338538693A78B680171A292CA2F2BAE4415910E9495EF3A4F345AAADA1C0AA914000FCC -+ NPR @ CHRY-FM -+ 42 -+ -+ 105.5 -+ -1 -+ -+ -+ 1063385386F04D219347EF9006074AB70D3A4405A0F119E046A838F334B5FC99D3C5F9C376 -+ AC @ CHRE-FM -+ 43 -+ -+ 105.7 -+ -1 -+ -+ -+ 1063385386EE619BE656B906FA217A860731E54AECC2F3058CF53FCF6F7C447C7618F1E553 -+ Nostalgia @ CIMJ-FM -+ 44 -+ -+ 106.1 -+ -1 -+ -+ -+ 1063385386BE62C1CE01ED24B2F557DF4EE9EC54C4DC91909802DBAA0671CFFF6AB02CE793 -+ Rock @ CHKS-FM -+ 45 -+ -+ 106.3 -+ -1 -+ -+ -+ 106338538608B1EE52D64B3DF96C6B8FA637F4990A904E03ADC15038EB887EB7A2E32C1FF8 -+ AC @ CIXK-FM -+ 46 -+ -+ 106.5 -+ -1 -+ -+ -+ 10633853862F38341D678AFB178E35BC9E2EC81177E6ECF02F346AC8BE73F202C17B5506A8 -+ AC @ CHCD-FM -+ 47 -+ -+ 106.7 -+ -1 -+ -+ -+ 10633853863B768122EE5ABF32DF9AA18A8D489F5F232AC368ACB3FC301098A40DCACDB7F1 -+ Rock @ CKQB-FM -+ 48 -+ -+ 106.9 -+ -1 -+ -+ -+ 1063385386ACDF712DD3826C57ECA305F40BCBFAAF5D8F34ADE81651E53F140E4A995E4D90 -+ Classic Rock @ CILQ-FM -+ 49 -+ -+ 107.1 -+ -1 -+ -+ -+ 1063385386F20F122F17C34424B4B3101B3FDEC0388E96395E48711F1ED50F3141B6ECFCC4 -+ CHR @ CING-FM -+ 50 -+ -+ 107.9 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,622 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Ontario -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853876E98DEFC969A09D6C13E4CD7C19F81DF1E95174BB71FA595BFA91E7BE4AFEF30 -+ Urban AC @ CKLN-FM -+ 1 -+ -+ 88.1 -+ -1 -+ -+ -+ 10633853878C9BF92E01972A10CE22FB12F7BAC5F40CBDE7A7F6855ADBC109FF4E662EE8A7 -+ Alternative @ CKDX-FM -+ 2 -+ -+ 88.5 -+ -1 -+ -+ -+ 1063385387612ACBF8CCC9F553967792F51C7544AB3DB850030A05917786D7A4A07A42AF97 -+ CHR @ CIUT-FM -+ 3 -+ -+ 89.5 -+ -1 -+ -+ -+ 10633853875CABE542CBF6AA88AEF61FCA1863EE48E8FCB8B2B0993E9277BC8FF154F51E4A -+ Classical @ CJRT-FM -+ 4 -+ -+ 91.1 -+ -1 -+ -+ -+ 1063385387E8B15BCDD0565BC5F357AD4FC826051D3DC2CD93853F25A9CAE1A95C329C46AF -+ CHR @ CKPC-FM -+ 5 -+ -+ 92.1 -+ -1 -+ -+ -+ 10633853874CB71B000668424DB4C117AD087DBD06DCCA25DD31AE334B14F9098269CFE919 -+ CHR @ CISS-FM -+ 6 -+ -+ 92.5 -+ -1 -+ -+ -+ 10633853873A28020387BE95260D4016A3858A071421107AE6F60AF9BCE6EEED8E9DD3166A -+ Rock @ CJRQ-FM -+ 7 -+ -+ 92.7 -+ -1 -+ -+ -+ 1063385387B6A7C22A5CC4619A2BCF91F1D813F4F60AFCB9D4BDDEED5A500103BF8D5E9815 -+ Community @ CKCU-FM -+ 8 -+ -+ 93.1 -+ -1 -+ -+ -+ 1063385387E79B7801EF38DD6A0FE7758A9DCFE13F96E5A1573CC12699F6DD63A0C57E7167 -+ AC @ CFRU-FM -+ 9 -+ -+ 93.3 -+ -1 -+ -+ -+ 10633853875189655E80CC025AB1797DF35A9969AC6BF51D1B656AE48319719662E0655A14 -+ Urban @ CFXL-FM -+ 10 -+ -+ 93.5 -+ -1 -+ -+ -+ 1063385387DB5EAEE982BDB34BBBDA7D40DC39B1DE7E927B7ED50AC8F08AC15B44D5C7B366 -+ CHR @ CKKL-FM -+ 11 -+ -+ 93.9 -+ -1 -+ -+ -+ 1063385387B7D3B73330648DDC480DD5D4BB40045EBE59EF06C36D95E926059096DEE7130A -+ Rock @ CJSD-FM -+ 12 -+ -+ 94.3 -+ -1 -+ -+ -+ 10633853878E460B2401661EA007EC2CCA2BAD6EAFED60BEB86503C6FAAF0CDA52D09D0FCC -+ Nostalgia @ CHRW-FM -+ 13 -+ -+ 94.7 -+ -1 -+ -+ -+ 1063385387763E811BE7BF239EB35E6580D3D9936E7CDEEA4B28B13B8B6F59BDAED1CC0D1E -+ Hot AC @ CKGE-FM -+ 14 -+ -+ 94.9 -+ -1 -+ -+ -+ 1063385387A486E26543E4F633D83587B4162E2347FF26FE1AFB99C26DF5FAACC62C14A096 -+ AC @ CKSY-FM -+ 15 -+ -+ 95.1 -+ -1 -+ -+ -+ 1063385387F7F7BC8A4760F68353D6B1B6039F80C7AF4FBA3B68565C9FB4C825B03374167C -+ Classic Rock @ CJXY-FM -+ 16 -+ -+ 95.3 -+ -1 -+ -+ -+ 1063385387B6E1CDC4D0369144EFD50DD7ECCB059291B9C5A5349973E76EAFB8660D28054F -+ Rock @ CFJB-FM -+ 17 -+ -+ 95.7 -+ -1 -+ -+ -+ 10633853877F705CD0E90EB7C924C230EA29DA271ECF194E6E8AF366AE10A6B8DC2F913BF5 -+ Rock @ CFPL-FM -+ 18 -+ -+ 95.9 -+ -1 -+ -+ -+ 106338538723656F97FF16DE7B18CD714B91CD7EB15A511821CF22B155893157BFAFEDF679 -+ Country @ CHVR-FM -+ 19 -+ -+ 96.7 -+ -1 -+ -+ -+ 1063385387AF261A8D40335B9B4BFAA43FDA39D7A7F5A53E976E6AA80CE1E85C5A4C04EC8F -+ AC @ CJEZ-FM -+ 20 -+ -+ 97.3 -+ -1 -+ -+ -+ 10633853876D561577E3DC788C19571674B29C5AD5AF5D520ECFF670E7C75BE09250012207 -+ AC @ CIQM-FM -+ 21 -+ -+ 97.5 -+ -1 -+ -+ -+ 106338538774FFC8229642E61F322532AF4FC6DC63ECBB4AD33DDD4D658C22E4F9CC0F0A8D -+ CHR @ CHFI-FM -+ 22 -+ -+ 98.1 -+ -1 -+ -+ -+ 10633853872A10FB5967CD90064B72DE60A7A25A13FE2F8ABC3466C4E40784578BF82F4E49 -+ AC @ CFLY-FM -+ 23 -+ -+ 98.3 -+ -1 -+ -+ -+ 10633853879EE628DA1882AC0D30A792250251A7A742AE1DDBBA5811A59B0246388426B65B -+ Country @ CYSS-FM -+ 24 -+ -+ 99.5 -+ -1 -+ -+ -+ 1063385387BE5A36CABF9B65A0B70E478CA2CF20F8F546636BD882184D0FDF54B74B7094C4 -+ AC @ CKMX-FM -+ 25 -+ -+ 99.9 -+ -1 -+ -+ -+ 1063385387F32B6EF72C8B152DAF03FED92D12EB2FFC3D12CDE01AA4FB7CF118C736D6700A -+ Ethnic @ CHIN-FM -+ 26 -+ -+ 100.7 -+ -1 -+ -+ -+ 1063385387C4397050BB9E7BBAA1E26DCEB254B67F43984158D5F2575C1441005633392C6A -+ Alternative @ CFMO-FM -+ 27 -+ -+ 101.1 -+ -1 -+ -+ -+ 106338538706412BAD92E6149D2AA9DD54571AFD4E1B42384A2BAED7979FFF6C45E0BB752D -+ Rock @ CKWF-FM -+ 28 -+ -+ 101.5 -+ -1 -+ -+ -+ 1063385387DD4F3EBC5658F6F0A62CDD8F3C26F303F4E14AB1A19328DC4FB0D90682D998C1 -+ AC @ CFRC-FM -+ 29 -+ -+ 101.9 -+ -1 -+ -+ -+ 10633853873BDA2F6A481DDDC9D578BE1587FEFF50428EBC9F88C650404F2B89ACEA75AE8B -+ Alternative @ CFNY-FM -+ 30 -+ -+ 102.1 -+ -1 -+ -+ -+ 106338538716473ED7B07ED3D3427F033B89DA601941B27D9750CF6AB19DAE2877839827EB -+ Hot AC @ CHST-FM -+ 31 -+ -+ 102.3 -+ -1 -+ -+ -+ 1063385387EDCCD75C62578153A960662DC007092A1AEFC29D9263CB1A0802B257D1F4DCE0 -+ CHR @ CFHK-FM -+ 32 -+ -+ 103.1 -+ -1 -+ -+ -+ 1063385387FCC1575AC7B63E73F65A4FF62360D7EF02D4E7A9108CCEEF414501862763ACA0 -+ AC @ CKLP-FM -+ 33 -+ -+ 103.3 -+ -1 -+ -+ -+ 1063385387D9A3E774AF8667AA1BFC1BA5907836D84DE0C4C002604B8E9E5F8C3766526AF4 -+ CHR @ CIDC-FM -+ 34 -+ -+ 103.5 -+ -1 -+ -+ -+ 1063385387256BC2D33EE81620BB8BE2BC2D01FCE6DED69B151C37604A399C817D01D97C57 -+ Rock @ CHXL-FM -+ 35 -+ -+ 103.7 -+ -1 -+ -+ -+ 10633853877BA40CEA39347B184BFD4CCC74D19EA2E61950BBED79671F3ED4970E7290FB50 -+ Nostalgia @ CKDK-FM -+ 36 -+ -+ 103.9 -+ -1 -+ -+ -+ 10633853877817B483F401A31D7828E8206898387283FCA1540CC07958302B35D487BFDAE6 -+ Country @ CICZ-FM -+ 37 -+ -+ 104.1 -+ -1 -+ -+ -+ 10633853870538B7B1497ED02C3E1919285BCFC3E00AE8219008687ABA87CF50519DD9EC99 -+ Country @ CJQM-FM -+ 38 -+ -+ 104.3 -+ -1 -+ -+ -+ 1063385387B642EE3194250F31ECDDC410157AF67B1CEE6692429B92F4C8C5FD87EFAF34F6 -+ AC @ CHUM-FM -+ 39 -+ -+ 104.5 -+ -1 -+ -+ -+ 10633853878F35BF4F80A7C66A66CB3E5D240042CF41DFD7F476614CDC8058D585A091559A -+ Country @ CKQM-FM -+ 40 -+ -+ 105.1 -+ -1 -+ -+ -+ 1063385387A7CDF81610B0B74DFA711AD53B1401F5BCBF2808E4EC1F541290037D908E03C7 -+ Classic Rock @ CFCA-FM -+ 41 -+ -+ 105.3 -+ -1 -+ -+ -+ 106338538735B590EA8B14262A3D7E5C26F381BD2B3F672388C6A3CB8189E27540CC3197C9 -+ NPR @ CHRY-FM -+ 42 -+ -+ 105.5 -+ -1 -+ -+ -+ 10633853876A79F38B234FEA9275F17E25A009CCCC3799FC24DA620AB235D9402C68241EA9 -+ AC @ CHRE-FM -+ 43 -+ -+ 105.7 -+ -1 -+ -+ -+ 1063385387225BDA02BA932246643D745C36BC2939BEA4210C339B412E994B663E6235A7AB -+ Nostalgia @ CIMJ-FM -+ 44 -+ -+ 106.1 -+ -1 -+ -+ -+ 1063385387F38D87244563679468C2B4BEBE2A54E7E4FB21AC53179493CD6CBBEA483D165F -+ Rock @ CHKS-FM -+ 45 -+ -+ 106.3 -+ -1 -+ -+ -+ 10633853876B6A06BA95EF9D75A3471C9D7B5CD6F3F7A9DC29F948B3109B928E7A763508B6 -+ AC @ CIXK-FM -+ 46 -+ -+ 106.5 -+ -1 -+ -+ -+ 10633853875D7E4E4EB1D04567335789330CDCBBDCB57C9450282F5F7D9AE8DBB02EB2AD15 -+ AC @ CHCD-FM -+ 47 -+ -+ 106.7 -+ -1 -+ -+ -+ 1063385387F8B40F9449181478EB112D7094B5084E3F568BDCBE08A688413E354F96766BCD -+ Rock @ CKQB-FM -+ 48 -+ -+ 106.9 -+ -1 -+ -+ -+ 1063385387C094B26D0BDE6C803C37923CC5FB32CD1EDF8DF52A3D6CB2122284A2A6C3016B -+ Classic Rock @ CILQ-FM -+ 49 -+ -+ 107.1 -+ -1 -+ -+ -+ 106338538755F98172903403007BAC06168BDCD9F06B491E6C6BA44988736EC1A94A7575A4 -+ CHR @ CING-FM -+ 50 -+ -+ 107.9 -+ -1 -+ -+ -+ 106338538726EEE0485C0FBBD70981AE736AE24CC1474499C447208C5082513B20660644B8 -+ Oldies @ CFOS-AM -+ 51 -+ -+ 0.56 -+ -1 -+ -+ -+ 1063385387C07E21EECF0A25E16F6A656EE640F2FAC4E53BA47D8AE32EC9E57F78D30E12F8 -+ CHR @ CKGL-AM -+ 52 -+ -+ 0.57 -+ -1 -+ -+ -+ 10633853878E6A34F02069592943599C06BAEFC372F3FB968695248C35544F8F65EECA9771 -+ News/Talk @ CKPR-AM -+ 53 -+ -+ 0.58 -+ -1 -+ -+ -+ 1063385387D0E33C0BCF07B05815CB61EB9FC244BB4C73BCBF2B736C92284EE8D2F4D19B55 -+ Sports @ CJCL-AM -+ 54 -+ -+ 0.59 -+ -1 -+ -+ -+ 1063385387EE790E6B43D12C980ECF8C55D5E947CBE9CD297B731275B2230DB86F56043C28 -+ Oldies @ CFCO-AM -+ 55 -+ -+ 0.63 -+ -1 -+ -+ -+ 10633853877E9CA0E6E7161E815266E8E12837CD9D97AD81ED5EBB768D0EF51FCF5F394DCD -+ News/Talk @ CHOG-AM -+ 56 -+ -+ 0.64 -+ -1 -+ -+ -+ 10633853879538D6491E52FAA18DB3BC50F9241867A79B00DA53907C76D9BFCF19D50145E5 -+ News @ CFTR-AM -+ 57 -+ -+ 0.68 -+ -1 -+ -+ -+ 1063385387E8D4CB03138624F10498976E0EEFE9B6E8A1414BC9CF9334848C3BEB7D7CEBB4 -+ Country @ CJBQ-AM -+ 58 -+ -+ 0.8 -+ -1 -+ -+ -+ 10633853873B47018A34F2913969C1379711467738CC1447C6D8A96A10BC816E3D08D2DF36 -+ Country @ CHAM-AM -+ 59 -+ -+ 0.82 -+ -1 -+ -+ -+ 1063385387A17C05D5E7313B59164DB319C9CB5CBBE6D3648A73118ED9F1EC9B3EEFDC03E1 -+ Oldies @ CHML-AM -+ 60 -+ -+ 0.9 -+ -1 -+ -+ -+ 106338538764CE1690FF419201C02E1732BA9391BF94CFFBD00B8C9C1FBEA494D3171FA0F0 -+ AC @ CFPL-AM -+ 61 -+ -+ 0.98 -+ -1 -+ -+ -+ 1063385387FAA32280A36E1881D28192C0585393D38DB29182FBFF509BE97BC71318317802 -+ News/Talk @ CFRB-AM -+ 62 -+ -+ 1.01 -+ -1 -+ -+ -+ 10633853876E80525B1EE7E7496987C5644DF0920681FA7843AD4EDA1D8397D8337DFCD145 -+ Oldies @ CHUM-AM -+ 63 -+ -+ 1.05 -+ -1 -+ -+ -+ 1063385387E28F26BA719DEC29D74AD9414D1227E22215DB299264C5424D3DBE465BD5C3A1 -+ News/Talk @ CHOK-AM -+ 64 -+ -+ 1.07 -+ -1 -+ -+ -+ 10633853872D7635F61027AEB8847B27D16C08909EFEC3ABA42FF0F3F54C3FDE4F71B0F0D5 -+ Oldies @ CKKW-AM -+ 65 -+ -+ 1.09 -+ -1 -+ -+ -+ 10633853876C9E8B06257C7A1924CFDC270AB4C4D2C10372854AA18B8DAC4A51BD5141D0BF -+ Oldies @ CKOC-AM -+ 66 -+ -+ 1.15 -+ -1 -+ -+ -+ 1063385387E05F4659A976BDD0877DBE5DF0B38C58FAE13E0BF65A5506A0F63E4586FB0923 -+ CHR @ CJTT-AM -+ 67 -+ -+ 1.23 -+ -1 -+ -+ -+ 10633853877217F9D5FF93CE68A7A42842A02D56A35ABD3745D9379126BBA635F8CA6AEA11 -+ Oldies @ CJCS-AM -+ 68 -+ -+ 1.24 -+ -1 -+ -+ -+ 10633853876111C32C65B2382E4D8D19B92D3D315BC2F78BCF3E02A1D2811153DCA52AB765 -+ AC @ CJTN-AM -+ 69 -+ -+ 1.27 -+ -1 -+ -+ -+ 1063385387F790B9D10F6151C81BB1E55667CFB7375A8065F19F3A0B7585763823F73BE172 -+ News/Talk @ CJBK-AM -+ 70 -+ -+ 1.29 -+ -1 -+ -+ -+ 1063385387067AB80B3AAF92C801A95FF4F71399F279E8B452D4AA089F8D75C2D061A0B09D -+ Classic Hits @ CKPC-AM -+ 71 -+ -+ 1.38 -+ -1 -+ -+ -+ 1063385387193CFE62DC76D42AD202E169C6834AC313DDE061924E1411330D09CBDDB7270D -+ Oldies @ CKSL-AM -+ 72 -+ -+ 1.41 -+ -1 -+ -+ -+ 1063385387E63DEDF4DD5851C889E843FDDFB37136B4F9650F2F4DB3F54B18B8C827FCE779 -+ AC @ CKPT-AM -+ 73 -+ -+ 1.42 -+ -1 -+ -+ -+ 106338538776DA0BA89CCAAC57A9D6082AA848EA0CE7A2D20CEC2AE4DC02880F2ADD40671B -+ Oldies @ CJOY-AM -+ 74 -+ -+ 1.46 -+ -1 -+ -+ -+ 10633853870C27702D5C4578D660CC1600408AFE1127C1DE8958808BD7B55B66BD0D8C7F4B -+ Oldies @ CFPS-AM -+ 75 -+ -+ 1.49 -+ -1 -+ -+ -+ 1063385387DFD4D0AA3FED72182CA5555E2FC4A576570722C696FFABFD40BED9B946F28915 -+ Ethnic @ CHIN-AM -+ 76 -+ -+ 1.54 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Quebec -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385389651181978E67E42215B4D30FD0060862B14D472B7E30917A978E36DC88F0313B -+ Talk @ CIQC-AM -+ 11 -+ -+ 0.6 -+ -1 -+ -+ -+ 1063385389E338FDF6FABED3D9A576513AECF04FD40E5001DC5B003893B4671B73BDDA9150 -+ Talk @ CHRC-AM -+ 12 -+ -+ 0.8 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,94 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Quebec -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385356CD9DD1A93794AB3675AB047B8E4E884FAA312F187A73AA6CB6919076C39CEB7B -+ Alternative @ CFAK-FM -+ 1 -+ -+ 88.5 -+ -1 -+ -+ -+ 10633853563B41E95179A54ECB4A00D6E0A80861B7BD22AA334A618FB85F0555F265EE2EE1 -+ Ethnic @ CHCR-FM -+ 2 -+ -+ 89.9 -+ -1 -+ -+ -+ 10633853568287524B70496005D97E3E9487853AB5A9DAF272E9A5F099D853C2D940097BD8 -+ AC @ CFQR-FM -+ 3 -+ -+ 92.5 -+ -1 -+ -+ -+ 10633853569402DBD98AB56C5A1D2A3705D4D023215C970130602DCCF105A42753CFDAFFE8 -+ Alternative @ CFLX-FM -+ 4 -+ -+ 95.5 -+ -1 -+ -+ -+ 10633853566FDEC9652755850D746766CFF88B7B4420EA0D990C5CD2A17A7C52E2E572C1DC -+ Hot AC @ CJFM-FM -+ 5 -+ -+ 95.9 -+ -1 -+ -+ -+ 106338535667B9AB049DC36A573F0B8AC3C73B78082A6CE5B36B640F94B9785CA51D5E536C -+ CHR @ CHOM-FM -+ 6 -+ -+ 97.7 -+ -1 -+ -+ -+ 1063385356A8AF6535A854DF52826B4E93CC763A9FC1610BC78163BFB0C30969DCDA6A02EA -+ Alternative @ CHOI-FM -+ 7 -+ -+ 98.1 -+ -1 -+ -+ -+ 10633853561CA6E44132CAFF8CDD7F6911708046B4EB1540F7156FE27DC8EE2F833EFAAECD -+ Oldies @ CFOM-FM -+ 8 -+ -+ 102.9 -+ -1 -+ -+ -+ 1063385356C718716056A273CAC1E4EABF02B9692085AA575B90A02139B050E05B4AAB0535 -+ CHR @ CFJO-FM -+ 9 -+ -+ 103.3 -+ -1 -+ -+ -+ 1063385356B14958EA8D57D93486064ADB374F0E1E3E6F15DE22BFA26C3D01B26708F902C9 -+ Urban AC @ CITF-FM -+ 10 -+ -+ 107.5 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,110 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Quebec -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338538917B618E7F0EEC470EB266AF65B527C0FC38A8E8BBBAC09E65D149B9ACC737FD4 -+ Alternative @ CFAK-FM -+ 1 -+ -+ 88.5 -+ -1 -+ -+ -+ 1063385389DFF8E8EFF4060F58A180BC540D88960C7D3BAF568F774DA3DBB94AC70C1AFE1F -+ Ethnic @ CHCR-FM -+ 2 -+ -+ 89.9 -+ -1 -+ -+ -+ 106338538963B8F0086E9B6B22C97B41C51136DC2D2DB620421A9368BF07C32F1FBED1F98F -+ AC @ CFQR-FM -+ 3 -+ -+ 92.5 -+ -1 -+ -+ -+ 10633853895625E419BD1CDDBAE521E96DC15523CA7EA87DE945BC22354195F46E4E7FAB5C -+ Alternative @ CFLX-FM -+ 4 -+ -+ 95.5 -+ -1 -+ -+ -+ 1063385389D50371EF969ECC882716053C947FE4AA98147B1C354409E4FDCAA99C7765B9D0 -+ Hot AC @ CJFM-FM -+ 5 -+ -+ 95.9 -+ -1 -+ -+ -+ 1063385389ABF38CC786A66D9E071AC6D4BA04CC8EE646205D74BC4CE9784A39BD07382AF3 -+ CHR @ CHOM-FM -+ 6 -+ -+ 97.7 -+ -1 -+ -+ -+ 10633853893C7A2C1B5B37A7D3DFF22237A0876D496FBFD44757541ABBD3FDBF572AF1630C -+ Alternative @ CHOI-FM -+ 7 -+ -+ 98.1 -+ -1 -+ -+ -+ 1063385389468260BA2B79BAAA971EFECA5B2C8AAC389782E3B85C726356AF8AB4A431B8FC -+ Oldies @ CFOM-FM -+ 8 -+ -+ 102.9 -+ -1 -+ -+ -+ 106338538903A7AB9379C1918F3F321B18682958D071C70B0BE42F443DAD8E2B79550E32DE -+ CHR @ CFJO-FM -+ 9 -+ -+ 103.3 -+ -1 -+ -+ -+ 1063385389D76EFB944D1D56D794BAFC219FA7911878F0EDCAC12BDD561549C32F1F334EB8 -+ Urban AC @ CITF-FM -+ 10 -+ -+ 107.5 -+ -1 -+ -+ -+ 106338538925183644B8075C87D6A37CC43D6B9136D5FC77CE7F72D51CEDA492CDE6D56582 -+ Talk @ CIQC-AM -+ 11 -+ -+ 0.6 -+ -1 -+ -+ -+ 1063385389174B649D33F7845E1E4B9435DAEFFCF97ECABAABE3E4D191B018DEFA410D187E -+ Talk @ CHRC-AM -+ 12 -+ -+ 0.8 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,70 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Saskatchewan -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 10633853922CBE03E5BF8155703EC10D3E0C3FAE6A256CB4FD8AB3CE2D3832C8F3E1951C2A -+ Country @ CJWW-AM -+ 6 -+ -+ 0.6 -+ -1 -+ -+ -+ 1063385392C81C9FB8F948767E9597ED261EA84C3C81BB082E9D5132C5CF46707342AD1930 -+ Oldies @ CKCK-AM -+ 7 -+ -+ 0.62 -+ -1 -+ -+ -+ 10633853928B14DAA96CD8E42A0B7BA74D75F99D64FFD6DF1E7B04DBA5D1C39C723B01164E -+ Country @ CJVR-AM -+ 8 -+ -+ 0.75 -+ -1 -+ -+ -+ 10633853923BCD4914F1F6A90B213F161DC962B060AE5C9819AE5586728D7A879F69A5A8CB -+ New Country @ CKBI-AM -+ 9 -+ -+ 0.9 -+ -1 -+ -+ -+ 106338539297B6A4F7667AE83208F641C1019592CCC7D78CEFB54B6B192061CD27F954DCFD -+ Country @ CKRM-AM -+ 10 -+ -+ 0.98 -+ -1 -+ -+ -+ 106338539203382F7D0844AAC2ED0844A0D0A75B2783B6FA435382D0E81B1B41E06D605034 -+ Hot AC @ CFYM-AM -+ 11 -+ -+ 1.21 -+ -1 -+ -+ -+ 106338539243EDB5DB93FBF91FE7E44DF60204953F4C2C29742D7541272FA4919CC9DBBEE3 -+ Hot AC @ CJYM-AM -+ 12 -+ -+ 1.33 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,54 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Saskatchewan -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 106338539149CCF4BDBBBE1DD4D4D882464CECF011290172C50BB99EA9E69086A9B6EA4764 -+ CHR @ CHMX-FM -+ 1 -+ -+ 92.1 -+ -1 -+ -+ -+ 1063385391CEEAF5E63A4936D1346D7EB79F9E7A6D4729E3E96C3B91153E69312BFB219596 -+ Country @ CFQC-FM -+ 2 -+ -+ 92.9 -+ -1 -+ -+ -+ 10633853912B0A5E29B34ECDF206DADE105BF251C8F1941E50C2206F9987AE54446F9503CB -+ CHR @ CFMC-FM -+ 3 -+ -+ 95.1 -+ -1 -+ -+ -+ 10633853918828B2B765310949888688E194181918A9F8AF854094462A385790FA81FA6E73 -+ CHR @ CFMM-FM -+ 4 -+ -+ 99.1 -+ -1 -+ -+ -+ 106338539163B0B17992A2632030645ED944EFD4395A96939F2340A9E77F5937735BFAD899 -+ Rock @ CFWF-FM -+ 5 -+ -+ 104.9 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp ---- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,110 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ G. Richard Raab, rraab@plusten.com -+ Sat Jan 18 14:31:54 2003 -+ USA -+ Saskatchewan -+ antenna -+ Generated from http://links.radio-online.com/stations.htm -+ -+ -+ 1063385392F117413BFADF22E4E72F4745D7323B099F1F28A2CAD22EFC5D33B66661E24D2D -+ CHR @ CHMX-FM -+ 1 -+ -+ 92.1 -+ -1 -+ -+ -+ 106338539234488E7C829A5C45B21E9214262665CEEED21A70823942A69FD442B2B97368D3 -+ Country @ CFQC-FM -+ 2 -+ -+ 92.9 -+ -1 -+ -+ -+ 1063385392F46C1FA4EBE0AB793FE0C6672232B68810CD9149C8C68F32E553421A62FF6098 -+ CHR @ CFMC-FM -+ 3 -+ -+ 95.1 -+ -1 -+ -+ -+ 10633853926160480419127C9EAA00305CF902A6E1781A04134A1D2A264E8E727AD473448A -+ CHR @ CFMM-FM -+ 4 -+ -+ 99.1 -+ -1 -+ -+ -+ 10633853922E23923749C3468C56ACA0DE9C402916DDBEBE083BAC6E34763BC5F2A1CB6725 -+ Rock @ CFWF-FM -+ 5 -+ -+ 104.9 -+ -1 -+ -+ -+ 1063385392ACA62862EA04E38850B9CCCF44BAD3AC95E05FD6938B4D23E561108F68EEB6AF -+ Country @ CJWW-AM -+ 6 -+ -+ 0.6 -+ -1 -+ -+ -+ 10633853921246AA0CC5D6569CAAD7B9122EBC9BA3BF74F4A56486DEF9E37B77AB4C7A900C -+ Oldies @ CKCK-AM -+ 7 -+ -+ 0.62 -+ -1 -+ -+ -+ 1063385392BAA64D7CDCCD7C1CF46A513FFE2815B12F602FE0BA67F5C1A699B302A66E26C9 -+ Country @ CJVR-AM -+ 8 -+ -+ 0.75 -+ -1 -+ -+ -+ 1063385392454E721BD87FB3F8D707CB0E681E8D981EDF4092A809A109AB55708657D82DF0 -+ New Country @ CKBI-AM -+ 9 -+ -+ 0.9 -+ -1 -+ -+ -+ 106338539242BD87899BB87FF733DB4E48EEB3CA70C5F65526232C1CC039A3395C4EDC90DA -+ Country @ CKRM-AM -+ 10 -+ -+ 0.98 -+ -1 -+ -+ -+ 106338539225BCE8632827B870192D3E43907F7CE2A240C38B527EA85F0D9EEF6B32C9D4B9 -+ Hot AC @ CFYM-AM -+ 11 -+ -+ 1.21 -+ -1 -+ -+ -+ 1063385392A4B7EBA582A1129D21179B617FFF95C3CDA93BC906C357943486E5516E0EB716 -+ Hot AC @ CJYM-AM -+ 12 -+ -+ 1.33 -+ -1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp ---- kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,330 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ Camilo Guevara Isidro <mylosoft@gmail.com> -+ 2010-02-07T17:07:49 -+ Colombia -+ Bogotá -+ -+ -+ -+ -+ 1265586572E5657722177EBEA73DA4FF0518811C3484A717A9C12CC4C4BFB3B0340A8B -+ 88,9 - Radio Uno -+ -+ -+ -1 -+ dontcare -+ 88.9 -+ -+ -+ 126558534656E8020B1D8585EC1EE27CA7DB8365FCF5703EC1AE1EFBE7CFB12ABBA2CA -+ 89,9 - 40 Principales -+ -+ -+ -1 -+ dontcare -+ 89.9 -+ -+ -+ 1265585398C027C4454EE87E3CF0BF2626DE27ECF258CBAD3A77F9F1651FA97A221841 -+ 90,4 - EMISORA HJUD LAUD (Universidad Distrital) -+ -+ -+ -1 -+ dontcare -+ 90.4 -+ -+ -+ 126558544558FC2009395BF1D9EF06D190DF6C4DC5B57BF0DC09F842010FEAAA002E3D -+ 90,9 - La Mega -+ -+ -+ -1 -+ dontcare -+ 90.9 -+ -+ -+ 1265585512B2A5E1E6BCF0D7755E8809B02B4E2EFFAD5E7EB5CC1539019249A85D88E4 -+ 91,3 - Vilmar Stereo (Faca) -+ -+ -+ -1 -+ dontcare -+ 91.3 -+ -+ -+ 12655855391167AC86413F107081FE6AC284347816867044B554DF12CBAF74502AD604 -+ 91,9 - Javeriana Estereo -+ -+ -+ -1 -+ dontcare -+ 91.9 -+ -+ -+ 1265585568699A8595F69B73223A07CA49137AE95C4DF49FB268AC8BEAA7FB6E1EA027 -+ 92,4 - Radio Policía Nacional -+ -+ -+ -1 -+ dontcare -+ 92.4 -+ -+ -+ 126558560029169A35872F465CB876832E32CBBAC8FA092BCACDB8321092BB2BD99E34 -+ 92,9 - La Z -+ -+ -+ -1 -+ dontcare -+ 92.9 -+ -+ -+ 1265585620BB32D339B7D584101BDB753F8543163ACF118BA83B2130D1AA6639098061 -+ 93,3 - Unilatina Stereo -+ -+ -+ -1 -+ dontcare -+ 93.3 -+ -+ -+ 12655856443DAAFEE2E8E0208C6DFFE33E3FCAE978CD0DA7A86C2EAE9466AC299E13C3 -+ 93,4 - Colombia Stéreo -+ -+ -+ -1 -+ dontcare -+ 93.4 -+ -+ -+ 1265585687761E6CB5384A4183D5B3CAEADF288BB781333F3C148B36E58C949C05378A -+ 93,9 - Amor Stéreo -+ -+ -+ -1 -+ dontcare -+ 93.9 -+ -+ -+ 1265585715EA2BE0C18E090093A7DD6EC6EF328ED54FF6AC5B26C7685D2F591156BC94 -+ 94,4 - Despecho stéreo -+ -+ -+ -1 -+ dontcare -+ 94.4 -+ -+ -+ 1265585747C397779EDAECA1EBBE137D71D7FDE6D7A1FD9368B4317A4788B183C5DB0C -+ 94,9 - La F.M. -+ -+ -+ -1 -+ dontcare -+ 94.9 -+ -+ -+ 1265585765AE4E456336743FADC6F062B0A5EC912CE7449E771EE244C1AA69ADAF553D -+ 95,4 - Quinta Stéreo -+ -+ -+ -1 -+ dontcare -+ 95.4 -+ -+ -+ 126558588417E1F181DA2BFEDF54050C1B5A634AC21D3F20B07AFAFBD83AB5B83A29EC -+ 95,9 - Radio Nacional de Colombia -+ -+ -+ -1 -+ dontcare -+ 95.9 -+ -+ -+ 126558592626C3EA5E78B816C4F441F8125FE77A2DD2F2E08684DA94FB8EC9C799C500 -+ 96,3 - Alternativa Stéreo / RCN Radio Stéreo -+ -+ -+ -1 -+ dontcare -+ 96.3 -+ -+ -+ 126558595451674B61A73EDD66BEE83371394479C90D318B2616CF3EBAE27DF8A020A5 -+ 96,9 - Melodía FM Stéreo -+ -+ -+ -1 -+ dontcare -+ 96.9 -+ -+ -+ 1265585990BF6F27CAB43016860538C68D61C6D28D09664C3DB7ABB76124585B13A85F -+ 97,4 - La Vallenata -+ -+ -+ -1 -+ dontcare -+ 97.4 -+ -+ -+ 126558605213FD122E47EFCE1529547FCFA5E5A62F78B752F91DA2AD6FF29292AB0D8B -+ 97,9 - RadioActiva -+ -+ -+ -1 -+ dontcare -+ 97.9 -+ -+ -+ 1265586077C1C779B863DF0AEFD7A40C691FF5CB0B316400AF784A5A2B4280C098C078 -+ 98,5 - UN Radio - Emisora Universidad Nacional -+ -+ -+ -1 -+ dontcare -+ 98.5 -+ -+ -+ 1265586107CBDDE91DE818CF1DC7C165DBEE97FC6EA7D00310919651673631A9A21498 -+ 99,1 - Radionica -+ -+ -+ -1 -+ dontcare -+ 99.1 -+ -+ -+ 1265586123ECADAEB507405B7C51062AA1EF04E1DCDBE4852B39D1463C904FC044A969 -+ 99,9 - W Radio -+ -+ -+ -1 -+ dontcare -+ 99.9 -+ -+ -+ 1265586139D948BCFA0F57A6F8459CCE29055C6E59B51D21799318B84A18BA5FF97426 -+ 100,4 - Oxígeno -+ -+ -+ -1 -+ dontcare -+ 100.4 -+ -+ -+ 12655861609F8D34C018D14435BD84EAE180213E1DAC209A38B5CFEAEF16822B791A64 -+ 100,9 - Caracol Radio -+ -+ -+ -1 -+ dontcare -+ 100.9 -+ -+ -+ 1265586188B331F176F32CFDF203ED323F3DF5DD9739B102B58F881754E128E80AB301 -+ 101,3 - Mauro Stereo - Funza -+ -+ -+ -1 -+ dontcare -+ 101.3 -+ -+ -+ 1265586210C72E262B4123BE023000CF7B19BAAC35096F216B6FDB89829E279DF14B3B -+ 101,9 - Candela Stéreo -+ -+ -+ -1 -+ dontcare -+ 101.9 -+ -+ -+ 1265586239A3A27E61661E60A972C3FAFE8AAE4EBEC0215906927FD023370BC7D03B51 -+ 102,9 - Tropicana Stéreo -+ -+ -+ -1 -+ dontcare -+ 102.9 -+ -+ -+ 1265586271BD4564DEB5AFA57B5D623461D8F41378348E7E7787065469DE8EAA9FD30B -+ 103,9 - La X -+ -+ -+ -1 -+ dontcare -+ 103.9 -+ -+ -+ 12655862903E11B0402AC81471A11C5DE3D5D3A6B3878A58676B737A9F90371D0EA834 -+ 104,4 - RCN Radio -+ -+ -+ -1 -+ dontcare -+ 104.4 -+ -+ -+ 1265586314D4AEB10D8887486F301C61C4D7CED780A7AF5F53B9AEB1C05D122B6BA293 -+ 104,9 - Vibra Bogotá -+ -+ -+ -1 -+ dontcare -+ 104.9 -+ -+ -+ 12655863376F22B915AA76D4DC6A6343E990918ADEB5D27FAB7066CC7EBDF303997C68 -+ 105,4 - Rumba Stéreo -+ -+ -+ -1 -+ dontcare -+ 105.4 -+ -+ -+ 1265586361EA6092AAB1DC59589F99C73013CD37B554E7F95D8E5F652F26AB7D206BEB -+ 105,9 - Olímpica Stéreo -+ -+ -+ -1 -+ dontcare -+ 105.9 -+ -+ -+ 12655863869246EB11A58366B4091C5A068AE0FA22C8759324D2527E1AB7EE1ED5D0B9 -+ 106,9 - Universidad Jorge Tadeo Lozano -+ -+ -+ -1 -+ dontcare -+ 106.9 -+ -+ -+ 126558641326CC0554E127440B8CCF9533F9BA88BFB6CE48DDBF1932B0E5F006DB5400 -+ 107,4 - Radio Rumbo Stéreo -+ -+ -+ -1 -+ dontcare -+ 107.4 -+ -+ -+ 126558644096CF476B3D0758B75660C491437181EE5702DC2CB4C54A7A46CCFCCF817D -+ 107,9 - Minuto de Dios -+ -+ -+ -1 -+ dontcare -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,9 @@ -+SUBDIRS = -+EXTRA_DIST = "bogota.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/" -+ $(INSTALL_DATA) "$(srcdir)/bogota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,9 @@ -+SUBDIRS = -+EXTRA_DIST = "split-cable.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/" -+ $(INSTALL_DATA) "$(srcdir)/split-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,231 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0-rc1 -+ Ivica Božulić <ibozulic@gmail.com> -+ 2008-04-05T16:59:08 -+ Croatia -+ Split -+ Cable -+ -+ -+ -+ 120740751328238D2159D5831AD30B26BA2A5A66CD1984B82075078737563C2FD2EA5E1557 -+ RADIO SPLIT -+ 11 -+ -+ -1 -+ dontcare -+ 97.4006 -+ -+ -+ 1207407508E3A4EBB3E570DD94433A956AB7448DB5968860538E1D6A359FD70C0938F32171 -+ OTVORENI -+ 8 -+ -+ -1 -+ dontcare -+ 95.8505 -+ -+ -+ 120740751775D937D8C6A07B0E5A3FF7A690E85481ED81940F462705AD3A45FACE5161BFB5 -+ DALMACIJA -+ 14 -+ -+ -1 -+ dontcare -+ 99.0257 -+ -+ -+ 1207407510D1E25B12ACC9660E602B300E6CF8E54E477F3C115442852B575AB2CDF5F27679 -+ KL EURODOM -+ 9 -+ -+ -1 -+ dontcare -+ 96.6256 -+ -+ -+ 1207407504EB158B4F1CF4176B28BF214BD88BA8A96C7FB26B6B17EA660FEFEC8092D303DF -+ RIVA -+ 6 -+ -+ -1 -+ dontcare -+ 94.6504 -+ -+ -+ 1207407500E9B6C096D64A894A068FABE75A019716C3B748D916EA2E354D69D7BAB862E5C4 -+ RADIO SALONA -+ 3 -+ -+ -1 -+ dontcare -+ 92.7253 -+ -+ -+ 122097750466D2BAFC3BC580FF5394F5F374F90D3DBB4AAC5A5155453A54F2E57A163BBE5E -+ DIN-DON -+ -+ -+ -1 -+ dontcare -+ 90.9 -+ -+ -+ 1220977448C1DF1B92704B74A403BBFA80772DC0AAE78099963484B94A4FCAD98D69E3EC2F -+ RADIO TROGIR -+ 21 -+ -+ -1 -+ dontcare -+ 90.3 -+ -+ -+ 1207407498389C4F99C767482BD69BF12E465DB9E0E5909D7655D16EB4A11E06DB9696C81C -+ RADIO KAŠTELA -+ 2 -+ -+ -1 -+ dontcare -+ 92.15 -+ -+ -+ 1207407516A0B01C6CA2CB9A40C6EC11394D665983073B0D42444011652721645FEA061C30 -+ HR 1 -+ 13 -+ -+ -1 -+ dontcare -+ 98.6507 -+ -+ -+ 12074075150544492C037A467AC5F2A3B7FBC286954BF27034A44EEC379C1FC5CB1FDE64EC -+ HR 2 -+ 12 -+ -+ -1 -+ dontcare -+ 98.2007 -+ -+ -+ 1220977646E1B29A182D5572F2B7CBCF7F2814D50923CB1CA312E83C75CE29E5E6D638678B -+ HR 3 -+ -+ -+ -1 -+ dontcare -+ 95 -+ -+ -+ 1207407511DBF4FAC44CA53796F2D74A357697A1E212F00C53838EFFD7AA648B2E147EC50E -+ NARODNI -+ 10 -+ -+ -1 -+ dontcare -+ 97.0506 -+ -+ -+ 12074075011E1E049ACABAB05DB23C164C4FD4102C4CD48A1C66CE8F9C12A6427A8B0EDBF2 -+ RADIO BRAČ -+ 4 -+ -+ -1 -+ dontcare -+ 93.3504 -+ -+ -+ 120740749651539469F93B7B572ACF9BA16639803013B692A1925A4CA5336FB9BCA7708A47 -+ MEGA MIX HVAR -+ 1 -+ -+ -1 -+ dontcare -+ 91.5252 -+ -+ -+ 120740750359F725F0F47690F7ED5EB1771CAE0D65DD4A7B6A1C8D51B26E69F0802E5A3A60 -+ NAUTIC -+ 5 -+ -+ -1 -+ dontcare -+ 93.9254 -+ -+ -+ 1207407507B8D6C9AE7C806221B94CB81132248F208BE1546980C50BAC1B99DD42A3056760 -+ KATOLIČKI RADIO -+ 7 -+ -+ -1 -+ dontcare -+ 95.4255 -+ -+ -+ 12074075240C0FA4E55B55464681E3185E457C820E0E3791E4AEA8E3C7A26A1698DBB83A65 -+ 1 LIVE (ẆDR) -+ 15 -+ -+ -1 -+ dontcare -+ 101.626 -+ -+ -+ 120740752872ED80D1CA5FAB754D53BFE3FB2AC696485DF2D97C7D2A95C2F001196206CF9E -+ SUNSHINE RADIO (Pro Sieben) -+ 16 -+ -+ -1 -+ dontcare -+ 103.251 -+ -+ -+ 12074075337B5A5DCC896803FEF4ED2896F3E9C95A7A4C1644C0CF9D421AB1C63855FE5BCE -+ KLASIK RADIO (Vox) -+ 17 -+ -+ -1 -+ dontcare -+ 105.126 -+ -+ -+ 1207407535BDE94774C396714FA26A50F5CFCA6513E8CCAFF38F1C27A21D4050165345ED78 -+ RTL RADIO(Vox) -+ 18 -+ -+ -1 -+ dontcare -+ 105.951 -+ -+ -+ 12074075381C8E6295357ED296DADEF6A7D2E294F8C14A621F0326E02C50F5B8EBD46809CC -+ ROCK ANTENNE (Kabel 1) -+ 19 -+ -+ -1 -+ dontcare -+ 107.101 -+ -+ -+ 1207407539569A37859951819D18B33C11C57D6FFB95D75DA69461023B1157880CB90BDEAB -+ ANTENNE BAYERN (Kabel 1) -+ 21 -+ -+ -1 -+ dontcare -+ 107.651 -+ -+ -+ 12209778051F47033DD3C846295AFC5E1DE6F5AEB5C075DBB37FFE4ECE772BBC8EC12E4F16 -+ JAM FM (RTL2) -+ 21 -+ -+ -1 -+ dontcare -+ 99.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,143 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Petr Urban <urbanp1@seznam.cz> -+ 2008-04-08T17:03:40 -+ Czech republic -+ Ceske Budejovice -+ Air -+ -+ -+ -+ 1207666974509EE882BDBA2D87DC38D38A0BCEF0D51C991F4DBB617CD0208EDA11DAD9CAA9 -+ ČRo1 - Radiožurnál -+ ČRo1 -+ -+ -1 -+ 91.1 -+ -+ -+ 120766698430190D64A0BA139E954D1E43B89612D5502C1F86C80C1642E1DD430B845549A5 -+ ČRo2 - Praha -+ ČRo2 -+ -+ -1 -+ 103.7 -+ -+ -+ 1207667006DBB1303ED14BC81ADF7DF384A388B2943FB58EC931A293F9112CBB4D761B0871 -+ ČRo3 - Vltava -+ ČRo3 -+ -+ -1 -+ 96.1 -+ -+ -+ 1207667008A26C97E5F7612C0820EE87362AB88E2EA0DBC8B74339996B5D14DFA56E79E3C3 -+ ČRo5 - České Budějovice -+ ČRo5 -+ -+ -1 -+ 106.4 -+ -+ -+ 120766702720B7E904410567F2DFB9CBEBEBD8BE64101515C6C1F9D6187482402554A9D1D7 -+ Kiss Jižní Čechy -+ Kiss -+ -+ -1 -+ 87.8 -+ -+ -+ 1207667739D293C26B631ACC80488CCCFE98D8A3CC0A7C56AFA7B7981B91AEB345E6E07054 -+ Rádio Blaník JČ -+ Blaník -+ -+ -1 -+ 88.4 -+ -+ -+ 1207668015852339FEC6B77D79165DE45D45965DAA1E179ECC574D4A3CA3B2F10077FB99B8 -+ Frekvence 1 -+ F1 -+ -+ -1 -+ 94.1 -+ -+ -+ 1207668044C717459C7325BF313BF5FC6BE2ECA70D06BDDFEEB4E66AEA7AB5B8460F85DB99 -+ Radio Impuls -+ Impuls -+ -+ -1 -+ 102.9 -+ -+ -+ 12076680971544CB58DA52B02BDB7A3E8D1D02AFEF2F7B2E31DDBC891EE5FE6F5E814081DB -+ Hitrádio Faktor -+ Faktor -+ -+ -1 -+ 104.3 -+ -+ -+ 12076681867F98C7B592723F35E8EF67EC33A823C164F88A740681041EDE7FBFEDA1DC6AD4 -+ Evropa 2 -+ Evropa 2 -+ -+ -1 -+ 90.5 -+ -+ -+ 120766823348F4850F00D515F62DA7FBFF0A75C47701649A96D6F2EBC8F7FC6F2A0333FC4E -+ Radio Proglas -+ Proglas -+ -+ -1 -+ 92.3 -+ -+ -+ 1207668324BA0EAC424584D6FA18AEE86392411AEB1B1625B2B8019CBC58FF6A01BC9E9C35 -+ Radio Faktor Gold -+ Gold -+ -+ -1 -+ 99.7 -+ -+ -+ 12076670307AE2B3DF6C6D8F3223287781D174FA9B1C92B75F4239837EBCD5DA4C40C9FCDC -+ Rádio Beat -+ Beat -+ -+ -1 -+ 101.2 -+ -+ -+ 1207668385CFDDA6ED02FA809768C7939C1A2CCBFD9C6D688BE6C2A654A58024802A9A4C26 -+ BBC/ČRo - Rádio Česko -+ BBC -+ -+ -1 -+ 89.8 -+ -+ -+ 12076705683C91C317574ADC848753E468585597BF46A7348C65F6F01083B97486AA04908B -+ Radio Šumava -+ Šumava -+ -+ -1 -+ 91.8 -+ -+ -+ 12076727277A7919C9F95D6C9B86F7D8EAB2CC76B3D139085C6125F0CBA4561344CBE73AD1 -+ Life Radio Ober Oesterreich -+ Life -+ -+ -1 -+ 100.5 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,16 +1,18 @@ - SUBDIRS = --EXTRA_DIST = "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp" -+EXTRA_DIST = "ceske-budejovice-antenna.krp" "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/" -+ $(INSTALL_DATA) "$(srcdir)/ceske-budejovice-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" - $(INSTALL_DATA) "$(srcdir)/plzen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/plzen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am kradio-3.5.13.1/kradio3/presets/england/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/england/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,18 +1,20 @@ - SUBDIRS = buckinghamshire --EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "newcastle-upon-tyne.krp" "sheffield.krp" -+EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "milton-keynes-antenna.krp" "newcastle-upon-tyne.krp" "sheffield.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/england/" -+ $(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/london.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp" -+ $(INSTALL_DATA) "$(srcdir)/milton-keynes-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/newcastle-upon-tyne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp" -- $(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/sheffield.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp" -- $(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" -- - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,72 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Ian Hay, <ian@rotodyne.co.uk> -+ 2003-01-25T22:35:18 -+ England -+ Milton Keynes, BUCKS -+ Antenna -+ A poorly served and weak area for reception -+ -+ -+ 1063385353C6B88DA43D60485F93CE285F49666657543D54E610AB347EB1D73FDA2FC7C510 -+ BBC Radio 2 -+ BBC Radio 2 -+ -+ 0.8 -+ 88.6097 -+ -+ -+ 10633853532D933FCEF3A7613BDDD56EBF088F9B6362B69E0FCABB21DFFC26D9AC81DC28BD -+ BBC Radio 3 -+ BBC Radio 3 -+ -+ 1 -+ 90.8185 -+ -+ -+ 1063385353C8BE87758A09C21FC727E3B7C8DE412595703F2E19438F5B7FBCD509531751D5 -+ BBC Radio 3 -+ BBC Radio 3 -+ -+ 1 -+ 90.8634 -+ -+ -+ 10633853533F24308814CEC86F7F2D451AF6CE0ADAA1EBBDED5507D7E1ED04AF7BB93C5E2C -+ BBC Radio 4 -+ BBC Radio 4 -+ -+ 1 -+ 93.0197 -+ -+ -+ 1063385353606298F24CB48B4D31470EF41B4AF40F4BF19AF4CA0019E972419C5E5FDF2A7B -+ Classic FM -+ Classic FM -+ -+ 0.8 -+ 100.446 -+ -+ -+ 1063385353E2F2EB1467A831526FB14696A5FE35FAD1623929349D8A8C9DC7F9A3EFB87F93 -+ Horizon FM -+ Horizon FM -+ -+ 0.8 -+ 103.324 -+ -+ -+ 10633853535F8DF276212D9521388835FE08AFEA463B8A2AE6BDFBD3B6AC34D330F9EE2613 -+ BBC 3 Counties Radio -+ BBC 3 Counties Radio -+ -+ 0.8 -+ 104.518 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp kradio-3.5.13.1/kradio3/presets/france/abbeville.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/abbeville.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,127 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ abbeville -+ antenna -+ -+ -+ -+ 1284670092CBB4B2223036021E901E948C5C89F0B128B7A4FE4844AA89DB5E2B9A9608A5A3 -+ Europe 1 -+ -+ -+ -1 -+ 104.9 -+ -+ -+ 1284670092648660A98566A70CACE41486F03F4399DB65FB3ABACD5C055203FB39AE440499 -+ Fun Radio -+ -+ -+ -1 -+ 102.0 -+ -+ -+ 1284670092B3619B5DE060324713328B8FAA5A7693FE9DA955C0889589E7E77119581F401C -+ France Musique -+ -+ -+ -1 -+ 89.8 -+ -+ -+ 12846700922805BF9C1B19351F89DEA4E887493DF8F908A77B809BF5264FF30920CED7D361 -+ Radio Soleil -+ -+ -+ -1 -+ 107.1 -+ -+ -+ 1284670092CCD737EC9A595C0FA42A693AE4B9BD9BDEE561D29B035D9A3E934FBB538861E0 -+ Contact -+ -+ -+ -1 -+ 91.2 -+ -+ -+ 1284670092AF1640DAE80035EBA6DFDB4900619CA63A09B5BE7E696D9E588444209E814B74 -+ RTL -+ -+ -+ -1 -+ 104.1 -+ -+ -+ 12846700923B52A20FAE2A9AD685AED4BCFDFA22D434AAD14CE9FE60EA08EE5144532BA8C8 -+ Skyrock -+ -+ -+ -1 -+ 96.7 -+ -+ -+ 1284670092AE5A89FF1501F8389594E2F77D608534EBA38EF82983388C01851326D10A90F2 -+ France Inter -+ -+ -+ -1 -+ 93.1 -+ -+ -+ 12846700924E2152476AFE9B26576E130FE4A3537120E816F60944D84557FB4D04058A18DF -+ France Bleu - Picardie -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 128467009240334916A605A6359ABA11A3201B2DBF572D26EA1A453835C7718FD16E810DF1 -+ Chérie FM -+ -+ -+ -1 -+ 99.2 -+ -+ -+ 12846700925022C005489EB6C1C182D5E3A7DE856419EFF889EC7E79F4C928A913871F465D -+ NRJ -+ -+ -+ -1 -+ 102.7 -+ -+ -+ 1284670092160F1146D4E5A9B6FFA578AF3EF1E9E4B9B6DEB84ED95244934E3AEADF7CACFA -+ France Culture -+ -+ -+ -1 -+ 97.4 -+ -+ -+ 1284670092E69028D981D566C9E356F1C57F4D731C82424DDD41F57280CF409001BBC12F1A -+ Europe 2 - Fréquence Picardie -+ -+ -+ -1 -+ 99.6 -+ -+ -+ 1284670092A04C60A71A8CED83F526DAFC306DBF70B846B68D5D86BAC9223AAD392C852AF7 -+ France Info -+ -+ -+ -1 -+ 105.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp kradio-3.5.13.1/kradio3/presets/france/amiens.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/amiens.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,187 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Erjon Seferi, <erseferi@wanadoo.fr> -+ 2008-07-12T14:58:40 -+ France -+ Amiens -+ ? -+ -+ -+ -+ -+12158657143024D1EC38E41C3981C2A3DED5B2457328B7E3D46BE37F8131554A8535B6E3B6 -+ France Musique -+ Musique -+ -+ -1 -+ 89.3 -+ -+ -+ -+1215865745F6AE866FAC40BCC63AED628D4F1970C5D65A7925430C2CC4AB71D97B7C900A6E -+ Rire et Chansons -+ Rire -+ -+ -1 -+ 91.4 -+ -+ -+ -+12158657683AED59C29FA1CE49EB3BC433950CBFA0209C58F56D95E554EF3ECEE97DB80CFB -+ Fun Radio -+ Fun -+ -+ -1 -+ 91.8 -+ -+ -+ -+121586578595DEB7BF34B66CE3552438EAE9718FD81AF0CE86C74D203E1D8DF2361F680733 -+ France Inter -+ France Inter -+ -+ -1 -+ 92 -+ -+ -+ -+1215865804D363782D3576B0FBBCECFE63C84407FBC46B81B8A0C73B13B9F64C9EA83A2A1D -+ Nostalgie -+ Nostalgie -+ -+ -1 -+ 92.2 -+ -+ -+ -+12158658460F51E43754E99E634F4E0359806CBEE1A23027BDE386DAAB9250F2C907D1F3EF -+ Contact -+ Contact -+ -+ -1 -+ 94.2 -+ -+ -+ -+121586582586BD714C746F57B98DED30C59AC90EB9EDD276AC5786D5A95EA49D76F91E2BEE -+ Europe 2 -+ Europe 2 -+ -+ -1 -+ 93.6 -+ -+ -+ -+121586586532CE40330DA5033BDD651073E6B76B1C208FD9E394903E0885B3C9CD82F041D7 -+ Fugue -+ Fugue -+ -+ -1 -+ 96.3 -+ -+ -+ -+1215865961A716CB4A7953401BF3FC007B882977487203F6039F220DF078DD72876831E2E0 -+ France Culture -+ France Culture -+ -+ -1 -+ 97 -+ -+ -+ -+1215865987C3DCAF25A4F999955F0B225AED2A4B6D6CA4406D744DE1DEB9B382CFD2659B8E -+ Skyrock -+ Skyrock -+ -+ -1 -+ 98.4 -+ -+ -+ -+1215866650FA0E943EBD524C07EEA5B189A237D52A2759A90ED57AA894437438E9F58BB0D6 -+ NRJ -+ NRJ -+ -+ -1 -+ 99 -+ -+ -+ -+12158666739C0B0FBE2B6AD890ED1C3A71C6899295BE980AE361D0A334C96D489D43104C26 -+ France Bleu Picardie -+ France Bleu Picardie -+ -+ -1 -+ 100.2 -+ -+ -+ -+1215866771F115C902CA9CFB8363685C34DD934FC4AAD3FDCABF254F2A62FE92F8720C91DA -+ Cherie FM -+ Cherie FM -+ -+ -1 -+ 101 -+ -+ -+ -+12158667960E6580CE771ED7D39736049B44DF55D2D66B88010293973D68D84ACCED55DB48 -+ Radio Classique -+ Radio Classique -+ -+ -1 -+ 101.4 -+ -+ -+ -+121586683984614CDE9D8A4B0F5FD6C2C23D2E881550DB9B20C0C0C2A97D92C29DAB51342A -+ RTL 2 -+ RTL 2 -+ -+ -1 -+ 103.2 -+ -+ -+ -+1215866858C0950D166660B91CC2A693AAD69008C04E7BD7BA817901090031BF0EA672243D -+ RTL -+ RTL -+ -+ -1 -+ 104.3 -+ -+ -+ -+12158668803D46BEEDD6D924EEABF943B4CC79573350C106691AF039E2035B55DF86476D1B -+ Europe 1 -+ Europe 1 -+ -+ -1 -+ 104.7 -+ -+ -+ -+1215866898947135C6305A6B43ED1E14548DF7D15C1DF509C26D3A9842587D39E2ED300109 -+ France Info -+ France Info -+ -+ -1 -+ 105.5 -+ -+ -+ -+1215865886EF1E5CA01719EEF06AF6F67D90FC7787ED543F376CF4BD66CF3C08990455B83F -+ Radio Soleil -+ Radio Soleile -+ -+ -1 -+ 107.1 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,111 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ bar le duc -+ antenna -+ -+ -+ -+ 128467009288848970E8B69F47F999D2B14FFD01D05E874529B3BAA15BE6B3BE4B7100D226 -+ Europe 2 - Pyramide FM -+ -+ -+ -1 -+ 102.0 -+ -+ -+ 1284670092F31430AEFF6F705EB72DC9E0DAD72038B1DC637A1033572C0EFDDD78E086EA06 -+ RFM -+ -+ -+ -1 -+ 98.3 -+ -+ -+ 12846700922503FFDDF37D311B2AB5B08CE2EB6F8A36D83AD15C69C99AE30A047A5596F35B -+ NRJ -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 1284670092B0E43A29C4478F7948793BF32BD9139B06AD9C05F46479187E1758FF6F8414B4 -+ France Musique -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 1284670092DF6970930CFED3954B7E0A0F8C0763B41149F05801B9DCAA8628F820F8ADA225 -+ Europe 1 -+ -+ -+ -1 -+ 107.0 -+ -+ -+ 12846700927823C30BED79D2D6DC0DF09D0F8922B83B76DA0E3F2B1B1F051240594DDE88AB -+ France Inter -+ -+ -+ -1 -+ 90.9 -+ -+ -+ 1284670092AE58ECECFDDA4D3B2ED21AD8D4BA98A75D7D5433B2DE5324F9C777897FA83419 -+ Skyrock -+ -+ -+ -1 -+ 90.2 -+ -+ -+ 12846700929D83CE99148380CB4CFDBD9F465ABC4C217D158DF80AB0EAC512AF0DACCF4B9D -+ RTL -+ -+ -+ -1 -+ 105.0 -+ -+ -+ 1284670092CB3DEAA6BBF2183C3A12D96C6951FF1D81056BE35A32568FAF1EEA4C4AE2B9A7 -+ France Culture -+ -+ -+ -1 -+ 88.4 -+ -+ -+ 1284670092630FC18571A977D3BFDC29DE4F8F57EF8A7F3987FF9DCC957B9F7408B613E91B -+ Fun Radio -+ -+ -+ -1 -+ 101.1 -+ -+ -+ 1284670092044892468F7073A7F9A858036B0B8645166B405C34963D602D3D0B416B4B788E -+ Meuse FM -+ -+ -+ -1 -+ 99.0 -+ -+ -+ 1284670092BEE4497AC8C30E3DE1154FA2EDDFF410EBDD0CC645BAE422D2A31C7EE1380B23 -+ France Info -+ -+ -+ -1 -+ 104.5 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp kradio-3.5.13.1/kradio3/presets/france/forbach.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/forbach.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,87 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ forbach -+ antenna -+ -+ -+ -+ 1284670092F6AED1720BC4C25CC80DF8508E978A4C880F08C85AB37E648BA42865BC9172A5 -+ France Musique -+ -+ -+ -1 -+ 93.6 -+ -+ -+ 1284670092ED7DF6074EA2290C8D25113C4A6C6430D19F356D0FE9D36943D3D95853CA6A48 -+ FIP -+ -+ -+ -1 -+ 98.8 -+ -+ -+ 128467009246F3514DE657AF735CC78E204020871D0E51B79A67AC20E125976A57C2F8019B -+ France Culture -+ -+ -+ -1 -+ 90.7 -+ -+ -+ 128467009227EE0EA3F0AC5FD8060857AC31F5DA1A87AA5E0D17B717ABAC47D09945E7FC20 -+ Europe 2 - Rockin'Chair -+ -+ -+ -1 -+ 102.3 -+ -+ -+ 128467009277F842697A2C414EA61BB59D140D42C729CAA955E82F9B61E4B8D962C0EF2D3C -+ France Info -+ -+ -+ -1 -+ 106.4 -+ -+ -+ 12846700927706F0C7EF1D2345D8EF050CB3BB6E2DD967BE4125561BCC7360C5C7A14A9B2B -+ RTL2 -+ -+ -+ -1 -+ 94.8 -+ -+ -+ 128467009277DF30BEB0273483BDF86A77D935CAB6055D923829B5DABC4F8EA519325FF5C9 -+ France Inter -+ -+ -+ -1 -+ 96.6 -+ -+ -+ 12846700920A3536E83EE0521FD84D6BA42D1295870629514B2E789BAA18A6F7516D652CD5 -+ Jerico -+ -+ -+ -1 -+ 101.3 -+ -+ -+ 1284670092427AAC75D4854737F1B0AC010DE15B74539F00FBF85AEE5B695E69330C622DA0 -+ Europe 1 -+ -+ -+ -1 -+ 104.5 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am kradio-3.5.13.1/kradio3/presets/france/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/france/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,18 +1,35 @@ - SUBDIRS = --EXTRA_DIST = "angers.krp" "lille-antenna.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp" -+EXTRA_DIST = "abbeville.krp" "amiens.krp" "angers.krp" "bar-le-duc.krp" "forbach.krp" "lille-antenna.krp" "metz.krp" "nancy.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp" "strasbourg.krp" "thionville.krp" "verdun.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/france/" -- $(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/abbeville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp" -+ $(INSTALL_DATA) "$(srcdir)/amiens.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp" - $(INSTALL_DATA) "$(srcdir)/angers.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp" -- $(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" -+ $(INSTALL_DATA) "$(srcdir)/bar-le-duc.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp" -+ $(INSTALL_DATA) "$(srcdir)/forbach.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp" -+ $(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/metz.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp" -+ $(INSTALL_DATA) "$(srcdir)/nancy.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp" - $(INSTALL_DATA) "$(srcdir)/paris-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" -+ $(INSTALL_DATA) "$(srcdir)/strasbourg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp" -+ $(INSTALL_DATA) "$(srcdir)/thionville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp" -+ $(INSTALL_DATA) "$(srcdir)/verdun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/metz.krp kradio-3.5.13.1/kradio3/presets/france/metz.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/metz.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/metz.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,135 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ metz -+ antenna -+ -+ -+ -+ 1284670092466690E5BD84B440D3BFB7C132EBBC6C027EBF679FC8A0C78472CF9799EE2CDA -+ NRJ -+ -+ -+ -1 -+ 107.3 -+ -+ -+ 1284670092132340B2BCAE77B6B4A18ECF3B7F896A259A4796D6BBF59B695E4DE09CFAED52 -+ Jerico -+ -+ -+ -1 -+ 102.0 -+ -+ -+ 12846700929B027D8D8DD1B4CA30CF8B1E31EA6CF765064D930499CF85134F3C5310EA5F95 -+ FIP -+ -+ -+ -1 -+ 98.5 -+ -+ -+ 1284670092A55DB1F4E72BE260B77B1A2988A3F156231B8F99231287A5C2BD7D3372901F02 -+ France Culture -+ -+ -+ -1 -+ 94.5 -+ -+ -+ 12846700921EF8E854DEE3F789FB23B8A70F9D79B4C63D179CBBEC7E418E25DDE303C85D56 -+ France Info -+ -+ -+ -1 -+ 106.8 -+ -+ -+ 1284670092DF970F5DC03F51880A418A6EA0F1AAE8E7C7859763B3884B02C930A04C840A2A -+ RTL2 -+ -+ -+ -1 -+ 92.2 -+ -+ -+ 12846700923DE7FD365EF2845589D012B14E55A24CB5D48BED38BDBBF1DD16D5FD0116367F -+ Europe 1 -+ -+ -+ -1 -+ 105.3 -+ -+ -+ 12846700922AC40738DF237B073ED19EE9580C08766B1E327226751B156B0596C8D77F3FC1 -+ France Inter -+ -+ -+ -1 -+ 99.8 -+ -+ -+ 1284670092F6E60CFF47589D64AEAD4D38A78D30F5BD1364441DD81ED7E131A153C7127DE9 -+ Chérie FM -+ -+ -+ -1 -+ 103.0 -+ -+ -+ 1284670092568C98D1C04445A19B98E9AABD38C3DD7E1C77A2877FF89584E6CFB7F133BB03 -+ France Musique -+ -+ -+ -1 -+ 89.7 -+ -+ -+ 1284670092D2CDD7D4A88A032E5C2278B9C43936080BD71DCB4444A4B1C263803C973BBC85 -+ Nostalgie -+ -+ -+ -1 -+ 101.1 -+ -+ -+ 1284670092131E3465106EAFE3D5E6DD2FC460A297972E8C8CCDD93449F95A65AA84C7541B -+ RFM -+ -+ -+ -1 -+ 99.0 -+ -+ -+ 128467009221D81E4678C70A8397098A47334FB521DC6CD66B87D681DBCB08F3FFEE53E22C -+ Europe 2 -+ -+ -+ -1 -+ 97.6 -+ -+ -+ 1284670092EB4D99794BDA559BBCB972C3D4FD37968CB1B682D48CE952B5848654E557C304 -+ Radio Peltre Loisirs -+ -+ -+ -1 -+ 89.2 -+ -+ -+ 128467009236146D220BA2293EEE3E862EAFFD6EDAA5989D562C8D482D83FB62CF3505D9ED -+ RTL -+ -+ -+ -1 -+ 104.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp kradio-3.5.13.1/kradio3/presets/france/nancy.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/nancy.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,199 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ nancy -+ antenna -+ -+ -+ -+ 12846700928C28BDB4C167CC28ABE2F241150B6BFBCD84D19B6A112F1CD6CA74E85031FED6 -+ RTL -+ -+ -+ -1 -+ 105.1 -+ -+ -+ 1284670092925044DE1D2F730CEA2C1A285B1431D3D6A1A62A01FFAE143F04650990DEDB6C -+ Fun Radio -+ -+ -+ -1 -+ 103.3 -+ -+ -+ 1284670092874B5F769CD83F20B7E29F9C9855201FC0ACDA9BE56C452B71F38D668E236C31 -+ France Inter -+ -+ -+ -1 -+ 96.9 -+ -+ -+ 1284670092589C2D6A0A64D385B1405DB122A475BE6D4E34D17ACFDDF31002311421A96982 -+ NRJ -+ -+ -+ -1 -+ 107.1 -+ -+ -+ 12846700923CA73B2F862BA6838D7E2340C6411A0C705A5F7864F55781C3DF48B9D319C1DF -+ Chérie FM - RDS -+ -+ -+ -1 -+ 95.7 -+ -+ -+ 1284670092486003F914B38CEAD941AE7AE3465C16B2E55208FE8C65177E59A044EDBB6D85 -+ France Culture -+ -+ -+ -1 -+ 88.7 -+ -+ -+ 1284670092519CBAAD8B3B3F4F761B09C25EA30591D3DF4825A6E9E009A7F0E3D97530D116 -+ Fajet -+ -+ -+ -1 -+ 94.2 -+ -+ -+ 128467009261139B2CAAD7FC4047642B8B9AC99362418DA14030B701C8FC44368B7C236D73 -+ Graffiti -+ -+ -+ -1 -+ 101.5 -+ -+ -+ 1284670092C0899A5EA8982054D3FE6153DC62053B513B9B249CDB0557DCB6BE0EC58C737D -+ France Bleu - Nancy-Lorraine -+ -+ -+ -1 -+ 100.5 -+ -+ -+ 12846700925FF6A09B43FCC5C952391AC09C782236A1991F521147DB6F6F998F908863A421 -+ BFM -+ -+ -+ -1 -+ 104.1 -+ -+ -+ 1284670092D7958B2205E340B1F556994057D6048A8505FD97444C0F3572CC522718934901 -+ Europe 1 -+ -+ -+ -1 -+ 105.5 -+ -+ -+ 1284670092A1BBD823EBA8304505C54F27BA10A34B286BB7717DB662CCA3997DEBD7B5C103 -+ Europe 2 -+ -+ -+ -1 -+ 96.1 -+ -+ -+ 1284670092C59EDEAFDDF5BD12421941363887E3FC1F9C02F7C42CB51C289B0D78686DC789 -+ Caraïb Nancy -+ -+ -+ -1 -+ 90.7 -+ -+ -+ 1284670092178423C7130AD6033A41F5B4E4A5358431D0C32D39C449F5F9643AC462B3AA42 -+ RFM -+ -+ -+ -1 -+ 102.3 -+ -+ -+ 128467009286C289A67EC2856C8E11C575436249337356E1D03AE5D7D69869C72C304D32A2 -+ Jerico -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 128467009280EDAF82A0E4C8E0791A7771F0EBFAF85FBF47E1AF2D356DF5E0B96D09C0E41C -+ RTL2 -+ -+ -+ -1 -+ 94.8 -+ -+ -+ 1284670092057A818064C625FFDF8FFDCEE8F7D5157C9593B328C71E8CB46BE8D94F8D32EE -+ Radio Classique -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 12846700923D4B26C666F75F4638E96D4255851CA819B612F0202473CDA1AAB81820959CB5 -+ Radio Soleil -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 12846700925253237B2FE53DB85D6E8D08261D3C72C556A4A87C11C99CFA324A4F9E013B54 -+ France Info -+ -+ -+ -1 -+ 105.9 -+ -+ -+ 128467009291EACD5C3118FCB39650CF2F50282CB1C146292978DD88FC5D28F919CBC8BE23 -+ Nostalgie -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 12846700926B71E5FD4D48F337AFF56F29B63844FA3AAAB9BD6E12F3A30205817D406BA13B -+ MFM - Lor'Music -+ -+ -+ -1 -+ 91.1 -+ -+ -+ 1284670092C852D374AC6E276A0197ED5FD76639F419A4233DFE7D34E0927294F93473D56D -+ Skyrock -+ -+ -+ -1 -+ 100.9 -+ -+ -+ 1284670092BC391D3495405E5BFC39A74705C00EBB8380C4D8A46634943831BE05186A64AD -+ France Musique -+ -+ -+ -1 -+ 91.7 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,159 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ strasbourg -+ antenna -+ -+ -+ -+ 12846700923E4B393E5A415A8821F0950DB7ADC911B451101CB8A83412BDB214AC10A45BDB -+ Europe 1 -+ -+ -+ -1 -+ 103.3 -+ -+ -+ 1284670092F28C30CF2C2D2F21B5B8EEC4272B5482D4B9AD3891B867090DC1E331C9371C89 -+ RTL -+ -+ -+ -1 -+ 105.7 -+ -+ -+ 128467009295FB4D21C567A53288C5F50B80FFC6C8BF145F8CF3383E618B92336E1D80AA04 -+ Top Music -+ -+ -+ -1 -+ 94.5 -+ -+ -+ 128467009240B254A71CC061CEFCE36E499A4F8FA23A8870EC6E62A2C9E35AD659F542319E -+ BFM -+ -+ -+ -1 -+ 106.9 -+ -+ -+ 12846700920E56FC721B1DD85B12528F3EFCE9324E65CB8D128293432024E0428D4F6177A2 -+ Nostalgie -+ -+ -+ -1 -+ 105.3 -+ -+ -+ 128467009206068A852BBB11271575C4A56F5B695A4FB59D705589CB5D879F47FA4A5567A7 -+ France Musique -+ -+ -+ -1 -+ 95.0 -+ -+ -+ 1284670092C350A16918E618B81BF46CEBB4612AB0CC2E07EB4E51AA2A2667D12FE43213D4 -+ France Bleu - Alsace -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 12846700922CEAE73C2850068D80764A919CB121BFF1522809542BEA48AA524CB01AF72E7B -+ RFM -+ -+ -+ -1 -+ 102.1 -+ -+ -+ 1284670092B329F2B0ECC0EC64A450996A322C488139AA62AB9F532F3559C36259F4667F35 -+ Arc-en-ciel - Campus -+ -+ -+ -1 -+ 90.7 -+ -+ -+ 12846700926567B2DE55046AE0D42756D179C7BFB06F6CD4F7469218EE2D0EAF766EDB7F9C -+ France Inter -+ -+ -+ -1 -+ 97.3 -+ -+ -+ 12846700924E0A4633D0BA750F8D7AE08237AE8FB305705F3EA70FE80ED55AB2169AF7B689 -+ France Culture -+ -+ -+ -1 -+ 87.7 -+ -+ -+ 128467009238F063D7AF81EC70CD704A4AF075C8CC1D9A5BE138EB40820C837F9959C5E26D -+ FIP -+ -+ -+ -1 -+ 92.3 -+ -+ -+ 1284670092AEF9E1B9AFEFDA210D407EC70E08F732821737BA5FF2335FBDBEEF8F1163F927 -+ NRJ -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 128467009297A9C9DB6F0E218ED83A72CAC3B14EBBCFB2698792B11E4678A3F78C0E1D141D -+ R.B.S. 91.9 -+ -+ -+ -1 -+ 91.9 -+ -+ -+ 128467009246A97CDEE4F12958FCDC501FA941CDD2A95750EFDA463A3048A4E1BBD432B19D -+ Accent 4 -+ -+ -+ -1 -+ 96.6 -+ -+ -+ 12846700925FF9BA22396CB3511FC436859ECBF2A6EDEB6A7D9FD33BB42B87769B55A415E0 -+ Europe 2 - Capital -+ -+ -+ -1 -+ 89.5 -+ -+ -+ 1284670092A47372115FBCDFEC1344E4B52CABFDC219F5E8B64F58C601749B0169C18C6594 -+ France Info -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 12846700923FD02A9CC9511880575B654239FA8DB65BD22E4EAE13E47C9CCEF6826813824E -+ Judaïca -+ -+ -+ -1 -+ 102.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp kradio-3.5.13.1/kradio3/presets/france/thionville.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/thionville.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,95 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ thionville -+ antenna -+ -+ -+ -+ 1284670092B6F6DC3DB805642C794D30675BD3F7BBB2B568458B4E640F0F8DC278951BBCC8 -+ France Culture -+ -+ -+ -1 -+ 94.5 -+ -+ -+ 12846700924930B52A844DAF1F8B3D70B171143D4848AA2EB1E22BAC78016919ACCF1E34F5 -+ France Info -+ -+ -+ -1 -+ 106.8 -+ -+ -+ 1284670092B308F6A499A6CDE3B8A1DC841B12B211E2879945EA920FE31B21D90E755B39D0 -+ France Inter -+ -+ -+ -1 -+ 99.8 -+ -+ -+ 1284670092A66DC5CB34CFD20DE722EC83BD5D73B65EF98AFD5C4DE633BC07AFC2AF3B4BB4 -+ RTL2 -+ -+ -+ -1 -+ 96.7 -+ -+ -+ 1284670092B715B5EAEAEC0E37343B21D3D2FA59614E630A255D9589196CBC97282EBB0027 -+ NRJ -+ -+ -+ -1 -+ 90.2 -+ -+ -+ 1284670092AE16D76A22DB50E7D816F2CCA6A5FA30F830A55BAFD174FE70CFB8CCA290E7FB -+ Skyrock -+ -+ -+ -1 -+ 95.8 -+ -+ -+ 128467009234F204DB71A42CF68454454369DCDA9104674FBE22456DB4BB1678D0B566E77C -+ France Musique -+ -+ -+ -1 -+ 89.7 -+ -+ -+ 12846700928D34A3FE9629FEC8AAB358615C846D492D094222270127FA1647632DF7588C9F -+ Europe 1 -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 12846700926944E469E73757903A6CBE0A72B9FB05CA95E18ED5C195176959D034DF93B889 -+ Fun Radio -+ -+ -+ -1 -+ 95.2 -+ -+ -+ 128467009244FEB99A0C2D7D723F3A7DF3751067708051BBA745E4331BC03FEC8B5D6A64ED -+ Jérico -+ -+ -+ -1 -+ 103.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp kradio-3.5.13.1/kradio3/presets/france/verdun.krp ---- kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/france/verdun.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,87 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-unknown -+ Ren Riassetto <rene.riassetto@fcvnet.net> -+ 2010-07-22T20:37:19 -+ France -+ verdun -+ antenna -+ -+ -+ -+ 128467009278010A2D5434A6F6F22E5A66CE7708D2CA6DBD3C316A474FE9854D82B9FD736F -+ Nostalgie -+ -+ -+ -1 -+ 100.0 -+ -+ -+ 12846700922278AD8A45B5150E6E2D361484A17DBA8CAD7D3A22A60177D20BC4CE8F8C9863 -+ Meuse FM -+ -+ -+ -1 -+ 95.0 -+ -+ -+ 128467009262F715217EDC9DE27775EC7EC16290810351190A7E478E603A4B7B29DDC5466D -+ France Musique -+ -+ -+ -1 -+ 97.4 -+ -+ -+ 1284670092D93351740E07CF987C5221762D5D2207BAD1BF579913FF192622F84C211D1D83 -+ Fun Radio -+ -+ -+ -1 -+ 93.9 -+ -+ -+ 128467009268CA66D4B2BA14EE0CED2D0C2C92D1F8EFAEBAF010136F72A52D21E43D165CAA -+ Europe 2 -+ -+ -+ -1 -+ 87.8 -+ -+ -+ 128467009252BF0EE1D79A69F3B35D35D917B006FB1AEA51528D5B864BFA1FF39B98B252FD -+ France Info -+ -+ -+ -1 -+ 106.3 -+ -+ -+ 1284670092BCCF1C1AF114AD7CC0A33CAED6391C0BB37556BDD28F5ABBE3E33384CA789323 -+ France Culture -+ -+ -+ -1 -+ 99.3 -+ -+ -+ 1284670092B5A21674EB0CB60DFAD1EE5289C13B2E5E4024EFFB9282A45D087EC9F3E539D4 -+ France Inter -+ -+ -+ -1 -+ 92.1 -+ -+ -+ 12846700922BD31A6A4F8FE9EE920303802128940DDAA4F90C5B1884666F646153DE0A98CA -+ NRJ -+ -+ -+ -1 -+ 93.0 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,225 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-10-29-3 -+ Michael Wlotkowski -+ 2006-11-04T08:00:33 -+ Germany -+ 88279 Amtzell -+ Kabel Amtzell -+ -+ -+ -+ -+1162625143B8F60924DFBD4124E7C3A6EFCD28D74818B50E090DDCD4FFCD570CD1F0789530 -+ Bayern 1 -+ BR1 -+ -+ -1 -+ 87.55 -+ -+ -+ -+11626252039C1FA9FA1F8752C1AA3B4848D497EF40289663E34FE856DCDF9C02D7B1642621 -+ Bayern 2 -+ BR2 -+ -+ -1 -+ 88 -+ -+ -+ -+1162625276BC3D5BA7B8BE66A16376C5112C2366C99749CBED7DA2DE68E1CAF767D51939A9 -+ Bayern 3 -+ BR3 -+ -+ -1 -+ 88.4 -+ -+ -+ -+116262527893232B6703651D7A7EC14292A1A45DFACC78B0B2F1CD334BA5CF908D316109DB -+ Bayern 4 -+ BR4 -+ -+ -1 -+ 89.3 -+ -+ -+ -+1162625278532D106A2CB47925F5CA62600A8925F6B53F988629962D4B960B0518370B6AA5 -+ Bayern 5 Akt. -+ BR5 -+ -+ -1 -+ 99.25 -+ -+ -+ -+1162625278AC5E844387B48B03022F370F779B44D6F2C9BB14D6B49918D0244CCE918C791B -+ Antenne Bayern -+ AT_BY -+ -+ -1 -+ 89.98 -+ -+ -+ -+11626252791F9B2E4F29EB7725663A8C96FD2661AD0950A1FB8E579E43687C5101A2408DF3 -+ Radio 7 -+ RA7 -+ -+ -1 -+ 95.65 -+ -+ -+ -+1162625279001DB03F038C523AD3F613ACCA261072D65947D9580939351E46A7BD39EB2DFB -+ S�dwestfunk Stuttgart -+ S�d_Stut -+ -+ -1 -+ 93.5 -+ -+ -+ -+11626256245813E9094294405282DD336F1ECFBD9C00B1BADFAB396C5D6E92379FC881E3FB -+ S�dwestfunk 2 -+ SWR2 -+ -+ -1 -+ 94.2 -+ -+ -+ -+1162625624B83C31DB6A49ED5BF1E5875A67F72F3E71DF8EA075ACAC5DE848F3AA9A270EC8 -+ S�dwestfunk 3 -+ SWR3 -+ -+ -1 -+ 95.15 -+ -+ -+ -+116262562504B184DB45DE35AEB046DD049C34735A6594D782304DB0B6C94EDA261F262166 -+ �sterreich 3 -+ �3 -+ -+ -1 -+ 90.45 -+ -+ -+ -+1162625625D2EA7E951DBB437CAE61C7B164AC10AE4E6873A812589AA9C2B1AB7E47767D8F -+ �sterreich Vorarlberg -+ �Vor -+ -+ -1 -+ 91.55 -+ -+ -+ -+1162625625A4662613704BFBCC8D54F84E970F74768580146F5223E2C0BE7594D4E44B53B6 -+ DRS 1 -+ DRS1 -+ -+ -1 -+ 92.3 -+ -+ -+ -+1162625879F0D63A6C3DCEC52C12E4B355759BB782F2399FFEAE5FD07DA923C5819BF953DB -+ DRS 3 -+ DRS3 -+ -+ -1 -+ 93.1 -+ -+ -+ -+11626258797A1228AD9BB871940E56976EE2279071ACF759F4C7AF61F227BE3C03A1F6AA3B -+ S�dwestfunk 1 -+ SWR1 -+ -+ -1 -+ 96.65 -+ -+ -+ -+1162625880695B4EA1E6A17A598FC40A29BDD8951E13C57266565A7010FCED0BB0B23C430D -+ Radio Lindau -+ RaLi -+ -+ -1 -+ 97.1 -+ -+ -+ -+11626258808F8679ED6AAFE17B9A7BD6571386E3A7BDC71C16F571F19028B7A5F92E546C4D -+ BDR-FM 4 -+ BDR4 -+ -+ -1 -+ 97.85 -+ -+ -+ -+11626258806B01BF5B8FE3F46A1D5DE3A11AC59525AF4804E7ED213C808095FFC27C0BC519 -+ RTL Oldies -+ RTLO -+ -+ -1 -+ 101.3 -+ -+ -+ -+116262588182BBFD4700519E8ACFACA2FAE19E10B64F80814B8F767932C7298178FC003A83 -+ MDR-Sputnik -+ MDRS -+ -+ -1 -+ 101.7 -+ -+ -+ -+116262588190642A6E97E8F2335C9D2A217C89C49A4C53A012A6D060D31345E1ECA1D28B22 -+ WDR / 1-Life -+ WDR1 -+ -+ -1 -+ 102.6 -+ -+ -+ -+1162625881E85B022A640DBC7504130C464F72E9DB1D4766676E0AEA1B39D02E5D0675D406 -+ Klassik Radio -+ KlRa -+ -+ -1 -+ 104.75 -+ -+ -+ -+1162625881BD9FFF78EE575F4DB03FDE70923DCA044D332AD6338DE4CFFD5F5C84DCC0C57B -+ Seefunk FN -+ SEFN -+ -+ -1 -+ 106.2 -+ -+ -+ -+11626258827BB56022653275D2B3D2D71D01FE7460C903744F9BA18C9BBB8CB69D3548D5CB -+ Schweiz 2 -+ SW2 -+ -+ -1 -+ 108 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,227 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Ralf Großerhode -+<ralf.grosserhode@t-online.de> -+ 2006-09-25T11:25:28 -+ Germany -+ Bayreuth -+ cable -+ Angaben stützen sich auf -+kabeldeutschland.de. Alle Angaben ohne Gewähr -+ -+ -+ -+1159176370F91BDD0EEE856DEAD20664F469A498EE506C3656D1C93C2E54C2ACD9F0945EDC -+ NDR 2 -+ -+ -+ -1 -+ 107.5 -+ -+ -+ -+115917641582A8F885CA1B60018EF4FAD96CD127D49F8716D87774563060A742D4FE57FB05 -+ Radio Plassenburg -+ -+ -+ -1 -+ 106.3 -+ -+ -+ -+1159176449A125C3340338A9019B847ABAB591E2BDA1AF0D472BE6E72A00397D75BD2298FF -+ Radio Melodie -+ -+ -+ -1 -+ 105.4 -+ -+ -+ -+115917647341F42319F3A75DC00E9BE5123BBB9CD08E65C94CC7F3C44AACB292842D1B27A1 -+ Klassik Radio -+ -+ -+ -1 -+ 104.65 -+ -+ -+ -+1159176506B42E1656C242954B4CE5F86F64E27F65D80D0457C46E0EF5A780FB31CCE2B5F5 -+ ERF Evangeliums-Rundfunk -+ -+ -+ -1 -+ 104.05 -+ -+ -+ -+1159176552292C30B53790A995DC66F2503C83DA6B3308D8C98D168D6190F5C756A5639488 -+ RTL Radio -+ -+ -+ -1 -+ 103.65 -+ -+ -+ -+1159176584EECCEDD8A70AA99D90F48D3735FCDB8138614666FB801EEFA7EDBDFD1246CBCB -+ sunshine live -+ -+ -+ -1 -+ 102.8 -+ -+ -+ -+11591766482EAFE02B575BDDA5B1167B3999CF8F3B36AA9A1959DBF0B467FFB8523B14160F -+ JAM-FM -+ -+ -+ -1 -+ 101.7 -+ -+ -+ -+1159176674300CF3DCE4ADDB188E4C7E67B7DC1948C06026FF3F2A92B05ED2957F7F2D38F2 -+ Deutschlandfunk -+ dlf -+ -+ -1 -+ 101.3 -+ -+ -+ -+1159176717DA67BDB605A5176C4B583B9CBE4EB7893615243D77B7AA31664A8ADD580146C6 -+ Antenne Thüringen -+ -+ -+ -1 -+ 100.7 -+ -+ -+ -+11591767428362F9949DF6118DB0CE2C4B7FF40F530700FCB20D480431F63765C17BA9D342 -+ Landeswelle Thüringen Suhl -+ -+ -+ -1 -+ 99.9 -+ -+ -+ -+11591767674E301B719648F56C922A9933FDD4E2DB6E4D2C0409CE62224C8A687CF05879AB -+ JUMP -+ -+ -+ -1 -+ 99.65 -+ -+ -+ -+11591768140C2188DDC2ECD8A7BB27822638F84F84359A378ECF3B5AB4004B27A881CF021C -+ mdr1 Radio Thüringen -+ mdr1 -+ -+ -1 -+ 98.6 -+ -+ -+ -+1159176895232978E557EF2CF353C2F816B6B193FB01B3490C802A6C3D5709D148601A4525 -+ mdr Figaro -+ -+ -+ -1 -+ 97.55 -+ -+ -+ -+1159176932A0E4BF414E39CD3EB016EF9F1B4EC8A54151B435C47AB97968FFD702A168C50F -+ DeutschlandRadio Kultur -+ dradio -+ -+ -1 -+ 96.65 -+ -+ -+ -+1159177049F8673E03B331FB756142AAFC347BFA37B2770D94F1A8230DE9B4CBFAF650FB7E -+ Bayern3 -+ BR3 -+ -+ -1 -+ 95.45 -+ -+ -+ -+115917709191D3D432F33F531306770B400ACC263BF3CC8F8A42D5E419143A24DF79C17310 -+ B5 aktuell -+ BR5 -+ -+ -1 -+ 95.1 -+ -+ -+ -+115917712194A3CA5B3209D4226A467F2556EEC51C3A4AFCEE6F031FA5F446AB5632F766D9 -+ BR2 Oberfranken -+ -+ -+ -1 -+ 94.45 -+ -+ -+ -+1159177150435518411DDFFDAE21AD099566B3C331266E1AA5F083962544043DD6C1158792 -+ BR1 Oberfranken -+ -+ -+ -1 -+ 93.6 -+ -+ -+ -+1159177190AED3B92961E90467002B8D036062364F82B2CBFE8256B1D5070B6B57D3F16622 -+ Bayern 4 Klassik -+ BR4 -+ -+ -1 -+ 92.4 -+ -+ -+ -+1159177233793063353EAC9E8F1F8C2D65BA5A87B40718AB9308B687AD55411E5B1B56E754 -+ Radio Galaxy -+ -+ -+ -1 -+ 88.7 -+ -+ -+ -+1159177364D6FF08C3DA4F93B14F8DFDB5C57FACBC86F4B832ACA66CB636EABE05DD5BD670 -+ Radio Mainwelle -+ -+ -+ -1 -+ 88.4 -+ -+ -+ -+1159177393A85981F6062ADAF5C8B6364C5F6761469184E847AAA93EE4DF6E49052E6C8993 -+ Antenne Bayern -+ -+ -+ -1 -+ 87.65 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,333 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ juergen kauer<jkauer@arcor.de> -+ 2007-03-20T22:46:38 -+ Germany -+ Berlin -+ Cable -+ Kabelnetz von Kabel Deutschland in Berlin-Lankwitz -+ -+ -+ -+1072791566EE4FC1594E6E6DC394DB75EEA2E9938CA67BA6682313127E3DC8CFD562686A13 -+ BBC Worldservice -+ 1 -+ -+ -0.01 -+ 87.495 -+ -+ -+ -+10727915677F9936FA0BAB670FB58F07C35C232BF6C8F65DB1C7A491480937848532CBB384 -+ RTL RADIO -+ 2 -+ -+ 0.82 -+ 88.055 -+ -+ -+ -+1072791567CC15FD02795828846ABF82393E35836D35535ACE3BE8DE23A3D666764EC92EEE -+ Klassik Radio -+ RTL -+ -+ -0.01 -+ 88.35 -+ -+ -+ -+10727915686667AAF2ABA643A8427136F1FF23B13680686E00AC029D20C746F82110E15883 -+ 100,6 Motor FM -+ 4 -+ -+ -0.01 -+ 89 -+ -+ -+ -+107279157082D00D133FC0C7F0A736DF9DA658240AE74C45890AE0A3E2E074448807441213 -+ Fritz -+ 5 -+ -+ -1 -+ 89.85 -+ -+ -+ -+10727915708CED28FBC443431F076E8E377DDFECDC96801422442D7A89DBD4567F05E915A8 -+ Radio Energy -+ 6 -+ -+ -0.01 -+ 90.455 -+ -+ -+ -+10727915716F7ED9C758E6C5CC9F58FBFA5957EA22BFF20B19CCBE47E9741A6A6C0E5ADF57 -+ Radio Melodie -+ 7 -+ -+ -1 -+ 90.805 -+ -+ -+ -+10727915727A649C66B9C75FF3ED4CB90B686BF3ADE3F27A658F1446CA1DB599E759B2719B -+ JAM FM -+ 8 -+ -+ -0.01 -+ 96.68 -+ -+ -+ -+1072791573F82AE782CEEEBD775EB38501C64B71B14C8DFEC95D001474317959E6581A1F8E -+ infoRADIO -+ 9 -+ -+ -1 -+ 92.05 -+ -+ -+ -+107279157430C736B8ED87C5571B6FDEB10504E28CCD9486F62DF082CFD590A699C3E0248E -+ Offener Kanal Berlin -+ 10 -+ -+ -1 -+ 92.6 -+ -+ -+ -+107279157482B2FA653974785D4655257398C16A26A4B8EFFB21FADE3262D2159C55F235AE -+ 94,8 Metropol FM -+ 11 -+ -+ -1 -+ 92.9 -+ -+ -+ -+1072791575013759401591C315632A40F3F6734FC75048A4345ACBB02D99067C5CF553DBC3 -+ DEFJAY -+ 12 -+ -+ -1 -+ 93.85 -+ -+ -+ -+107279157688C1348A5C55ACED6747F7B0FDBD4863B36F11EFA5C80443FFE52355AE8C7EDC -+ Star FM -+ 13 -+ -+ -0.01 -+ 94.551 -+ -+ -+ -+1072791577C45B6C9771EA973DF94328D91A5FDFF87B11790B23AD6001B218FC777E6CE2F1 -+ radio BERLIN 88,8 -+ 14 -+ -+ -1 -+ 94.9255 -+ -+ -+ -+107279157865A27D18F805B7F2DF9873794B299DEF581B7AB615949944EB0A232683FCAD38 -+ KulturRadio -+ 15 -+ -+ -1 -+ 95.35 -+ -+ -+ -+107279157937EE7B714C71289579A1C99C508664996231F58F92529F7FE46E2B38FBF06657 -+ BB Radio -+ 16 -+ -+ -1 -+ 95.996 -+ -+ -+ -+1072791579332D9366F17BD87251985FC7C429E2952A69E06EFDD85D254BB4DDF8816A4408 -+ Radio Paradiso -+ 17 -+ -+ -1 -+ 96.546 -+ -+ -+ -+10727915801AC51F36D9DB58534B0CC40DF6055C0717ADE6B59776D1C04AF4C5E0E33D7718 -+ RADIOmultikulti -+ 18 -+ -+ -1 -+ 96.851 -+ -+ -+ -+1072791581F1329D24372E9ED5171891011B1D34792BB423B640A0DD0248E6D82A403FA220 -+ DeutschlandRadio Berlin -+ 19 -+ -+ -1 -+ 97.496 -+ -+ -+ -+107279158182E86933E311515E8355B8D72F1AE2E65F5887BF78E9F5B84BE1155BCABDCC8D -+ 98,8 KISS 99 FM -+ 20 -+ -+ -1 -+ 97.901 -+ -+ -+ -+10727915836948510D2C8FE10382E670931472C2D1CFFF6D2F80A617CDA8483EB678FA4321 -+ Berliner Rundfunk -+ 21 -+ -+ -1 -+ 99.251 -+ -+ -+ -+10727915848BC80E6D186BC53D388A41307E314B3C977185BB7BB24B0D86F329BEB29D1003 -+ RADIO EINS -+ 22 -+ -+ -1 -+ 99.9508 -+ -+ -+ -+107279158571AE18245596E9390E46457F573BBC152F4A7DCD02C52641CE192E727E60CD69 -+ mdr SPUTNIK -+ 23 -+ -+ -1 -+ 100.301 -+ -+ -+ -+107279158593519FA971426F180D2376830F7095EA51761ED137E43058D7B80A638CF58620 -+ 94 3 r.s.2 -+ 24 -+ -+ -1 -+ 100.746 -+ -+ -+ -+1072791587EA7AA8881EF9FFE900E6B0BED14F01B38BA22CBC16526397AEDD3FB7D38C2758 -+ Antenne Brandenburg -+ 25 -+ -+ -1 -+ 101.646 -+ -+ -+ -+10727915873FF901E6FC22915B56137882D60DEE023706BDB5FCF368209061582D2614758B -+ Deutschlandfunk -+ 26 -+ -+ -1 -+ 102.001 -+ -+ -+ -+1072791588378E9D932C33F1231837B9A2014E604CDE9DF44EAB8EB5FB2B55B5A6E9E3A1DB -+ Jazz Radio -+ 27 -+ -+ -1 -+ 102.446 -+ -+ -+ -+1072791589A310930786205964A1A672504FEFCFE0C3FC34AE2A43CCEC4345556C6167B580 -+ Spreeradio -+ 28 -+ -+ -1 -+ 103.001 -+ -+ -+ -+11744269309D360EE4BFE2B2A775AEC8F16A1CBF4D46AF5BB75B1CB610639E346802A431B9 -+ JAM FM -+ 34 -+ -+ -1 -+ 103.746 -+ -+ -+ -+107279159044714ABF2F837EFA328827AD05695552023C89D6B4DC728EB175EE1BAC4A4D8C -+ 104,6 RTL Berlin -+ 29 -+ -+ -1 -+ 104.076 -+ -+ -+ -+10727915928FF2DFF1847AC9ACEF507F3353229A2B67EFF320AB9712C200E002F37A28895F -+ SWR3 -+ 30 -+ -+ -1 -+ 104.951 -+ -+ -+ -+1072791593C28480C8972B00751352BBA74BC446B3A7338BF5E581C0C38BBA95C063B479BA -+ sunshine live -+ 31 -+ -+ -1 -+ 105.846 -+ -+ -+ -+1072791593A55AE94E136B46AC1EF61FF2A8AA2DA703EA17189BA6C7B18BD9506CB4EB6DC5 -+ Radio France Internationale -+ 32 -+ -+ -1 -+ 106.201 -+ -+ -+ -+1072791594E4FCB64702D7F3190369EE339FF4229396A4791AA1A1446012FA58BE91F25A95 -+ WDR 2 -+ 33 -+ -+ -1 -+ 106.946 -+ -+ -+ -+1072791596546338507FEBC23B2130D3E3BC0F909B6C7047EEDA64CF7EB6BD2938F03DA3A0 -+ SWR2 - Baden-Wuerttemberg -+ 34 -+ -+ -1 -+ 107.876 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,285 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.4 -+ Gereon Schueller email@gereon.de -+ 2012-07-30T23:43:39 -+ Germany -+ Bonn -+ Unitymedia Cable Network -+ -+ -+ -+ 10919654322C2EF9495C225621B9F02F38D65CFC19F781211D908E273732E406391CD83D79 -+ EINS LIVE -+ 32 -+ -+ -0.01 -+ dontcare -+ 89.5 -+ -+ -+ 1091965432DBB1C47689A796F5A1C31D13160E84E4B0B2B2BCF238ADFCD56D5291ECBE7D34 -+ WDR 2 -+ 21 -+ -+ -1 -+ dontcare -+ 103 -+ -+ -+ 1091965432E620D2DEA57DE8D3425869D9B61FAE8A909EBC1722C46E9FBF9B76D67ED16064 -+ WDR 3 -+ 15 -+ -+ -1 -+ dontcare -+ 88.5 -+ -+ -+ 109196543276474D50DC0126736B1119DD90EC0AB7BE3055817859732721E8D84396EAD0F4 -+ WDR 4 -+ 10 -+ -+ -1 -+ dontcare -+ 105.2 -+ -+ -+ 1091965432C0D8D51BEC7FF0F3D80EE649446D9DBD6C644D5B40BBF847B78C06DEAE0528A5 -+ WDR Radio 5 -+ 35 -+ -+ -1 -+ dontcare -+ 92 -+ -+ -+ 109196543202597F652196A8D0009727B698654FF01A73E446650AB4B0F7D78128268F10BF -+ WDR Radio 5 Funkhaus Europa -+ 23 -+ -+ -1 -+ dontcare -+ 95.2 -+ -+ -+ 10919654327FC5DE92D726B62F116DC19AB42A5B9E50F4C2B6D9EE8CEB885CF5CD95743CD0 -+ HR 1 -+ 6 -+ -+ -1 -+ dontcare -+ 97.25 -+ -+ -+ 1091965432EB0D627AD9EA1893AB97AF05E283F9818B9C5BC03A96828A824CAB2794F2422C -+ HR 2 -+ 13 -+ -+ -1 -+ dontcare -+ 106.05 -+ -+ -+ 1091965432AC1714188FE3DED94E17643578A3E62ACFD719E0B45742C3E2382DB18AEDEEB2 -+ HR 3 -+ 20 -+ -+ -1 -+ dontcare -+ 96 -+ -+ -+ 109196543242548D5CC887023C30BAAD21DEC259799CD610808DB84512ED0F5E0110243B96 -+ SWR 1 Rheinland Pfalz -+ 16 -+ -+ -1 -+ dontcare -+ 89.9 -+ -+ -+ 10919654322B538342EF91D6B54D33F4DA945A72439271B8204D1BEEB61270FC81F43ACB36 -+ SWR 2 Rheinland-Pfalz -+ 5 -+ -+ -1 -+ dontcare -+ 107.7 -+ -+ -+ 1091965432F2368F7A2CD6FA43903E86319637E767C98EE31AA5AE1432E44AF7F9E45BA023 -+ SWR 3 -+ 28 -+ -+ -1 -+ dontcare -+ 107.25 -+ -+ -+ 1091965432E125008DF90996BFD0997C7D3DE02B0A794DD3F6ADED22025500878964ED059D -+ SWR 4 Rheinland -+ 13 -+ -+ -1 -+ dontcare -+ 96.7 -+ -+ -+ 109196543207D0720F7D31DA8771BA01EBAFF4F6B36550DB8DAA86DAA1A032F0EDCE5B0BAE -+ Deutschlandfunk -+ 25 -+ -+ -1 -+ dontcare -+ 104.8 -+ -+ -+ 109196543266466AC67416B83BD8FD516241243783C74023FD75DFAEAB17F8325BD1BCCDE5 -+ DeutschlandRadio Kultur -+ 7 -+ -+ -1 -+ dontcare -+ 98.45 -+ -+ -+ 1091965432BEBF709E0B4332DDBCB8F94C34EE848CF5BEE1A4F28AC37966378C7017DA1BE2 -+ Radio Bonn/Rhein-Sieg -+ 33 -+ -+ -0.01 -+ dontcare -+ 99.75 -+ -+ -+ 1091965432C2CF129CEA931E111DA60CFC9D36C588FD72ACA92ABD44763DED1F050E820FE5 -+ Radio Köln -+ 20 -+ -+ -1 -+ dontcare -+ 90.4 -+ -+ -+ 1091965432CCE146C86E2248511CF3373E685BDA8F54A8D8CC97C5C9CD56039CB4F5943CC9 -+ sunshine live -+ 23 -+ -+ -1 -+ dontcare -+ 94.25 -+ -+ -+ 1091965432520C12ECD249D970FE383731DCF2C796233E6A13D8EAFF413FE07A6C4FEDB6EB -+ DomRadio -+ 8 -+ -+ -1 -+ dontcare -+ 93.95 -+ -+ -+ 1091965432DAA66E312D952479B2ECB430EE509F8625E0F64C3866C454AE02F2E272DE8A60 -+ Jam-FM -+ 11 -+ -+ -1 -+ dontcare -+ 94.65 -+ -+ -+ 10919654324719F08B7D922C9956CBC1794CF886037C6FE8210D0D44107D04DA2F323329AB -+ RTL Radio -+ 1 -+ -+ -1 -+ dontcare -+ 98.75 -+ -+ -+ 1343691592BA7AA01237F6E3E7E9F6FA677EDA32DC604054ED37608748B137AFD320E4 -+ Radio Paloma -+ -+ -+ -1 -+ dontcare -+ 91.7 -+ -+ -+ 10919654329D3E62F7898B303285904EB4D7400A8051766199D279E9B4970DCE53AA35FFE4 -+ Radio RPR Eins Rheinland -+ 26 -+ -+ -1 -+ dontcare -+ 99.35 -+ -+ -+ 10919654320ADB8A8DA2451E866A10421A346F0CECD55A0B9F270AB263D9DABCD1D62946A0 -+ Klassik Radio -+ 12 -+ -+ -1 -+ dontcare -+ 96.4 -+ -+ -+ 1091965432A0454782B1B958D30B59CD7FC2C02811E9EB63432F55469EEE5121577C35A39B -+ Belgischer Rundfunk (deutsch) -+ -+ -+ -1 -+ dontcare -+ 100.85 -+ -+ -+ 134369151654628D560CDE8CB1DF82669C0CAA2EA2C46F94C0C7171605343B76E2A301 -+ bigFM - Hot Music Radio -+ -+ -+ -1 -+ dontcare -+ 91 -+ -+ -+ 1343691539C50D1F861456D49146F6FED5AA9704E68D632C68536BDEE9E306F9A27ED9 -+ ERF (Evangeliums-Rundfunk) -+ -+ -+ -1 -+ dontcare -+ 88.2 -+ -+ -+ 134369175436874EEA444FE168D7CD968569EC60A1BD656ECA93B8493B82804E8A1056 -+ AFN - Frankfurt -+ -+ -+ -1 -+ dontcare -+ 106.35 -+ -+ -+ 1091965432D540169A28BE38B5BC636CC5958B619A5EBF736B6534AC1DE7BD3021AC5FDEB1 -+ BFBS -+ 27 -+ -+ -1 -+ dontcare -+ 102.15 -+ -+ -+ 13436915630ECC4585C73D9671B8255ADF510E275F8F2C688684315D9AA259D8707517 -+ FM 3 (niederl.) -+ -+ -+ -1 -+ dontcare -+ 92.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,261 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-10-29-3 -+ Tim Gollnik, <Tim.Gollnik@t-online.de> -+ 2004-06-09T11:18:14 -+ Germany -+ Bremerhaven -+ cable -+ -+ -+ -+ -+1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E -+ NDR 2 -+ 1 -+ -+ -1 -+ 87.95 -+ -+ -+ -+1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11 -+ NDR 1 Niedersachsen -+ 4 -+ -+ -1 -+ 88.4 -+ -+ -+ -+10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3 -+ NDR 4 / Parlament -+ 5 -+ -+ -1 -+ 88.95 -+ -+ -+ -+10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684 -+ NDR 90,3 -+ 4 -+ -+ -1 -+ 89.6 -+ -+ -+ -+10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6 -+ NDR Kultur -+ 5 -+ -+ -1 -+ 90.9 -+ -+ -+ -+1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90 -+ Deutschlandfunk -+ 6 -+ -+ -1 -+ 91.55 -+ -+ -+ -+109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A -+ Radio Bremen 1 -+ -+ -+ -1 -+ 92.75 -+ -+ -+ -+109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141 -+ Nordwest Radio -+ 8 -+ -+ -1 -+ 94 -+ -+ -+ -+1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41 -+ Funkhaus Europa -+ 9 -+ -+ -1 -+ 93.45 -+ -+ -+ -+1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6 -+ Radio Bremen 4 -+ 10 -+ -+ -1 -+ 94.8 -+ -+ -+ -+10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366 -+ Energy Bremen -+ -+ -+ -1 -+ 95.1 -+ -+ -+ -+1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202 -+ Radio HH -+ 11 -+ -+ -1 -+ 95.75 -+ -+ -+ -+10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C -+ Radio ffn -+ 10 -+ -+ -1 -+ 96.15 -+ -+ -+ -+10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178 -+ OFFENER KANAL -+ 13 -+ -+ -1 -+ 96.95 -+ -+ -+ -+10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E -+ AFN Power Network -+ 14 -+ -+ -1 -+ 97.25 -+ -+ -+ -+1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D -+ Delta Radio -+ 12 -+ -+ -1 -+ 97.85 -+ -+ -+ -+1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02 -+ Radio RSH -+ 16 -+ -+ -1 -+ 99.9 -+ -+ -+ -+1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6 -+ HitRadio Antenne Niedersachsen -+ 18 -+ -+ -1 -+ 101.3 -+ -+ -+ -+10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734 -+ BFBS Radio 1 -+ -+ -+ -1 -+ 101.75 -+ -+ -+ -+1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F -+ DeutschlandRadio Kultur -+ 19 -+ -+ -1 -+ 102.05 -+ -+ -+ -+1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2 -+ 106!8 rock'n pop -+ 19 -+ -+ -1 -+ 102.9 -+ -+ -+ -+1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189 -+ sunshine live -+ 21 -+ -+ -1 -+ 103.65 -+ -+ -+ -+109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C -+ RTL Radio -+ -+ -+ -1 -+ 103.95 -+ -+ -+ -+1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4 -+ n-joy radio -+ 22 -+ -+ -1 -+ 104.5 -+ -+ -+ -+1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844 -+ Klassik Radio -+ 23 -+ -+ -1 -+ 104.95 -+ -+ -+ -+10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B -+ JAM-FM -+ 25 -+ -+ -1 -+ 106.3 -+ -+ -+ -+1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC -+ Radio Melodie -+ -+ -+ -1 -+ 106.7 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp kradio-3.5.13.1/kradio3/presets/germany/coswig.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/coswig.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,294 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Hagen Edlich -+ 2007-04-11T01:39:29 -+ Germany -+ 06869 Coswig (Anhalt) -+ Kabelnetz -+ -+ -+ -+ -+1176247707A0C82B606E65CC7F2FBEA0866020438DF24632426678DC361F7C193C7B8845BE -+ Sunshine Live -+ Sunshine Live -+ -+ -1 -+ 87.5 -+ -+ -+ -+117624703266B62F9E009559DBD9A294B32B2F73EAF63A8B28AF83431F80E5593786641AC1 -+ NDR 1 Niedersachsen -+ NDR 1 Niedersachsen -+ -+ -1 -+ 87.8 -+ -+ -+ -+117624708971E9A8A2BDD50B839C80F17E99FC2615603B9AF02F3B9705EB71FBEF5CD7DDFB -+ NDR 2 -+ NDR 2 -+ -+ -1 -+ 88.5 -+ -+ -+ -+1176247163E70DCE726F2CFBE3BEDFE8B05EE6C384D5318795E41C4466A9D7D48A19F3D8E9 -+ NDR Kultur -+ NDR Kultur -+ -+ -1 -+ 88.8 -+ -+ -+ -+1176245349AF57021CB5F93E2F5A44202078E3D594898EF9872CAB0F55A5829328C7EAD2E8 -+ Jump -+ Jump -+ -+ -1 -+ 89.65 -+ -+ -+ -+1176247446EA0C211D139184145EA8064C5E02087F1E93344C014ECC142E373A46EE7E77AD -+ Fritz -+ Fritz -+ -+ -1 -+ 90.15 -+ -+ -+ -+11762474728BDF3F755C240D8D8EB9781F3A928DD4F22EAB34B36E9CCE9F6C24F4FB22831D -+ NRJ -+ NRJ -+ -+ -1 -+ 90.75 -+ -+ -+ -+1176245354F9792D14D7A4C02FED7644C6303C3E62B96E1E359B27F35F29846AA304932DE4 -+ MDR Sputnik -+ MDR Sputnik -+ -+ -1 -+ 91.2 -+ -+ -+ -+1176247621B215007AC7280D5AE46B6F93A29A9DFFE3294F7CA63684D265D00ED5D2D70365 -+ Radio Leipzig -+ Radio Leipzig -+ -+ -1 -+ 91.6 -+ -+ -+ -+11762477071EAC736A707A9AD5509666EAB5FF92E6CF5A6C7EA071BFEC4DA56D97BF4BDD7E -+ Radio Brocken -+ Radio Brocken -+ -+ -1 -+ 92.2 -+ -+ -+ -+1176247708D821B8DDC4E76242BCC0BB4BF906412069F6ED1FCAEAC1B8D03964B1CBE8678C -+ Radio SAW -+ Radio SAW -+ -+ -1 -+ 92.5 -+ -+ -+ -+1176247708D5E33AC1D3235A3B271AC0E9B528BF08E3F7AA040E83CBD48DFEEE1DB9C8E3B8 -+ MDR Figaro -+ MDR Figaro -+ -+ -1 -+ 92.95 -+ -+ -+ -+11762469094F443FA4C67B3C73A1E9E0BAA1E3B014646B4C654F4EE1C450FDA11CC6493A67 -+ Antenne Bayern -+ Antenne Bayern -+ -+ -1 -+ 93.4 -+ -+ -+ -+11762453616DC96E98F9F2BB736BF0BED0642CDC2DE88F1991EA915DEF2D2962229D1B30FB -+ Rockland SA-AN -+ Rockland SA-AN -+ -+ -1 -+ 93.7 -+ -+ -+ -+11762453621223D1F049DF97DBE0F4A9A9E6B39671D21628044599F72342464C97D6F22081 -+ Eins live -+ Eins live -+ -+ -1 -+ 94.0004 -+ -+ -+ -+1176245363C836DBABFAB34DBBB91AC2D42AF7CE1454F2A0FF095FF31E9F70F40E2211AD56 -+ Nordwestradio -+ Nordwestradio -+ -+ -1 -+ 94.3 -+ -+ -+ -+11762453641AABE4D81D8EF0C27DB3C48B078D6C93E30FE3830E9053F195CD9D2108AA7481 -+ Radio 1 -+ Radio 1 -+ -+ -1 -+ 94.85 -+ -+ -+ -+1176245365D229F90373EB6CA1F4E2ADF2097BA1AA1A8363E83A2D5EF4557F7573070B87BB -+ MDR Info -+ MDR Info -+ -+ -1 -+ 95.4 -+ -+ -+ -+1176245367AE96165F2EC516BBF2F71FB44077D98C704EFD0B7F99481BC98E91B6E8DE4400 -+ Stadtradio 88,88 -+ Stadtradio 88,88 -+ -+ -1 -+ 95.8 -+ -+ -+ -+1176245368B945284318577B0B720618D63FAB35CE85F9F45D77BBF0A87F71C0BA8FC19D42 -+ DLF -+ DLF -+ -+ -1 -+ 96.3 -+ -+ -+ -+1176246864242513E9CE92BAF25CBB8433B11384AC93E9F35FA2E7F978FCDB5F903ECC5CAD -+ MDR 1 Radio SA-A -+ MDR 1 Radio SA-A -+ -+ -1 -+ 97.2 -+ -+ -+ -+117624682132A6A74354D08337EB493D374072B03763DC26FE4F5F1386FA8CC1AAFC644F7F -+ MDR 1 Radio SA -+ MDR 1 Radio SA -+ -+ -1 -+ 97.7 -+ -+ -+ -+1176245373B9B0F90767273A2D459B78EC67A5E9236696975DC9B3B77297618818D1CDCAFA -+ Radio Melodie -+ Radio Melodie -+ -+ -1 -+ 98.1 -+ -+ -+ -+11762453744C9A303A5C5A7E3504F75EAB55DE2ED1D6615AFF845F83C7ACC1BB6AD3A36E04 -+ n-joy -+ n-joy -+ -+ -1 -+ 98.65 -+ -+ -+ -+117624537733B9E8D7B049EB078A4CE72545B28E4EEA9B24ECA20C3B72B9AE5175D3E83E4F -+ Deutschlandradio -+ Deutschlandradio -+ -+ -1 -+ 99.9 -+ -+ -+ -+117624537973BF9927DDB11CCCA2E1DC331145C184763291A36FB37FE6C83EA4A5B3F320FE -+ RTL Radio -+ RTL Radio -+ -+ -1 -+ 100.5 -+ -+ -+ -+11762467554B0CD17FAECDE5837EE6588BB3C6369BCDE6991A787DF809A1CD7B3631CBF982 -+ Hitradio Antenne SA -+ Hitradio Antenne SA -+ -+ -1 -+ 101 -+ -+ -+ -+1176246795DD47990D17CF58ABB65DFEFCFE0438780A7ABB4861B01A39D4B30B4659B06C34 -+ R.SA -+ R.SA -+ -+ -1 -+ 101.3 -+ -+ -+ -+1176245383C0A242E951364EE884AAB9286100E06033AFB09A165DFCAD9CE6AC787472FC34 -+ Das Ding -+ Das Ding -+ -+ -1 -+ 102.05 -+ -+ -+ -+11762453843AAEDF886054B17B1394DF7B17678D7E1F85FC029CDD541FF69E7C7882B9A316 -+ Radio Kultur -+ Radio Kultur -+ -+ -1 -+ 102.7 -+ -+ -+ -+1176245389E77366541FAE828839AA3E4F8503FB21940E7A40E81E566E64B118AFC18F681C -+ FFH -+ FFH -+ -+ -1 -+ 105.15 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,304 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Werner Muehl <info@ib-muehl.de> -+ 2006-10-03T17:36:01 -+ Germany -+ Erlensee -+ Cabel -+ Stations/Frequencies for Hanau, Bruchkoebel, Maintal, Erlensee, -+Rodenbach, Neuberg, Langenselbold -+ -+ -+ 106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101 -+ Antenne Bayern -+ Antenne Bayern -+ -+ -1 -+ 94 -+ -+ -+ 1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C -+ AFN -+ AFN -+ -+ -1 -+ 105.15 -+ -+ -+ 1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632 -+ Bayerischer Rundfunk 1 (Main / Franken) -+ BR 1 -+ -+ -1 -+ 91.2 -+ -+ -+ 10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B -+ Bayerischer Rundfunk 2 (Main / Franken) -+ BR 2 -+ -+ -1 -+ 92.15 -+ -+ -+ 1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6 -+ Bayerischer Rundfunk 3 -+ BR 3 -+ -+ -1 -+ 92.45 -+ -+ -+ 10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F -+ Bayerischer Rundfunk 4 Klassik -+ BR 4 KLassik -+ -+ -1 -+ 93.55 -+ -+ -+ 1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D -+ Bayerischer Rundfunk 5 -+ BR 5 -+ -+ -1 -+ 95.75 -+ -+ -+ 1159888999C88F220598C7CA2D533194FF95E4EF0629E3EA1144151F13104F3D0A957F6975 -+ BIG-FM -+ BIG-FM -+ -+ -1 -+ 100.95 -+ -+ -+ 1159889239AFCB7A4D3F499D83C998312C5314A3374819A63E5DD848F26D2A28724A188BF5 -+ Deutschlandfunk Köln -+ DLF -+ -+ -1 -+ 104.05 -+ -+ -+ 10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2 -+ Deutschlandradio Kultur -+ DLR Kultur -+ -+ -1 -+ 90.1 -+ -+ -+ 11598894980E90DF6E12053843D94648E3AC2B00607502F7B3338DBE6C237AAC528179BBE1 -+ Harmony FM -+ Harmony FM -+ -+ -1 -+ 107.5 -+ -+ -+ 1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359 -+ Hessischer Rundfunk 1 -+ HR 1 -+ -+ -1 -+ 87.6 -+ -+ -+ 106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45 -+ Hessischer Rundfunk 2 -+ HR 2 -+ -+ -1 -+ 99.45 -+ -+ -+ 1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812 -+ Hessischer Rundfunk 3 -+ HR 3 -+ -+ -1 -+ 88.55 -+ -+ -+ 10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C -+ Hessischer Rundfunk 4 Rhein-Main -+ HR 4 Rhein-Main -+ -+ -1 -+ 89 -+ -+ -+ 11367224732DD9647905D1A0E3003D6727D6C6A468489AE8E1B8349C8BDE108A1BE864F4DF -+ Hessischer Rundfunk - Info -+ HR - Info -+ -+ -1 -+ 88.2 -+ -+ -+ 11598893448B33C4FDC7C5C5B9B501188282E8B21D0B19A89E026C9BC0E284F344F9DB8C3D -+ Hessischer Rundfunk - Info MW -+ HR-info MW -+ -+ -1 -+ 105.8 -+ -+ -+ 10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1 -+ Hit-Radio FFH Rhein-Main -+ FFH -+ -+ -1 -+ 90.75 -+ -+ -+ 1136724537075C78FBD2816E19C6B77CC4DAFDC888A9DC10DEBA65983A0B76537048067AE1 -+ JAM-FM -+ JAM-FM -+ -+ -1 -+ 107.8 -+ -+ -+ 106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34 -+ Klassik Radio -+ Klassik -+ -+ -1 -+ 107.2 -+ -+ -+ 11367244420E0433EBB9A7933AE1DFCAE9AC5968416B2B9C1718E31FED01DFD0676DC2505B -+ MAIN FM -+ MAIN FM -+ -+ -1 -+ 106.2 -+ -+ -+ 1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447 -+ Planet Radio -+ Planet -+ -+ -1 -+ 103.75 -+ -+ -+ 1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186 -+ Radio Fortuna -+ Fortuna -+ -+ -1 -+ 87.9 -+ -+ -+ 1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3 -+ Radio Melodie -+ Melodie -+ -+ -1 -+ 98.15 -+ -+ -+ 1159889106EC20DC8D1EA0580D1BC060B8B6D873182E34D8269303B75B03A36EC11810BDC9 -+ Radio Primavera -+ Primavera -+ -+ -1 -+ 102.75 -+ -+ -+ 1136724286E5985147114BB716FE9E15FA357C38BBB0CB331B5396CEB9EBDBCE94915F4A18 -+ Radio RPR Eins -+ RPR 1 -+ -+ -1 -+ 96.95 -+ -+ -+ 106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC -+ RTL Radio -+ RTL -+ -+ -1 -+ 103.3 -+ -+ -+ 10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6 -+ Sunshine Live -+ Sunshine -+ -+ -1 -+ 97.25 -+ -+ -+ 1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC -+ SWR 1-Rheinland-Pfalz -+ SWR 1-Rh.Pfalz -+ -+ -1 -+ 94.65 -+ -+ -+ 106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5 -+ SWR 2-Rheinland-Pfalz -+ SWR 2-Rh.Pfalz -+ -+ -1 -+ 94.95 -+ -+ -+ 1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765 -+ SWR 3 -+ SWR 3 -+ -+ -1 -+ 96.2 -+ -+ -+ 1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839 -+ SWR 4 - Pfalz -+ SWR 4 -+ -+ -1 -+ 91.5 -+ -+ -+ 115988887190FF89418BFC2D560EB0F3E672896E7B59B292E3B85FA8AB6AC579E5FF5ECB05 -+ Sky Radio -+ Sky Radio -+ -+ -1 -+ 99.05 -+ -+ -+ 1136724325091824FE3A7B2E74B15CCE068D71760C4BA8271CE5F3511F5BA9F69098A9C9C8 -+ WDR 2 (Siegen) -+ WDR 2 -+ -+ -1 -+ 101.25 -+ -+ -+ 106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68 -+ WDR 3 -+ WDR 3 -+ -+ -1 -+ 101.7 -+ -+ -+ 11367226162FF388CE9717148283756F57FE37EEE28DD6148247865CBD8BC64CF3C8EF3A01 -+ YOU FM -+ Y -+ -+ -1 -+ 89.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,295 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Skutek <grf-chz@gmx.de> -+ 2007-12-18T15:31:54 -+ Germany -+ Erwitte/Lippstadt/Soest/Paderborn/Warstein -+ cable -+ Stand November 2007 -+ -+ -+ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 -+ hr1 -+ -+ -+ -1 -+ 87.9 -+ -+ -+ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 -+ hr2 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 -+ hr3 -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 -+ hr4-Rhein-Main-Journal -+ -+ -+ -1 -+ 88.95 -+ -+ -+ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 -+ 1LIVE (WDR) -+ -+ -+ -1 -+ 89.4 -+ -+ -+ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A -+ Deutschlandfunk -+ -+ -+ -1 -+ 90.1 -+ -+ -+ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 -+ Deutschlandradio Kultur -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 -+ WDR2 - Siegen -+ -+ -+ -1 -+ 90.75 -+ -+ -+ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 -+ NDR1 Radio NDS - Südwest -+ -+ -+ -1 -+ 91.15 -+ -+ -+ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 -+ NDR2 -+ -+ -+ -1 -+ 92.4 -+ -+ -+ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 -+ WDR3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F -+ NDR Kultur -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 -+ JUMP -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F -+ WDR4 -+ -+ -+ -1 -+ 94.25 -+ -+ -+ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF -+ Klassik Radio -+ -+ -+ -1 -+ 94.55 -+ -+ -+ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 -+ BR1 - Main/Franken -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 -+ WDR Radio 5 -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D -+ domradio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 -+ ERF (Evangeliums Rundfunk) -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 -+ Funkhaus Europa (WDR) -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 -+ SWR1 -Rheinland Pfalz -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C -+ SWR2 -Rheinland Pfalz -+ -+ -+ -1 -+ 98.25 -+ -+ -+ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B -+ SWR3 -+ -+ -+ -1 -+ 98.75 -+ -+ -+ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A -+ BFBS (engl.) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB -+ DEFJAY -+ -+ -+ -1 -+ 100.2 -+ -+ -+ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 -+ radio ffn - Osnabrück -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF -+ JAM FM -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E -+ Radio Melodie -+ -+ -+ -1 -+ 101.75 -+ -+ -+ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 -+ RTL Radio - Die besten Hits aller Zeiten -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D -+ sunshine live -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 -+ WDR2 Bielefeld/HIT RADIO FFH -+ -+ -+ -1 -+ 103.9 -+ -+ -+ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 -+ 2255LIVE Ihr Gewinnradio -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 -+ Radio Hochstift/AFN - Frankfurt -+ -+ -+ -1 -+ 106.85 -+ -+ -+ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 -+ Radio Siegen/Hellweg Radio/Radio Sauerland -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,355 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0-beta1-r664 -+ Andreas Karl -+ 2005-03-04T19:15:35 -+ Germany -+ Frankfurt / Hessen -+ Cabel -+ Stations/Frequencies for Frankfurt Main -+ -+ -+ -+1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359 -+ HR1 -+ HR1 -+ -+ -1 -+ dontcare -+ 87.6 -+ -+ -+ -+1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186 -+ HR-KLASSIK -+ HR4 KL -+ -+ -1 -+ dontcare -+ 87.9 -+ -+ -+ -+106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45 -+ HR-Info -+ HR-Info -+ -+ -1 -+ dontcare -+ 88.2 -+ -+ -+ -+1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812 -+ HR3 -+ HR3 -+ -+ -1 -+ dontcare -+ 88.55 -+ -+ -+ -+10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C -+ HR4-RheinMain -+ HR4 -+ -+ -1 -+ dontcare -+ 89 -+ -+ -+ -+10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1 -+ YOU FM -+ YOU FM -+ -+ -1 -+ dontcare -+ 89.9 -+ -+ -+ -+1068545254ADEF6022D469FC3619A861A9696292F20C8DCBA6AD9F0B18313132367BD9CEE8 -+ DeutschlandRadio-Berlin -+ DLR-B -+ -+ -1 -+ dontcare -+ 90.1 -+ -+ -+ -+1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC -+ Hitradio FFH -+ FFH -+ -+ -1 -+ dontcare -+ 90.75 -+ -+ -+ -+106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5 -+ BR1 (Mainz/Franken) -+ BR1 -+ -+ -1 -+ dontcare -+ 91.2 -+ -+ -+ -+1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765 -+ SWR4-Pfalz -+ SWR4 -+ -+ -0.01 -+ dontcare -+ 91.5 -+ -+ -+ -+10685452546D14E1356C2246B3F5D7185F12B04FCCA6FD2489D136AFD321BD33231C2C4DB4 -+ BR3 -+ BR3 -+ -+ -1 -+ dontcare -+ 92.45 -+ -+ -+ -+1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839 -+ BR4 Klassik -+ BR4 -+ -+ -1 -+ dontcare -+ 93.55 -+ -+ -+ -+106854525435295B421B71BB719FFC423427D88A13394AC09A41C7FADE4CFAF34CF20A967D -+ Antenne Bayern -+ ANT-BAY -+ -+ -1 -+ dontcare -+ 94 -+ -+ -+ -+1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632 -+ SWR1-Rheinaland Pfalz -+ SWR1 -+ -+ -1 -+ dontcare -+ 94.65 -+ -+ -+ -+10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B -+ SWR2-Rheinaland Pfalz -+ SWR2 -+ -+ -1 -+ dontcare -+ 94.05 -+ -+ -+ -+1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6 -+ BR5 -+ BR5 -+ -+ -1 -+ dontcare -+ 95.75 -+ -+ -+ -+10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F -+ SWR3 -+ SWR3 -+ -+ -1 -+ dontcare -+ 96.2 -+ -+ -+ -+1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D -+ Radio RPR Eins -+ RPR1 -+ -+ -1 -+ dontcare -+ 96.95 -+ -+ -+ -+106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101 -+ Sunshine LIVE -+ SUNSHINE -+ -+ -1 -+ dontcare -+ 97.25 -+ -+ -+ -+1068545254E6194286DD3604C97905284DBD5755FEA2D0D8243E97D5BC889C76C1B6E91888 -+ Radio Melodie -+ MELODIE -+ -+ -1 -+ dontcare -+ 98.15 -+ -+ -+ -+106854525480DD9CEA8D762EF40365B81DC415F98E8D8D49BB5077BACB848F33AB8FFC1154 -+ RADIO BOB!(ex Sky Radio) -+ SKY -+ -+ -1 -+ dontcare -+ 99.05 -+ -+ -+ -+10685452547C658BFD8AB9FE93566A1D66601EE06F430A26079E188A0E4E304860235DE200 -+ HR2 -+ HR2 -+ -+ -1 -+ dontcare -+ 99.45 -+ -+ -+ -+1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C -+ radio-x -+ radio-x -+ -+ -1 -+ dontcare -+ 99.95 -+ -+ -+ -+106854525431E0BF7A1159B68FE9747EC8803E96EDE40295B8DCDFC2ADE2D50090859A2AF3 -+ BIG-FM -+ BIG-FM -+ -+ -1 -+ dontcare -+ 100.95 -+ -+ -+ -+10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2 -+ WDR2-Siegen -+ WDR2 -+ -+ -1 -+ dontcare -+ 101.25 -+ -+ -+ -+1068545254C2A9AD17F3E452CBB5EDA1FC41F3E91A2CE003910634BC8F3FC0472D24C5BE3B -+ WDR3 -+ WDR3 -+ -+ -1 -+ dontcare -+ 101.7 -+ -+ -+ -+1068545254886BEA32C5981E47D8085FAC639673F691BBEA7D08BEA9437C8168874C4FF3DA -+ Radio Fortuna -+ FORTUNA -+ -+ -1 -+ dontcare -+ 102 -+ -+ -+ -+106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34 -+ RTL RADIO -+ RTL -+ -+ -1 -+ dontcare -+ 103.3 -+ -+ -+ -+106854525490359933CE6E34491643A8F2D51D4B3CDF0644A3FC88A9122F9173A0422A77A4 -+ planet radio -+ planet -+ -+ -1 -+ dontcare -+ 103.75 -+ -+ -+ -+1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447 -+ Deutschlandfunk (Koeln) -+ DLF-K -+ -+ -1 -+ dontcare -+ 104.05 -+ -+ -+ -+1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3 -+ AFN -+ AFN -+ -+ -1 -+ dontcare -+ 105.15 -+ -+ -+ -+106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC -+ MAIN FM -+ MAIN FM -+ -+ -1 -+ dontcare -+ 106.2 -+ -+ -+ -+10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6 -+ KLassik Radio -+ KlassikR -+ -+ -1 -+ dontcare -+ 107.2 -+ -+ -+ -+106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68 -+ JAM-FM -+ JAM -+ -+ -1 -+ dontcare -+ 107.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,367 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Christian Haase -+ 2008-01-23T15:04:13 -+ Germany -+ G�ttingen -+ Cable -+ -+ -+ -+ -+120109774346C3B3C59CC62EE9B80B8D8E08A315081FF6DEECADDE797036DD35DD720313AB -+ NDR 1 Niedersachsen S�dost -+ NDR 1 -+ -+ -1 -+ 87.8 -+ -+ -+ -+12010980262AC02EA7CEE4A9787E1BAB56662E863F8406F1DBD1121C163281EBEC130DF71C -+ NDR 2 -+ NDR 2 -+ -+ -1 -+ 88.2 -+ -+ -+ -+120109780028FA4C97936D91B7AA300175D6246EA08F4B5CD9E4CCB628641F6227FDA707EA -+ NDR Kultur -+ NDR Kultur -+ -+ -1 -+ 88.65 -+ -+ -+ -+1201097927EFEA249C8FC673EBD62E941ED93ED433BCF7E836D1CD7782CDD2CDB152189691 -+ Deutschlandfunk -+ Deutschlandfunk -+ -+ -1 -+ 90.25 -+ -+ -+ -+12010978510EA8D2B980E6C19488BA1E7535640C12518B88F734A91A50DB5ECAB1DCF3E4F5 -+ NDR Info -+ NDR Info -+ -+ -1 -+ 89.25 -+ -+ -+ -+120109837495323238ABA5A082BC5CE9E13FB9BAC2319CB9E8C2FDC5D51E5F7F57CFC3B794 -+ BFBS (engl.) -+ BFBS -+ -+ -1 -+ 90.7 -+ -+ -+ -+1201098447C7921DFDCE0A87585C877A4E4F14469E6E631197D8F61C3D9DB7992C0F6CF94E -+ N-Joy Radio -+ N-Joy -+ -+ -1 -+ 91.05 -+ -+ -+ -+12010985118C339A3D9CF54A26F18143C58DDE078F0C4398FF419B22C8A1112EF54EC9AA72 -+ HR 1 -+ HR 1 -+ -+ -1 -+ 91.7 -+ -+ -+ -+1201098547D3AB57CEE698B1055882DADE29CB3BFCB82BBBF20CBF6F2F2B1976EFF9044708 -+ HR 2 -+ HR 2 -+ -+ -1 -+ 92.4 -+ -+ -+ -+12010985715E0FCC725AC4DF418CB8BE1BBF2401F969B75AAC93F3E12AFF6FE818B7BC4DAB -+ HR 3 -+ HR 3 -+ -+ -1 -+ 92.7 -+ -+ -+ -+12010986083B91D444A320FF64D572F4D06E5EBF7CF9F5E58BD9CEC18429D6B4C179BEDE9F -+ HR 4 Nordhessen-Journal -+ HR 4 -+ -+ -1 -+ 93.15 -+ -+ -+ -+12010986436FC6FB10889A59B3E26CF84319697556F79675891B01D19E087BE589A51BD835 -+ WDR Radio 5 -+ WDR 5 -+ -+ -1 -+ 93.75 -+ -+ -+ -+1201098676DC4A41C8EBF28E3EA290014DDB3AE0BDB33EB4F05ED3FFE781348C803686134B -+ MDR 1 Radio Th�ringen Erfurt -+ MDR 1 Th�ringen -+ -+ -1 -+ 94.25 -+ -+ -+ -+1201098849EE6F5544A5FDEF6F4E671794F7B0D49294B52D96146A015A91EDC48286D85AB9 -+ WDR 2 Bielefeld -+ WDR 2 -+ -+ -1 -+ 95 -+ -+ -+ -+1201097557C000942967970C43A83708468FF26103AC8B0581DEB400BA21BAA8A849874B32 -+ Stadtradio G�ttingen -+ Stadt G� -+ -+ -1 -+ 95.35 -+ -+ -+ -+12010989008BC7BC41095AC902061E5E57722FF5DC4E18AD136EBAC375EB9E5B74B67DB036 -+ WDR 4 -+ WDR 4 -+ -+ -1 -+ 95.8 -+ -+ -+ -+12010989234A3586E929CF194D5AE5061E2B51FDE4CB0DDA02C21811EB73A8CDD679CE3F89 -+ BR 2 Main/Franken -+ BR 2 -+ -+ -1 -+ 96.65 -+ -+ -+ -+1201098961DB6AA80EBEF605DB7726EDE700738740F99E762D3B9673046909F377F5BC81A9 -+ BR 1 Main/Franken -+ BR 1 -+ -+ -1 -+ 96.95 -+ -+ -+ -+1201098991D21FAC6C42CBCA1C30EDAB03AA24F35F6C0EDA5D9EBB6AB9D3575A055E1D1A59 -+ Bayern 3 -+ Bayern 3 -+ -+ -1 -+ 97.65 -+ -+ -+ -+1201099021BADD498B6AEC071B3D17C5FA9DC6491CF07DEE1ABDD5E0D193DC04D0D0C6AB83 -+ Eins Live (WDR) -+ Eins Live -+ -+ -1 -+ 98.3 -+ -+ -+ -+1201099060F137794C0CABE65412572A3A1E133778DB9A56F21E0051DF5AE004DB7EFF1588 -+ Deutschlandradio Kultur -+ Dtl Kultur -+ -+ -1 -+ 98.75 -+ -+ -+ -+1201099105DE85CE952993AC3FEE8B917C0FC45FF302BE4DE3514056800C802CED566AAD3D -+ WDR 3 -+ WDR 3 -+ -+ -1 -+ 99.15 -+ -+ -+ -+120109912693D8EAD66B191CC7A8E74A66CD8F16439634F4E02C27A55B3C05C096A27FEC9A -+ Radio Hochstift -+ Hochstift -+ -+ -1 -+ 99.65 -+ -+ -+ -+120109915408E02695F27D249358DA6D4DF70ADE3FFF4F64426449434DA9C21C0B94012FE7 -+ Antenne Th�ringen -+ Antenne Th�ringen -+ -+ -1 -+ 100.1 -+ -+ -+ -+12010991983A71807FC0FF0365E5400DC2A509123262CEC6B18FCD5AE7D29293D198BCCFCC -+ 89,0 RTL -+ 89,0 RTL -+ -+ -1 -+ 100.75 -+ -+ -+ -+120109923991F554555E1295EB09A9DE9D0B6208EC7E506B35BA3E55B57BEEC55DC439FEAF -+ MDR 1 Radio Sachsen-Anhalt Magdeburg -+ MDR 1 Sachsen-Anhalt -+ -+ -1 -+ 101.1 -+ -+ -+ -+120109931215CD26378E5951B3C42F185A66A67D3D1CF2232BB7A9671BADB30E47F94CE77D -+ Jump -+ Jump -+ -+ -1 -+ 101.55 -+ -+ -+ -+120109934107BECD3DDA9C499E7BF7CF85D856A2FE0303C63771B39618B8D865D1353BEBD6 -+ Radio SAW -+ Radio SAW -+ -+ -1 -+ 101.95 -+ -+ -+ -+1201099371D3D2A916EC4AE1ACDBAE8DB326FC93A0FBAB9D7CA67F0768F02633150F58C77D -+ MDR Figaro -+ MDR Figaro -+ -+ -1 -+ 102.65 -+ -+ -+ -+1201099410375D010A6DC949089AC8548A8767B283E400580491A40EB9FC1F2844FDE748FA -+ Radio 21 -+ Radio 21 -+ -+ -1 -+ 103.25 -+ -+ -+ -+12010994505AA8B9A303C5365BD0377108CAC995D185AA06FE9DC280AB1F3764FD6062079A -+ Radio FFN G�ttingen -+ FFN -+ -+ -1 -+ 104 -+ -+ -+ -+12010995145E068162D8B94A1DC01E3D59898ECCDFE5E2242602AD59D560BD33ED2A37919E -+ Hit-Radio Antenne Niedersachsen G�ttingen -+ Antenne Niedersachsen -+ -+ -1 -+ 104.6 -+ -+ -+ -+1201099558D1923339D9D36028AB475C46AB4C84D6CCE86295FAECA640FA99B2D84D6D8BB3 -+ sunshine live -+ sunshine live -+ -+ -1 -+ 104.95 -+ -+ -+ -+12010995821652BB98253CA9A3F953BDD44D4BE6DA7BF855DBC6290EED9C915D488E716F41 -+ Radio Melodie -+ Radio Melodie -+ -+ -1 -+ 105.35 -+ -+ -+ -+12010996100276949EC86ACCDEB088DB01877A9A0E2B53AF2EC6BB8B042BDA14C6597EDC6C -+ Klassik Radio -+ Klassik Radio -+ -+ -1 -+ 105.8 -+ -+ -+ -+120109963563936CEE1E7D6B93A945FD9607A1EAC60D2FE23A4D222A8571F306FDDB447BCC -+ Hit Radio FFH Nordhessen -+ FFH -+ -+ -1 -+ 106.65 -+ -+ -+ -+1201099700A4AF799AEC5140A08E9CCC709595B2A508AAEF09DC1DAF710F0AC06432D93229 -+ RTL Radio - Die besten Hits mit Gef�hl -+ RTL Radio -+ -+ -1 -+ 107.2 -+ -+ -+ -+1201099740E0E7E0DB340AF8DDE58C6981D09FE7C5B8E6A6278CC15AD387BC40BE7677B96B -+ DEFJAY -+ DEFJAY -+ -+ -1 -+ 107.65 -+ -+ -+ -+1201099768FDAA47CB55582A630F00D1A94BBA7593014DE7B012357FB155BDD4AF8555FF68 -+ Jam FM -+ Jam FM -+ -+ -1 -+ 108 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp kradio-3.5.13.1/kradio3/presets/germany/hilden.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/hilden.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,353 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Uwe Kuhlmann, Uwe_Kuhlmann@web.de -+ 2005-05-03T18:20:35 -+ Germany -+ Hilden -+ cable -+ Gilt fr Hilden / Langenfeld / Leichlingen / Monheim / Leverkusen -+(any comment and thanx welcome!) -+ Enth�lt zusammengef�gte Eintr�ge -+ -+ -+ -+11135013660F9F721EC3DC80603B46C9B67D41EC8F353D462884758182C22E2077C5A6E497 -+ SWR1-Rheinland-Pfalz -+ 8 -+ -+ -1 -+ 87.6 -+ -+ -+ -+11135013665F0A1111D6314DAAF3D15B0190CCD182F24D0C60991DEEB9B94F59C1677AD451 -+ SWR4-Rheinland -+ 26 -+ -+ -1 -+ 87.9 -+ -+ -+ -+11135013665186333B9483BC89B57913499A9E70F6393DCCF34CC89877F80044FCE256AA7D -+ SWR3 -+ 9 -+ -+ -1 -+ 88.35 -+ -+ -+ -+1113501366138A802AD5A22ACBFB1DB303E0D67097FFB8B72914AFE4EADBB906627695F64C -+ WDR2-Wuppertal -+ 11 -+ -+ -1 -+ 88.95 -+ -+ -+ -+1113501366E5A9DE63878AF799B9CAF38BCF370DAA0E5A7B43A8FE9C640FA8668F704EE60C -+ WDR Radio 5 -+ -+ -+ -1 -+ 89.7 -+ -+ -+ -+11135013667E9887B5EEBE22B9DAFF23CFBA9E070109351EFC26A26286F63BDD19EE66E698 -+ JAM-FM -+ 24 -+ -+ -1 -+ 90.05 -+ -+ -+ -+1113501366CF2D50F282F0C22E452E6D7F3130773C446F5906C9305C2A45B53A8480F78890 -+ WDR2-Rhein-Ruhr -+ -+ -+ -1 -+ 90.6 -+ -+ -+ -+11135013662BDEA51AF1ABE96284621DF2E6EF55BB9C075ED63E16914AA95A561F4AB17C5A -+ WDR4 -+ -+ -+ -1 -+ 92.1753 -+ -+ -+ -+111350136699854D3B8C0FB6729070CB2AF25C72E672BE565F8B5742CCD6473CDCCB1CC863 -+ Radio Neandertal -+ 4 -+ -+ -1 -+ 92.5 -+ -+ -+ -+1113501366A7ADDEB8C9A8341BD6ED9BC754AE0E39DF172E9E4B20C7DE27A818F77196DDEA -+ DeutschlandRadio Berlin -+ 13 -+ -+ -1 -+ 93.4004 -+ -+ -+ -+111350136671FD32971DB55D9712623AE318937011D1F42C6F61C9D5E3918403B643C311DB -+ Eins Live (WDR) -+ -+ -+ -1 -+ 94.05 -+ -+ -+ -+111350136682160AC418966730CDA6BFA3264F27BFAA63D8D6481FA8EE12A0181C9C8B7CD7 -+ Deutschlandfunk -+ 14 -+ -+ -1 -+ 94.45 -+ -+ -+ -+1113501366D1D121522B0A5B8AE9527134DBFBE187C97A4DE7183C57F4D200C135F2C07957 -+ RTL RADIO - DIE GR�SSTEN OLDIES -+ 21 -+ -+ -1 -+ 95.3 -+ -+ -+ -+1113501366F8D933B2F83F720B5124C85435F071C19522579E89C89F7647F3ED2490EB223E -+ WDR Radio 5 Funkhaus Europa -+ 15 -+ -+ -1 -+ 96.75 -+ -+ -+ -+1113501366DB8E4FA3F8534872CFF67494232ECA2E0B1AE6E6B4E1E349DC5761EA766453F5 -+ Klassik Radio -+ 23 -+ -+ -1 -+ 97.05 -+ -+ -+ -+1113501366073A8DC7CF7DDE6CFC1A5B4F62B6CD4EB6E2EB932C338787F847B8C5BCC9DC92 -+ Radio Berg -+ -+ -+ -1 -+ 98.8 -+ -+ -+ -+1113501366C53472253704CB7F6B1FDE7D1EDF76DCB586336AD12FC2878F51F418B6516651 -+ Radio 3 (niederl.) -+ -+ -+ -1 -+ 100.951 -+ -+ -+ -+1113501366B41219F825DE19A759CF74E874FECBC14DB39ACECAEF16448257C009AAC7E55F -+ sunshine live -+ 20 -+ -+ -1 -+ 102.051 -+ -+ -+ -+1113501366CFE017DFCC8A99D4656566A73CAFCFE2C40FB8B50D2A30A748AB4A6B327F5AE9 -+ Radio Melodie - Heimatfunk mit Herz M�nchen -+ -+ -+ -1 -+ 102.551 -+ -+ -+ -+1113501366165B0CA74BF612CDEFF38DC3262780DCFFBD76523396DA987B648B5554AC6794 -+ SWR2-Rheinland-Pfalz -+ 10 -+ -+ -1 -+ 103.101 -+ -+ -+ -+1113501366FEB7AB3FBC338FB78E0BBBF284D377EEF809EE6A6835E323805BFC665B251CC9 -+ Radio RPR Eins-Rheinland -+ 7 -+ -+ -1 -+ 103.951 -+ -+ -+ -+1113501366C7761F0E03F265D63062F2FAA29B6547D786974D33512630893942E754E4856A -+ Radio RSG -+ 3 -+ -+ -1 -+ 104.25 -+ -+ -+ -+11135013666976F9AF303FC869DE76FC858BC99A1EA59CE7A085D422455D726D8F95E95109 -+ RPR Zwei -+ -+ -+ -1 -+ 105.4 -+ -+ -+ -+11151372270EC2A4BF0F3036909FAE1CAEB62513B25CD6CC458264FA0EBC0AEC2459AB9DF1 -+ Radio 2 (niederl.) -+ 19 -+ -+ -1 -+ 106.226 -+ -+ -+ -+1113501366A1FB1AB86226CDD00EFCB3EB6682621E1FD1F9F33EDCC22F0F4B532F7E70892F -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 106.501 -+ -+ -+ -+1115137175FDF5091456A1D516BAA383BCCB627DEEA81DD03FF84E9C717612D08113588191 -+ WDR Radio 5 -+ 1 -+ -+ -1 -+ 89.7752 -+ -+ -+ -+1115137180DFA1745F8A7300B22E767E411E1C589B2A4D6FD4EBF7999758BCA9B2636F21C8 -+ WDR 3 -+ 12 -+ -+ -1 -+ 91.3753 -+ -+ -+ -+1115137190DD24C928DD3EBFD3A52AC708916FF2D33FD9177C60BDD96C00FC13F655B0F5F0 -+ Deutschlandfunk -+ 5 -+ -+ -1 -+ 94.5255 -+ -+ -+ -+1115137191E6E3192689593527258FBE309B99ABC975756DA62A654060E611722D93D5395E -+ Antenne D�sseldorf -+ 2 -+ -+ -1 -+ 95.0255 -+ -+ -+ -+1115137197FCFA500F48697544E1D615FE25960E193ED884DFCBD792D151D7B04AAB7FE414 -+ WDR Radio 5 Funkhaus Europa -+ 7 -+ -+ -1 -+ 96.8256 -+ -+ -+ -+11151372038613F752A26302D72D4D81EC08D55D5EDA3399ADB0C44EDA4CC4F2771ACBD5B1 -+ Radio Berg -+ 5 -+ -+ -1 -+ 98.8757 -+ -+ -+ -+1115137205517685CB9E5B1C8C3EC2A3CA5BEACEEDF709791AF99BE3ECCAD34E89FDF56BD7 -+ hr3 -+ 25 -+ -+ -1 -+ 99.5508 -+ -+ -+ -+1115137207FD6AA54223126EE02DA3C2A6D9BCC41D14AF2F509ABE8DC0368769410D153A79 -+ BFBS (engl.) -+ 16 -+ -+ -1 -+ 100.026 -+ -+ -+ -+11151372129C623D6777686C2A80630E4E4D5A4418334033A86B30A1053C2FEA522F91D9B5 -+ ERF (Evangeliums-Rundfunk) -+ 22 -+ -+ -1 -+ 101.651 -+ -+ -+ -+1115137221EB4CC9C6A22DC1204E6087A523333CA4E6B34ECC70DB3D955C03680DDFD70B21 -+ Radio RSG -+ 17 -+ -+ -1 -+ 104.326 -+ -+ -+ -+11151372245CEB4DCA54C0376C7944BCB601E8C5489F66A2ABB6C147AC597D6AAD837F0CCC -+ bigFM -+ 17 -+ -+ -1 -+ 105.476 -+ -+ -+ -+111513723052CCEE3605297250E16967BE66424CD40A53BF4B8C025EA93479D4A446CFE13C -+ Domradio -+ 18 -+ -+ -1 -+ 107.126 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,255 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Daniel Stränger (dev at schmaller dot de) -+ 2006-12-18T12:35:21 -+ Germany -+ Konstanz -+ Cable Analog -+ -+ -+ -+ 116644167238F1321A4B015F1A70F1842BBD28B7DBA8363006066739ECFA4F89940729E454 -+ Deutschlandfunk -+ 1 -+ -+ -1 -+ 87.8 -+ -+ -+ 1166441674E3AAF2D536A35F27D5E131E302E18E17917B9494E129F68D1C024DABAE330D0B -+ Radio Seefunk -+ 2 -+ -+ -1 -+ 88.2 -+ -+ -+ 116644167511341F9D7375A102777A285699E9B19B32086C3D07F2C680124431E6BA88D8A1 -+ RSI 1 -+ 3 -+ -+ -1 -+ 88.8 -+ -+ -+ 1166441677044454339E85CB23E0FEA80C97395F0B5F082834621AFF71FA0F6ADCD0F2D3F6 -+ DASDING -+ 4 -+ -+ -1 -+ 89.7 -+ -+ -+ 116644153867318DD8FA616CB002B7FEFF3F116DF68E827BCC769BB7A021010251DDE8ABA9 -+ RTL Radio -+ 1 -+ -+ -1 -+ 90.1 -+ -+ -+ 11664416801E589D311ADF455D4FCB833AEDC04FCC43FB47826334173FBEB9A321E5C0D517 -+ SWR1 -+ 6 -+ -+ -1 -+ 91.1 -+ -+ -+ 1166441681D1C8EE34DA5B5FE2DEC676D3637C77289C1481479BB739B98EB1A72A6C8F095F -+ SWR2 -+ 7 -+ -+ -1 -+ 91.6 -+ -+ -+ 11664416828E205C849B191DF5451F0860CE93EA01C8E99D9FB0035582D32F18A738DFDFF6 -+ SWR3 -+ 8 -+ -+ -1 -+ 92.2 -+ -+ -+ 116644168351AFF8CAE8BC28FD39CE5D8AF01C87AE5FD7846FCD787A992E12A05389D80135 -+ SWR4 -+ 9 -+ -+ -1 -+ 92.6 -+ -+ -+ 1166441686E6B7B6A6F9330000DE77BE3F17D29949832AADED45E4A255C8D3C616A185B1C3 -+ Ö1 -+ 10 -+ -+ -1 -+ 93.7 -+ -+ -+ 1166441687E8198ED84131F832827B2A92B7C83EF390FC501C294FB8A402907055687F11AA -+ Ö2 (Radio Vorarlberg) -+ 11 -+ -+ -1 -+ 94.3 -+ -+ -+ 1166441688C0209D108F8D6916416D33514FCE4E8DF3C40A3A9B12FC57B1DA0B18F0106562 -+ Ö3 -+ 12 -+ -+ -1 -+ 94.7 -+ -+ -+ 1166441690A492F72FDB725DFEA7C727463535B570F301E39118BE6A85A5D6D0FFF73EDACE -+ FM4 -+ 13 -+ -+ -1 -+ 95.5 -+ -+ -+ 1166441691D64CE148BACD840CCFFE639FA2430DBF48793C6091BEB6DFC923237DE8311966 -+ Klassik Radio -+ 14 -+ -+ -1 -+ 96 -+ -+ -+ 11664416923BED343121C02899E757E85FC91F2D66A4FD30008839AA8FCB2B46A986831416 -+ Antenne Bayern -+ 15 -+ -+ -1 -+ 96.4 -+ -+ -+ 11664416935FA995580C00EB03AB99D6B8C3627B2F9AFD00555BABDBFBD8B6C847701951E5 -+ BR2 -+ 16 -+ -+ -1 -+ 96.7 -+ -+ -+ 11664416954251D17FFAB1C19888B3BDAF309017191E8491A11CCA94CAC4AEAFDFC87D98E4 -+ BR1 -+ 17 -+ -+ -1 -+ 97.5 -+ -+ -+ 1166441549E468A60BBEC88E3339CF1A6373AB4396A859CF4D6DD101AC9801A5D48F94A85B -+ BR3 -+ 2 -+ -+ -1 -+ 98 -+ -+ -+ 1166441698F67C9285970AC34FE783A1836A1A3E1803F76F49D7B12A09B29BA04B091FDF88 -+ BR4 -+ 19 -+ -+ -1 -+ 99.1 -+ -+ -+ 1166441700D7B89D336BB7B1F99B077C67043F15466D919E17B16DF11A94AAEE341731B07D -+ BR5 -+ 20 -+ -+ -1 -+ 99.7 -+ -+ -+ 1166441702B157AA712BABF263606A5E443DC45F86D96F95FBB356893A52EAA109DBC29C57 -+ ERF Radio -+ 21 -+ -+ -1 -+ 101.1 -+ -+ -+ 11664417049F25A61DD6C16564B65E024BB73D521960DA92AC806C2CF0E7E721EA611EFC7C -+ radio horeb -+ 22 -+ -+ -1 -+ 101.95 -+ -+ -+ 1166441554347C30787FB9E9EBDE1ACA28B860B5A9B93E591E1D50F99D9A967FE947F7ACC3 -+ DRS1 -+ 4 -+ -+ -1 -+ 102.65 -+ -+ -+ 1166441707031EB9C9E8C4151B05CFEC6A968FBD13B23893F4D94D4222F72A9062D39EBDCF -+ DRS2 -+ 24 -+ -+ -1 -+ 103.1 -+ -+ -+ 11664417087A318E1452B0D1B3F54AA8485AD3F67F74F5D44AD758C104C0B4FDD61F758339 -+ DRS3 -+ 25 -+ -+ -1 -+ 103.7 -+ -+ -+ 11664417100AB0C53D85FAADBF07AD5EB8C02384E12BA33BCFC23C5AF20800B674440827B6 -+ Radio Melodie -+ 26 -+ -+ -1 -+ 104.55 -+ -+ -+ 1166441711D189CA449A9546945255009207B5C9367287BF496B7001A7C938AC6A326901E3 -+ Radio 7 -+ 27 -+ -+ -1 -+ 104.85 -+ -+ -+ 116644171371F70255CFB196BCE5F932B0618CBE35F681F092278A13A69678CA61C6869C6E -+ JAM-FM -+ 28 -+ -+ -1 -+ 105.75 -+ -+ -+ 11664417167F4F1DFCFB7C204E8AB95C8D042E295FFB2EC595E441055F60325A48559F7CF8 -+ Deutschlandradio Kultur -+ 29 -+ -+ -1 -+ 107.25 -+ -+ -+ 1166441717BE71C69ECAF383473836EFB426F77A6155FAA5D9496658C99C2F4E6401FC5E74 -+ sunshine live -+ 30 -+ -+ -1 -+ 107.55 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,295 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Skutek <grf-chz@gmx.de> -+ 2007-12-18T15:31:54 -+ Germany -+ Erwitte/Lippstadt/Soest/Paderborn/Warstein -+ cable -+ Stand November 2007 -+ -+ -+ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 -+ hr1 -+ -+ -+ -1 -+ 87.9 -+ -+ -+ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 -+ hr2 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 -+ hr3 -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 -+ hr4-Rhein-Main-Journal -+ -+ -+ -1 -+ 88.95 -+ -+ -+ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 -+ 1LIVE (WDR) -+ -+ -+ -1 -+ 89.4 -+ -+ -+ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A -+ Deutschlandfunk -+ -+ -+ -1 -+ 90.1 -+ -+ -+ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 -+ Deutschlandradio Kultur -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 -+ WDR2 - Siegen -+ -+ -+ -1 -+ 90.75 -+ -+ -+ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 -+ NDR1 Radio NDS - Südwest -+ -+ -+ -1 -+ 91.15 -+ -+ -+ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 -+ NDR2 -+ -+ -+ -1 -+ 92.4 -+ -+ -+ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 -+ WDR3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F -+ NDR Kultur -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 -+ JUMP -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F -+ WDR4 -+ -+ -+ -1 -+ 94.25 -+ -+ -+ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF -+ Klassik Radio -+ -+ -+ -1 -+ 94.55 -+ -+ -+ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 -+ BR1 - Main/Franken -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 -+ WDR Radio 5 -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D -+ domradio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 -+ ERF (Evangeliums Rundfunk) -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 -+ Funkhaus Europa (WDR) -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 -+ SWR1 -Rheinland Pfalz -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C -+ SWR2 -Rheinland Pfalz -+ -+ -+ -1 -+ 98.25 -+ -+ -+ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B -+ SWR3 -+ -+ -+ -1 -+ 98.75 -+ -+ -+ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A -+ BFBS (engl.) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB -+ DEFJAY -+ -+ -+ -1 -+ 100.2 -+ -+ -+ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 -+ radio ffn - Osnabrück -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF -+ JAM FM -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E -+ Radio Melodie -+ -+ -+ -1 -+ 101.75 -+ -+ -+ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 -+ RTL Radio - Die besten Hits aller Zeiten -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D -+ sunshine live -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 -+ WDR2 Bielefeld/HIT RADIO FFH -+ -+ -+ -1 -+ 103.9 -+ -+ -+ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 -+ 2255LIVE Ihr Gewinnradio -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 -+ Radio Hochstift/AFN - Frankfurt -+ -+ -+ -1 -+ 106.85 -+ -+ -+ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 -+ Radio Siegen/Hellweg Radio/Radio Sauerland -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,402 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ H.-J.v.Angern" <h.j.v.angern@mdcc-fun.de> -+ 2010-01-17T18:05:53 -+ Germany -+ Magdeburg -+ Cable -+ -+ -+ -+ 1263742682EFA8D7372495F12DC5035422BAD8D3846427919A16F52EF7FF445AFA377B -+ Hitradio Brocken -+ -+ -+ -1 -+ dontcare -+ 87.6 -+ -+ -+ 12637427327527D1C44D176E9453D15642882AA0A707E44309221E46E7F2880685268B -+ Jump MDR -+ -+ -+ -1 -+ dontcare -+ 87.9 -+ -+ -+ 1263742775EB08A061881C66DCB3F6458E4A460DA7AD2C5DCB1535E063FAE23F188826 -+ MDR 1 Sachsen Anhalt -+ -+ -+ -1 -+ dontcare -+ 88.35 -+ -+ -+ 1263742825D0BB7B10DA6EB23C2FAC12F3C684F04B4E90797356E2BCF667C133218BF6 -+ Sky Radio -+ -+ -+ -1 -+ dontcare -+ 88.8 -+ -+ -+ 1263742827A3842FCF15F38EFD4AE035EBD778E446BE23071188606E1A4D6974361B7F -+ Deutschland Radio -+ -+ -+ -1 -+ dontcare -+ 89.25 -+ -+ -+ 126374282814ADFADBE2EF1CE3D8D76C481B621D30EE27BBCFF14A52676918965C4945 -+ MDR Info -+ -+ -+ -1 -+ dontcare -+ 89.6 -+ -+ -+ 126374282923CF6A6384B154BD196B26FAEC0F46E5D2F75992F1A4CB1E3922E945756F -+ SAW -+ -+ -+ -1 -+ dontcare -+ 90 -+ -+ -+ 1263742830B389853BBD307C73B674DD3080C10A8D7CB8838BDD6057B175CA920FD3AA -+ Oldi Radio -+ -+ -+ -1 -+ dontcare -+ 90.3 -+ -+ -+ 1263742831CC06B9C80311B37D6466924D9AB2D3ADA554FF9DED60340AC9A039E9B3C8 -+ Rock Antenne -+ -+ -+ -1 -+ dontcare -+ 91.25 -+ -+ -+ 12637428322B4118EB5A3211F093974CCCC9927F9558491D774C8AA7E0A33F07700346 -+ Eins Live -+ -+ -+ -1 -+ dontcare -+ 91.65 -+ -+ -+ 1263742833D9A214651D3D206F59094AABE5E3353C48F4020AA8C27C76F836275592E0 -+ NDR 1 Radio Niederschsen -+ -+ -+ -1 -+ dontcare -+ 92.25 -+ -+ -+ 126374283318A69C075A277B3AE8BBC79F4E1E1CFF4D823EABB3E27F2EFC9AA217DDCC -+ NDR 2 -+ -+ -+ -1 -+ dontcare -+ 92.55 -+ -+ -+ 126374283421160FBC90ECB09B18979625B7F274B18546F9C5C97A246495B9AAE1A5E9 -+ FFH -+ -+ -+ -1 -+ dontcare -+ 92.9 -+ -+ -+ 126374283589E02D1E4A540935B08F8687AB04E172BB80B27849A0CDDFFF03174B4C17 -+ NDR Kultur -+ -+ -+ -1 -+ dontcare -+ 93.3 -+ -+ -+ 126374283631ED9E0026122FD10F2825536EC8979B1F01BEB7AD59A182A60DA6AB6337 -+ NDR Info -+ -+ -+ -1 -+ dontcare -+ 93.75 -+ -+ -+ 1263742837C5F29068AF8F6315053367092213F5A91FECB77C79B25DC7123F0F97CE96 -+ Deutsche Welle -+ -+ -+ -1 -+ dontcare -+ 94.35 -+ -+ -+ 126374283890A8F7FA29894A666714B8C172C8AC2B4AB800CFCE4CFAECCE5B89E97343 -+ Klassik Radio -+ -+ -+ -1 -+ dontcare -+ 94.35 -+ -+ -+ 126374283997A76504466255252E1563C2AB7F4C94AF7CB603B93CBF0F04A192200307 -+ HR 3 -+ -+ -+ -1 -+ dontcare -+ 94.8 -+ -+ -+ 1263742840F23D0ECD733FDD8E3731B6056CEB2E209AB55CDF408DC3D77D63C4213280 -+ WDR 2 -+ -+ -+ -1 -+ dontcare -+ 95.1 -+ -+ -+ 126374284156512415BAD6D5DDC43C6D31836973C0907AB8D029DFF6B517E53C2FDDF6 -+ Radio Multikulti -+ -+ -+ -1 -+ dontcare -+ 95.4 -+ -+ -+ 1263742841551253EE75D6424548E0CC1889E159736C4D2ADD3549A113C07F1F061CE2 -+ FFN -+ -+ -+ -1 -+ dontcare -+ 96 -+ -+ -+ 126374284252DC31E7051B8F2C4984B09241B8BB7819148D202E8E524B02774BD15A8A -+ Deutschlandfunk -+ -+ -+ -1 -+ dontcare -+ 96.75 -+ -+ -+ 12637428435D4645161BCED1C50EF09BF6CE85BEA46C166A1E2D64B19B1822D6700EAD -+ Antenne Niedersachsen -+ -+ -+ -1 -+ dontcare -+ 97.15 -+ -+ -+ 126374284413BE6B50358FE9B9ADF0A6EA2D9EDF035B91B1321D75EDF33D749E1CFA20 -+ HR 1 -+ -+ -+ -1 -+ dontcare -+ 97.6 -+ -+ -+ 126374284593B682D61F333A3D754C703C82F42B741DDE18D0C8A2CF8524399A3798F9 -+ JAM-FM -+ -+ -+ -1 -+ dontcare -+ 98.45 -+ -+ -+ 126374284646159C57300999149BF9E29B870F326D53B7AD3585AA98358AE57FB57D76 -+ Radio Kultur -+ -+ -+ -1 -+ dontcare -+ 98.85 -+ -+ -+ 1263742847858C45BB6735345C399F738AFF6F55013D910568D69A6A9A85C313021A5F -+ HR 4 -+ -+ -+ -1 -+ dontcare -+ 99.2 -+ -+ -+ 12637428482EBB68304452FDD74383FB9A44ED38027A32F0806F305E13C5368B14F616 -+ Bayern 4 -+ -+ -+ -1 -+ dontcare -+ 99.8 -+ -+ -+ 1263743544D78D9BED87ED0DF1E8519FB2AF5D2C111B20A29EFF9C93A1DFB9F96254C5 -+ MDR Sputnik -+ -+ -+ -1 -+ dontcare -+ 100.5 -+ -+ -+ 126374354537444BA44CBE30C1D397DA0991B3F9BF542115EEF022AFBC5E5FF290C7A5 -+ MDR Figaro -+ -+ -+ -1 -+ dontcare -+ 101.2 -+ -+ -+ 126374354645C945AE5A4783113FEEB24D935493E61DCD872EE2A134A465E863CD3876 -+ Fritz ! -+ -+ -+ -1 -+ dontcare -+ 101.7 -+ -+ -+ 12637435473D9A588A8A12B43BF3596ED13EFB1180A2A05719E7A8FB40D30A250A0056 -+ BFBS -+ -+ -+ -1 -+ dontcare -+ 102.2 -+ -+ -+ 1263743548B8232CCE6182B4CF3816782E0844B502DDF91E2C28351A0B5877367DE0D3 -+ SR 1 Europawelle -+ -+ -+ -1 -+ dontcare -+ 102.8 -+ -+ -+ 1263743549B9F2A5257233788E6F04310A8F1DD491442CA56AD73B0E5798C729B99EDC -+ YOU FM -+ -+ -+ -1 -+ dontcare -+ 103.1 -+ -+ -+ 1263743550BFDFB8BCD636A097518718168B3D5D61ECD57E40BCC0F277542874A1BA7C -+ Bayern 1 -+ -+ -+ -1 -+ dontcare -+ 103.7 -+ -+ -+ 1263743551B0AEC06DC0F6E54AEE4040B5C41574A6875E90B9911063287E2D6D26F294 -+ RBB 88.8 -+ -+ -+ -1 -+ dontcare -+ 104.15 -+ -+ -+ 126374355201213C9812FD21730D85E96DE0D3A52EF78B5E02A2715518232B56C8A7BD -+ Rockland Sachsen Anhalt -+ -+ -+ -1 -+ dontcare -+ 104.85 -+ -+ -+ 12637435532085DA6DFCF8ACF5D9110E3D8906C6787F5C5959EA24F6556F8B352E32CC -+ Radio Eins -+ -+ -+ -1 -+ dontcare -+ 105.15 -+ -+ -+ 12637435547572CEF30E8B572F74EFE1BD51A7857523DA4C6C72CE5231468DC024D09C -+ Sunshine Live -+ -+ -+ -1 -+ dontcare -+ 105.5 -+ -+ -+ 1263743941C06A86CC4F04B028AA968B5A1D0C649853283C5CC797B064E9291C30B25F -+ ORF 1 -+ -+ -+ -1 -+ dontcare -+ 105.9 -+ -+ -+ 1263743942BC75454A3292124CDCE7FCE62C833AA3C823D7B730489D91694921C82BBE -+ 89.0 RTL -+ -+ -+ -1 -+ dontcare -+ 106.4 -+ -+ -+ 126374394362921148E9ECCE4D0A53BAA6752E8C954750B5716E2DA94072190FB92E46 -+ Antenne Bayern -+ -+ -+ -1 -+ dontcare -+ 106.85 -+ -+ -+ 126374394436B325F6FA9AF7DA917B9D0F9651623DD1D358F20DDBFCAF846F16F20BDC -+ Antenne Brandenburg -+ -+ -+ -1 -+ dontcare -+ 107.6 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am kradio-3.5.13.1/kradio3/presets/germany/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/germany/Makefile.am 2012-11-30 23:30:53.000000000 +0100 -@@ -1,244 +1,282 @@ - SUBDIRS = --EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "worfelden-cable.krp" -+EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "amtzell-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "bayreuth.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.3.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bonn-cable.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bremerhaven-cable.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "coswig.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erlensee.krp" "erwitte-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "frankfurth-am-main-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "goettingen-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "hilden.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "konstanz-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "lippstadt-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "magdeburg-mdcc-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "norderstedt-cable.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oer-erkenschwick.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "paderborn-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "soest-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "warstein-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "wilhelmshaven-cable.krp" "worfelden-cable.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/" -- $(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" -- $(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/muenchen-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" -- $(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" -+ $(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" -+ $(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" - $(INSTALL_DATA) "$(srcdir)/aichach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" -+ $(INSTALL_DATA) "$(srcdir)/amtzell-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bayreuth.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-cable.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp" -+ $(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/bonn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/bremerhaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" - $(INSTALL_DATA) "$(srcdir)/chemnitz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" -+ $(INSTALL_DATA) "$(srcdir)/coswig.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp" -+ $(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" - $(INSTALL_DATA) "$(srcdir)/duesseldorf.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" -- $(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" -- $(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" - $(INSTALL_DATA) "$(srcdir)/erlangen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" -- $(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" -- $(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/erlensee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp" -+ $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" -+ $(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/frankfurth-am-main-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/goettingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" - $(INSTALL_DATA) "$(srcdir)/hamburg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" -- $(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" - $(INSTALL_DATA) "$(srcdir)/hamburg-cable5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" -- $(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" - $(INSTALL_DATA) "$(srcdir)/hamburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" -- $(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" -- $(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" -- $(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/hilden.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp" -+ $(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" - $(INSTALL_DATA) "$(srcdir)/karlsruhe-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" -- $(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" -+ $(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" - $(INSTALL_DATA) "$(srcdir)/koeln-loevenich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/konstanz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" - $(INSTALL_DATA) "$(srcdir)/langenselbold-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/lippstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/magdeburg-mdcc-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" - $(INSTALL_DATA) "$(srcdir)/muenchen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" - $(INSTALL_DATA) "$(srcdir)/muenchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" -- $(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" -- $(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" - $(INSTALL_DATA) "$(srcdir)/muenster.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" -- $(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" -- $(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" -- $(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" -- $(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/neuberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" -+ $(INSTALL_DATA) "$(srcdir)/norderstedt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp" - $(INSTALL_DATA) "$(srcdir)/nuernberg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" -- $(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" -- $(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/oer-erkenschwick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp" -+ $(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/paderborn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/rodenbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/soest-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" - $(INSTALL_DATA) "$(srcdir)/stuttgart-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" -- $(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" -- $(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" -- $(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" -- $(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" -- -- -+ $(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/warstein-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" -+ $(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/wilhelmshaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" -+ - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,450 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2009-02-14 -+ Gerhard-Czech@web.de -+ -+ Germany -+ Norderstedt -+ cable -+ wilhelm.tel Senderliste -+ -+ -+ -+1063385350B84E83FC624D588B9BE2C16667AF463CE62AE705548F65C08E293A455B179381 -+ Radio Hamburg -+ Radio HH -+ -+ -1 -+ 88.05 -+ -+ -+ -+106338535026BB6D13F62EB11F9202671BE547076886D906672B3BA433EEA32DEE1D5CFBBC -+ Deutschlandradio Kultur -+ Deutschlandradio Kultur -+ -+ -1 -+ 88.5 -+ -+ -+ -+10633853501AC822C1346D33E13696EEC91ACF26BA372F11213BD45B4EE82A96C15FA32287 -+ WDR 3 -+ WDR 3 -+ -+ -1 -+ 88.8 -+ -+ -+ -+1063385350373BB2F1ABE25FE88366C4630D30676015E09340196CE2D9CA144A574BF9E312 -+ NDR 1 Radio Niedersachsen -+ NDR 1 RN -+ -+ -1 -+ 89.25 -+ -+ -+ -+106338535060116062B40326BB376BFE3AFC499BED2E9977E2FD33EFC4C2EA9A8EC7536CA9 -+ NDR 1 Welle Nord -+ NDR1 WN -+ -+ -1 -+ 89.85 -+ -+ -+ -+1063385350EE3CB6DB0F51E1AA3983153965EA7FA09DCE13F03EF634CB5831F8DB746ADD02 -+ NDR 4 Info Spezial -+ NDR 4 -+ -+ -1 -+ 90.15 -+ -+ -+ -+106338535093FD8B50CD14B4DEDDCAB424AD4A236A3B5132F5A742DD5AE35A1523EA82761E -+ N-Joy Radio -+ N-Joy -+ -+ -1 -+ 90.55 -+ -+ -+ -+106338535044CA129A3069F2F21913EF30FA88A204A17C4F3B771FDB8D37D72B5897D516E6 -+ 1-Live -+ 1-Live -+ -+ -1 -+ 91 -+ -+ -+ -+106338535054196C1A743CDE1D0B11CAA8DE8ACD3A7AFB00ABE2A2803F3E6FBA8EA828014B -+ hr 1 -+ hr 1 -+ -+ -1 -+ 91.5 -+ -+ -+ -+1063385350DE5AD2FDA58E954D66478D9324226E127F9223095557A8D3DFFFEF16FB37C337 -+ Radio Nora -+ Radio Nora -+ -+ -1 -+ 91.85 -+ -+ -+ -+10633853509EAAA7B362EC8BCFC1629FA3834FF7A76B91D6C4BFF4CDC3BB222C79D9568692 -+ hr 2 kultur -+ hr 2 kultur -+ -+ -1 -+ 92.1 -+ -+ -+ -+10633853500A5320B468F00DDB554C8AFD8D8DB4366DDE401B68B8C10D4BF1100A550E3138 -+ hr 3 -+ hr 3 -+ -+ -1 -+ 92.5 -+ -+ -+ -+1063385350508688C1414B72DB224F647C9BBD7A21F19D3F86897B0A82ECB4DBEABAE2C92E -+ SWR 1 -+ SWR 1 -+ -+ -1 -+ 92.8 -+ -+ -+ -+10633853506439B306C57FD4A5340C8F7E7364CBEFE1372C60178FEF29688E0627A218BC52 -+ NDR 90,3 -+ NDR 90,3 -+ -+ -1 -+ 93.2 -+ -+ -+ -+106338535021D5A21FDEDA49C85D63E57004F55638248728F0BFD40F7671CC9BBC5AEA95DB -+ SWR 2 -+ SWR 2 -+ -+ -1 -+ 93.6 -+ -+ -+ -+1063385350D34BD6644543C07C38FA2D661672A512583CC51AD16F6F0DE32CC4697AEB1118 -+ NDR Info -+ NDR Info -+ -+ -1 -+ 94.05 -+ -+ -+ -+1063385350FF40EDBD2E10FDAD51A29E107DCAF7077E29E1736E60CB0BDDFA49A551A6A1C2 -+ NDR 2 -+ NDR 2 -+ -+ -1 -+ 94.65 -+ -+ -+ -+10633853500D6CCAD018C68368688B649B1ACFEE285A557AB5C0FDA660E65718DB691499E1 -+ MDR Sputnik -+ MDR Sputnik -+ -+ -1 -+ 95.1 -+ -+ -+ -+1063385350EBE5C823BACEAE26C7FF138AE71E7711B738C34E75208D92DC51ED5FB9C2FB5E -+ Tide 96,0 + HH Lokalradio -+ Tide + HH Lokal -+ -+ -1 -+ 95.45 -+ -+ -+ -+106338535011B527125E5F38884C3CF693AB2004D3E1C810FD877D2B4213FEFD3836370889 -+ NDR Kultur -+ NDR Kultur -+ -+ -1 -+ 95.75 -+ -+ -+ -+1063385350AB3F8EE6BAC5C355404FD149F70CF608788C42CBCD172722787BFE29CFBAA8BA -+ Bayern 1 -+ Bayern 1 -+ -+ -1 -+ 96.1 -+ -+ -+ -+1063385350601899CA33011371470A528C450992A0D64DD34A718C7BCE4AF47EF312D4B136 -+ Bayern 2 -+ Bayern 2 -+ -+ -1 -+ 96.4 -+ -+ -+ -+106338535068C208A46296C2BE28873616D9C401F53E209937F709EDC3EB6EB7BE49EC4F02 -+ 106!8 rock'n pop -+ 106!8 rock'n pop -+ -+ -1 -+ 96.75 -+ -+ -+ -+10633853502006935D7247875D8AA64C3B2AF8933D5B8D3650A1CAE77A4C6B677833772F0E -+ Oldy 95 -+ Oldy 95 -+ -+ -1 -+ 97.25 -+ -+ -+ -+1063385350169E84364F4F9F4D3C3547FAC7365B9521BEFAB964624811D599177AA4E77E55 -+ radio Paloma -+ radio Paloma -+ -+ -1 -+ 97.5 -+ -+ -+ -+10633853503D5AA8B2230615373C62861989B4AD0EB99F4EAED33ECF1EBF06B5967FCD831A -+ bremen 1 -+ bremen 1 -+ -+ -1 -+ 97.95 -+ -+ -+ -+10633853507248B4D0A7AD9E7DF13B1893C01E6FC349E736D790CD33B3D0696E9063E85E46 -+ RTL Radio -+ RTL Radio -+ -+ -1 -+ 98.2 -+ -+ -+ -+1063385350F6080C0CB178074EB190CA8E77340D8267A33B6C3C3E58B87D1E3255DD0AF5D5 -+ Klassik Radio -+ Klassik Radio -+ -+ -1 -+ 98.6 -+ -+ -+ -+106338535094733F26C046A7795D27ED029389749370E31C7C1C78483134F220F8D8FAD4A7 -+ Antenne Bayern -+ Antenne Bayern -+ -+ -1 -+ 98.9 -+ -+ -+ -+1063385350FAD03C1D4B5A46C859A3A110D862C8523602E39385B8E5E402B94A751731F2EC -+ Radio ffn -+ Radio ffn -+ -+ -1 -+ 99.35 -+ -+ -+ -+10633853500526AA9671790C3BB2211D6DF78CC72D1ABB18733ED5803200B3B1B0ED13C46A -+ Energy 97,1 Hamburg -+ Energy -+ -+ -1 -+ 99.65 -+ -+ -+ -+10633853502CD554F9AD1EB9D0727B9D0621D03342D67D2F526DC6C43040F140D1D8412A88 -+ NDR 1 MV -+ NDR 1 MV -+ -+ -1 -+ 99.9 -+ -+ -+ -+1063385350FCC367BB28B3F06B05EE9436A580DD111C23C69BA950EFFF390F827E9539BB65 -+ Bayern 4 -+ Bayern 4 -+ -+ -1 -+ 100.2 -+ -+ -+ -+106338535048C54A30155C428309B238A6B368938D90074D049CAC4719607EAB5CF7D1CBB3 -+ Das Ding -+ Das Ding -+ -+ -1 -+ 100.5 -+ -+ -+ -+10633853506D9D33CCAD3D2A21934D4332B28A106F4E7B556D2E85E73D1CA9694FE389A9BF -+ WDR 2 -+ WDR 2 -+ -+ -1 -+ 100.8 -+ -+ -+ -+106338535090C69B1F51500F2011BA197DBBF8655430B7EBCE140C874329F8C8C8B0CEA50A -+ you fm -+ you fm -+ -+ -1 -+ 101.3 -+ -+ -+ -+1063385350B7953D6A790A5AB4818383A12C503EC062B044FCA52ABF433AA19E42A49283BF -+ sunshine live -+ sunshine live -+ -+ -1 -+ 101.6 -+ -+ -+ -+1063385350FC80A9732793334A7DAC69EA8F7B486EC7160FC3F7A6E592E08C280C7D06F449 -+ Fritz! -+ Fritz! -+ -+ -1 -+ 102 -+ -+ -+ -+12340016715898BD9CD68481FA7E9268C59FDCF206A92F6C2FC4D81F4BF99B1CD14087279D -+ Deutschlandfunk -+ Deutschlandfunk -+ -+ -1 -+ 102.3 -+ -+ -+ -+1234001676F3C24D22C4CEFAAF59368B1C6175B9A112326DD02540159968DCE362531E47BF -+ Hit-Radio Antenne -+ Hit-Radio -+ -+ -1 -+ 102.75 -+ -+ -+ -+1234004410D728141F410BBB7AE00435D01B95B781EAA667EFA34510D49D1F3B511BF1421B -+ SWR 3 -+ SWR 3 -+ -+ -1 -+ 103 -+ -+ -+ -+1234004410592FCEB5589B5E7B2E730AB5CB789633232C5CAF6D6D19C59D09BBC989CB022F -+ Bayern 3 -+ Bayern 3 -+ -+ -1 -+ 103.4 -+ -+ -+ -+1234004411DFC8AC8BFB2B7B5065F7BE40919DA57485B510CAAA1DA6C66D5B15185BF1FBEF -+ delta radio -+ delta radio -+ -+ -1 -+ 103.75 -+ -+ -+ -+123400445658D18DC5F7E316C14349DAA777FE6EC95255EC80D8E33B208D502CC98C97C9B5 -+ R.SH Radio Schleswig-Holstein -+ R.SH -+ -+ -1 -+ 104.4 -+ -+ -+ -+123400445766065E8E29FA0613993EAF2667A8B3E9D6AF0F4ADACEC66F591C43800662D112 -+ Nordwest Radio -+ Nordwest Radio -+ -+ -1 -+ 104.7 -+ -+ -+ -+12340044573D82674FCA85A381784833081DFDF233C9C032301D07C8CAB368BD735FAAA9CC -+ Freies Sender Kombinat (FSK) -+ Freies Sender Kombinat -+ -+ -1 -+ 105.7 -+ -+ -+ -+1234004409F068FBDBCEF941ACA3B7C82B7DBBCE43BF5287F6A4B96407FA5343837E171138 -+ BFBS -+ BFBS -+ -+ -1 -+ 107 -+ -+ -+ -+1234004458B512B7DC7D8646454A0094CF9F2930306C137063BF00680315D0802EDEDA67B4 -+ Jam FM -+ Jam FM -+ -+ -1 -+ 107.3 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,175 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Uwe Thaler, <Uwe.Thaler@t-online.de> -+ 2003-12-23T22:02:09 -+ Deutschland -+ Essen -+ Kabel -+ Liste Radio Kabelcom Essen -+ -+ -+ 111645544461FE8EC7D53496B0149CC2169AFF2BE5A321887F26EA65C4C52540225748C2DE -+ RTL Radio -+ RTL R -+ -+ -1 -+ 104.8 -+ -+ -+ 1116455444132EC8910552A076B2263EB4FB6DA83828A0EDE6BACD06C3147D3D1D432A0B84 -+ Deutschlandfunk -+ DLF -+ -+ -1 -+ 87.5 -+ -+ -+ 1116455444C33A968EE2BF1BB48608049D2CF4CF12067F88AD3A8399924505353DC2F8C1B1 -+ WDR 4 -+ WDR 4 -+ -+ -1 -+ 91.35 -+ -+ -+ 11164554441C32631CB6263AF15048C040D027B28AFFC9380A2B9027721DAC470EFF0F2B13 -+ WDR Eins Live -+ Eins Live -+ -+ -1 -+ 88.25 -+ -+ -+ 1116455444EC9767FF57C695D2BC57D4E9960583C198339CBC10C280ADC8967430FA73362C -+ Deutschland Radio Berlin -+ DR -+ -+ -1 -+ 90.2 -+ -+ -+ 11164554447E69E7F5DC8891C1EC85A6BABE9DA55BF3F972E92D42A27D94189964F338DAEF -+ WDR III -+ WDR III -+ -+ -1 -+ 90.65 -+ -+ -+ 111645544489F961FBA68B91A2590ED0348782FD901D630C4B10247EE161FF365EDA52A0A4 -+ Funkhaus Europa - WDR 5 -+ WDR 5 FHE -+ -+ -1 -+ 91.25 -+ -+ -+ 11164554447D2214728E8C6A0FE7F397222627101A4A4186A81B2C51C0D9C9E66A4A91DE81 -+ wdr II -+ wdr ii -+ -+ -1 -+ 89.15 -+ -+ -+ 1116455444DCD947F01824F0A55659C25B627F517E6ADDF5B00B3FB2A658F738A482055810 -+ Klassik Radio -+ Klassik -+ -+ -1 -+ 107.5 -+ -+ -+ 11164554446002034B38BC07A94EDA8819EF2177282B18B46232A19A5ECE0901DF6A0D4D85 -+ NDR 2 -+ NDR 2 -+ -+ -1 -+ 98.7 -+ -+ -+ 1116455444B6F7C6375D08F52073F4D132CEC84048966F773C1492E82A05585CCA2C11A891 -+ HR 3 -+ HR 3 -+ -+ -1 -+ 96.15 -+ -+ -+ 111645544479D905B9328F1AC358A01F714EE8C17400018AE87DBED4CE5C7F625F914B5FDB -+ domradio -+ dom -+ -+ -1 -+ 96.25 -+ -+ -+ 111645544480377316E6435D71F5EB8AA0402FB46031174B80C5AC418AE0C0CCDAEDA937A2 -+ bigFM Rheinland-Pfalz -+ bigFM -+ -+ -1 -+ 97.35 -+ -+ -+ 11164554449784A88F4B6C63A7C41D755BE911D687B4C687070880F5B28605E85AECA30754 -+ SWR 4 Rheinland -+ SWR 4 -+ -+ -1 -+ 97.75 -+ -+ -+ 1116455444D5E482E6616E9D6E5D5BDFE5A04193005823CE44E87B48484DF749B8FF8D035B -+ SWR 3 -+ SWR 3 -+ -+ -1 -+ 98.75 -+ -+ -+ 11164554440A3113553BB364D4A20AE066334DE449CA5C17CCA426E8FA1D1EDCCB375D94B6 -+ SWR 1 Rheinland-Pfalz -+ SWR 1 -+ -+ -1 -+ 91.7 -+ -+ -+ 11164554447A369B21CFC99C0BF2B72914C742BE496DFDFCD025658A93E387411759BBFA9D -+ sunshine live -+ Sunshine -+ -+ -1 -+ 102.55 -+ -+ -+ 1116455444C55AFCD21C815FB71F984EABA23B215432E193FCC8D4F77B9722D39CCA020CF2 -+ BFBS -+ BFBS -+ -+ -1 -+ 103.7 -+ -+ -+ 111645544418C2B1594DAF8F9AD98E1A3D4EC894D3A74B163377373AA0D594B4690538B502 -+ WDR 5 -+ WDR 5 -+ -+ -1 -+ 105.5 -+ -+ -+ 11164554446B06F6FC468822B3823EA87329E6F0A6F352A325BC2618FB8037056CC8A53191 -+ Radio Melodie -+ Melodie -+ -+ -1 -+ 105.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,295 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Skutek <grf-chz@gmx.de> -+ 2007-12-18T15:31:54 -+ Germany -+ Erwitte/Lippstadt/Soest/Paderborn/Warstein -+ cable -+ Stand November 2007 -+ -+ -+ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 -+ hr1 -+ -+ -+ -1 -+ 87.9 -+ -+ -+ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 -+ hr2 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 -+ hr3 -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 -+ hr4-Rhein-Main-Journal -+ -+ -+ -1 -+ 88.95 -+ -+ -+ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 -+ 1LIVE (WDR) -+ -+ -+ -1 -+ 89.4 -+ -+ -+ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A -+ Deutschlandfunk -+ -+ -+ -1 -+ 90.1 -+ -+ -+ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 -+ Deutschlandradio Kultur -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 -+ WDR2 - Siegen -+ -+ -+ -1 -+ 90.75 -+ -+ -+ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 -+ NDR1 Radio NDS - Südwest -+ -+ -+ -1 -+ 91.15 -+ -+ -+ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 -+ NDR2 -+ -+ -+ -1 -+ 92.4 -+ -+ -+ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 -+ WDR3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F -+ NDR Kultur -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 -+ JUMP -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F -+ WDR4 -+ -+ -+ -1 -+ 94.25 -+ -+ -+ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF -+ Klassik Radio -+ -+ -+ -1 -+ 94.55 -+ -+ -+ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 -+ BR1 - Main/Franken -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 -+ WDR Radio 5 -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D -+ domradio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 -+ ERF (Evangeliums Rundfunk) -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 -+ Funkhaus Europa (WDR) -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 -+ SWR1 -Rheinland Pfalz -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C -+ SWR2 -Rheinland Pfalz -+ -+ -+ -1 -+ 98.25 -+ -+ -+ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B -+ SWR3 -+ -+ -+ -1 -+ 98.75 -+ -+ -+ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A -+ BFBS (engl.) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB -+ DEFJAY -+ -+ -+ -1 -+ 100.2 -+ -+ -+ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 -+ radio ffn - Osnabrück -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF -+ JAM FM -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E -+ Radio Melodie -+ -+ -+ -1 -+ 101.75 -+ -+ -+ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 -+ RTL Radio - Die besten Hits aller Zeiten -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D -+ sunshine live -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 -+ WDR2 Bielefeld/HIT RADIO FFH -+ -+ -+ -1 -+ 103.9 -+ -+ -+ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 -+ 2255LIVE Ihr Gewinnradio -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 -+ Radio Hochstift/AFN - Frankfurt -+ -+ -+ -1 -+ 106.85 -+ -+ -+ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 -+ Radio Siegen/Hellweg Radio/Radio Sauerland -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,295 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Skutek <grf-chz@gmx.de> -+ 2007-12-18T15:31:54 -+ Germany -+ Erwitte/Lippstadt/Soest/Paderborn/Warstein -+ cable -+ Stand November 2007 -+ -+ -+ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 -+ hr1 -+ -+ -+ -1 -+ 87.9 -+ -+ -+ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 -+ hr2 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 -+ hr3 -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 -+ hr4-Rhein-Main-Journal -+ -+ -+ -1 -+ 88.95 -+ -+ -+ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 -+ 1LIVE (WDR) -+ -+ -+ -1 -+ 89.4 -+ -+ -+ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A -+ Deutschlandfunk -+ -+ -+ -1 -+ 90.1 -+ -+ -+ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 -+ Deutschlandradio Kultur -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 -+ WDR2 - Siegen -+ -+ -+ -1 -+ 90.75 -+ -+ -+ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 -+ NDR1 Radio NDS - Südwest -+ -+ -+ -1 -+ 91.15 -+ -+ -+ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 -+ NDR2 -+ -+ -+ -1 -+ 92.4 -+ -+ -+ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 -+ WDR3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F -+ NDR Kultur -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 -+ JUMP -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F -+ WDR4 -+ -+ -+ -1 -+ 94.25 -+ -+ -+ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF -+ Klassik Radio -+ -+ -+ -1 -+ 94.55 -+ -+ -+ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 -+ BR1 - Main/Franken -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 -+ WDR Radio 5 -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D -+ domradio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 -+ ERF (Evangeliums Rundfunk) -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 -+ Funkhaus Europa (WDR) -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 -+ SWR1 -Rheinland Pfalz -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C -+ SWR2 -Rheinland Pfalz -+ -+ -+ -1 -+ 98.25 -+ -+ -+ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B -+ SWR3 -+ -+ -+ -1 -+ 98.75 -+ -+ -+ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A -+ BFBS (engl.) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB -+ DEFJAY -+ -+ -+ -1 -+ 100.2 -+ -+ -+ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 -+ radio ffn - Osnabrück -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF -+ JAM FM -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E -+ Radio Melodie -+ -+ -+ -1 -+ 101.75 -+ -+ -+ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 -+ RTL Radio - Die besten Hits aller Zeiten -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D -+ sunshine live -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 -+ WDR2 Bielefeld/HIT RADIO FFH -+ -+ -+ -1 -+ 103.9 -+ -+ -+ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 -+ 2255LIVE Ihr Gewinnradio -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 -+ Radio Hochstift/AFN - Frankfurt -+ -+ -+ -1 -+ 106.85 -+ -+ -+ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 -+ Radio Siegen/Hellweg Radio/Radio Sauerland -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,295 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Skutek <grf-chz@gmx.de> -+ 2007-12-18T15:31:54 -+ Germany -+ Erwitte/Lippstadt/Soest/Paderborn/Warstein -+ cable -+ Stand November 2007 -+ -+ -+ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 -+ hr1 -+ -+ -+ -1 -+ 87.9 -+ -+ -+ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 -+ hr2 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 -+ hr3 -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 -+ hr4-Rhein-Main-Journal -+ -+ -+ -1 -+ 88.95 -+ -+ -+ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 -+ 1LIVE (WDR) -+ -+ -+ -1 -+ 89.4 -+ -+ -+ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A -+ Deutschlandfunk -+ -+ -+ -1 -+ 90.1 -+ -+ -+ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 -+ Deutschlandradio Kultur -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 -+ WDR2 - Siegen -+ -+ -+ -1 -+ 90.75 -+ -+ -+ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 -+ NDR1 Radio NDS - Südwest -+ -+ -+ -1 -+ 91.15 -+ -+ -+ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 -+ NDR2 -+ -+ -+ -1 -+ 92.4 -+ -+ -+ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 -+ WDR3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F -+ NDR Kultur -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 -+ JUMP -+ -+ -+ -1 -+ 93.7 -+ -+ -+ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F -+ WDR4 -+ -+ -+ -1 -+ 94.25 -+ -+ -+ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF -+ Klassik Radio -+ -+ -+ -1 -+ 94.55 -+ -+ -+ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 -+ BR1 - Main/Franken -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 -+ WDR Radio 5 -+ -+ -+ -1 -+ 95.3 -+ -+ -+ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D -+ domradio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 -+ ERF (Evangeliums Rundfunk) -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 -+ Funkhaus Europa (WDR) -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 -+ SWR1 -Rheinland Pfalz -+ -+ -+ -1 -+ 97.9 -+ -+ -+ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C -+ SWR2 -Rheinland Pfalz -+ -+ -+ -1 -+ 98.25 -+ -+ -+ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B -+ SWR3 -+ -+ -+ -1 -+ 98.75 -+ -+ -+ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A -+ BFBS (engl.) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB -+ DEFJAY -+ -+ -+ -1 -+ 100.2 -+ -+ -+ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 -+ radio ffn - Osnabrück -+ -+ -+ -1 -+ 100.6 -+ -+ -+ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF -+ JAM FM -+ -+ -+ -1 -+ 101.4 -+ -+ -+ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E -+ Radio Melodie -+ -+ -+ -1 -+ 101.75 -+ -+ -+ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 -+ Radio 4 (niederl.) -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 -+ RTL Radio - Die besten Hits aller Zeiten -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D -+ sunshine live -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 -+ WDR2 Bielefeld/HIT RADIO FFH -+ -+ -+ -1 -+ 103.9 -+ -+ -+ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 -+ 2255LIVE Ihr Gewinnradio -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 -+ Radio Hochstift/AFN - Frankfurt -+ -+ -+ -1 -+ 106.85 -+ -+ -+ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 -+ Radio Siegen/Hellweg Radio/Radio Sauerland -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp 2012-11-30 23:30:53.000000000 +0100 -@@ -0,0 +1,277 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Michael Herbers, <michael.herbers@gmx.de> -+ 2007-12-11T23:23:26 -+ Germany -+ Wilhelmshaven -+ cable -+ tux fan -+ -+ -+ -+1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E -+ NDR 1 Niedersachsen -+ 1 -+ -+ -1 -+ 99.55 -+ -+ -+ -+1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11 -+ NDR 2 -+ 2 -+ -+ -1 -+ 96.2 -+ -+ -+ -+10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3 -+ NDR Kultur -+ 3 -+ -+ -1 -+ 95.2 -+ -+ -+ -+10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684 -+ NDR Info -+ 4 -+ -+ -1 -+ 107.6 -+ -+ -+ -+109129056091591890E743FC62C0FE220A787BDAFD61AC8C983B8D81A36B97886C7BFCA512 -+ Radio Jade -+ 5 -+ -+ -1 -+ 87.8 -+ -+ -+ -+10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6 -+ Radio Ostfriesland -+ 6 -+ -+ -1 -+ 100.15 -+ -+ -+ -+1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90 -+ RTL Radio -+ 7 -+ -+ -1 -+ 89.1 -+ -+ -+ -+109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A -+ FFN -+ 8 -+ -+ -1 -+ 105.3 -+ -+ -+ -+109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141 -+ Hitradio Antenne -+ 9 -+ -+ -1 -+ 102.9 -+ -+ -+ -+1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41 -+ N-Joy -+ 10 -+ -+ -1 -+ 100.95 -+ -+ -+ -+1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6 -+ Bremen 1 -+ 11 -+ -+ -1 -+ 102.1 -+ -+ -+ -+10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366 -+ Energy Bremen -+ 12 -+ -+ -1 -+ 92.3 -+ -+ -+ -+1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202 -+ Nordwest Radio -+ 13 -+ -+ -1 -+ 98.5 -+ -+ -+ -+10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C -+ Bremen 4 -+ 14 -+ -+ -1 -+ 104 -+ -+ -+ -+10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178 -+ Radio Sunshine -+ 15 -+ -+ -1 -+ 97.85 -+ -+ -+ -+10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E -+ Jam FN -+ 16 -+ -+ -1 -+ 94.9 -+ -+ -+ -+1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D -+ FH Europa -+ 17 -+ -+ -1 -+ 100.45 -+ -+ -+ -+1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02 -+ Deutschlandfunk -+ 18 -+ -+ -1 -+ 88.6 -+ -+ -+ -+1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6 -+ Deutschlandradio Berlin -+ 19 -+ -+ -1 -+ 107.25 -+ -+ -+ -+10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734 -+ Radio Klassik -+ 20 -+ -+ -1 -+ 98.8 -+ -+ -+ -+1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F -+ Radio Melodie -+ 21 -+ -+ -1 -+ 91.25 -+ -+ -+ -+1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2 -+ Radio 1 NL -+ 22 -+ -+ -1 -+ 90.6 -+ -+ -+ -+1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189 -+ Radio 2 NL -+ 23 -+ -+ -1 -+ 90.15 -+ -+ -+ -+109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C -+ Skyradio NL -+ 24 -+ -+ -1 -+ 96.85 -+ -+ -+ -+1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4 -+ Radio 4 NL -+ 25 -+ -+ -1 -+ 92.6 -+ -+ -+ -+1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844 -+ RESERVE -+ 26 -+ -+ -1 -+ 97.3 -+ -+ -+ -+10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B -+ RESERVE -+ 27 -+ -+ -1 -+ 99.2 -+ -+ -+ -+1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC -+ RESERVE -+ 28 -+ -+ -1 -+ 101.5 -+ -+ -+ -+109129056054E0EC549A20C823CC67874F7909A856ED54416CDD24B65DE1C12AD39B5B5EFE -+ RESERVE -+ 29 -+ -+ -1 -+ 102.45 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,639 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ George Alexandropoulos <g.alexandropoulos@gmail.com> -+ 2008-12-26T18:43:34 -+ Greece -+ Athens -+ -+ -+ -+ -+ 1230309911B23A391B5B6404E3091E9D9ECF9BE8DE4A6FBC37628F936966CA145F15FEED0F -+ Κρήτη FM (RDS) -+ 1 -+ -+ -1 -+ 87.5 -+ -+ -+ 1230310041C53AF537096A464EA9D7393DB1ED3791370F5775E49BC8858BA82280458F5DAC -+ Εν Λευκό (RDS) -+ 2 -+ -+ -1 -+ 87.7 -+ -+ -+ 12303101575D33579382D14ECCC22E92B1414305016182FB7BA9EFE6CA50A604D850A57CBC -+ Oasis FM (RDS) -+ 3 -+ -+ -1 -+ 88 -+ -+ -+ 1230310220B5C206BC9810A35D1EFC93D70746E857B846B8E310CAA13D3602035490A9913E -+ V FM -+ 4 -+ -+ -1 -+ 88.3 -+ -+ -+ 12303102476E86C70BF2EA5C48D3F805B504267254CE29524B0C63D596BD22B6BCEF20E221 -+ John Greek -+ 5 -+ -+ -1 -+ 88.6 -+ -+ -+ 1230310272DFE71B1E1BF4CB2EE6E6DA9E2F7AF5B19072431F604C8BE6B18D2EAF368FC67A -+ Angel (RDS) -+ 6 -+ -+ -1 -+ 88.9 -+ -+ -+ 12303103371BC455280287C472750952A9492A173E7279696BE7277A3DB9C66CD53149B85A -+ Arren-a Radio (RDS) -+ 7 -+ -+ -1 -+ 89.2 -+ -+ -+ 12303104015CF4557D8ACE18694D6EE8154D07ECA17672AF11C6F5FF0F723EA05D0145705D -+ ΡΣ Εκκλησίαςτης Ελλάδος (RDS) -+ 8 -+ -+ -1 -+ 89.5 -+ -+ -+ 12303104471B8BBD04DF9F47C0EDB773F06B4BACAE82699ACD1A45F0BB75F8D25B3882794E -+ Δρόμος FM (RDS) -+ 9 -+ -+ -1 -+ 89.8 -+ -+ -+ 12303104933673A9EFFDAB1E1AD16F03D4FFE37C1F5CED43B5C75620A80BC2E9C404F67699 -+ 902, Αριστερά στα FM -+ 10 -+ -+ -1 -+ 90.1 -+ -+ -+ 12303105374AE158E5AB0ED3A18C78292DD00315902384EA6109A0AA1172552C1C080BAE77 -+ Κανάλι 1 Πειραία -+ 11 -+ -+ -1 -+ 90.4 -+ -+ -+ 1230310714AE2CA9D371FBCA12154CF555677EF21621890B461BA8FA41F9D9D764DCCDB484 -+ Γλυφάδα FM -+ 12 -+ -+ -1 -+ 90.6 -+ -+ -+ 123031075982EB93F0EF674D9AA441B245BD7FC8D1FEFAA870F9109E184E6DBE4596FDD410 -+ Ράδιο Άστυ -+ 13 -+ -+ -1 -+ 90.7 -+ -+ -+ 123031080527F7E8134485FDE8926E30146332E82E336178DBF4ABD96487E9D52D5AE22C20 -+ Ε.ΡΑ. Τρίτο -+ 14 -+ -+ -1 -+ 90.9 -+ -+ -+ 12303109063B0E3AD5E48ED3A8CF88FE8CC51A90CEF91CA05453F7B360BD86723BB051B413 -+ Πειραεϊκή Εκκλησία (RDS) -+ 15 -+ -+ -1 -+ 91.2 -+ -+ -+ 12303109560CCDEF1DFE6DD06D30184BD88334C27D249404F7C06141D1E15DEED2769A26C3 -+ Κρητική Ραδιοφωνία (RDS) -+ 16 -+ -+ -1 -+ 91.4 -+ -+ -+ 123031099637DA95EC174BC5C9C0C30E5793D31DEC5D1F80C23C56F9791CE86F6ADA4794A1 -+ ΝΕΤ (RDS) -+ 17 -+ -+ -1 -+ 91.6 -+ -+ -+ 12303110246F1535C1B2CC59A3667E77E510E27CC6D0CE1BC195B16C8C1F2E07E98D5EF0C1 -+ Galaxy 92 (RDS) -+ 18 -+ -+ -1 -+ 92 -+ -+ -+ 1230311024FC7B25A31EC1F8FB66C8575BBBC79BB71852C7FFFDBB4C9FD2640605C24E4A0F -+ Λάμψη FM (RDS) -+ 19 -+ -+ -1 -+ 92.3 -+ -+ -+ 123031116244E7BDC268D4A421650CBA260D84346E9DFCA6D2BA54B0DF53EE49CCBF29E034 -+ Best Radio (RDS) -+ 20 -+ -+ -1 -+ 92.6 -+ -+ -+ 12303111928090247F007166010E5D852822A29E1FDAACEDB887EA1261923F19A599386CB3 -+ Kiss Radio (RDS) -+ 21 -+ -+ -1 -+ 92.9 -+ -+ -+ 1230311213A944DC146D6BFAA016A9F26EAD33E758890572A9BCA0E1319327B250F2C5AFEE -+ Orange (RDS) -+ 22 -+ -+ -1 -+ 93.2 -+ -+ -+ 1230311245C89045C8E4A643D71D1924EEAD1B28C67AE522A65071531C2353C8FB57EF22A9 -+ Energy Radio TEI FM -+ 23 -+ -+ -1 -+ 93.4 -+ -+ -+ 12303115166EC20D8697A6C3050C3AA563EFBE770A99C1B0798F2A7A606478B34E367B694E -+ Kosmos (RDS) -+ 24 -+ -+ -1 -+ 93.6 -+ -+ -+ 1230311550F6F0482ED41A99B83F9BB388EF16F0036BEC8D74B18472D3BC37DBB6D93AADD7 -+ Ράδιο Μεσώγεια -+ 25 -+ -+ -1 -+ 93.8 -+ -+ -+ 12303115893C0F6BB62B993A0F13809EB983624554E39A1BA8ACA0A12ED49C38D39D9B3CD5 -+ Επικοινωνία -+ 26 -+ -+ -1 -+ 94 -+ -+ -+ 1230311623B8101A41BD370C4EF460EC27324FF1F5B7DC74C2F24DEF1040131D54EC8FE6CB -+ Ξένιος (RDS) -+ 27 -+ -+ -1 -+ 94.3 -+ -+ -+ 12303116644824056613E423391508C9C281DEE90D20CE8ACA0314F50F466D75BF2AC16DF8 -+ Nova Sport FM (RDS) -+ 28 -+ -+ -1 -+ 94.6 -+ -+ -+ 1230311710D727DBE7F8CA17F95D03CFA6D30792C80E0E040DA8420015272305DBD56EE553 -+ Ρυθμός (RDS) -+ 29 -+ -+ -1 -+ 94.9 -+ -+ -+ 12303117775436213D83FC8FFC561FF16EC0237120E5A5F2BA7B9AB3B50A49C4787E75AC65 -+ Athens Deejay (RDS) -+ 30 -+ -+ -1 -+ 95.2 -+ -+ -+ 123031182099429EF22F12F22F67E2687DE8E7E1135CF17C4A97338CA0D823A7CD06AF585F -+ Ε.ΡΑ. Τρίτο -+ 31 -+ -+ -1 -+ 95.6 -+ -+ -+ 1230311851996923E9C3FE3723FDF97B589375FC6407F26EA25208B8834A403B4711B8D9A7 -+ Φλόγα FM -+ 32 -+ -+ -1 -+ 95.8 -+ -+ -+ 123031189004AE833A162F5018E0CE681665DEE99206E26CD3C7E9936D1591F7719F4C9658 -+ Disco Radio -+ 33 -+ -+ -1 -+ 95.8 -+ -+ -+ 12303120414A9CD78220A67C5AD36C260CE2DF6116A7B81B7D178AF5A8EF31C992EEB232BB -+ Flash (RDS) -+ 34 -+ -+ -1 -+ 96 -+ -+ -+ 12303120671B21410896F7FDC86B9A94492DFBEA717FA148DBB2E42E2B8DD867B678E39528 -+ Red FM (RDS) -+ 35 -+ -+ -1 -+ 96.3 -+ -+ -+ 1230312096E38A0CACC50521610911604EB55EEC77B4A747F608831BF9083EE5512311D3A3 -+ Hijack 96.6 (RDS) -+ 36 -+ -+ -1 -+ 96.6 -+ -+ -+ 12303121260761F5F5BAAB82465FB3A2C3ECBAEE61CAE3A792C46D9548DE5F649648A73270 -+ Rock FM -+ 37 -+ -+ -1 -+ 96.9 -+ -+ -+ 1230312166804069BA50E9D7111832D0EA4852161E89B5731255BF0CAE2CCE50550093AE9B -+ Ant1 (RDS) -+ 38 -+ -+ -1 -+ 97.2 -+ -+ -+ 12303121992EB1FA8C469E8BB788AB71BCC3AAB8F9742987112AFC1F6CE45F2166E9A91FA4 -+ Love Radio (RDS) -+ 39 -+ -+ -1 -+ 97.5 -+ -+ -+ 1230312232366483921B506A2979478D06B02158103F0EB385DBB7B2B856C52168FC595967 -+ Real FM (RDS) -+ 40 -+ -+ -1 -+ 97.8 -+ -+ -+ 1230312306F95ED4F74CEFDE73EF011BA8CF8778AFAA3467DB5FB30144450D3245A192515B -+ 98 FM -+ 41 -+ -+ -1 -+ 98 -+ -+ -+ 1230312327A2288437FE737C29476DC47CB0508582ADF7E9DBADDB8774C04577B33FBEBC19 -+ Αθήνα 9.84 -+ 42 -+ -+ -1 -+ 98.3 -+ -+ -+ 1230312364E2AA2C6881FEE40B2D884943C3E8B64481D60ACCBE9A2432EDE514FE51753308 -+ Derti -+ 43 -+ -+ -1 -+ 98.6 -+ -+ -+ 12303124142D87A4C355F98DDE7CB724DAEE89545FF34A606A36F76ABD84B7B5E4E8CD40D6 -+ Alpha Radio (RDS) -+ 44 -+ -+ -1 -+ 98.9 -+ -+ -+ 123031244511426477E7E610045A66A6D0648BD107284348B0468CDEE0BAAC91FA0DA08C5D -+ Μελωδία -+ 45 -+ -+ -1 -+ 99.2 -+ -+ -+ 1230312493A31F04C250C1D43FD9C594F763BFC1B87A1010A03899E9291D1EA2E79698D695 -+ City 99.5 (RDS) -+ 46 -+ -+ -1 -+ 99.5 -+ -+ -+ 1230312525A4CAAE7137B93A8D20DFFAB81BEA4204385EA6C189A30DE176BB82CB3D4A148B -+ Σκαϊ 100.3 (RDS) -+ 47 -+ -+ -1 -+ 100.3 -+ -+ -+ 1230312591B671B9655862ABA64375F40E746FA963F2A4505F0EDEA78AD33E03A339BBA3AF -+ Ε.ΡΑ. Σπορ (RDS) -+ 48 -+ -+ -1 -+ 100.9 -+ -+ -+ 12303126302C4C368C2349DAD777E3D6F4AD90894D48C29579859906DE59FF20C54BD187D7 -+ Δίεση (RDS) -+ 49 -+ -+ -1 -+ 101.3 -+ -+ -+ 1230312665CBE843B50F7F4895C9461709F956CEFD6ACC0AA75BD380E0D0241AB88670114A -+ FM1 -+ 50 -+ -+ -1 -+ 101.5 -+ -+ -+ 123031268612ED29D140FC9FD11967DCF92C0DC33C82861B4F5089A394BA80AEF15D33ABF0 -+ Ράδιο Κουρσάρος -+ 51 -+ -+ -1 -+ 101.5 -+ -+ -+ 123031274240D069495348EA1D28B8BD54A4A017B286E8444F2CBBEF72582F5438F6C4BEBD -+ Ε.ΡΑ Σπορ (RDS) -+ 52 -+ -+ -1 -+ 101.8 -+ -+ -+ 12303127692012CEFDB538BB251256AAFD024C4DB8BAC224CD6C9B7920211B6850C34A359F -+ Sfera (RDS) -+ -+ -+ -1 -+ 102.2 -+ -+ -+ 1230312809CCCC7D548CEB4151F8190472A6E0459B728B5E74930805AB103319560297EAED -+ Nitro Radio (RDS) -+ 54 -+ -+ -1 -+ 102.5 -+ -+ -+ 1230312850905EE182DBAD8E79EE4386C24413E2154A31CDCEAD3AA12B457A9E2568122523 -+ Ε.ΡΑ Δεύτερο (RDS) -+ 55 -+ -+ -1 -+ 102.9 -+ -+ -+ 1230312886817169D7A15A93410BFE95957996DC91D991585BEC1E45DAF693E26D317804F5 -+ Ράδιο Αναγέννηση (BlackMan) (RDS) -+ 56 -+ -+ -1 -+ 103.1 -+ -+ -+ 12303130012B5ABE270738A8EC062B1E27F5154F2BF3F3672E6352C5DB44C6DE6AE22C5017 -+ Sentra FM (RDS) -+ 57 -+ -+ -1 -+ 103.3 -+ -+ -+ 123031309044B0C6B4FC9EC701C76FF0E7A6768D86DBD12AE00ED80896B645BFBF87461CFE -+ Dream FM -+ 58 -+ -+ -1 -+ 103.5 -+ -+ -+ 12303130998219B153DCF3C8F424A9AA19CEFFE7655171852B4C342C55E8F22078BB431339 -+ Ε.ΡΑ. Δεύτερο (RDS) -+ 59 -+ -+ -1 -+ 103.7 -+ -+ -+ 123031320703190AF84743CFFA4197D7281A023936BFFAA8F9B2C483D77FBE0BF4B608F9DD -+ Παρέα FM (RDS) -+ 60 -+ -+ -1 -+ 104 -+ -+ -+ 1230313237B50AF8C2E59E8BBAB86DC11C0383988DF52F9CCC5925CE44E2A74C5EA3888D86 -+ Athens International Radio -+ 61 -+ -+ -1 -+ 104.4 -+ -+ -+ 1230313281C3A6919D43EB36613751890BA2A52B1A6B2A8468F7A2B234F6BB9256E77EE2BE -+ Athens Shock Radio -+ 62 -+ -+ -1 -+ 104.6 -+ -+ -+ 12303133198504BD0FD62C0E5041BB115CC1500975A0CD88AC5FE350A8BE98382B21CA5148 -+ Radio Paradise (RDS) -+ 63 -+ -+ -1 -+ 104.6 -+ -+ -+ 123031336668A73E93D3A4F9DA8E629E9683521DE0914CD7E344AFC223ECC2A40732CE7427 -+ Στυλ FM (RDS) -+ 64 -+ -+ -1 -+ 104.8 -+ -+ -+ 123031341161834E2B7904C834F82709132303CB4A198EF37D476079A8CD32AC5B283056C2 -+ Ε.ΡΑ Σπορ (RDS) -+ 65 -+ -+ -1 -+ 105 -+ -+ -+ 1230313446E73E13D8B03DAD2777B665D5BE7BA7D81E17FEC6F7E9003F27058BD6B1B59D32 -+ Atlantis -+ 66 -+ -+ -1 -+ 105.2 -+ -+ -+ 123031358462B35AC7AE0E6C9192F6D5D3CAAF62F9239903610EFDAB3DC718B0A68168A021 -+ Παλμός -+ 67 -+ -+ -1 -+ 105.4 -+ -+ -+ 1230313617CC4B3C32327F712A220D7221443447E80E5D99A3C71E80E5A7878C78B5EE04C6 -+ Στο Κόκκινο (RDS) -+ 68 -+ -+ -1 -+ 105.5 -+ -+ -+ 1230313664E878568C085647D08491F498CBAA9369F76F2DCA407587E7C21BDA41BCF55738 -+ ΝΕΤ (RDS) -+ 69 -+ -+ -1 -+ 105.8 -+ -+ -+ 123031368917BFC8A91497C0194CFE9D2D8CB058EE98222B86EF99944E17585F802C19373E -+ Mad Radio (RDS) -+ 70 -+ -+ -1 -+ 106.2 -+ -+ -+ 12303138141D53424848F1188AC3BC6E8F99E7A8437CD2316CCC05803F035198B3CE573573 -+ Ράδιο Αργοσαρωνικός -+ 71 -+ -+ -1 -+ 106.4 -+ -+ -+ 12303138654AE79C55DE444E7393577333E613CBED20C0CA7699F84F99FBF3B36647789BA4 -+ Digital FM -+ 72 -+ -+ -1 -+ 106.7 -+ -+ -+ 123031390634A5D157059B3EC7240BB2FC9E3CB2362A6276261AE13A6BCF96CC52B8B3F8DC -+ Kosmos (RDS) -+ 73 -+ -+ -1 -+ 107 -+ -+ -+ 1230313941D75FBD7052D139CDB27CC53A4284924C335A8604275D3E9F30BFE92CE32CEEF4 -+ Blue Space -+ 74 -+ -+ -1 -+ 107.2 -+ -+ -+ 12303139928D015AE8A07354DD78F3E4696EE19A4C7A28355A6CFAB152F27A74F7B7E63205 -+ Star Radio -+ 75 -+ -+ -1 -+ 107.4 -+ -+ -+ 123031402535BB69B460FE9C4D04663F7E6B8979490B5C134369E42D10967DBA94DF832936 -+ Ακτίνα -+ 76 -+ -+ -1 -+ 107.6 -+ -+ -+ 1230314060D147B66919B197790141847E85744766CE02ABE25521EDBF9ADB038B1D549B5C -+ Super FM -+ 77 -+ -+ -1 -+ 107.8 -+ -+ -+ 12303141163EA61198376BD854C55C07DB1AC4154AEF2F18FD38AD4D3A2882D45BA6BB4711 -+ Ηχόραμα -+ 78 -+ -+ -1 -+ 108 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,665 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ Michael Tr.<michtri@otenet.gr> -+ 2009-07-02T14:16:43 -+ Greece -+ Athens -+ -+ -+ -+ -+ 1236303555F8C6D2B7D76AB919961DED8B465344600D480097DFA0B9D8FD21EE4407743965 -+ ΚρΞ?τη FM -+ -+ -+ -1 -+ dontcare -+ 87.5 -+ -+ -+ 123630355521C6A97AC143F04E4FFEF9B3296A8D76AAC854EA957FD9E73FE35DBCC613F56E -+ Εν Ξ›Ξ΅Ο…ΞΊΟŽ -+ -+ -+ -1 -+ dontcare -+ 87.7 -+ -+ -+ 1236303555B5D8B70524B3E069215BBD5F346D540F080C118092F4A5C20C46BA4913E9D333 -+ Oasis FM -+ -+ -+ -1 -+ dontcare -+ 88 -+ -+ -+ 123630355592B516BDCAE2D5B5117E8380F5C41A7425C4D3602A9C50DCCDFADDA8772C5140 -+ VFM -+ -+ -+ -1 -+ dontcare -+ 88.3 -+ -+ -+ 12363035551849550D23A9C290AD1089418684403211056223761369428A5442BFB798845C -+ John Greek -+ -+ -+ -1 -+ dontcare -+ 88.6 -+ -+ -+ 12363035552856D73C8625ABB8CE79549854C486E994731F59D4D4E2F682134AC8BF610CEB -+ Angel -+ -+ -+ -1 -+ dontcare -+ 88.9 -+ -+ -+ 12363035559401473C68D712CFB05370CBACC513E3407AD70F06C4AE5EE66B0A6544DD8B87 -+ Arren-a Radio -+ -+ -+ -1 -+ dontcare -+ 89.2 -+ -+ -+ 1236303555DF524877EA983F64260140F197B075D3BD3D535FBB6C6F78F58AD498B70A3180 -+ ΑΣ Εκκλησίας της Ελλάδος -+ -+ -+ -1 -+ dontcare -+ 89.5 -+ -+ -+ 1236303555B950E4E8944932CF5F899D284017823CA7EB448F5464BF512371E1407A515995 -+ Ξ”ΟΟŒΞΌΞΏΟ‚ FM -+ -+ -+ -1 -+ dontcare -+ 89.8 -+ -+ -+ 1236303555FE988948927F6B487000FA9AA7A5633C44653BF74C5DBDA3CE6D27A088350511 -+ 902 ΑριστΡρά στα FM -+ -+ -+ -1 -+ dontcare -+ 90.1 -+ -+ -+ 1236303555BE3B63152696DFA54B3A92B66775A35264BB7281F2C2E2B342BFB3594D65F598 -+ Κανάλι 1 ΠΡιραιά -+ -+ -+ -1 -+ dontcare -+ 90.4 -+ -+ -+ 12363384889A1A75FA05DEE86039BD59FD19D83DB15CA0C9367271F0EA3AD6379241B77D36 -+ Radio Asty -+ -+ -+ -1 -+ dontcare -+ 90.6 -+ -+ -+ 1236303555D034E543C6CBD3A56BDD86E42C3B3786BB9DFB185CB7F2A73670A51769693FAF -+ Ξ•.ΑΑ. ΀ρίτο -+ -+ -+ -1 -+ dontcare -+ 90.9 -+ -+ -+ 12363035557DC51B6683E28C647D0E16B52477B8BF2F7443F6D0F978F0D4123F89A2A53C22 -+ ΠΡιραϊκΞ? Εκκλησία -+ -+ -+ -1 -+ dontcare -+ 91.2 -+ -+ -+ 123630355579A9ED56F6354B0F53FEF9102BCB7342FC6A8CCD369AAFE206C1DF7E83A6494A -+ ΞšΟΞ·Ο„ΞΉΞΊΞ? Ααδιοφωνία -+ -+ -+ -1 -+ dontcare -+ 91.4 -+ -+ -+ 123633865886ABEF0BD85FA264A328E2D52FC8C3E4893BF1FAADB1E04AE447B10495E4F403 -+ NET -+ -+ -+ -1 -+ dontcare -+ 91.6 -+ -+ -+ 1236303555025BCA17F8EF9A0B5B48AF56C02D07CFF8EAE7BECD66DEAE04FA39CC018DA682 -+ Galaxy 92 -+ -+ -+ -1 -+ dontcare -+ 92 -+ -+ -+ 123630355578828CC76A23BCDFCAAB11465BA737D79C719BB35FBE232B352442AD3C81563A -+ Ξ›Ξ¬ΞΌΟˆΞ· FM -+ -+ -+ -1 -+ dontcare -+ 92.3 -+ -+ -+ 12363035557B2403325DD733982F42829F4CA43FE9626BF7A1A5A68FD482AA36EBC6E6BBDE -+ Best Radio -+ -+ -+ -1 -+ dontcare -+ 92.6 -+ -+ -+ 1236303555E15EE72ABEC2D16F003455AC70685892F731AA36E818356AAFD6868297144CE3 -+ Kiss FM -+ -+ -+ -1 -+ dontcare -+ 92.9 -+ -+ -+ 12363035554FA4D7BE8217DCC400C11D50231BDCC560E8D4467F3CFF12F91964CEBDC23A35 -+ Orange -+ -+ -+ -1 -+ dontcare -+ 93.2 -+ -+ -+ 1236303555CC91671E5F32D0EA8F6C7A47DE9DF968000FFEC1F096B74E65F35EDC31320775 -+ Kosmos -+ -+ -+ -1 -+ dontcare -+ 93.6 -+ -+ -+ 1236303555EE0F168A293A39F6B7715EB7015BBC5AE1B84F98B6894B60375913F89F3E3837 -+ Epikoinonia FM 94 -+ -+ -+ -1 -+ dontcare -+ 94 -+ -+ -+ 1236303555D807F6B64385AFAFF35CA0C71E48D6402D8F6DD1317FD8985368202683E76F99 -+ XFM -+ -+ -+ -1 -+ dontcare -+ 94.3 -+ -+ -+ 123630355582F11794FA491D9AE942B99CCE9CFA385D60A76ADCA8272398798F66FF5023D0 -+ Nova Sport FM -+ -+ -+ -1 -+ dontcare -+ 94.6 -+ -+ -+ 1236303555DE36BA648307E877F5C340E34F10E7ED563BE03BD991A7450B73ADFE87611457 -+ Ξ‘Ο…ΞΈΞΌΟŒΟ‚ -+ -+ -+ -1 -+ dontcare -+ 94.9 -+ -+ -+ 1236303555F619039E0DB51B3B3F55754A159449F4987CCC442060D32AE6E356090B8ACE70 -+ Athens DeeJay -+ -+ -+ -1 -+ dontcare -+ 95.2 -+ -+ -+ 123633888677CEFB92E1F3A3633D56C3179ACF1EEC1C060BC7F7B1355614ECDC8F6D817F72 -+ Ξ•.ΑΑ. ΀ρίτο -+ -+ -+ -1 -+ dontcare -+ 95.6 -+ -+ -+ 1236303555F019432F2B2A97E6A9289B3FA6E172E58C306F31E7D14BFEE8B6651DF6FFE4AD -+ Floga -+ -+ -+ -1 -+ dontcare -+ 95.8 -+ -+ -+ 1236303555002B7464B001BD05C6D36F0DF95839816750FA47A4C4BB620522BE3313234FB6 -+ Flash -+ -+ -+ -1 -+ dontcare -+ 96 -+ -+ -+ 1236303555CE211857EA50B8116A8C780BFB75B354F0F24471E8A250D465E95B476C4C32D0 -+ Red FM -+ -+ -+ -1 -+ dontcare -+ 96.3 -+ -+ -+ 12363035552BD28A667EDE6729B103EB0113819281D4FD8C9FB6ECCE791510744AEDE96470 -+ Hijack 96.6 -+ -+ -+ -1 -+ dontcare -+ 96.6 -+ -+ -+ 1236303555B6DE03DB507ED282725F38D2126C7E2B53C99A15CB9C1D9E5D2FAAAA71B2C54C -+ Rock FM -+ -+ -+ -1 -+ dontcare -+ 96.9 -+ -+ -+ 12363035550F41ABC97DBFA000B3049E6BE2C8CC094565BA9CFA86419367AF83DA286A377E -+ Ant1 -+ -+ -+ -1 -+ dontcare -+ 97.2 -+ -+ -+ 1236303555228F598B5C8AEBB9E7DEB479DBB324EFC609073E2A505C1DA9C65F024AF0A273 -+ Love Radio -+ -+ -+ -1 -+ dontcare -+ 97.5 -+ -+ -+ 1236303555AF8701B92ED1DFAC5F94AA6D76D64ACC4045FFE126AE5B9D65890FB28F8001C0 -+ Radio Veronica -+ -+ -+ -1 -+ dontcare -+ 97.7 -+ -+ -+ 1236303555BB78B6473DCA5D19CD162E660D97C3DCC20C1B168BAD04BAEB393743DD4DE192 -+ Real FM -+ -+ -+ -1 -+ dontcare -+ 97.8 -+ -+ -+ 123630355584EFCCA46C288369540AEA2E9177C6FEC32931B3A41BAAADC772302EC6B70C30 -+ Free FM 98 -+ -+ -+ -1 -+ dontcare -+ 98 -+ -+ -+ 12363035556772D03B3375CA4CBB4C77526F4C68665A982472337D7E6FB57A70C6AD08CB7D -+ ΑθΞ?Ξ½Ξ± 9.84 -+ -+ -+ -1 -+ dontcare -+ 98.3 -+ -+ -+ 1236303555D05113FEDCD174B864DFE6C363D64D8F0FEDDB93A0895D5951444A6FFC271DE0 -+ Derti -+ -+ -+ -1 -+ dontcare -+ 98.6 -+ -+ -+ 1236303555E3B5FBA84598C50E5D5AA5DEC44020AEF46F05CEA27B5962AF71A36302EB05DA -+ Alpha Radio -+ -+ -+ -1 -+ dontcare -+ 98.9 -+ -+ -+ 123630355502E85E6E11163EC9CE92D641E96E23C2AB647D8F10E3C636572712FA388CFC59 -+ ΞœΞ΅Ξ»Ο‰Ξ΄Ξ―Ξ± -+ -+ -+ -1 -+ dontcare -+ 99.2 -+ -+ -+ 12363035556B4FBBE8D6D94307A23452C23B7F1EF17470DEC6A261B1945480300877040849 -+ City 99.5 -+ -+ -+ -1 -+ dontcare -+ 99.5 -+ -+ -+ 12363391269EBCA96147929CD6EA80429E231A1F13C2AA9C45F1DDA930C0494BBF6F3ECC49 -+ Ξ•.ΑΑ. ΔΡύτΡρο -+ -+ -+ -1 -+ dontcare -+ 99.9 -+ -+ -+ 12363035556B5F9C8F7B4D768DCA637C204F25F1E298E6A404C7A97091261CDE9D4052451A -+ Σκάι -+ -+ -+ -1 -+ dontcare -+ 100.3 -+ -+ -+ 12363035553183FA84CE18D387CB46EBF5CC16505D39F9FF616AFAB34D809FBA59005473F8 -+ Αάδιο ΞˆΞ½Ο„Ξ±ΟƒΞ· (ΞšΞ±Ο„Ξ¬Ξ»Ξ·ΟˆΞ· ΝομικΞ?Ο‚) -+ -+ -+ -1 -+ dontcare -+ 100.6 -+ -+ -+ 12363392215C1075EAAAAF5F8B68DC241DC64B73E74F8CA31C80B8CC5CDAA5A6FFA831CCE6 -+ Ξ•.ΑΑ. Σπορ -+ -+ -+ -1 -+ dontcare -+ 100.9 -+ -+ -+ 123630355546A9DBD579719C3F103D9BCD58C4A4A93E7EE0081B3878770CA4FBAAC69104B8 -+ ΔίΡση -+ -+ -+ -1 -+ dontcare -+ 101.3 -+ -+ -+ 123633930939349E99E1583D905411E3A26A9F7A0F3B1854E36D8DD0ABD9D7ECF27C92A79C -+ FM1 -+ -+ -+ -1 -+ dontcare -+ 101.55 -+ -+ -+ 12363035550FB3D1826ADA343C62F12E359EC478299C150CAF5EB77600601A693C9AFEEA7F -+ Ξ•.ΑΑ. Σπορ -+ -+ -+ -1 -+ dontcare -+ 101.8 -+ -+ -+ 12363035559F6943BECB480619307FB7846D0D6049CE6B63871E531C04D89126A9A0BCBEE9 -+ Sfera -+ -+ -+ -1 -+ dontcare -+ 102.2 -+ -+ -+ 12363035553E482A95AA9987C3A13DD33143C23B73E7FFB25AA030805EFA54EA35F608B45A -+ Nitro Radio -+ -+ -+ -1 -+ dontcare -+ 102.5 -+ -+ -+ 123633941752D1852572742677A43F7BBC58123BADEAC534375869AB801E5AEA35D3E27A54 -+ Ξ•.ΑΑ. ΔΡύτΡρο -+ -+ -+ -1 -+ dontcare -+ 102.9 -+ -+ -+ 1236303555F437335446AED229C9B7173F51FE17C07E4E0BB2B9FFEAF9184B419391B80F27 -+ Αάδιο Αναγέννηση (Blackman) -+ -+ -+ -1 -+ dontcare -+ 103.1 -+ -+ -+ 12363035551465037E37D37C8643099BA790C9517BF50876E67333AE6F6013D7748AEA8299 -+ Sentra FM -+ -+ -+ -1 -+ dontcare -+ 103.3 -+ -+ -+ 1236303555BC9F9CFAF5E21430C6527BEAF2FB64E7C057ED24F1B6BAEFC4ECCD1FFBD55BF8 -+ Ξ•.ΑΑ. ΔΡύτΡρο -+ -+ -+ -1 -+ dontcare -+ 103.7 -+ -+ -+ 12363035555742A6CD0D32F6B7442B4F64A76D0F640673125BCC3D244B89C279B57C8020A3 -+ Παρέα FM -+ -+ -+ -1 -+ dontcare -+ 104 -+ -+ -+ 1236339576168E8F86D1EFEB569EC1BE7E8B9076FFE2DBEA320C1E10E46035FECF489C55F4 -+ Radio Laikos -+ -+ -+ -1 -+ dontcare -+ 104.2 -+ -+ -+ 12363035552826561E0029161F6A503930BA1F6C47201A6E3C68D154371F54D64DC93204CD -+ Athens International Radio -+ -+ -+ -1 -+ dontcare -+ 104.4 -+ -+ -+ 123630355532218320A3836943AEE9715736B1A30E09E8D04FCFF0E41E3325B8E57681C32E -+ Shock Radio/Paradise Radio -+ -+ -+ -1 -+ dontcare -+ 104.6 -+ -+ -+ 1236339857FD45FB7C8BF3CD34E2A81D8DDC0A4C533F9312A346A9E948CB848A1636C2AC2B -+ Styl FM -+ -+ -+ -1 -+ dontcare -+ 104.8 -+ -+ -+ 1236303555B3AC4C4846304D7D5CB88AD564C7B9291D4119031D5D5B8B085251AF8E3EE4A7 -+ Atlantis -+ -+ -+ -1 -+ dontcare -+ 105.2 -+ -+ -+ 123630355529017C5A217A450030806F0667B6AAE22A3D609C5A643A0E7AAAEC4CEC2C0938 -+ Στο κόκκινο -+ -+ -+ -1 -+ dontcare -+ 105.5 -+ -+ -+ 1236303555C56B7569D58DAFEEEBC35636A57418EA19C6C6487DDEF05D6E7FE9AB48222330 -+ NET -+ -+ -+ -1 -+ dontcare -+ 105.8 -+ -+ -+ 123630355564CE6CC7B5934E7C847A55C2E13AE83F870C4DE984DAB56C100FE7D3F31C7D0E -+ Mad Radio -+ -+ -+ -1 -+ dontcare -+ 106.2 -+ -+ -+ 1236303555EA609BC93A37A5207464F74D75118039B2D584CE6452D6698CEBA61AE028C294 -+ Αάδιο Ξ‘ΟΞ³ΞΏΟƒΞ±ΟΟ‰Ξ½ΞΉΞΊΟŒΟ‚ -+ -+ -+ -1 -+ dontcare -+ 106.4 -+ -+ -+ 12363404362D264AEDDC91C1E2A212597D78ECAE4C633315101C2D1C96789CD265CC45C9E9 -+ Digital FM -+ -+ -+ -1 -+ dontcare -+ 106.7 -+ -+ -+ 12363035553FC9D2C8AAF40C2FFDBE37510033B111AD1B323C66ADC3F0019DDB838EDCA999 -+ Kosmos -+ -+ -+ -1 -+ dontcare -+ 107 -+ -+ -+ 123634057618FA5E35E2D3FD8BD5242DC258A594E14B15F717CB25EA5F2890892747DE622F -+ Blue Space FM -+ -+ -+ -1 -+ dontcare -+ 107.2 -+ -+ -+ 12363035556CEBBE420E1068460097F219C8A46A51A6ED734B28FA9644F3F85F64A1D8D923 -+ Ακτίνα -+ -+ -+ -1 -+ dontcare -+ 107.6 -+ -+ -+ 123630355527CE70F600EEEF1844A053FD3A3E2635FB28AA296D8D8B180AB413D3158329B7 -+ Ξ—Ο‡ΟŒΟΞ±ΞΌΞ± -+ -+ -+ -1 -+ dontcare -+ 108 -+ -+ -+ 1246530641771960F6E09566E2D1FC981BA989DB7371D1C962E23D5B859B78ABB9E60A -+ NME -+ NME -+ -+ -1 -+ dontcare -+ http://shout.astream.com:80 -+ mp3 -+ auto -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,243 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Kotorkis Constantinos <kkie68@gmail.com> -+ 2007-04-26T19:30:02 -+ Greece -+ Kastoria -+ antenna -+ -+ -+ -+ -+1063385407E05886942B080C70E9095C4F9EF8862C65C78A24F00C860909A8F2DF1D8E4276 -+ NET -+ 1 -+ -+ 0.7 -+ 88.6 -+ -+ -+ -+10633854072B0E0DC480808BDB1B13DE7C9EAD8922118AA2308E8EAE5734F497B27D0E5CA4 -+ Kastoria FM -+ 2 -+ -+ 0.7 -+ 89.3 -+ -+ -+ -+1063385407BAC77165139F07C89AC054801FFCC28D35D934283F02B9BCED437CEE6AC0714E -+ Star FM -+ 3 -+ -+ 0.7 -+ 90.1 -+ -+ -+ -+106338540734A200C587C92B80A77C200463AB2E267EC19752C4A9437DEB5F536717B94D20 -+ Second Program -+ 4 -+ -+ 0.7 -+ 90.6 -+ -+ -+ -+106338540752061A546AA001A586665BCB54004C1C1347298E7283572C82D64949DBE9C957 -+ Radio 1 -+ 5 -+ -+ 0.7 -+ 91.1 -+ -+ -+ -+10633854076453138F76391F38AB129A608316C5D09E32485167705CA7955F77678A2940A0 -+ Kastoria FM -+ 6 -+ -+ 0.7 -+ 91.5 -+ -+ -+ -+1063385407C1E6152C11A5C05EC1A9B26344BC96855CB5499B0FE9A34778570B790E42D350 -+ Love Radio -+ 7 -+ -+ 0.7 -+ 92 -+ -+ -+ -+10633854074684F1C732220572385076AA324545DAA6F665760E56C87A810D7993A286798F -+ Radio Galatini -+ 8 -+ -+ 0.7 -+ 92.6 -+ -+ -+ -+1063385407C2FDA891449DE0C03E5E7932F799722FAA4FF13B03CBE4C99A0917B6C7ADD6DB -+ Radio Kastoria -+ 9 -+ -+ 0.7 -+ 93 -+ -+ -+ -+10633854075A7010C56169D354DA3EF48A44A96CD0A0D0E37B3901BE8D3BB0A8C463EFC47B -+ ANT -+ 10 -+ -+ 0.7 -+ 93.6 -+ -+ -+ -+1063385407DE46F8206EF76187D23429152202A1B933189E4B1058E32A2F9B4CA7633CAC14 -+ Church FM -+ 11 -+ -+ 0.7 -+ 94.2 -+ -+ -+ -+1063385407B76A1FDD10FBFF5530744D064D6BAA8B830B25EF0A574F0392AA52CC9B12C6E8 -+ ALPHA - Kastoria -+ 12 -+ -+ 0.7 -+ 94.7 -+ -+ -+ -+1063385407B364D20C095E208175C40582AF362B2AFF3BA446358B43A75D885C7089181318 -+ Radio Top -+ 13 -+ -+ 0.7 -+ 95 -+ -+ -+ -+1063385407925B3F89E35DCA26D0FDD23B201FB3B5D913150A0B2ED13406D4550A8F225EE7 -+ FM 95.7 -+ 14 -+ -+ 0.7 -+ 95.7 -+ -+ -+ -+106338540763F9B74ECB3A3738307E1F8CAC58922C79D914D1A19D9DE507FB9F0AF73D481F -+ ERA Florina -+ 15 -+ -+ 0.7 -+ 96.6 -+ -+ -+ -+1063385407BBFCDA7EEB359F7449A9AB09788E3B61611A75A52A0132D62A97345D4AE5120E -+ Radio Argos -+ 16 -+ -+ 0.7 -+ 97.4 -+ -+ -+ -+1063385407EC895CE1ED4BA554256C9675503A14AE0A16204C31C96D1EF8DA5F5EAE1CDCE4 -+ 98 - 0 FM -+ 17 -+ -+ 0.7 -+ 98 -+ -+ -+ -+10633854073984D438913EB6D843C930D9E3C759F66D5D6844F62CD0B9BC13DE9D088D0E06 -+ ALPHA -+ 18 -+ -+ 0.7 -+ 98.4 -+ -+ -+ -+1063385407B773C66DE987BF3F6C54397272705D41947595F1627E186C69EC4869070517B5 -+ Astra -+ 19 -+ -+ 0.7 -+ 99.2 -+ -+ -+ -+1097440937C315B67747A306C466CCCF55B8F055176DFD6A2061AADC235FD95FE5259545E3 -+ ERA Kozani -+ 20 -+ -+ 0.7 -+ 100.6 -+ -+ -+ -+106338540776AB993148427CF32961DF65E082B3746EE579B7F51228015D2C0AFEE5FE3B18 -+ Energy FM -+ 21 -+ -+ 0.7 -+ 101 -+ -+ -+ -+10633854072EF5E4D39CD2686DC398799C6BC06B33C6CF5AF8F49EF08AB2DDE87A1DF28CB5 -+ Melodia -+ 22 -+ -+ 0.7 -+ 102.4 -+ -+ -+ -+10633854070216B895699C7066D736450D9AB7CE21915CEDEE4160943B05558B7DCA595F8B -+ Radio Contact -+ 23 -+ -+ 0.7 -+ 103.3 -+ -+ -+ -+1177228968EE49047C34766F31EBA3CBC70B260C51795FF804520F3673FA4D31D60C29C5E5 -+ Siera FM -+ 24 -+ -+ 0.7 -+ 105.3 -+ -+ -+ -+1177228975E0F618803191F64E0F240EA42E64C2FE3CAF4220B5381EBF53F5C2DA7BF44774 -+ xristianity.gr -+ 25 -+ -+ 0.7 -+ 107.3 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am kradio-3.5.13.1/kradio3/presets/greece/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/greece/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,13 @@ -+SUBDIRS = -+EXTRA_DIST = "athens2-antenna.krp" "athens-antenna.krp" "kastoria-antenna.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/" -+ $(INSTALL_DATA) "$(srcdir)/athens2-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/athens-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/kastoria-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp ---- kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,144 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Zoltán Kukk <kukkzoli at freemail.hu> -+ 2007-01-03T21:00:00 -+ Hungary -+ Bodajk -+ -+ -+ -+ -+ -+1167850373C82402EA2D65E2EF47C5AD84039FCA74B2C9606BDA3149E6D6BDF7FBE95D063E -+ Juventus rádió -+ Juventus -+ -+ -1 -+ 89.5 -+ -+ -+ -+1167850406B8127A80BD8BD2C586FD1631292311B0CED2324E69418EC01B0557B9968CACAC -+ Ezerjó rádió -+ Ezerjó -+ -+ -1 -+ 89 -+ -+ -+ -+1167850435CFAC2599DDD436BF567F4271775919A5B073D86F44E1F4060A7C28B8F0F6A2F2 -+ Danubius rádió -+ Danubius -+ -+ -1 -+ 103.3 -+ -+ -+ -+1167850498CCFA6F317518BF91DF109749ECB2DFDB6E9EC8166C0A969B744DAEEF6ACF8242 -+ Sláger rádió (Budapest) -+ Sláger -+ -+ -1 -+ 100.8 -+ -+ -+ -+1167850855354EC11F0524A66B56EBF339D03E94CFEACCF7CCD5321509F1FA04047EC4AA7D -+ Sláger rádió (Kabhegy) -+ Sláger -+ -+ -1 -+ 107.2 -+ -+ -+ -+11678510534FA202C2D87C91BABE55195F61FCF266513D3FDDD4FD825E1531ABA688DA9176 -+ Kossuth rádió (Budapest) -+ Kossuth -+ -+ -1 -+ 107.8 -+ -+ -+ -+1167851116A73EED2A8825C4D7FDB0CF782E800B989D0AE371B5B0DCD7DE29C0B9A3E729ED -+ Kossuth rádió (Székesfehérvár) -+ kossuth -+ -+ -1 -+ 92.3 -+ -+ -+ -+116785116398AF0022838BE746A818A591D40E0724E64E12194140D15BBD54A164999C2128 -+ Petőfi rádió (Budapest) -+ Petőfi -+ -+ -1 -+ 94.8 -+ -+ -+ -+11678512258B63DE67579D3C8A129EDBCC01F899B13BBBE330F0A9639354957A85A7EFA3E0 -+ Petőfi rádió (Kabhegy) -+ Petőfi -+ -+ -1 -+ 93.9 -+ -+ -+ -+116785126176BD6278000E1B61D6456B665421F90C2399723E2FF720C6A422748F6B10086F -+ Bartók rádió (Budapest) -+ Bartók -+ -+ -1 -+ 105.3 -+ -+ -+ -+11678513005B487EEA72C73F5C6C68C219F140943028F878063E44F6DB114EFF24F51C60A0 -+ Bartók rádió (Kabhegy) -+ Bartók -+ -+ -1 -+ 105 -+ -+ -+ -+1167851614C4E8169C6CBA010DE341C04C2945D0F372DBCE50FDF23A6EAFA8BFE50ED1AF72 -+ Fehérvár rádió (Székesfehérvár) -+ Fehérvár -+ -+ -1 -+ 94.5 -+ -+ -+ -+11678516557A409DB4975E5AFCF59176FAF534BAEFC5AB5AE0828EA0F3EAB932A502D26F02 -+ Vörösmarty rádió (Székesfehérvár) -+ Vörösmarty -+ -+ -1 -+ 99.2 -+ -+ -+ -+1167851693B85F04BD653789133040263C907C468621EA5E96E1546A763B543243B3BADA55 -+ Rádió 1 (Székesfehérvár) -+ Rádió 1 -+ -+ -1 -+ 101.8 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,14 +1,16 @@ - SUBDIRS = --EXTRA_DIST = "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp" -+EXTRA_DIST = "bodajk.krp" "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/" -- $(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" -+ $(INSTALL_DATA) "$(srcdir)/bodajk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp" - $(INSTALL_DATA) "$(srcdir)/budapest-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp" - $(INSTALL_DATA) "$(srcdir)/budapest-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,66 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Sveinn í Felli, -+<sveinki@nett.is> -+ 2007-09-19T16:06:04 -+ Iceland -+ Akureyri -+ Antenna -+ Skýrustu stöðvarnar í Þorpinu, beint á móti -+Hallandssendunum og í sjónlínu við -+Vaðlaheiðarmöstrin. -+ -+ -+ -+1116455444C0A53C88CF0B0CDA23B95FF522492EDC8D85A8A49E1FFDEC642F996299EBB966 -+ 12spor AEY -+ -+ -+ -1 -+ 89.5 -+ -+ -+ -+111645544483CB529B5F78FB43D62D676F8E160605DDB4EF2740153A1C170D9E77B153CEB7 -+ Talstöðin AEY -+ -+ -+ -1 -+ 90.9 -+ -+ -+ -+1116455444EF6B983A00E17071CFDECD828F1BDC0B8D79AAEA6B7070982F29B978DAAAA2E0 -+ Gamla Gufan -+ RUV -+ /home/sveinki/Documents/mnt/myndir/Skype -+Pictures/ruv0.jpg -+ -1 -+ 91.6 -+ -+ -+ -+1190205101A69868A03E013E9129D67A1A2C905B0269D0F028844017DE11058713DB990936 -+ Bylgjan AEY -+ 1 -+ -+ -1 -+ 92.7504 -+ -+ -+ -+11902051081962E6F35CE1BCF2BC88F69F37181A8D9D354ACC18945492247F99F3C75D886B -+ Raus 2 AEY -+ R2 -+ -+ -1 -+ 96.5256 -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,10 +1,11 @@ - SUBDIRS = --EXTRA_DIST = "reykjavik-antenna.krp" -+EXTRA_DIST = "akureyri-antenna.krp" "reykjavik-antenna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/" -+ $(INSTALL_DATA) "$(srcdir)/akureyri-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/reykjavik-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp" - -- - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,90 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ R Deepak -+ 2007-03-31T18:43:18 -+ India -+ Chennai -+ FM Channels -+ All the FM channels in Chennai. -+ -+ -+ 11753445936E9E0E3CB2F8B796DA65739E538B78054D02FC4FF552D5AD5322BF9096662427 -+ Suryan FM! 93.5 -+ Suryan -+ -+ -1 -+ 93.5 -+ -+ -+ 117534478397469F0EE509B25EC447D0FB792BAD25C215AC5030FCE0A5526753581D51EE8A -+ AIR Chennai! 106.4 -+ AIR -+ -+ -1 -+ 106.4 -+ -+ -+ 11753448532F6C07DB566ADC38950FBEFE3BA1B7A17C67588FCFE42ECF91EBC93060C5484E -+ Radio Mirchi! 98.3 -+ Mirchi! -+ -+ -1 -+ 98.3 -+ -+ -+ 1175344609AEBF26E4585D6BB9451B35A6B79D28D60BB45191557CEABE2B70DE9B73286723 -+ Hello FM! 106.4 -+ Hello -+ -+ -1 -+ 106.4 -+ -+ -+ 1175345266393FFD660E04396BD99D66EF2B285E20CFEE6F34EC7C1D76D6CE7CD5678A5A99 -+ Radio City! 91.1 -+ City! -+ -+ -1 -+ 91.1 -+ -+ -+ 11753453722D6047CF4D052685FF27306A5E4EB1D199E8F73B96D8F6FF98D2ECD83377B214 -+ Aha! 91.9 -+ Aha! -+ -+ -1 -+ 91.9 -+ -+ -+ 1175345415AB9DF01C90B137E3F59A6D461167A3DCA48358E634B8018ACB4302D67004B137 -+ 92.7 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ 1175345458D724DBB612353F3FEE62EF46FDF1262938FB884B7DB68746D40ADB11E4B44824 -+ Radio One! 94.3 -+ One! -+ -+ -1 -+ 94.3 -+ -+ -+ 1175345587560034B04EDFB7D495329917971B0D575ABA42943DE907244C2712EAFDC58C7D -+ All India Radio 105 -+ AIR 105 -+ -+ -1 -+ 105 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am kradio-3.5.13.1/kradio3/presets/india/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/india/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,9 @@ -+SUBDIRS = -+EXTRA_DIST = "chennai-antenna.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/india/" -+ $(INSTALL_DATA) "$(srcdir)/chennai-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp ---- kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,239 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Gabriele Armao - <armao@cs.unibo.it> -+ 2006-10-04T19:27:15 -+ Italy -+ Bologna -+ -+ -+ -+ -+ 1159867796E4871EB13C28A4A30D192702AE16A05157116050944CD6793E90BF9431658294 -+ Puntoradio -+ Puntoradio -+ -+ -0.01 -+ 88 -+ -+ -+ 1159867800ACD74C759A92F0A0145B76486A9BA709640E3C8F5E09F4AA2349729389715EEB -+ Radio 1 -+ Radio 1 -+ -+ -1 -+ 89.5252 -+ -+ -+ 11598678056B10C8341D5C385A6E8083B51B686CF65A96E423BB96146AB0EBB15F12EBAEAA -+ Radio 2 -+ Radio 2 -+ -+ -1 -+ 91.6753 -+ -+ -+ 1159867815F32674A7E6FCF9D777C56835DE55FD2EF382991E57FA34D17B6084D8AE6A96DA -+ Radio Gamma -+ Radio Gamma -+ -+ -1 -+ 95.05 -+ -+ -+ 115986781556CB6407ED08D4399F2B64B0D712DF67904FE87E846290502F5E7D29F74273D7 -+ Radio Company -+ Radio Company -+ -+ -1 -+ 95.3755 -+ -+ -+ 115998100090243491D552054F89D8AE7CC4C1BBB8E5A75979E8623EDCE4B4FA88E66F5259 -+ Radio Città del Capo -+ Radio Città del Capo -+ -+ -1 -+ 96.3 -+ -+ -+ 1159867821D06CE1DEFACAE89FA611D6C23F51494EF2AA0E9644A204A103574E4246A500F4 -+ Radio Nettuno -+ Radio Nettuno -+ -+ -1 -+ 97 -+ -+ -+ 1159867823CDAAED89B09854AE271D642C9CA742EEAD75D17800B0139C21BA29E8C3A48F45 -+ Radio International -+ Radio International -+ -+ -1 -+ 97.5756 -+ -+ -+ 1159867824DFE7DA44AA821CEF20013FB9698274C644DA33DCFCDB594271F69B9B7B21782A -+ Paneburro -+ Paneburro -+ -+ -1 -+ 98.25 -+ -+ -+ 11598678290325C9320F5DE2D693129FAD419939421E812A1C96B5A41EF5DCFC3951EC0B15 -+ Playstudio -+ Playstudio -+ -+ -1 -+ 99.4 -+ -+ -+ 1159981753D8BD52A46D7EAFD830788FE999D83B1A3CBF25070AED7694DA606FFFC5359D60 -+ Radio Deejay -+ Radio Deejay -+ -+ -1 -+ 99.7 -+ -+ -+ 1159981844BCA202D2B3664A3DF04F9A5B0CC018D76C0BF6D378608CD6A7CD5198C44896DA -+ Radio Fashion -+ Radio Fashion -+ -+ -1 -+ 100.2 -+ -+ -+ 1159867834C67A4C4EFF36BBBA44B89F4EEFA5A0FDA68318BE7C332940741BE05CC9FC4E02 -+ Radio Maria -+ Radio Maria -+ -+ -1 -+ 101 -+ -+ -+ 1159867835AA567DCB00F1CDA9CEC1D422F70EBDA6D4F7DA7013A2BCC645F4B8AEEEC9BFAE -+ Radio Monte Carlo 2 -+ RMC2 -+ -+ -1 -+ 101.3 -+ -+ -+ 115998202597FB17CD324D30D4365EBFAAB74C28DB868BB8D425D1D730113AB84587524351 -+ RTL 102.5 -+ RTL 102.5 -+ -+ -1 -+ 101.6 -+ -+ -+ 1159982065046E122F7603346855EF8A55392F69BAFD8A73FA43B2C1A7CD10325A2E7F75DF -+ Kiss Kiss -+ Kiss Kiss -+ -+ -1 -+ 101.8 -+ -+ -+ 115986783739E74C73DCAE72789AB048FB7551DCB819C63A7F1870A746B08AB62F3BE80B2C -+ Radio Anni 60 -+ Radio Anni 60 -+ -+ -1 -+ 102.351 -+ -+ -+ 115986783967AD82D48D91060A6D094CC266C7B84667EE0219D268835AD5B65A9E7B835DC0 -+ Radio Bruno -+ Radio Bruno -+ -+ -1 -+ 102.8 -+ -+ -+ 11599822368F30FEE3569AD480E8E9EDDC59E3ADB3F077542FD82BED3B147C62ACF47268AF -+ Radio Città Fujiko -+ Radio Città Fujiko -+ -+ -1 -+ 103.05 -+ -+ -+ 1159867840EC49187AF76B4CC4862BD711948CF56DB9FBCDB0040409329E5918F1C4FB9E8C -+ Radio 103.3 -+ Radio 103.3 -+ -+ -1 -+ 103.251 -+ -+ -+ 11599823610B03AD0A2BA306E94007E0E548C1FDF3F7A2960FA9E2F745A08C80CF286FEF31 -+ Radio105 -+ Radio105 -+ -+ -1 -+ 103.55 -+ -+ -+ 1159867842CC2EB15567BD3B2BB8167B7D0A467877326888C087BE7FE78FE8826CDB70FBB7 -+ Radio Sabbia -+ Radio Sabbia -+ -+ -1 -+ 103.976 -+ -+ -+ 11598678446057BC4116C3FD33AF7BAF73951B6DAEE334DC8A35311D6952232AC131AB86D2 -+ Radio DImensione Suono -+ RDS -+ -+ 0 -+ 104.501 -+ -+ -+ 115986784537E07F9C327005C0DB00C6D1BB6749175482EB87FE5C7DEE67AEDEC6EAB06921 -+ Lattemiele -+ Lattemiele -+ -+ -1 -+ 105.026 -+ -+ -+ 11598678482059D4D5764000004CF5FD49E8796D8E1E1B5DA24CBAFB3670FCBC1F9D644FFF -+ Playradio -+ Playradio -+ -+ -1 -+ 106.076 -+ -+ -+ 1159867850B8776E8E5D779CC8EC9CD4FBEF53C3A6CBDBAB1049FBC64455B0BA3222B9B964 -+ Radio 24 -+ Radio 24 -+ -+ -1 -+ 107.001 -+ -+ -+ 1159867852D619DE2433296B2FD51950E7A1F34D750801F1D90BBEEC2750851A9166F65C0C -+ Lattemiele -+ Lattemiele -+ -+ -1 -+ 107.526 -+ -+ -+ 1159867853CCFF791DEAD366D390AB80F332149BE5523826D5927A027319AABD4A118FFCF2 -+ Radio 101 -+ Radio 101 -+ -+ -1 -+ 107.951 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am kradio-3.5.13.1/kradio3/presets/italy/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/italy/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,14 +1,17 @@ - SUBDIRS = --EXTRA_DIST = "bologna.krp" "rovato.krp" "torino-antenna.krp" -+EXTRA_DIST = "bologna.2.krp" "bologna.krp" "rovato.krp" "torino-antenna.krp" "trento.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/" -+ $(INSTALL_DATA) "$(srcdir)/bologna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp" - $(INSTALL_DATA) "$(srcdir)/bologna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp" - $(INSTALL_DATA) "$(srcdir)/rovato.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp" - $(INSTALL_DATA) "$(srcdir)/torino-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/trento.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp" - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp kradio-3.5.13.1/kradio3/presets/italy/trento.krp ---- kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/italy/trento.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,367 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ ClaudioFior -+ 2008-02-23T12:21:33 -+ Italy -+ Trento -+ Generical commercial radio -+ The first private radio for audience -+ -+ -+ -+12037788327C5000A1E1C3107F31D06EE254802E7FE64344B8508BD16B33321349F935F092 -+ RTT -+ -+ -+ -1 -+ 87.8 -+ -+ -+ -+12037784512E058DF3EB180F961037205703CFA3E43AD176232529B6F7A694C83C90133064 -+ Radio 1 -+ -+ -+ -1 -+ 88.05 -+ -+ -+ -+12037783990F5404D815267E1CEFBEBD2AF561F18B4AA33DE9DBC766067B0BE8A04398B6EA -+ RTT -+ -+ -+ -1 -+ 88.2 -+ -+ -+ -+1203778152A526CCA7DA26245392806D9EEBC290A91EEC1D318C9D80F87BE2F00C41B8B27C -+ Radio 1 -+ -+ -+ -1 -+ 88.7 -+ -+ -+ -+1203766148E30AA19F10875C0E4491222EF1665EFFC0D39FD585D8A7867309FD8AE02D2E13 -+ Radio Italia -+ -+ -+ -1 -+ 89 -+ -+ -+ -+1203765566F4E2677160964DE0F02C40E19C974AF24CA370A5497DC8684CDA0971F1565234 -+ Radio Italia Anni 60 -+ -+ -+ -1 -+ 89.6 -+ -+ -+ -+120376511549E6B71A3CE890F8B8676EEFD32C390819740918C2141BA47DD3150368D636E3 -+ Latte e miele -+ -+ -+ -1 -+ 90.05 -+ -+ -+ -+120376467696B11D09DBAE0D31FC25BC86C345975673125B1C3E0DE0962A9CDB822548D482 -+ Radio Maria -+ -+ -+ -1 -+ 90.4 -+ -+ -+ -+1195497782E78C6F58B61A33B081034F832CAF523A81F48BB5DD73D145CAE67C6D658F8E91 -+ Radio1 -+ -+ -+ -1 -+ 91 -+ -+ -+ -+1195498225CD235FD6E77F1BB29DF7303459C6ED8F08603A713F988646EBE11998E54D4122 -+ Radio2 -+ -+ -+ -1 -+ 90.7 -+ -+ -+ -+11981031163FC9FCF9F8557F554E7B70F10ABD1D8709C53C0AB9932DC9352467EEC8C00603 -+ Radio3 -+ -+ -+ -1 -+ 92.7 -+ -+ -+ -+119810398361E8DC092D02E9643CA66BDCCC5EB080057E8BB1BF8534EC6FFE3277DB186A7F -+ Radio Montecarlo -+ -+ -+ -1 -+ 95.45 -+ -+ -+ -+1203150062CB034C1991734F1DC16A7F45C94824B25183111A6C807DE86FED49C10EB41DE9 -+ Radio Margherita -+ -+ -+ -1 -+ 91.4 -+ -+ -+ -+1203150356B2B3BF5088BF9B9224B6E44A13843E8D5FCCC9C9E6CD722DFBDEF67DB7B3D571 -+ Radio Cuore2 -+ -+ -+ -1 -+ 91.95 -+ -+ -+ -+1203150494711D017990E1A8C63D001A814F39BF5CD86E7FA27B31EA5B7832962E769FC1F2 -+ Radio Studio pi� -+ -+ -+ -1 -+ 92.4 -+ -+ -+ -+120315071062B241694CA1A60BAE348E8EF398A0E787A9DCC3C217A146CC5BB5D063EADD92 -+ Radio Italia -+ -+ -+ -1 -+ 92.95 -+ -+ -+ -+1203153606B8A32AD018D71B5804D33FC84739B120ED1E04180E44E0234D5A200516DC3EE1 -+ 105 in alta quota -+ -+ -+ -1 -+ 93.4 -+ -+ -+ -+120315396131FC29130C20B77297DF7D1F37C78079FC106952987C864AE6D5F492AC1D6E06 -+ Radio cuore -+ -+ -+ -1 -+ 94.35 -+ -+ -+ -+1203154501D15FD503F381C2FEF7661D720D5F52963461D72CFA9FA21127CFA667CADF9A33 -+ Radio cuore 3 -+ -+ -+ -1 -+ 95 -+ -+ -+ -+12031568517DD2548E0946F0065974D5A21507A3E08350C7AA97AE0957D887E276AD99C019 -+ NBC -+ -+ -+ -1 -+ 96.3 -+ -+ -+ -+1203200613E74CEFC21DA7C4B61BC16A599C136A70D129B325476B181C2C1CAECF6556E90E -+ In blue -+ -+ -+ -1 -+ 96.65 -+ -+ -+ -+12037568765ECB0C523B1E78437E39371DC85BC474862827FA874A2B15D66D1B352B10AB26 -+ Radio Dimensione Suono -+ RDS -+ -+ -1 -+ 97.95 -+ -+ -+ -+1203757011E882BF401D989C42961F043F263E18467AECBB0A10E00652EDC1D82337D405D1 -+ Vergin Radio -+ -+ -+ -1 -+ 98.25 -+ -+ -+ -+12037570988FB0B1EBE148AC82B42FB155E3429D704D950EE22ADDA71D55DB145A65CB1ABA -+ Radio Dimensione Suono -+ RDS -+ -+ -1 -+ 98.6 -+ -+ -+ -+1203757250F1C78881D6FF295D020E80C91C4AC8E56329C223B3F87837CE44E4C78D08CF0D -+ Radio Latte e Miele -+ -+ -+ -1 -+ 98.85 -+ -+ -+ -+1203757675DF3EB701C74C7CF82B8B9173CEC28CB21C70F61A87CC91025EA6C021E3898B5F -+ Radio Dolomiti -+ -+ -+ -1 -+ 99.2 -+ -+ -+ -+120375786255B98C202F837DD293EEF55471EACA537B331E228B2EE835E494F4866C4E9A2F -+ Radio Genius -+ -+ -+ -1 -+ 100.75 -+ -+ -+ -+12037583500BB86685BFC434BE7675EC38DD2E7604E0220C0DE8D1D65695A0E7B06378AD6A -+ Radio Dolomiti -+ -+ -+ -1 -+ 101.1 -+ -+ -+ -+12037584063E07EC045C029EDBFE8499AC6E21E4342C33B8CF7C4824DD2DDA12A21C852D03 -+ Radio Genius -+ -+ -+ -1 -+ 101.65 -+ -+ -+ -+12037584836A28EE00AF9C12F3FAD88367F1DB27C939CE4DA444200AE57017191D0813614E -+ Radio Capital -+ -+ -+ -1 -+ 101.95 -+ -+ -+ -+1203758731A214755DC7D0A2FEC3927765269DCE92958E7D5C3D83B8C884D9212621CE9644 -+ Radio Gamma -+ -+ -+ -1 -+ 102.25 -+ -+ -+ -+1203758996A5D1C5CF5289364B936E933C047EFA878B2663A679F56B0A8DE1DEEF029E5526 -+ RTL 102.5 -+ -+ -+ -1 -+ 102.45 -+ -+ -+ -+120375929353FA1323BD876CCF878483DDE94B4A6AC5CDB97FC16B4C4CFE460C901B60CCCD -+ Radio 24 -+ -+ -+ -1 -+ 102.7 -+ -+ -+ -+120375997547B7A1EDB73B248BB273EB8CD513AC1D2B3C0DC882208B4DCEDE1CFB244DACE3 -+ Rete 101 -+ -+ -+ -1 -+ 102.95 -+ -+ -+ -+1203761052A4C36EDEEE1E12F8452070F64678AD816B2E449E2C1B9D761A9644F7DB1FE18A -+ Radio Radicale -+ -+ -+ -1 -+ 103.35 -+ -+ -+ -+1203761721500B262A77C5F20170FCE50704F412CB4C55AA7B7CAF552F636CD4E307A3FF4A -+ Radio DJ1 -+ -+ -+ -1 -+ 103.65 -+ -+ -+ -+1203764354DE34015364D5C788E9EE6BB21CF1286AF4BBD7CCA54E4836D6536E5B8D68C3A3 -+ Radio Maria -+ -+ -+ -1 -+ 104 -+ -+ -+ -+1203764542A23343C3040B36F14B8B65AE6D8298113863B25247836B094DDC21E962A0279A -+ Radio DJ -+ -+ -+ -1 -+ 104.25 -+ -+ -+ -+1203764641F20C7E2AC6EBD257052162471AE4DEFD3773757B400E480176B471F07CEE6612 -+ Radio 105 -+ -+ -+ -1 -+ 105 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,12 +1,13 @@ - SUBDIRS = --EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp" -+EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp" "vilnius.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/" - $(INSTALL_DATA) "$(srcdir)/kaunas-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/panevezys.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/vilnius.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp" - - uninstall-local: - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp ---- kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,88 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Andrzej Valchik -+ 2008-08-27T23:00:25 -+ Lithuania -+ Vilnius -+ -+ Contains merged Data -+ -+ -+ -+12198672179D04D8F6F96417B40484863BE066FC65D89EB7336B216618B7319056873D6999 -+ Zip FM -+ 1 -+ -+ -1 -+ 100.1 -+ -+ -+ -+1219867219728EC984D598E6FC962752395F584B659E6D7C2DCF837FCE3C20951C5DD66969 -+ Russian Radio -+ 2 -+ -+ -1 -+ 105.6 -+ -+ -+ -+1219867220014EF13080BDD4E133C40C717013A6D0E184DED3CE7D49C820379D0F4ED69288 -+ Radiocentras -+ 3 -+ -+ -1 -+ 101.5 -+ -+ -+ -+1219867222255675B2B22E8A9936E9BCE61691DD75DCE674AE5CD3A0D1B83C717CB64D7FCA -+ M1 -+ 4 -+ -+ -1 -+ 106.801 -+ -+ -+ -+121986753461099673260F43AC1048500BA8CD6A48CE88E7C3655AC55029A0533699DEEE5C -+ Power Hit Radio -+ -+ -+ -1 -+ 95.9 -+ -+ -+ -+121986760885465B9D5A74B4022D81F51C0478BAA1BF2E57D4C4A983FFB26616F66E28491A -+ European Hit Radio -+ -+ -+ -1 -+ 99.7 -+ -+ -+ -+12198670760B330000E51F0F3617E1C73F67120DF45ACE16AB33D101129A0F65BEF43D2847 -+ Opus 3 -+ -+ -+ -1 -+ 98.3 -+ -+ -+ -+12198677026740FED9FAD2BC544E5FFDF0F11F5B9FCF3C84AE76210C237B238794FE3E35B0 -+ M1+ -+ -+ -+ -1 -+ 106.2 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp ---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,324 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Loes Alex >alex@linux.lu> -+ 2006-11-12T12:25:01 -+ Luxembourg -+ Esch/Alzette -+ -+ Contains merged Data -+ -+ -+ -+1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0 -+ S�dwestrundfunk 1 -+ SWR1 -+ -+ -1 -+ 99.2 -+ -+ -+ -+1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359 -+ S�dwestrundfunk 1 -+ SWR1 -+ -+ -1 -+ 97.7 -+ -+ -+ -+1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262 -+ S�dwestrundfunk 2 -+ SWR2 -+ -+ -1 -+ 93 -+ -+ -+ -+1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E -+ S�dwestrundfunk 3 -+ SWR3 -+ -+ -1 -+ 90 -+ -+ -+ -+1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808 -+ S�dwestrundfunk 3 -+ SWR3 -+ -+ -1 -+ 90.6 -+ -+ -+ -+1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08 -+ Classic21 -+ Classic21 -+ -+ -1 -+ 87.6 -+ -+ -+ -+106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343 -+ Premiere -+ Premiere -+ -+ -1 -+ 96.4 -+ -+ -+ -+11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7 -+ Vivacit� -+ Vivacit� -+ -+ -1 -+ 91.5 -+ -+ -+ -+1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6 -+ RTL L�tzebuerg -+ RTL L�tzebuerg -+ -+ -1 -+ 88.9001 -+ -+ -+ -+11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42 -+ RTL L�tzebuerg -+ RTL L�tzebuerg -+ -+ -1 -+ 92.5 -+ -+ -+ -+116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E -+ RTL Radio -+ RTL Oldie -+ -+ -1 -+ 93.3 -+ -+ -+ -+1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71 -+ RTL Radio -+ RTL Oldie -+ -+ -1 -+ 97 -+ -+ -+ -+116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F -+ BEL RTL -+ Bel RTL -+ -+ -1 -+ 90.4 -+ -+ -+ -+116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B -+ Musique -+ Musique -+ -+ -1 -+ 90.8 -+ -+ -+ -+10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85 -+ Musique 3 -+ Musique 3 -+ -+ -1 -+ 94.1 -+ -+ -+ -+10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6 -+ DNR -+ DNR -+ -+ -1 -+ 102.9 -+ -+ -+ -+11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36 -+ DNR -+ DNR -+ -+ -1 -+ 104.2 -+ -+ -+ -+1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561 -+ 100komma7 -+ 3 -+ -+ -1 -+ 100.701 -+ -+ -+ -+10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0 -+ Radioara -+ ARA -+ -+ -1 -+ 103.3 -+ -+ -+ -+1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639 -+ Eldoradio -+ ELDO -+ -+ -1 -+ 105.002 -+ -+ -+ -+1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C -+ City FM Esch -+ City FM -+ -+ -1 -+ 101.2 -+ -+ -+ -+1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606 -+ Inter -+ Inter -+ -+ -1 -+ 98.1 -+ -+ -+ -+11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F -+ Radio Festival -+ Festival -+ -+ -1 -+ 101.7 -+ -+ -+ -+116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9 -+ new station 9 -+ 9 -+ -+ -1 -+ 105.9 -+ -+ -+ -+116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45 -+ Radio Latina -+ Latina -+ -+ -1 -+ 101.2 -+ -+ -+ -+1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A -+ Lokalradio Betebuerg -+ LRB -+ -+ -1 -+ 103.9 -+ -+ -+ -+11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D -+ Radio Contact 2 -+ Contact 2 -+ -+ -1 -+ 105.7 -+ -+ -+ -+1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39 -+ RGL -+ RGL -+ -+ -1 -+ 106 -+ -+ -+ -+1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E -+ Radio Belle Vallee -+ Belle vallee -+ -+ -1 -+ 107 -+ -+ -+ -+1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF -+ Radio Contact -+ Contact -+ -+ -1 -+ 107.5 -+ -+ -+ -+1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA -+ Radio Challenger -+ Challenger -+ -+ -1 -+ 102.2 -+ -+ -+ -+1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890 -+ 95,5 FM -+ 95,5 -+ -+ -1 -+ 95.5 -+ -+ -+ -+1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6 -+ 95,9 FM -+ 95,9 FM -+ -+ -1 -+ 95.9 -+ -+ -+ -+11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7 -+ 106,5 FM -+ 106,5 FM -+ -+ -1 -+ 106.5 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp ---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,324 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Loes Alex >alex@linux.lu> -+ 2006-11-12T12:25:01 -+ Luxembourg -+ Esch/Alzette -+ -+ Contains merged Data -+ -+ -+ -+1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0 -+ S�dwestrundfunk 1 -+ SWR1 -+ -+ -1 -+ 99.2 -+ -+ -+ -+1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359 -+ S�dwestrundfunk 1 -+ SWR1 -+ -+ -1 -+ 97.7 -+ -+ -+ -+1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262 -+ S�dwestrundfunk 2 -+ SWR2 -+ -+ -1 -+ 93 -+ -+ -+ -+1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E -+ S�dwestrundfunk 3 -+ SWR3 -+ -+ -1 -+ 90 -+ -+ -+ -+1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808 -+ S�dwestrundfunk 3 -+ SWR3 -+ -+ -1 -+ 90.6 -+ -+ -+ -+1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08 -+ Classic21 -+ Classic21 -+ -+ -1 -+ 87.6 -+ -+ -+ -+106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343 -+ Premiere -+ Premiere -+ -+ -1 -+ 96.4 -+ -+ -+ -+11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7 -+ Vivacit� -+ Vivacit� -+ -+ -1 -+ 91.5 -+ -+ -+ -+1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6 -+ RTL L�tzebuerg -+ RTL L�tzebuerg -+ -+ -1 -+ 88.9001 -+ -+ -+ -+11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42 -+ RTL L�tzebuerg -+ RTL L�tzebuerg -+ -+ -1 -+ 92.5 -+ -+ -+ -+116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E -+ RTL Radio -+ RTL Oldie -+ -+ -1 -+ 93.3 -+ -+ -+ -+1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71 -+ RTL Radio -+ RTL Oldie -+ -+ -1 -+ 97 -+ -+ -+ -+116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F -+ BEL RTL -+ Bel RTL -+ -+ -1 -+ 90.4 -+ -+ -+ -+116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B -+ Musique -+ Musique -+ -+ -1 -+ 90.8 -+ -+ -+ -+10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85 -+ Musique 3 -+ Musique 3 -+ -+ -1 -+ 94.1 -+ -+ -+ -+10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6 -+ DNR -+ DNR -+ -+ -1 -+ 102.9 -+ -+ -+ -+11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36 -+ DNR -+ DNR -+ -+ -1 -+ 104.2 -+ -+ -+ -+1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561 -+ 100komma7 -+ 3 -+ -+ -1 -+ 100.701 -+ -+ -+ -+10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0 -+ Radioara -+ ARA -+ -+ -1 -+ 103.3 -+ -+ -+ -+1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639 -+ Eldoradio -+ ELDO -+ -+ -1 -+ 105.002 -+ -+ -+ -+1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C -+ City FM Esch -+ City FM -+ -+ -1 -+ 101.2 -+ -+ -+ -+1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606 -+ Inter -+ Inter -+ -+ -1 -+ 98.1 -+ -+ -+ -+11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F -+ Radio Festival -+ Festival -+ -+ -1 -+ 101.7 -+ -+ -+ -+116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9 -+ new station 9 -+ 9 -+ -+ -1 -+ 105.9 -+ -+ -+ -+116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45 -+ Radio Latina -+ Latina -+ -+ -1 -+ 101.2 -+ -+ -+ -+1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A -+ Lokalradio Betebuerg -+ LRB -+ -+ -1 -+ 103.9 -+ -+ -+ -+11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D -+ Radio Contact 2 -+ Contact 2 -+ -+ -1 -+ 105.7 -+ -+ -+ -+1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39 -+ RGL -+ RGL -+ -+ -1 -+ 106 -+ -+ -+ -+1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E -+ Radio Belle Vallee -+ Belle vallee -+ -+ -1 -+ 107 -+ -+ -+ -+1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF -+ Radio Contact -+ Contact -+ -+ -1 -+ 107.5 -+ -+ -+ -+1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA -+ Radio Challenger -+ Challenger -+ -+ -1 -+ 102.2 -+ -+ -+ -+1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890 -+ 95,5 FM -+ 95,5 -+ -+ -1 -+ 95.5 -+ -+ -+ -+1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6 -+ 95,9 FM -+ 95,9 FM -+ -+ -1 -+ 95.9 -+ -+ -+ -+11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7 -+ 106,5 FM -+ 106,5 FM -+ -+ -1 -+ 106.5 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,10 +1,13 @@ - SUBDIRS = --EXTRA_DIST = "walferdange.krp" -+EXTRA_DIST = "alzette.krp" "esch.krp" "walferdange.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/" -+ $(INSTALL_DATA) "$(srcdir)/alzette.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp" -+ $(INSTALL_DATA) "$(srcdir)/esch.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp" - $(INSTALL_DATA) "$(srcdir)/walferdange.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp" - -- - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/Makefile.am kradio-3.5.13.1/kradio3/presets/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/Makefile.am 2012-11-30 23:52:48.000000000 +0100 -@@ -1 +1 @@ --SUBDIRS = switzerland norway bulgaria new-zealand ireland sweden iceland italy portugal brazil germany russia catalonia usa australia finland lithuania england slovakia canada spain luxemburg turkey belgium argentina romania netherlands south-africa austria uruguay hungary poland czechia france -+SUBDIRS = argentina australia austria belarus belgium brazil bulgaria canada catalonia colombia croatia czechia england finland france germany greece hungary iceland india ireland italy lithuania luxemburg netherlands new-zealand norway poland portugal romania russia slovakia south-africa spain sweden switzerland turkey ukraine uruguay usa vietnam -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp ---- kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,360 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Wilfred van den Assem -+ 2004-08-14T13:45:29 -+ Netherlands -+ Ede -+ cable -+ got data from http://www.upc.nl/ -+ -+ -+ -+1061768916D6D60211155A9867579BD00D8BAAB1B161379528845A471C2473820166ACE223 -+ Radio 1 -+ Radio 1 -+ -+ -1 -+ 87.6 -+ -+ -+ -+1061768916674F270FB0E48154D32C1348A18098757C8FBB5B2E6DD4DBE531C44F80E55850 -+ Radio 2 -+ Radio 2 -+ -+ -1 -+ 88.2 -+ -+ -+ -+1061768916521DF9F0D8CC313B63094A26C58A3EF43281F65F7405DC7ED9F250F50877E6A8 -+ Radio 3 -+ Radio 3 -+ -+ -1 -+ 88.7 -+ -+ -+ -+1061768916875497BD80A8B3EB56FDD97D8BCD15143EF3A7FB072C8B3AF77BFC9B8B077F41 -+ Radio 4 -+ Radio 4 -+ -+ -1 -+ 89.1 -+ -+ -+ -+106176891671E2CAEA45B3503F03EC1C51826002CBD7B24604CA6379650E39A727905D27A9 -+ Radio 747 AM -+ Radio 747 AM -+ -+ -1 -+ 89.6 -+ -+ -+ -+106176891660FD79DFF18BF25EE5732FDAE5A7F4DE53C34511719A9D9A192A52FCDAB424FB -+ VRT Radio 1 -+ VRT Radio 1 -+ -+ -1 -+ 91.6 -+ -+ -+ -+1161153582384EAC06B0BE166AB53A183932FF5B20B5E78210FDACD304E3E73F651DCD3C03 -+ VRT Radio 2 -+ VRT Radio 2 -+ -+ -1 -+ 92 -+ -+ -+ -+10617689169CF30DDBE712348BEF827B9C3992B2E4761C7BE090E611BA3F3639F4C1B9ED68 -+ VRT Radio Klara -+ VRT Radio Klara -+ -+ -1 -+ 92.4 -+ -+ -+ -+116115361665D32BD758259F77358067404F00097689E170441AE61F4A31352285D328250E -+ Radio Oost -+ Radio Oost -+ -+ -1 -+ 107.9 -+ -+ -+ -+1161153652CCFDA5E3632D597D89537123A32442359230A708945E6893FC34A713DAF3CFB7 -+ Omroep Fryslan -+ Omroep Fryslan -+ -+ -1 -+ 100.9 -+ -+ -+ -+1061768916CCBEFA171CFA37C0C9504D15C9E5D25D4307FAB210169CE31D93B3EC2639EFC1 -+ Omroep Gelderland -+ Omroep Gelderland -+ -+ -1 -+ 103.3 -+ -+ -+ -+1061768916DAD184A2F4074D993CBB883601E987A73B79E77DF27EC7B59BBE06D9E3F1C25A -+ Lokale Omroep -+ Lokale Omroep -+ -+ -1 -+ 93.1 -+ -+ -+ -+10617689169DB2EDD8EC100A91AEE995A3803046E75F4C2E9FD96C4A9F4F4E572ACFD76E60 -+ BBC Radio 3 -+ BBC Radio 3 -+ -+ -1 -+ 102.2 -+ -+ -+ -+1161153719E945B75BBAE2BE88E1D6708CA899C38812377F524084DC17799B28EF95A7449F -+ WDR 1 -+ WDR 1 -+ -+ -1 -+ 99.1 -+ -+ -+ -+11611537345314B57844DCB83ED1854B2DD0AF2C0F35DE85056B2C31076E0C233C546ED8FA -+ WDR 2 -+ WDR 2 -+ -+ -1 -+ 99.5 -+ -+ -+ -+1161153750FEF87459094374CCA4D2C2D3184881B0E0490493088F22BF3F9EBA30857E4256 -+ WDR 3 -+ WDR 3 -+ -+ -1 -+ 99.9 -+ -+ -+ -+116115377178116A777931577FF53165625081CB5D288FD6584D5FDA80359B75305E9CE512 -+ WDR 4 -+ WDR 4 -+ -+ -1 -+ 100.5 -+ -+ -+ -+1061768916B8192E1A210DEA36E235662832013CA5A99264A14A07BA0933F5079FA526A1CE -+ Arrow Rock Radio -+ Arrow Classic Rock Radio -+ -+ -1 -+ 97.6 -+ -+ -+ -+116115335888BB7FB1792AB5778FA5020D15B6D27B83D36DA1707E3135AED4395FA4DC6DEA -+ Arrow 90,7 FM -+ Arrow 90,7 FM -+ -+ -1 -+ 101.3 -+ -+ -+ -+11611538298006F042F5BA4800CCB6E984D134258D0ED47B33E519D2D3E29AA1D3A138D734 -+ Het Gelders Geluid -+ Het Gelders Geluid -+ -+ -1 -+ 102.8 -+ -+ -+ -+11611538849F64970DCE09509546044C9CA3819FF67DD1EC1EF0ECCE744D74D2E4F1C64E6E -+ BBC World Service -+ BBC World Service -+ -+ -1 -+ 104.5 -+ -+ -+ -+1161153903EFD4B3ED578A480A62461EEBA0EABBE5603346C9DF183154881E81A7080A6F83 -+ BNR Nieuwsradio -+ BNR Nieuwsradio -+ -+ -1 -+ 106.7 -+ -+ -+ -+10617689169DB024ABAAA652F2C5476890B717855DBD52903DA0E0F5255A8E98AC2BB3E732 -+ Classic FM -+ Classic FM -+ -+ -1 -+ 104.9 -+ -+ -+ -+10617689164394C7A3D38B4FEDE5625C2E7534ED6AD44B8EE956712A802388A26DB075E098 -+ Concertzender -+ Concertzender -+ -+ -1 -+ 103.8 -+ -+ -+ -+1061768916FC58F6080AA9D2E99E4EF096A27242230717633F27CEAD62834C228FEE869BCC -+ RTL FM -+ RTL FM -+ -+ -1 -+ 98.1 -+ -+ -+ -+11611539802AD1AF72DE7F31516F32690C20DF5CDFCBD9FFF73B11B5B7066A3F17EDEF95F6 -+ Hot Radio -+ Hot Radio -+ -+ -1 -+ 101.8 -+ -+ -+ -+1161154009DFC37030D6C2614E5E925F3B92CA4F8987B0C6079BF0A79CA6C69D0810CE5DCA -+ Slam FM -+ Slam FM -+ -+ -1 -+ 97.1 -+ -+ -+ -+116115403704F8DC30EF1E672D16616263E4423BECE77A6247368F1003E605F23E3CADAB70 -+ Keizerstad FM -+ Keizerstad FM -+ -+ -1 -+ 105.4 -+ -+ -+ -+106176891684678CE4B308A8A6F724F5C73506E16E27268EB819FC720AE7AD5B483473E4B6 -+ Kink FM -+ Kink FM -+ -+ -1 -+ 94.1 -+ -+ -+ -+1061768916248E70F2866B0754758FA4F16D395369F9B3550559E24A77C1B48B5C1EEB0684 -+ Q-Music -+ Q-Music -+ -+ -1 -+ 95.4 -+ -+ -+ -+10617689161657EC736540B26C223EC40019E316770DD54F30EDD58351F305A7CCF58CF42E -+ Radio 10 Gold -+ Radio 10 Gold -+ -+ -1 -+ 94.6 -+ -+ -+ -+1061768916495B2FFD8C70DEA15BCE8BCD882F1ECB21F05F8713D6610A04BE9690F59CD956 -+ Radio 538 -+ Radio 538 -+ -+ -1 -+ 90.6 -+ -+ -+ -+1161154174EE98D5510463A0C07109A56AD2303F0B1E6EC5A22EF3B9918775924D8921C7B5 -+ Radio Donna -+ Radio Donna -+ -+ -1 -+ 98.6 -+ -+ -+ -+1061768916C3BBEBD88D7BE50E0D66854AAFC41402F07BCC2B609B8D70D7B1BE9E0551D162 -+ Radio Veronica -+ Radio Veronica -+ -+ -1 -+ 95.9 -+ -+ -+ -+1161154202F08ECD8CB447AAD23BB63C38C144E82BCC2C6258E4E774BEB0AC1E958B9945BF -+ Rebecca -+ Rebecca -+ -+ -1 -+ 107.1 -+ -+ -+ -+10617689165763D6C843F7F6EC887BCB341263385A26A6AF2E11CB926DE91932882C30DCF7 -+ Sky Radio -+ Sky Radio -+ -+ -1 -+ 90 -+ -+ -+ -+10617689166BA97C6B690CD30B8E86DA28E1B815A478FD6B58504AF435C114B2CFD4177318 -+ Yorin FM -+ Yorin FM -+ -+ -1 -+ 93.6 -+ -+ -+ -+11611542299B25F62676B0D3F897FE54E785DFE3A527F5EBD866C1F49207CADEBF1A1EDB6A -+ 2e Kamerlijn -+ 2e Kamerlijn -+ -+ -1 -+ 107.6 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,30 +1,31 @@ - SUBDIRS = --EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp" -+EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "ede.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/" -- $(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" -- $(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" - $(INSTALL_DATA) "$(srcdir)/alphen-aan-den-rijn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" - $(INSTALL_DATA) "$(srcdir)/amersfoort-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" -+ $(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" - $(INSTALL_DATA) "$(srcdir)/amsterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/ede.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp" -+ $(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" - $(INSTALL_DATA) "$(srcdir)/groningen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" -+ $(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,104 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ rado-1.0beta3b -+ Mario, <mariuszwr@o2.pl> -+ 2008-03-30T14:19:27 -+ poland -+ czestochowa -+ -+ antenna -+ -+ -+ 109569822506C857816E13E27DEC856024B05151EB43DE1B656728CCA49EB2B9427D135846 -+ Polskie Radio Bis -+ Bis -+ -+ -1 -+ 98.95 -+ -+ -+ 1094719793C323351FB798EF728B232148DC066B49C9E7C8CF11D7F9AC32CBFF70F79F25B0 -+ Trójka -+ Trójka -+ -+ -1 -+ 91.7 -+ -+ -+ 1095697872BBA803C49A13E8248BEA59AEE7B241A7AC35BDAC2A07159E8935A7768571ED15 -+ Radio C -+ C -+ -+ -0.01 -+ 96.6 -+ -+ -+ 1095697962016FBF883B757A23FDD3AD28778C46353A6FF8D656EA6AE8A7377F44AF09B63D -+ Radio Katowice -+ Katowice -+ -+ -1 -+ 98.45 -+ -+ -+ 10956981207850CC6E93BB5799DE6342A15BCBBC2F6EA512A458D1624CFF503292FB19F94A -+ Jedynka -+ Jedynka -+ -+ -1 -+ 87.55 -+ -+ -+ 109569817873B0C0A37E18F984E4D9CF9E9A9F2C7B3A48D230ADDEABD4DF0CFB7D4F220B79 -+ RMFMAXX -+ RMFMAXX -+ -+ -1 -+ 102.55 -+ -+ -+ 1095697990DB89F838E5B480B6023336F88A88670804126D366D2D42B241FB499AE0EDC18F -+ Radio Zet -+ Zet -+ -+ -1 -+ 103.45 -+ -+ -+ 1094719872EA2412A37C582F0EE766611FB36914F824B944B872DDD8D42DF884F1682F485B -+ RMF FM -+ RMF FM -+ -+ -0.01 -+ 105.9 -+ -+ -+ 1094720563210A2A1BCA82A429BECEC40E1CC444660EE2B573EA7E032282B2B66E89A8B8A5 -+ Dwójka -+ Dwójka -+ -+ -1 -+ 90.6 -+ -+ -+ 109569825516562B261D7E9C26E0DCA51E196A1F79A8B0AA5978B7D2AD4003D354DA8FB186 -+ Radio Fiat -+ Fiat -+ -+ -1 -+ 94.7 -+ -+ -+ 1095698040CF98DFCCAFF2E5690ED9E44F33E5F9DA2A96FF5FE1D6B81D5BFAA6A578E3791B -+ Radio Jasna Góra -+ Jasna Góra -+ -+ -1 -+ 100.55 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,151 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Marcin Dabek -+ 2005-05-02T12:01:20 -+ Poland -+ Gdansk -+ -+ -+ -+ -+ 12215568287C61A88AEC8635FC5CCFF7171F303401B1DCFD2CA5CE3D81AA7F3224E90BC742 -+ RMF Classic -+ -+ -+ -1 -+ 88.4 -+ -+ -+ 122155684736B50D0EAE6D579A11236D29B3B4469F8F9C1CDBEA36913DBD03F5FFFE7B1204 -+ Radio Maryja -+ -+ -+ -1 -+ 88.9 -+ -+ -+ 12215568727DFE9D88CDC83160CCC15526A6CF26D8701917D5244503A3B7E285F14E141377 -+ Polskie Radio Program 2 -+ -+ -+ -1 -+ 89.5 -+ -+ -+ 1229710262F4878A7B00BE2D7F76D54B3BA03B9A47463EC5FD828B08F5D0BFA7EE0B966028 -+ Chilli ZET -+ -+ -+ -1 -+ 92 -+ -+ -+ 1221556917BE7AC365D5DDF2C108946E1D0152AD5A703D3C68DA2DDBB40B911CBB6A6E693B -+ Radio Kaszebe -+ -+ -+ -1 -+ 92.3 -+ -+ -+ 1221556932BF6B314ECB047845EF8614D8B46B954ECD37DD45B8DF865F9743E15AF2D64CA8 -+ Polskie Radio Euro -+ -+ -+ -1 -+ 93.4 -+ -+ -+ 12215569572CE92640C495542FFB927F221407B75D9BF2555272C335DBA68110863E696996 -+ Radio Eska Trójmiasto -+ -+ -+ -1 -+ 94.6 -+ -+ -+ 1221556988D9342A99AFC0B1A9E59692FC1FB6E06F164791963D1F5D88F9065195F35C37C6 -+ Polskie Radio Program 1 -+ -+ -+ -1 -+ 95.7 -+ -+ -+ 1221557013882E0532BD346FFFD9A5EA1CD212D9C8E152E98DAB619AC6E927E7DDD1233BAB -+ RMF Maxxx Trójmiasto -+ -+ -+ -1 -+ 96.4 -+ -+ -+ 1221557038E31C4C464C57757EB85F937BA47741C3B136900BD84054C1CE3452114747163A -+ Radio TOK FM -+ -+ -+ -1 -+ 97.8 -+ -+ -+ 1219857722931B3EEF9145FBCFF13C6034AB67BA25D1207ADCA53F82364AA593224F7109CF -+ RMF FM -+ -+ -+ -1 -+ 98.4 -+ -+ -+ 1221557083CE00FD4802E76A9C8E7FBF6379D9AC6BC454404BDCDD1E517F5BA60209B1D3DD -+ Polskie Radio Program 3 -+ -+ -+ -1 -+ 99.9 -+ -+ -+ 1221557119075B6D8D3C90DFC53DBEE7AD2FDA2B6B9D025437E41D40C49DB45EDE918430DC -+ Radio Plus Gdańsk -+ -+ -+ -1 -+ 101.7 -+ -+ -+ 1221557141040C86265FA2B11B772DB78368F5D3FFCD9A20DAEB3BA239B0D04864925CAACB -+ Radio Złote Przeboje -+ -+ -+ -1 -+ 103 -+ -+ -+ 1221557171CAB3A2B6E4E3CAD3F6E293D318C15489374FF7EE504CB68DFAA2E08B704C14B7 -+ Polskie Radio Gdańsk -+ -+ -+ -1 -+ 103.7 -+ -+ -+ 122155719504D8B63D209DF87C9FAB419641D87FFED865596883C203FDDE6E86F663BEDC81 -+ Radio Eska Rock -+ -+ -+ -1 -+ 104.4 -+ -+ -+ 1219857671CD41C2FF7BAB36A8B4E4FCD5B5675ABC24E423D3DFE2705995D5719CFDDC022D -+ Radio Zet -+ -+ -+ -1 -+ 105 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,197 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ -+ 2007-06-20T00:25:42 -+ Poland -+ Lodz -+ Multimedia_cable -+ Contains merged Data -+ -+ -+ -+11822951592B62AD0B29DA188FC37D5BC6DF251E8831E9B25E1B08D8217AC8C820314A5E87 -+ Tok FM -+ Tok -+ -+ -1 -+ 98.8 -+ -+ -+ -+11822954375392ACECD74C5E8F829F49E89C6538C88A683A95FCB11D5E442DDD7B5EDD3841 -+ Polskie Radio BIS -+ BIS -+ -+ -1 -+ 98.3 -+ -+ -+ -+1182295070AD54E88C72A2EA8AE4C3EFBDFEA8522D6E560D5FE3C8EC0371C49CA6E65BF29A -+ RMF FM -+ RMF -+ -+ -1 -+ 97 -+ -+ -+ -+11872808081B25C94B7555C7F8A4B9888E9AF25C6358CDF7F9B27C951BB0E9A7E7230BCFA8 -+ Sunshine Live -+ Sunshine -+ -+ -1 -+ 95 -+ -+ -+ -+11872803804CA47D3949558F9F50EDC13DB1BE5D6067FE476C4C3A52378A7C2608AB8D9FDD -+ Klassik Radio -+ Klassik -+ -+ -1 -+ 94.4 -+ -+ -+ -+11872804261AA8FF934BC24FA59871DC47CCED08ECDDB0A9B5B16EB8E4208775A98DBA10F4 -+ RTL Radio -+ RTL -+ -+ -1 -+ 93 -+ -+ -+ -+11822950461598E1CEBE4AD1116E623E7F82824779228D49FCADF3F6967F2D3A7C5A5E9DA2 -+ Radio Zet -+ Zet -+ -+ -1 -+ 90.4 -+ -+ -+ -+118229530168E7CC202D9FCE6928BE23CD43DDEA8EBDED271636F820F3396FD86454CC3C5B -+ Radio Z�ote Przeboje -+ Z�ote Przeboje -+ -+ -1 -+ 89.2 -+ -+ -+ -+1182294924AA0C337B114539C8878F2697138156C0DBD5AF8CB4E6BEDDEF2C6AB020BFC334 -+ Radio Pogoda -+ Pogoda -+ -+ -1 -+ 104.1 -+ -+ -+ -+118229190344092EF2F0D2AA89D78EF8CFE8A2BEFE42FAFAB2F4D9C2C57C6D54D384A366BD -+ Radio Maryja -+ Maryja -+ -+ -1 -+ 87.5 -+ -+ -+ -+11822950051DEE65FC7A6D1FD85B2A696A21081EFAC6A3492731946B1B99E99C2F31FEF73A -+ Polskie Radio Program 2 -+ PR2 -+ -+ -1 -+ 105.5 -+ -+ -+ -+118728050865D611D8D6A580F01787B91B3C88FE6ED168D744FE6597A6A3832AC1C506CDA1 -+ Jam FM -+ Jam -+ -+ -1 -+ 105.1 -+ -+ -+ -+1182295497B82166CE2968E66B97BA2BD60C955F6076B475B0713DA5CFD1F3A855347991FD -+ Polskie Radio Program 1 -+ PR1 -+ -+ -1 -+ 106 -+ -+ -+ -+1182295121FE742DD14B3861BE7C0767ACD3C14BD1CEF344EC37AFCC8E69DB26C706202EB4 -+ Radio Parada -+ Parada -+ -+ -1 -+ 104.1 -+ -+ -+ -+118229519080D140BF6665ED6B0E319197C0796B202C344D457245805ADCA1A324BD6DB024 -+ Radio Eska Rock -+ Eska Rock -+ -+ -1 -+ 103.1 -+ -+ -+ -+1182295224A5CFF0376073A55D56260F2D0BDF72CC0D9E0CD0444C96E5B053B12352276040 -+ Polskie Radio ��d� -+ Radio ��d� -+ -+ -1 -+ 102.5 -+ -+ -+ -+11872802306FD47B3725D04E5C840EA16346C835BE25A43B27AE9EA709ECCC5A60E400AC12 -+ Polskie Radio Program 3 -+ PR3 -+ -+ -1 -+ 101.9 -+ -+ -+ -+11822952706BCBA8B1F212D43FF9CD77304D15248CCBB36D99CBFE1717E6FC70B5328FB9AA -+ Radio Vox FM ��d� -+ Vox -+ -+ -1 -+ 101.3 -+ -+ -+ -+1182291526776BF1C96CE85AC3882781A6821B58BDA25507033F693A442094A1E6CF7B40CE -+ Radiostacja -+ -+ -+ -1 -+ 106.5 -+ -+ -+ -+11872807143C41BCDB4450D8F024BB289D4434AB639B2C9BB430A5F37BE3CF44F40BACAEFF -+ Eska ��d� -+ -+ -+ -1 -+ 100.8 -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am kradio-3.5.13.1/kradio3/presets/poland/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/poland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,30 +1,47 @@ - SUBDIRS = --EXTRA_DIST = "bialystock-antenna.krp" "elblang-antenna-fm.krp" "katowice.krp" "krakow-antenna.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp" -+EXTRA_DIST = "bialystock-antenna.krp" "czestochowa.krp" "elblang-antenna-fm.krp" "gdansk.krp" "katowice.krp" "krakow-antenna.krp" "lodz-cable.krp" "nowy-sacz-antenna.krp" "opole-antenna.krp" "poznan-antenna.krp" "tarnow.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp" "warszawa-cable.krp" "warszawa-ursynow.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/" -- $(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" -- $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/bialystock-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/czestochowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp" - $(INSTALL_DATA) "$(srcdir)/elblang-antenna-fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp" -- $(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" -- $(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/gdansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp" - $(INSTALL_DATA) "$(srcdir)/katowice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp" -- $(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" -+ $(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/lodz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/nowy-sacz-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/opole-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/poznan-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/tarnow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp" -+ $(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" - $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" - $(INSTALL_DATA) "$(srcdir)/warsaw.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" -+ $(INSTALL_DATA) "$(srcdir)/warszawa-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/warszawa-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,70 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta2 -+ Marcin"WASYL"Basiaga, -+WasylNS@interia.pl -+ 2005-11-30T14:36:51 -+ Poland -+ Nowy Sącz -+ antenna -+ Contains merged Data -+ -+ -+ -+1104422521ECAFDA4C92BFABDCA1C6CE092CD4E64C696A81194D6FE9F26DEF7D9999466F8E -+ RMF FM -+ RMF FM -+ -+ -0.01 -+ 103.196 -+ -+ -+ -+1104426638C6D4851AD1CE10470FBE94C2FFF50A6011843F618E3E5453686AFA1C1EB1AE23 -+ Radio Zet -+ Zetka -+ -+ -0.01 -+ 97.796 -+ -+ -+ -+1104429437CB3574C52E0E9C7C5D92D4C557A2B457B005AE4DF83176CC2CD5F9E9DE65FD04 -+ Polskie Radio PR 3 -+ Trójka -+ -+ -1 -+ 94.796 -+ -+ -+ -+1104429442C8D842CAF84FE1C33EA30EC6CA2E7653E11E1C384D4EF4946409D66EB2334273 -+ Polskie Radio PR 1 -+ Jedynka -+ -+ -0.01 -+ 99.2007 -+ -+ -+ -+110449736641CF389791C851CE7ACA60328CECD88E3722CC969EB7C3DF4ABA7DDEF7D86FA3 -+ Złote Przeboje ECHO -+ ECHO -+ -+ -1 -+ 93.7999 -+ -+ -+ -+1104849921CBBF6A08B9FF1C1FAE90125D357C387AB173C28038A02076EF970BB49C181077 -+ Radio Kraków -+ Radio Kraków -+ -+ -0.01 -+ 90.05 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,100 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Krzysztof Kusiak, -+<szyszart@poczta.onet.pl> -+ 2007-01-24T16:57:09 -+ Poland -+ Opole -+ Antenna -+ -+ -+ -+ 1 -+ Polskie Radio Program 2 -+ 1 -+ -+ -1 -+ 88.3 -+ -+ -+ 2 -+ Tr�jka -+ 2 -+ -+ -1 -+ 90.3 -+ -+ -+ 3 -+ Radio Eska -+ 3 -+ -+ -1 -+ 90.8 -+ -+ -+ 4 -+ Radio Zet -+ 4 -+ -+ -1 -+ 92.2 -+ -+ -+ 5 -+ Radio Z�ote Przeboje -+ 5 -+ -+ -1 -+ 92.8 -+ -+ -+ 6 -+ RMF FM -+ 6 -+ -+ -1 -+ 95.3 -+ -+ -+ 7 -+ Radio Maryja -+ 7 -+ -+ -1 -+ 98.2 -+ -+ -+ 8 -+ Radio Opole -+ 8 -+ -+ -1 -+ 101.2 -+ -+ -+ 9 -+ Radio Planeta -+ 9 -+ -+ -1 -+ 106.2 -+ -+ -+ 10 -+ Radio Plus Opole -+ 10 -+ -+ -1 -+ 107.9 -+ -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,213 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0-rc4 -+ artur.zaprzala@gmail.com -+ 2009-05-23T11:21:38 -+ Poland -+ Poznań -+ antenna -+ Na podstawie http://nadaje.com/miasta/Poznan.html -+ -+ -+ 1243073856B7CB5AE3A8DD7F64D99162701127E8EB17921157D47B4F1CD2C1B35300AC -+ Radio Merkury -+ Merkury -+ -+ -1 -+ stereo -+ 100.9 -+ -+ -+ 1181345500C8D8A94219DBBC463934BEFA6CB0DAB24F33C6ABA71DFB08DF33AB483E441B55 -+ PR Program III -+ Trójka -+ -+ -1 -+ stereo -+ 96.4 -+ -+ -+ 1243091725823AD6BA86EF676F69423FC8246C52646B4D3AC6A598D678C8FC8DECBA06 -+ PR Program II -+ Program II -+ -+ -1 -+ stereo -+ 89.1 -+ -+ -+ 11813450874FEFBFE9D9664744CED00CC429A41AF491A0F341950699E506F2833995048115 -+ PR Program I -+ Program I -+ -+ -1 -+ stereo -+ 92.3 -+ -+ -+ 124307402214A45EF45919BAFF02EA193FD2BFD73C6A1489C197787A21C309564028FC -+ Polskie Radio Euro -+ Euro -+ -+ -1 -+ stereo -+ 100.2 -+ -+ -+ 1181310720D76397D1E0CE3FA017DE0FF960A280D3994F75AB6512563E93B6BCC932D2C33E -+ Radio Złote Przeboje -+ Złote Przeboje -+ -+ -1 -+ stereo -+ 88.4 -+ -+ -+ 1243092477BD500CBB54A00F1BBDEF4DD16A2F7E2EC9B6F8E2047E22A40611BCB7476D -+ Chilli ZET -+ Chilli ZET -+ -+ -1 -+ stereo -+ 101.6 -+ -+ -+ 12430741057023A3CC5976ADC55C0E886946A60A4205CBF98A166CFC41C4CFEB8C198D -+ Radio Eska Rock -+ Eska Rock -+ -+ -1 -+ stereo -+ 107.4 -+ -+ -+ 1243073700ECE65C3E99B2CE8049C7498B1732137742C789DFC70A2113D921DBE69A02 -+ MC Radio -+ MC Radio -+ -+ -1 -+ stereo -+ 102.7 -+ -+ -+ 1181345133A04BF742C340E1FC6BDA16A09CF9612919DA70DDEA02798BD190B0F0762FB7C9 -+ RMF FM -+ RMF FM -+ -+ -1 -+ stereo -+ 94.6 -+ -+ -+ 11813451171B80122E5B2FC18587A666F545EBCA4E45F41A816A2C9FD381DA957E0188263B -+ Radio Z -+ Z -+ -+ -1 -+ stereo -+ 97 -+ -+ -+ 1243074060EBA788F812C95004302AB34F8D515473E912E93F3E6DC9006E712955F619 -+ Radio Z -+ Z -+ -+ -1 -+ stereo -+ 104.7 -+ -+ -+ 11813107167D3CC8996BCF9B44DDADB08B9AAE804FA337940B03AA28F18B2AB02E28CDDD51 -+ Radio Blue FM -+ Blue FM -+ -+ -1 -+ stereo -+ 103.4 -+ -+ -+ 1181345115714F0A6908202C3FE5BC5ED7D62A8B0A0DF97CFFCE612011CD1EDAF67CFC4AC2 -+ RMF MAXXX -+ RMF MAXXX -+ -+ -1 -+ stereo -+ 93.5 -+ -+ -+ 1181345101A37EB521C0D4DA7736962278AD3B3961D3DB8853572FD1AAF554A20C2D68B89D -+ Radio Eska -+ Eska -+ -+ -1 -+ stereo -+ 93 -+ -+ -+ 11813451194A150D2B5165FA1DB1E53F35E32978BDBE46BAB7D4445AD3333CE5D7EC48095F -+ Radio Afera -+ Afera -+ -+ -1 -+ stereo -+ 98.6 -+ -+ -+ 1243092539C04A6CD4C5B25CD713CCD794592A56DE0274843B85D9FADA0064A9DE8456 -+ Radio Roxy FM -+ Roxy FM -+ -+ -1 -+ stereo -+ 105.4 -+ -+ -+ 1243073918646EC6C3D2F64E7C33C1B2C375E6130AB50FFFB0CC15BCE2DF66E82F219A -+ Radio Planeta -+ Planeta -+ -+ -1 -+ stereo -+ 90.6 -+ -+ -+ 12430739360FD65A37249E783AE38ED70BB151627FBE6B6CADDAF83EC4A4445EEACAFF -+ Radio Planeta -+ Planeta -+ -+ -1 -+ stereo -+ 99.4 -+ -+ -+ 118131069508E2B7F26DF1C5B1CE1A577EC08E051873B7C21C86B13ADBE50257B825F6C941 -+ Radio TOK FM -+ TOK FM -+ -+ -1 -+ stereo -+ 97.7 -+ -+ -+ 11813450899FC57789CC3A44DDAE5C22E6BB61251A7438BC16C1566D9ABA9C2A9EA5B27698 -+ Radio Emaus -+ Emaus -+ -+ -1 -+ stereo -+ 89.8 -+ -+ -+ 1243074085F655034EB7C8D95088C8A951706DA80D4DB373C89ED8DFA968CF396FDA4C -+ Radio Maryja -+ Maryja -+ -+ -1 -+ stereo -+ 106.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,167 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Jacek Drobiecki, j.drobiecki@mwi.pl -+ 2006-08-13T13:05:16 -+ Poland -+ Tarnow -+ antenna -+ -+ -+ -+ 11554744911E6260E25520A4AF03462D1BF650D3A46C33D2DF18E13B711A0B093BD9B0C97D -+ Polskie Radio Program 2 -+ PR 2 -+ -+ -1 -+ 88 -+ -+ -+ 1155474531FC82F3BA0DEC16DE3BD16B08971EDE5158F6ADE06830918279C8ECB6418ADEA9 -+ RMF FM -+ RMF -+ -+ -1 -+ 88.2 -+ -+ -+ 115547460387D53144D776A4650C37E47E15D549DB99E130D7FF101CEABAE3B24887F22DE3 -+ Polskie Radio Program 2 -+ PR 2 -+ -+ -1 -+ 88.6 -+ -+ -+ 1155474640001219B3008B89483DB18A6FF42AAD83D6707D0C985063B4E848D5731369B58F -+ Polskie Radio Program 2 (Bochnia) -+ PR 2 -+ -+ -1 -+ 89.4 -+ -+ -+ 115547434749EC4CD78DAF20EF8E4B6E5333C45F003ACFBD12AE2C32298739B8B7DE02AF6F -+ Radio Krakow -+ Krakow -+ -+ -1 -+ 90 -+ -+ -+ 1155474669C49CEC64EE4291EA8A8CEE82E09F00DEE28C746C3D111AABDF776A0168D0F773 -+ Polskie Radio BIS -+ PR BIS -+ -+ -1 -+ 91.1 -+ -+ -+ 1155474725CCD85AFA6208AD4153E9335229304383B405A12BE66C7898150B48B976FC2EDC -+ RMF FM -+ RMF -+ -+ -1 -+ 95.4 -+ -+ -+ 11554747499B0D4864A56811C0894BD0900CCAA7FD2505CEA0C5110492C072EE7A93A4947D -+ RMF FM -+ RMF -+ -+ -1 -+ 96 -+ -+ -+ 1155474784D6818BED1604A6E700CF77A5403ADE565C559553F56FFAE046586F7BEF76B2D8 -+ Radio MAKS -+ MAKS -+ -+ -1 -+ 98.1 -+ -+ -+ 115547481284433E6F0785342958176E418F731D56E1BDB9A28A6CBFAE1278B26BAA3BBC8B -+ Polskie Radio Program 3 -+ PR 3 -+ -+ -1 -+ 99.4 -+ -+ -+ 1155474827CDDBE861AEF4E59966935D8DE6DD1534825BF9877CFF5467F78F2A2161669997 -+ Polskie Radio Program 1 -+ PR 1 -+ -+ -1 -+ 99.9 -+ -+ -+ 115547485978A3B6D7231EB91CB3E4FBD591C21233389FD21B0F23CD69DDD81063B7FA920F -+ Radio Krakow -+ Krakow -+ -+ -1 -+ 101 -+ -+ -+ 1155474884CD983E4A9E47EA99CD475E1287382B5B43A8B9971F26AA5725D15601D075ABF9 -+ RDN Malopolska (Nowy Sacz) -+ RDN -+ -+ -1 -+ 101.2 -+ -+ -+ 115547489596B110A4C03019FF4EE2856C2E1110DDD10E37BFEBD32D8AB2F2EBE2472E76D1 -+ Radio Krakow -+ Krakow -+ -+ -1 -+ 101.6 -+ -+ -+ 11554749149AE9DBE9A8C74D5237F782051EEDB4417F3D784F19323506F3DDCF2FB48609DD -+ Radio Maryja -+ Maryja -+ -+ -1 -+ 102.6 -+ -+ -+ 1155474928C7C7EE5700DCEC117911DD5E0424E053B50A99FDD440B9825AE78B530A824B07 -+ RMF FM -+ RMF -+ -+ -1 -+ 103.2 -+ -+ -+ 1155474940ED3934C9676750AB9D3BA445FDF5E129BA3663825AA3C85476F8C9878ABBAB9D -+ RDN Malopolska -+ RDN -+ -+ -1 -+ 103.6 -+ -+ -+ 1155474965831D096128378DE1965F5323CF342B7058B96847CA59CF9905AD7760B68CAD35 -+ Radio ZET (Krakow) -+ ZET -+ -+ -1 -+ 104.1 -+ -+ -+ 1155475014BBDCB24424B44D1097D4B2D69580AAD5AE0A045EFC0FD28813BCF95113EAD5CE -+ Radio ZET -+ ZET -+ -+ -1 -+ 107.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,97 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ andrzejk@aster.net.pl -+ 2008-12-08T09:11:31 -+ Poland -+ Warszawa -+ astercity cable -+ pakiet basic -+ -+ -+ -+10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E -+ PR Program 1 -+ 1 -+ -+ 1 -+ 89.5 -+ -+ -+ -+108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9 -+ PR Program 2 -+ 2 -+ -+ -1 -+ 104 -+ -+ -+ -+1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244 -+ PR Program 3 -+ 3 -+ -+ -1 -+ 102.7 -+ -+ -+ -+1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11 -+ Radio Dla Ciebie -+ 5 -+ -+ -1 -+ 98 -+ -+ -+ -+122872309592995F81CBC12BF16FFDDA976EF54E3ACEEEDAF287D916DA723E1CFA3BD173FC -+ Radio Wawa -+ 4 -+ -+ -1 -+ 105.2 -+ -+ -+ -+1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8 -+ Radio Zet -+ 7 -+ -+ -1 -+ 99.1 -+ -+ -+ -+108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471 -+ RMF-FM -+ 9 -+ -+ -1 -+ 107.1 -+ -+ -+ -+1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667 -+ Radio Bis -+ 6 -+ -+ -1 -+ 94.3 -+ -+ -+ -+1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F -+ Radio Maryja -+ 8 -+ -+ -1 -+ 101.7 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp ---- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,88 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Andrzej Koz�owski, <andrzejk@astercity.net> -+ 2007-10-10T18:21:22 -+ Poland -+ Warszawa-Ursynow -+ astercity cable -+ pakiet basic -+ -+ -+ -+10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E -+ PR Program 1 -+ 4 -+ -+ -1 -+ 89.5 -+ -+ -+ -+108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9 -+ PR Program 2 -+ 23 -+ -+ -1 -+ 104 -+ -+ -+ -+1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244 -+ PR Program 3 -+ 21 -+ -+ -1 -+ 102.7 -+ -+ -+ -+108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471 -+ Radio Wawa -+ 24 -+ -+ -1 -+ 105.2 -+ -+ -+ -+1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11 -+ Radio Dla Ciebie -+ 14 -+ -+ -1 -+ 98 -+ -+ -+ -+1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667 -+ Radio Bis -+ 10 -+ -+ -1 -+ 94.3 -+ -+ -+ -+1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8 -+ Radio Zet -+ 16 -+ -+ -1 -+ 99.1 -+ -+ -+ -+1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F -+ Radio Maryja -+ 20 -+ -+ -1 -+ 101.7 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,71 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta2 -+ Hélio Guilherme <helio.guilherme@bluebottle.com> -+ 2006-11-18T22:54:01 -+ Portugal -+ Aveiro -+ -+ Sintonizados a 10km a Sul da cidade. -+ -+ -+ 1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5 -+ Antena 2 -+ ANTENA2 -+ -+ 0.5 -+ 87.34 -+ -+ -+ 11164554449DE41CDB4FBD7A49098CC696567AD524945B94899CC3498B6C5752A8B04D06B8 -+ Rádio Renascença -+ RR -+ -+ -0.01 -+ 88.17 -+ -+ -+ 1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878 -+ Aveiro FM -+ AvFM -+ -+ -0.01 -+ 88.57 -+ -+ -+ 111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8 -+ Antena3 -+ ANT3NA -+ -+ -0.01 -+ 93.06 -+ -+ -+ 1116455444150CB66C475C9CB684A9CCAB396CEB9A29EEE7E5536B3E7E272032275E24187A -+ AveiroFM -+ AvFM -+ -+ -1 -+ 98.81 -+ -+ -+ 11172936389B2769CBDCDC246EE4A75B8E6727EE985F3A839B55A40DBA9B558400165B803F -+ Rádio Clube de Aveiro -+ RCA/RCP -+ -+ -0.01 -+ 107 -+ -+ -+ 115075507171272DFC8631DB6A60AE46717B8FF41F7927414A02E38E3E9A0B1C732A6B584C -+ Antena 2 -+ 3 -+ -+ -0.01 -+ 101.245 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,10 +1,11 @@ - SUBDIRS = --EXTRA_DIST = "lisboa-antenna.krp" -+EXTRA_DIST = "aveiro-antenna.krp" "lisboa-antenna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/" -+ $(INSTALL_DATA) "$(srcdir)/aveiro-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/lisboa-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp" - -- - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,159 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.2 -+ Andrey Tomilenko (aka Thom) thom82@mail.ru -+ 2012-06-22T20:57:29 -+ Russia -+ Khabarovsk -+ Antenna -+ -+ -+ -+ 1305638939C1FD865E64BAC19C5F57AA772A41E3154D83B787C6A8BBE41BA59C2D4F50 -+ Радио Юность -+ 1 -+ -+ -1 -+ dontcare -+ 71.24 -+ -+ -+ 1305638967B8157796236B9C31EA6815AB3C48379EF65E79F49A3C79C36703B1F4D915 -+ Радио Маяк -+ 2 -+ -+ -1 -+ dontcare -+ 72.02 -+ -+ -+ 13056389922F1F70C837614DE48AE22EF0FEFBFCBF25660BC1196A68629EE08CB0F3C1 -+ Радио России -+ 3 -+ -+ -1 -+ dontcare -+ 72.8 -+ -+ -+ 130563904442B5A2DDA4F2CE53202F339A5EDE755CEE833D693FC05B308A26E05303B5 -+ Ретро FM -+ 4 -+ -+ -1 -+ dontcare -+ 87.9 -+ -+ -+ 13056390981FCC9EC91AA3DC33CE07779742EDC01DFAD322F810AA5C641578B689A25B -+ Авторадио -+ 5 -+ -+ -1 -+ dontcare -+ 88.7 -+ -+ -+ 13056391188DDE01EF727CF401895206DAA0BB3FF7E907AC8105D76121359DEA67894A -+ Русское Радио -+ 6 -+ -+ -1 -+ dontcare -+ 89.6 -+ -+ -+ 13403587309CACBC90948F03CBCD705121A11FCB3C08F1015195B38A61E19CA9FF1B7C -+ Юмор FM -+ 7 -+ -+ -1 -+ dontcare -+ 91 -+ -+ -+ 13056391680029FBFC1E1A539CD8847454B89ACC8B316221B4FE23591283568D29EB74 -+ Милицейская волна -+ 8 -+ -+ -1 -+ dontcare -+ 101.4 -+ -+ -+ 13056392023511D5D2255D527F78A9F3A2773304264B21F4431550D50A0C7935A891B0 -+ Радио 101.8 FM -+ 9 -+ -+ -1 -+ dontcare -+ 101.8 -+ -+ -+ 1340358776C1D2B150D77B86BB2AC6634B476162CAE427444FC5FD63B7F5428393489A -+ Серебряный дождь -+ 10 -+ -+ -1 -+ dontcare -+ 102.7 -+ -+ -+ 130563925202974C20BE1F41D064DF0F58F50BF73A3FD4C3DFD97D4CF50362D7ADC943 -+ Радио Дача -+ 11 -+ -+ -1 -+ dontcare -+ 103.1 -+ -+ -+ 1305639289B512A628A955D08E53324832FB8CDCEBDA010C75CD50714594D7633004AC -+ Восток России -+ 12 -+ -+ -1 -+ dontcare -+ 103.7 -+ -+ -+ 130563932489FDF6E2BD0FE5CE07D11879AB3EC67D4504F7245EBE90EC3372BF8E9401 -+ Дорожное радио -+ 13 -+ -+ -1 -+ dontcare -+ 104.3 -+ -+ -+ 1305639357C85ADEAA9CE0A129200D98B6FC5343251C2F74FBE88C22E5A5808BE77F0C -+ Вести FM -+ 14 -+ -+ -1 -+ dontcare -+ 104.8 -+ -+ -+ 1305639381A545F9CA03ED0BFEAAE4186B78418905B20AF41ADF875DFF7E13F9282768 -+ Европа Плюс Хабаровск -+ 15 -+ -+ -1 -+ dontcare -+ 105.6 -+ -+ -+ 1305639414A15F8313B28FA6B1F1DD6DB5C43F107C068A2E9F0B46D5C3C024F5CA8562 -+ Маяк FM -+ 16 -+ -+ -1 -+ dontcare -+ 106.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am kradio-3.5.13.1/kradio3/presets/russia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/russia/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,12 +1,27 @@ - SUBDIRS = --EXTRA_DIST = "moscow.krp" "saint-petersburg-antenna.krp" -+EXTRA_DIST = "khabarovsk.krp" "moscow.2.krp" "moscow.3.krp" "moscow.4.krp" "moscow.5.krp" "moscow.krp" "saint-petersburg-antenna2.krp" "saint-petersburg-antenna.krp" "samara.krp" "vladivostok-antenna.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/" -- $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/khabarovsk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp" -+ $(INSTALL_DATA) "$(srcdir)/moscow.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/moscow.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp" -+ $(INSTALL_DATA) "$(srcdir)/moscow.4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp" -+ $(INSTALL_DATA) "$(srcdir)/moscow.5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp" - $(INSTALL_DATA) "$(srcdir)/moscow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp" -+ $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/samara.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp" -+ $(INSTALL_DATA) "$(srcdir)/vladivostok-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,142 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Wasiliy Cheremisinov <wasiliy.ch@gmaill.com> -+ 2007-12-08T10:59:46 -+ Russia -+ Moscow -+ -+ -+ -+ -+ -+1064330466317A41A714F7A3C70B72A8F4F88EFF1AD5870570230FAC49A74C6528C4359C32 -+ Busines FM -+ 1 -+ -+ -1 -+ 87.5 -+ -+ -+ -+1064330466947F92FD80D121BD0DF4EDFEE9874FC5EB83A080586606778F480426C7442561 -+ Humor -+ 2 -+ -+ -1 -+ 88.7 -+ -+ -+ -+10643304662D3779EBD6858C0583607EBF2788213464832A85F4205B19D671A503DF4BAB30 -+ Jazz -+ 3 -+ -+ -1 -+ 89.1014 -+ -+ -+ -+106433046664F3991076F0870D839F4065A92B11B3059FAAF1F7AF006AFE06F56FDEC49E93 -+ Auto -+ 3 -+ -+ -1 -+ 90.3 -+ -+ -+ -+106433046619C3366A5F5A7EC91799AAEF32A445F3424E9E10E41C636539CF59CC24C082AB -+ Nashe -+ 6 -+ -+ -1 -+ 101.7 -+ -+ -+ -+1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED -+ MonteKarlo -+ 7 -+ -+ -1 -+ 102.102 -+ -+ -+ -+1064330466CA4EED0736CAAB36E71A839D40008B0C5AC9AA2C82C643A9AFED34C2B1B13AED -+ Maximum -+ 4 -+ -+ -1 -+ 103.727 -+ -+ -+ -+1064330466979D59DE67FAA40E5E5408F6F709FC01B7A01AAA3434B64A6270A375091BD753 -+ Europe Plus -+ Europe Plus -+ -+ -1 -+ 106.203 -+ -+ -+ -+106433046610DCFA997911331B73CDB8ECD23DE325DD1105AF6768E6E071D4CD51DAF72FF5 -+ Love radio -+ 7 -+ -+ -1 -+ 106.603 -+ -+ -+ -+10643304660D5013C5720489386C78C7990FEB7F6A8AC21D623CB23A6B02B123D892B08E02 -+ Seven Hills -+ Seven Hills -+ -+ -1 -+ 104.7 -+ -+ -+ -+1064330466E85A0C0833E61EED4D7180C6B2186A20ED80D94859E7B7764ED980E964796459 -+ BestFM -+ -+ -+ -1 -+ 100.5 -+ -+ -+ -+10643304668EE856A49266E70C96D6371545017E454330FFC78F72BDA85BE1B1A7D8BEF6E7 -+ Silver Rain -+ -+ -+ -1 -+ 100.1 -+ -+ -+ -+1064330466EE8DA6A56D9A920D2BF0E7C52A7B72423B0552B652EE24CD3859998B5702B762 -+ Classic -+ 5 -+ -+ -1 -+ 100.902 -+ -+ -+ -+1194197244ED4A8A191D1807FCF73D636896F020AFDFB2DF7A765FFAD1F322D06AA154B896 -+ Relax -+ 5 -+ -+ -1 -+ 90.8 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,466 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Ser Moro -+ 2008-11-09T07:40:00 -+ Russia -+ Moscow -+ -+ На 09 ноября 2008 г. (09 nov 2008) -+ -+ -+ -+12122828023F212F976473C4E93995D4891E8C777646EC34AA187F3448C0EC7E543609CBC2 -+ Бизнес FM -+ Buziness -+ -+ -1 -+ 87.5 -+ -+ -+ -+12122827990F65AFCF6B3859E87971677CE6871AA71F6DA2E00B58C3BCFDF04A57035AE67F -+ Сити FM -+ City -+ -+ -1 -+ 87.9 -+ -+ -+ -+121228279796B23241487AFED5155A28232E67B9EA7CE628A67F0AC2F6BCC433C01A4369D8 -+ Ретро FM -+ Retro -+ -+ -1 -+ 88.3 -+ -+ -+ -+1212282794C55B646493A81EF00526173AAD59794E0A8C92E10D5E87C4A47973F2379A26F2 -+ Юмор FM -+ Юмор -+ -+ -1 -+ 88.7 -+ -+ -+ -+1212282794B5DE3840CC9B45A581943EF925529837BEC12B66C3D85E90F3996B65BA0DCA58 -+ Радио Джаз -+ Джаз -+ -+ -1 -+ 89.1 -+ -+ -+ -+12122596825C81908E711F49D34E2488F9E0CBC975C4B3DCA073F6DE213A8A01920BC096E0 -+ Megapolis FM -+ Megapolis -+ -+ -1 -+ 89.5002 -+ -+ -+ -+12122597039752418C5847057F3705AC380BE3BA5FD830328E221B3D353EED65850266ACE7 -+ Кекс FM -+ Kex -+ -+ -1 -+ 89.9 -+ -+ -+ -+121225968579A6748F6F0976C2DE6D1CB4A53B97CE0F1C3ABBB08FCBB45106E48DC5BFDD98 -+ Авто Радио -+ АвтоРадио -+ -+ -1 -+ 90.3 -+ -+ -+ -+1212259688DA536296403BFE6C53E376FEBC230247FF0A589D0483AB91AD8F08557DEB6A41 -+ Relax -+ Relax -+ -+ -1 -+ 90.8 -+ -+ -+ -+121225968939C1C287EFC31157B5BACC22FD61CB81A7A785C097349863FC892E23DBF888AA -+ Эхо Москвы -+ Эхо -+ -+ -1 -+ 91.2 -+ -+ -+ -+1212259691C099D02DD657FDC1D535FFCC843C096BAA4D230DF1D0EF937282F477A9CB1AD3 -+ Культура -+ Культура -+ -+ -1 -+ 91.6 -+ -+ -+ -+1212259692167C08E0C5F1453D16DE8A855A0938E10641E9C7FE41B77FD5948D32F68F74D2 -+ Говорит Москва -+ 92 -+ -+ -1 -+ 92 -+ -+ -+ -+12122596961F2F8798C4AF031DC06C680A36A17247A632141493DA9C57B21540155AF20194 -+ Радио Дача -+ Дача -+ -+ -1 -+ 92.4 -+ -+ -+ -+12122596993B33CE7223A502CDE834AC553FD5B1ACBE52DA72FDF905583CCC03252456B392 -+ Радио Карнавал -+ Карнавал -+ -+ -1 -+ 92.8 -+ -+ -+ -+1225098463FAF803940A48CC5DD762C9533BDC42913313BC62C9A3E7C2459348A3E851558B -+ Спорт -+ Спорт -+ -+ -1 -+ 93.2 -+ -+ -+ -+12138945622084AC7C25C48D647BBC4E3E0CE9AD45BA5AEFA5B9B4E5458B9EC833ECCC0A9F -+ Radio Newton -+ Newton -+ -+ -1 -+ 93.6 -+ -+ -+ -+12250982552FF63D58F730C6F74FE8EE55569A165B6AEAF01CE9F319C8E21A8556B9436B82 -+ Radio Unost -+ U -+ -+ -1 -+ 94 -+ -+ -+ -+123196465419618E775ADB30B8FBA7BC0AC4ED246FCC72C7933EEC9D8A313395649F4C76E2 -+ Radio Lornet -+ Lornet -+ -+ -1 -+ 94.4 -+ -+ -+ -+12122827767F54AF294458E31567320F8D23209CDEE586C3DA2FCA907480AD37C291805057 -+ Радио Моя семья -+ Семья -+ -+ -1 -+ 94.8 -+ -+ -+ -+121228278574DD0761AB27D245495CE6B980B40D7E886D1AB6B1C42091B893E48A46783853 -+ Rock Radio -+ Rock -+ -+ -1 -+ 95.2 -+ -+ -+ -+12123390445BBF6A3ED8F754C4156A0BB2B470DA04733F19754E36F1ED6FC19AC85F1D64C2 -+ Радио Звезда -+ Звезда -+ -+ -1 -+ 95.6 -+ -+ -+ -+12348480920036E7BC9624E105EFE480CF03DC713FF687375B2041F2E26BA12F0BF95A6540 -+ 96 -+ 96 -+ -+ -1 -+ 96 -+ -+ -+ -+1212339046DDCBDF85F15BE3CAB54C1C0F0A8334B83255E9131C72C5F1E831B2E0F7CD2984 -+ X-FM -+ X-FM -+ -+ -1 -+ 96.4 -+ -+ -+ -+12123390461714F20182DBDDF585EC9929A50864AE86074C3C8E1E02F5AED483D5B462D980 -+ Детское Радио -+ Детям -+ -+ -1 -+ 96.8 -+ -+ -+ -+1219914057D2886AC3FAF181A0F36D2A9D76A1C252631C40E6E39BDF5ED016BE8242F100B9 -+ Radio Комсомольская правда -+ Radio КП -+ -+ -1 -+ 97.2 -+ -+ -+ -+1212339047DFFBBFF46ADF915EDF6CA7D1FE79038F088FFF2291DBD34D9EEC0DA84893D70F -+ Радио России -+ Вести -+ -+ -1 -+ 97.6 -+ -+ -+ -+1212339054BC3DCB9C2D81802E0E77E6E82336E2D17F87C6ED63F400C263BBE6DB3C2E14E2 -+ 98 -+ 98 -+ -+ -1 -+ 98 -+ -+ -+ -+12155099273AA79DF72C4062FA8C04E9D964815CB91829824065AFE9A8D2BAB1F4AA94463D -+ Свежее радио -+ Fresh -+ -+ -1 -+ 98.4 -+ -+ -+ -+1212339385229EBB7819AC5442AC0E1F41E58F10C72CA249BEF2BE9E3A659006684E6A8944 -+ Радио Алла -+ Алла -+ -+ -1 -+ 98.8 -+ -+ -+ -+1226205404FBE117B1B15AECDF62B6FF796F9658061C68CCBD7A57E8CE1DF50CE7E1A4AA14 -+ Radio Orpheus Classic -+ Orphey -+ -+ -1 -+ 99.2 -+ -+ -+ -+1212339386F7157F3BFC0DD589711E42FEE85071B689BEE4534AFFF55523ED54A7528BA870 -+ Финам -+ Финам -+ -+ -1 -+ 99.6 -+ -+ -+ -+12123393868B5B553B02B25F4DAD23C73657402F8383C1B9FC1E8620894774526C4AF6C1E1 -+ Радио Серебряный дождь -+ Silver -+ -+ -1 -+ 100.1 -+ -+ -+ -+12123393873AB899D7246EB39485864B2F04EAFDD1765682408BA8192975DA61DB7A83B3F1 -+ Радио Best FM -+ Best -+ -+ -1 -+ 100.5 -+ -+ -+ -+1212339387F11C65FEA6E51B7B8E93C7CA337F5DFDFCA2F8ADAD249503D3C9D0E84EA26351 -+ Classic -+ Classic -+ -+ -1 -+ 100.9 -+ -+ -+ -+1212339388EEE39E0BC4D3DA35192A71CE62993C32CEF36856FF682F80DDD3EF6B98C536D6 -+ D FM -+ DFM -+ -+ -1 -+ 101.2 -+ -+ -+ -+1212339659E2E4B8321BABF68F83B40DBB5178D9982E286066E756532578AE9312F77EA3E2 -+ Наше Радио -+ Наше -+ -+ -1 -+ 101.7 -+ -+ -+ -+1212339658E751B53B44FE1F1A6CB6D173CFDE7BFD900D63319CAC8AD2BD17B5E130AADB83 -+ Radio Monte-Carlo -+ Monte-Carlo -+ -+ -1 -+ 102.1 -+ -+ -+ -+12123396589CF758161886D9EBCB3F9935FD928E7B62EAF419F10636D9E74CE75F03ADEC0B -+ Радио Попса -+ Попса -+ -+ -1 -+ 102.5 -+ -+ -+ -+121233979036412BB8D5C8E91549545A821460D7CD25921A5823B83D48072EB378C6CFE6D5 -+ Радио Шансон -+ Шансон -+ -+ -1 -+ 103 -+ -+ -+ -+12123397914DC4E206CE83692E6403D4A60E2B618F648D59DE5B1B86E0F1CC5BA7346A4E55 -+ Маяк -+ Маяк -+ -+ -1 -+ 103.4 -+ -+ -+ -+1212339791D7BD41F55ACAC72BB37828705B336858ED3872404B84D4B756CA3BC1C043B2A3 -+ Radio Maximum -+ Maximum -+ -+ -1 -+ 103.7 -+ -+ -+ -+121233979674E163A4CB1750E1B5695178A3E6B6D2633C72DDB810B1E769975DB3B0A3301A -+ Radio Energy -+ Energy -+ -+ -1 -+ 104.2 -+ -+ -+ -+121234007486004F788B3D4D98C280330FFA2D9B472961C33C1604CFDAE47B0662F4864611 -+ Radio 7 -+ Radio7 -+ -+ -1 -+ 104.7 -+ -+ -+ -+1212340074EE1D11E026C89F078E0829E75A80904A3503AE203E09F1620F350B680B74E472 -+ Radio Next FM -+ Next -+ -+ -1 -+ 105.2 -+ -+ -+ -+1212340075589879A76AA393BAFDF5DF4555B287B418A2225B182A0851A599A46B31FC6990 -+ Русское Радио -+ РусРадио -+ -+ -1 -+ 105.7 -+ -+ -+ -+12123400752D0B01A4845E3747674600730689641EF7D2A58F5A6F9E475F590C2B17B3FB31 -+ Europe + -+ Europe+ -+ -+ -1 -+ 106.2 -+ -+ -+ -+121234007591A90762201E3A7A025C8089D71E7D010F1BD6C1DC67621A5445559100BABE20 -+ Love Radio -+ Love -+ -+ -1 -+ 106.6 -+ -+ -+ -+12123400761B5688D434BA35EFEA9E23F61FE0C066EF18F45E751B61F700466DA357388236 -+ Русская Служба Новостей -+ РСН -+ -+ -1 -+ 107 -+ -+ -+ -+1212340077A657F5A456F3AC7A05F638034484ED6CB2C508B5B7CE45CA49E4943B7AD3CB16 -+ Hit FM -+ HitFM -+ -+ -1 -+ 107.4 -+ -+ -+ -+1212340373F23364BD99C0FD26A8FE62CCC1FC2326409F5E1952746C8D45D693B34297DC61 -+ Радио Милицейская волна -+ Милиция -+ -+ -1 -+ 107.8 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,486 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ Basil <614@mail.ru> -+ 2006-12-24T14:00:31 -+ Russia -+ Moscow -+ Aver media studio 307 -+ http://www.radioo.ru/ -+ -+ -+ -+1166957632E1E6B773B16FAB3C9BBE8D8781249B51B85183FB4644F8B5BD4AFFC80B99918C -+ Love Radio -+ -+ -+ -1 -+ 66.02 -+ -+ -+ -+1166957579D0832BBA97ACA268BF14E56BD550D114E1FDDE0BD8951CBFE0A2163E4069E3F9 -+ Radio of Russia -+ -+ -+ -1 -+ 66.44 -+ -+ -+ -+1166957557AD5CF65A33753EB4783380B2D909A75959EA7DB49335DBCDA806DF576F9E88D1 -+ Maximum -+ -+ -+ -1 -+ 66.86 -+ -+ -+ -+1166957531EE4C210521F42A6074AF09772AF1A72431482C98A0574EDBCB64D424B7939184 -+ Mayak -+ -+ -+ -1 -+ 67.22 -+ -+ -+ -+116695750623A2EE2D00B86A33412D256B8498339EBB7B57DE4BA1463879A1DCA077792B41 -+ Avtoradio -+ -+ -+ -1 -+ 68 -+ -+ -+ -+11669574847289DE68C47E37F6D780471358D18F59C685C0038723C9DDFBFF6BB204CAD87D -+ Radio-1 -+ -+ -+ -1 -+ 68.3 -+ -+ -+ -+11669574457A4DC4E624827B2B132AE6A093289F54D91510995EA005AD458EBE226D3276C5 -+ Yunost' -+ -+ -+ -1 -+ 68.84 -+ -+ -+ -+11669574079F9EC2AEF3ADB2D01D5FB77DA8E5101C2B1F33A47E7CB7A48C01E46DB5733E6B -+ Russian radio-2 -+ -+ -+ -1 -+ 69.26 -+ -+ -+ -+1166957372D0EFB9DD0E58F11A669F20C7636C4C7359BC74B57859603CABD6EA3E383F73E8 -+ Europe plus -+ -+ -+ -1 -+ 69.8 -+ -+ -+ -+1166957329444CE214B5282ACBCCC9D0CFBB923D38FBD5881C2D85B762A6030FBD68B8790F -+ Ultra -+ -+ -+ -1 -+ 70.19 -+ -+ -+ -+11669572935247BDFDED87C62DE211E85F85958BB19922B8A5CF4368B61D78548CA9A940D1 -+ Russian radio -+ -+ -+ -1 -+ 71.3 -+ -+ -+ -+1166957221E055943148E8F9463BE8D5818BEA3BA30A08203786FB4ED16D913CDF79B0780A -+ Orfey -+ -+ -+ -1 -+ 72.14 -+ -+ -+ -+116695719350C9F89CDA632EE1E5E8228C51FFB348E380A567776482D28A61E1FDAF919BCC -+ Radio-Retro -+ -+ -+ -1 -+ 72.92 -+ -+ -+ -+1166957083101FD14C6FB1C54314BE3FB7D301DE25AEBB388FA5E519560BF675C254B5D85B -+ Radio 7 na 7 holmah -+ -+ -+ -1 -+ 73.4 -+ -+ -+ -+11669570483021426130F14BA799C4532A1E94CA33C15510D0808D726993F2D5CD12BF1A4B -+ Echo of Moscow -+ -+ -+ -1 -+ 73.82 -+ -+ -+ -+1166956990CD8B8893868F6156B295FE27607F49EEC77AFB3FB72CAAF4D565FD83074C5F42 -+ Radio-Arsenal -+ -+ -+ -1 -+ 87.5 -+ -+ -+ -+1166956756A12CD220E711648DAEB58CB7ED10154187C2C0E24785EA12DDFA4BD25252DC69 -+ City-FM -+ -+ -+ -1 -+ 87.9 -+ -+ -+ -+11669569236286CCBF2A0E5EA3DED4BC8C67FBE7FC72D3B80B331BC8C961A71BB176355171 -+ Retro-FM -+ -+ -+ -1 -+ 88.3 -+ -+ -+ -+11669560101DEA7A9DD968F07112FDC44DD324224A38FBA5D5B865FB6D2955B682FC37D8BB -+ Humor FM -+ 7 -+ -+ -1 -+ 88.7 -+ -+ -+ -+1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED -+ Radio Jazz -+ 7 -+ -+ -1 -+ 89.1 -+ -+ -+ -+1166955883D8A04151E06D760E4DF7842990744F8A91720F94CF971EC619F0740C4B6B3AE4 -+ Megapolis-FM -+ -+ -+ -0.01 -+ 89.5 -+ -+ -+ -+11669558359E63EA7B5B2DEB6FE1FB2FEE89F013636EFD33BC5A9A9F45C2AD71A498C515F7 -+ Melodiya -+ -+ -+ -0.01 -+ 89.9 -+ -+ -+ -+11669557934A98B4E710AD5AF9869B1B2D144B8DC5561089B2955338935CBE122A135EA4BF -+ Avtoradio -+ -+ -+ -0.01 -+ 90.3 -+ -+ -+ -+116695559236C1ED99206B33F508E21FEE76AC7FE98FD022956184B0589A0F6676F99EAF4C -+ Relax FM -+ -+ -+ -0.01 -+ 90.8 -+ -+ -+ -+116695562015B618A6F9D0548252841B7979C5E390A1B4F83B3FF1EE8E2D5D6405D5A00041 -+ Echo of Moscow -+ -+ -+ -0.01 -+ 91.2 -+ -+ -+ -+11669556985A865C27C521C9C97FACBEDCF297A972C453C4EC9044639AA5CDD4FE360B3393 -+ Culture -+ -+ -+ -0.01 -+ 91.6 -+ -+ -+ -+1166955387C3ABE1CF31ADA0BFAD068F592100A89A0BA5C06332ED7ECA15D66D9D7897FC42 -+ Govorit Moskva -+ -+ -+ -0.01 -+ 92 -+ -+ -+ -+1166955534C99366F4574B49157C6E49B1BE8C521C8D7C4369DFB4E11E1964C3939D654FC1 -+ Radio Udacha -+ -+ -+ -0.01 -+ 92.4 -+ -+ -+ -+11669554443AC0849DBF480743A2A75F80D1A5A0961437C1ABC792FE3B493E3B99B98FE438 -+ Radio Sport -+ -+ -+ -0.01 -+ 93.2 -+ -+ -+ -+1166955327A5A60A1BA10F9E45AB03057448A48CCC6BB6E2B869CF0347F5DEC4E5892865AB -+ Zvezda -+ -+ -+ -0.01 -+ 95.6 -+ -+ -+ -+11669552470238A75168E4067074193A8BE904A83C4B142DF39BCAEB354B07C4B6505325E2 -+ M-Radio -+ -+ -+ -0.01 -+ 96.4 -+ -+ -+ -+116695519894B4CA3641876C66F34BDB9784EC7FFDB8888F16901B26407D7D67389CCB8601 -+ Radio Rossiya -+ -+ -+ -0.01 -+ 97.602 -+ -+ -+ -+1166955120CE8553D7E2FA57F6C9CCDD1260A217C10EAA121E6193B630764EA91F2AB47692 -+ Russian Songs -+ -+ -+ -0.01 -+ 98.802 -+ -+ -+ -+116695501694031750D1F39D2B677CC9174F963EE0200C0F375F176DE5F2C1206D3BD73F34 -+ Silver rain -+ -+ -+ -0.01 -+ 100.102 -+ -+ -+ -+1166956114A7783981473BE9C2773D90392F9C647F1ACC07B4A630F92202E4921619FF571C -+ Best FM -+ 7 -+ -+ -1 -+ 100.5 -+ -+ -+ -+1166956189FC9213CF6C51999DE90A5029DD8717E31A6C0C32C67C9B2704A6D23823E0F8F2 -+ Radio Classic -+ 7 -+ -+ -1 -+ 100.9 -+ -+ -+ -+1166956224013A6F091F5FACC187C80B7799774F17A454E988CDEDF05D3571BCA00A3CD0DA -+ Dinamit-FM -+ 7 -+ -+ -1 -+ 101.2 -+ -+ -+ -+11669562690A11198557EE507FFB7954DA34C38B676DEDA1509A6D66786C56203A28F9F94F -+ Nashe radio -+ 7 -+ -+ -1 -+ 101.7 -+ -+ -+ -+11669563019B8DB055ADA960C32A8AFC23AAE3940B38EE3C8F8766B91C8245D87E7932C8E4 -+ Radio Monte-Carlo -+ 7 -+ -+ -1 -+ 102.1 -+ -+ -+ -+116695636884CCD5D7C5900B5796DFA6C9667EBBEB7B38A426B4D759A17C2BD91336829EAA -+ Radio Popsa -+ 7 -+ -+ -1 -+ 102.5 -+ -+ -+ -+1166956399B5023480C7B42DA089AA87F6EDE92EC88AA4A3075D0D5B4FC80C9FEA397C2CE2 -+ Shanson -+ -+ -+ -1 -+ 103 -+ -+ -+ -+1166956417F021C66B643D13FD46C17672F93228108D2E40A921E65C18643DB8A52F239201 -+ Mayak-FM -+ -+ -+ -1 -+ 103.4 -+ -+ -+ -+116695644332BD22B7C117952C90E15739DA0F472D7E709C986DD3BB722CC9686304300B31 -+ Maximum -+ -+ -+ -1 -+ 103.7 -+ -+ -+ -+1166956467C3FE528365A3FE4F02A089BDA4538722A94D5750B9B9F9B92E5C65E96C35C20A -+ Energy -+ -+ -+ -1 -+ 104.2 -+ -+ -+ -+1166956491E7F82945D14B1E17BDDFA8CE2DCF38607B2825A5D5384BC86C52724284AB0DCB -+ Radio 7 na 7 holmah -+ -+ -+ -1 -+ 104.7 -+ -+ -+ -+1166956520D811ADD05B13F61CEF11C3BC6077C25A641C2EED304AD183722B29C5E4B2EB44 -+ Radio Next -+ -+ -+ -1 -+ 105.2 -+ -+ -+ -+116695655702F1446544A6D8FDDF1F18783C2E1250224F31BD4F1E52973D1762B1DE305B26 -+ Russian radio -+ -+ -+ -1 -+ 105.7 -+ -+ -+ -+1166956582FCEEECE6B71538020E0FEE80F48B730A887DD24272958D8A3B833E67FA1A9CE8 -+ Europe plus -+ -+ -+ -1 -+ 106.2 -+ -+ -+ -+1166956665BBE158E4AB6982810081D0CC0A8DB510A065244FC65E7E7DCDEC5375AC84CA46 -+ Love radio -+ -+ -+ -1 -+ 106.6 -+ -+ -+ -+11669566898A71C985BD4F702BD8E37FDD0FEFB4C061B8C1C0A173E3F78A2B3A78710C4531 -+ Russian news service -+ -+ -+ -1 -+ 107 -+ -+ -+ -+11669567303B9760EE6E437AE2AB08E9A17A2863B75CA17AAA838C2EFB8BE4C68940A036C0 -+ Hit-FM -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -+1166956816C5E7650467CD2ED1AA3DEA8FDB61220C5B53C6DC983094B1EE9A0F78F875B255 -+ Milicejskaya volna -+ -+ -+ -1 -+ 107.8 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,456 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Дмитрий Смелков <das@sidero.ru> -+ 2009-09-29T12:52:24 -+ Russia -+ Moscow -+ FM tuner -+ from http://www.radivo.ru/ -+ -+ -+1254113419B3C18A92D0E731CE42E8D1B5422801904B133FA665DD97FAE73E96A00FBE8DB2 -+ 87.5 Business FM -+ business -+ -+ -1 -+ 87.5 -+ -+ -+ -+1254113603879D10C2B96E3183D52959B8856D666C01DD7A0D3E2241083206A2DB0960B2D3 -+ 87.9 City FM -+ city -+ -+ -1 -+ 87.9 -+ -+ -+ -+1254115232366C9DEA47B3A7116316F1EBE11D09C33A82D9CE30A7476990E14F8C8757ED0E -+ 88.2 Retro FM -+ retro -+ -+ -1 -+ 88.2 -+ -+ -+ -+12541150826343FCCBF4C9FE2C48DC3AFF72223EC870B294904B965C7786164418D1ECEB61 -+ 89.1 Radio Hour -+ radiohour -+ -+ -1 -+ 89.1 -+ -+ -+ -+1254115595A961F47B9FA95B97E461DB06938647202A847D49C0C24C59CFDBDEDEFE840190 -+ 89.5 Megapolis FM -+ megapolis -+ -+ -1 -+ 89.5 -+ -+ -+ -+1254115803EE8AEC14BE9ED5C558908548FF16F6218299D22BBCC1EA13F357B4B2CB8C3D55 -+ 89.8 Kex FM -+ kex -+ -+ -1 -+ 89.8 -+ -+ -+ -+125411663098D26141ECE7630E94EC91620E2B11B29F55D97E66353E635912278CD06408EC -+ 90.3 Auto Radio -+ auto -+ -+ -1 -+ 90.3 -+ -+ -+ -+12541167464545487460A4DFFC5CE6F8B50604319D36561246F36B8339961D7A05BFC02642 -+ 90.8 Relax FM -+ relax -+ -+ -1 -+ 90.8 -+ -+ -+ -+1254116837998FD1B2F1CB9E369CC14D023BFD0E3F28C30E5670D2B3F90F3ADC7A329895B9 -+ 91.2 Echo Moscow -+ echo -+ -+ -1 -+ 91.2 -+ -+ -+ -+125411883682FF181084BEB9506C2BD92D573167086EA5E6A970BA7BF89C2F31C10F141BE7 -+ 91.6 Cultura Radio -+ cult -+ -+ -1 -+ 91.6 -+ -+ -+ -+1254118931AEDBCC2332E787FB1BD109EF5339D3ADD39EC0D9BEF4D1647FC2E424B4D3DA80 -+ 92.0 Speak Moscow -+ speakmoscow -+ -+ -1 -+ 92 -+ -+ -+ -+125411900574B23E44E4A814887A6254349FF7EA6A63CF785968BDC2D4EB96235EC27FC613 -+ 92.4 Radio Dacha -+ dacha -+ -+ -1 -+ 92.4 -+ -+ -+ -+1254119087D1C80EEDD9D50AE4C7EF5CE7AC1AC1924A2A151B0D06EABFACF49505FD189A22 -+ 92.8 Karnaval -+ karnaval -+ -+ -1 -+ 92.8 -+ -+ -+ -+1254208038DC6388DAD27AEEC081627D18A85ECD56B732DFEDEFBD0EDFD3269B423E1FB0E1 -+ 93.2 Radio Sport -+ sport -+ -+ -1 -+ 93.2 -+ -+ -+ -+12542080899D30F2FBBC0E46D5E7C438DB8250612B1BB1B295383A2B1F02B67523F2B26E0C -+ 93.6 NewTONE FM -+ newtone -+ -+ -1 -+ 93.6 -+ -+ -+ -+1254209832885D8EACB4781D6A59A016B0342F474B31C89E12FF6CD69C257924A82C368E8D -+ 94.0 Youth FM -+ youth -+ -+ -1 -+ 94 -+ -+ -+ -+12542099761A361B34C331CA5822DBF2A247297A1D420D89742BF3107DBA8E8C10AEEB7B81 -+ 94.4 Lornet -+ lornet -+ -+ -1 -+ 94.4 -+ -+ -+ -+1254210228ED1569120CACBF54781E22BA8E1F327B44FE51705A8E9ACDECB3E416B1C97439 -+ 94.8 My family -+ family -+ -+ -1 -+ 94.8 -+ -+ -+ -+12542103277D90DA1B11C2382160EF2748D4CCFFFAC5C27EF5231C933C41132EE1A00B3132 -+ 92.5 FM -+ 92_5_fm -+ -+ -1 -+ 95.2 -+ -+ -+ -+125421040801C66994144AE1BF4130B6E61B509D327F18D375A7DB7E0295834139FB18F2FB -+ 95.6 Star FM -+ star -+ -+ -1 -+ 95.6 -+ -+ -+ -+1254210555DC625D856752C6B8F5AD7E20419BB318E01A1895DBC9FA38BA755A9433240257 -+ 96.0 Tour -+ tour -+ -+ -1 -+ 96 -+ -+ -+ -+1254210690E4B1BBA290BBC0633D3C5428B80A238A1EE76F8A8B78DE207ABE627BFA4EAE47 -+ 96.4 X FM -+ x -+ -+ -1 -+ 96.4 -+ -+ -+ -+12542107788E5E6BBB75B20D94E632DEC2F2271010DCEDEB30464F9A9A9E6C1D1989B49D6C -+ 96.8 Kids FM -+ kids -+ -+ -1 -+ 96.8 -+ -+ -+ -+12542109468DF4D861CC4352DD73492D57049D752D0B7699AC2A8E21FFBD9AAA3E0ECA2BBD -+ 97.2 Kommi FM -+ kommy -+ -+ -1 -+ 97.2 -+ -+ -+ -+1254211077FFBB611A4952B42E012F454F9A6856ACDD141621E0B1FD46EE1063A64B7732EC -+ 97.6 Vesty FM -+ vesty -+ -+ -1 -+ 97.6 -+ -+ -+ -+12542111368120FA07696D76E9051198BF7DD2A2203D1207D98DF67B154C158D950006022E -+ 98.0 98-Hits FM -+ hits -+ -+ -1 -+ 98 -+ -+ -+ -+12542111955D1C8602DD46E46EB51F985EB9B7D18B321EAE5AA52A367CC0DCD615F4E70DAE -+ 98.4 Fresh FM -+ fresh -+ -+ -1 -+ 98.4 -+ -+ -+ -+12542112900E007DE37B5945C000F14A7BDF6FE9353595FFDD5B7F10F70777B4A70769D98C -+ 98.8 Alla -+ alla -+ -+ -1 -+ 98.8 -+ -+ -+ -+125421137786885E1A519D06FC665D843621D57F354569E748BAED5BCC4ED24A45AA3BACDF -+ 99.2 Orpheus -+ orpheus -+ -+ -1 -+ 99.2 -+ -+ -+ -+1254211405D36EF5FFB3C3F976726AC733CF85E6C8D6010FDA058D7D4853FE4EA22DEB7AAA -+ 99.6 FinAm FM -+ finam -+ -+ -1 -+ 99.6 -+ -+ -+ -+1254211511B2F2B33598DF20767D683FEDBF14BCF48B8E421FB06B5CA7DC7FA48225B347F2 -+ 100.1 Silver Rain -+ rain -+ -+ -1 -+ 100.1 -+ -+ -+ -+1254211695A7414A14CD8B6C8AEEA25BE7255BF911A2F49A43015857C206A89AD8A8F23FD3 -+ 100.5 Best FM -+ best -+ -+ -1 -+ 100.5 -+ -+ -+ -+12542118336B9184DC2526A04E26068352F769930C2C179E0A0C1B4C97F13479AD80F92AE2 -+ 100.9 Radio Classic -+ classic -+ -+ -1 -+ 100.9 -+ -+ -+ -+1254211957B53A0D5717BBFE765D179B97462295F20170616066BE0EBEFE3AB432F207ECA1 -+ 101.2 D-FM -+ dfm -+ -+ -1 -+ 101.2 -+ -+ -+ -+1254212095CABACDDF1849CDE516C3721C546F839B688C25583C6B76BDE71F5A37365CDD4F -+ 101.7 Our Radio -+ our -+ -+ -1 -+ 101.7 -+ -+ -+ -+125421218101C4242DE07C4952D972476E047C29905300CD40E2C956ABAAB93F1343FF0703 -+ 102.1 Monte Carlo -+ montecarlo -+ -+ -1 -+ 102.1 -+ -+ -+ -+12542122574A490326E90BA2143ED3CBA9ECE84D51ACE9888179A851E019D49C1BFD902E9E -+ 102.5 POP-SA -+ popsa -+ -+ -1 -+ 102.5 -+ -+ -+ -+1254212409B14B1DDD97729A43EFF2196C938431A6DFFFDDDEB708F71BFE3BA5FCD9481CD0 -+ 103.0 Shanson -+ shanson -+ -+ -1 -+ 103 -+ -+ -+ -+1254212449AF5CCA7CCD0A0A429F6A0B1A280D071FF498AFFA110761B26A01FFBD3AE9AB54 -+ 103.4 Lighthouse -+ lighthouse -+ -+ -1 -+ 103.4 -+ -+ -+ -+125421248712D3B6413968F909481424D8D32E99BDF14FD58DA9DA2FA8B624DCB6007035E4 -+ 103.7 Maximum -+ maximum -+ -+ -1 -+ 103.7 -+ -+ -+ -+12542127050D97BAA80BDCE7504703E2A9C6F161999453E46AD3CC6D99F6767C6CF76C3743 -+ 104.2 Energy -+ energy -+ -+ -1 -+ 104.2 -+ -+ -+ -+125421278240CFAB908AE144C301C4A01EB0C7D48A5CECE281E1B8C6E815B17B6496499C3A -+ 104.7 Radio 7 -+ radio7 -+ -+ -1 -+ 104.7 -+ -+ -+ -+1254213566627DCF077D632A14DD76250EC1060682EE482A4AAC10315DA36711C347E50874 -+ 105.2 Next -+ next -+ -+ -1 -+ 105.2 -+ -+ -+ -+125421372931ED002928F13BD48B38C77F57176B136C93C8A595624BEC8BD6A6B707AE695F -+ 105.7 Russian Radio -+ russian -+ -+ -1 -+ 105.7 -+ -+ -+ -+1254213794A88ECDB89C81F42B2CDDA09B66B4FCA62E33624331AA1BDE4031DB6169377C36 -+ 106.2 Europe+ -+ europe -+ -+ -1 -+ 106.2 -+ -+ -+ -+1254213892F9F02154427DE2C906EC61A784CF7ED2438EE6559BDE0A88AC1E42BE44A39AAE -+ 106.6 Love Radio -+ love -+ -+ -1 -+ 106.6 -+ -+ -+ -+12542141315B35477A88C0C075181F1C74FFE56A2FA2087A6D8D06EB8BD7DA827B8EAB252C -+ 107.0 RSN -+ rsn -+ -+ -1 -+ 107 -+ -+ -+ -+1254214188565B3064EC814AA6F693342B771BF65AE9F77CAF3656E059FAECAEE6980134F9 -+ 107.4 Hits FM -+ hitsfm -+ -+ -1 -+ 107.4 -+ -+ -+ -+1254214270622D673398308291D95016FA8228F590BC02522A14F14D3018F9303B44B72CC8 -+ 107.8 Police wave -+ police -+ -+ -1 -+ 107.8 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,177 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ Hanataro (Александр Николаевич <hanataro25@gmail.com>) -+ 2011-03-04T16:29:42 -+ Russia -+ Saint-Petersburg -+ -+ -+ -+ -+ 12992427093FBA5E1570243458E2D5F851F3BBFC99DF2268059177356E9A652BFD2E3F -+ Дорожное радио -+ Дорожное радио -+ -+ -1 -+ dontcare -+ 87 -+ -+ -+ 12992267583B237AB8A0CA36A5978FDB4D934789809AA63B645C0D7EFB86FF3B224776 -+ Ретро -+ Ретро -+ -+ -1 -+ dontcare -+ 87.9996 -+ -+ -+ 12992267615D79138BF78E489668066A5F161E95CB0C2E1F0D2D2C7E8B3AED74947879 -+ Авто Радио -+ Авто Радио -+ -+ -1 -+ dontcare -+ 88.3496 -+ -+ -+ 1299245224DFDE600C4E78F81A578FBA1F2A45006C1A483D5738B2BF48ED284BC2C9FC -+ Для Двоих -+ Для Двоих -+ -+ -1 -+ dontcare -+ 90.5 -+ -+ -+ 1299226770ED601040E43EE3B93E2438C4AC6AFC01DDEACC98B1EE08302A04F82068E7 -+ Кекс FM -+ Кекс FM -+ -+ -1 -+ dontcare -+ 91.0996 -+ -+ -+ 1299226773D02C541B6C989B46A7BE9E07EF3C544185FC9341F54F2EDBE86E17D89BC7 -+ Эхо Москвы -+ Эхо Москвы -+ -+ -1 -+ dontcare -+ 91.4996 -+ -+ -+ 12992450064E4AAA3432B8FCA126079FA296A86E336905CE3ABF2EFED8C373D58C3798 -+ Радио Рокс -+ Радио Рокс -+ -+ -1 -+ dontcare -+ 102 -+ -+ -+ 12992268058FEAF0C94EF06273EB673743E6258F75242AB4295D51C5B66F4EC057F2AF -+ Студио -+ Студио -+ -+ -1 -+ dontcare -+ 102.349 -+ -+ -+ 12992435281FDB16BE9B711DE92E41FCEA928DDD2FC1ABA6AFCD5B07A578393BD0EC54 -+ Динамит FM -+ Динамит FM -+ -+ -1 -+ dontcare -+ 103.4 -+ -+ -+ 12992268107030A254DC106BD62B943CE1313E4BADD282E927475E0B571AA5F3694D92 -+ Наше Радио -+ Наше -+ -+ -1 -+ dontcare -+ 103.9 -+ -+ -+ 1299226813353F96B553C09BB1CC06CB806CA6EE34705D76534B42A70C5E8C2BB99596 -+ Русский Шансон -+ Русский Шансон -+ -+ -1 -+ dontcare -+ 104.399 -+ -+ -+ 1299226815509A209761FCE70F2AA153A6D6118E92DD70A6516B2E44535A25AC5A117C -+ Балтика -+ Балтика -+ -+ -1 -+ dontcare -+ 104.849 -+ -+ -+ 12992439342FE6A60DC705889C54E4E43102EE5BD7A70338627821A114AEA10A547484 -+ Love -+ Love -+ -+ -1 -+ dontcare -+ 105.3 -+ -+ -+ 129922681953A87D8654349F7F46E20C2482A6BE6EA8C59008AE1DD6F9650CFD33F414 -+ Спутник -+ Спутник -+ -+ -1 -+ dontcare -+ 105.899 -+ -+ -+ 1299226822C937A9D0C21E95F9AB1D7A36CACD1AAD8751DF1E0868B8499D496E10F3E1 -+ record -+ record -+ -+ -1 -+ dontcare -+ 106.299 -+ -+ -+ 1299226825ADD93E9496FBE70152AEF5833A1B98A1B2EEC51A47DE80A35C432EE4A6D7 -+ Маяк -+ Маяк -+ -+ -1 -+ dontcare -+ 106.949 -+ -+ -+ 12992448213D3022DC21C96DB5D1AED00A71539ABED1EB113698432D0D45C6B9CA1540 -+ Бизнес FM -+ Бизнес FM -+ -+ -1 -+ dontcare -+ 107.35 -+ -+ -+ 12992448794E7CF4A66A7FAFC810B559EFE948480288CC3288AB469C6F84B28CC51F89 -+ Русское радио -+ Русское радио -+ -+ -1 -+ dontcare -+ 107.8 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp kradio-3.5.13.1/kradio3/presets/russia/samara.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/samara.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,239 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ slider -+ 2010-11-25T11:06:47 -+ Russia -+ Samara -+ -+ ver 0.01 -+ -+ -+ 12906697574C22D12352F932FBC406C8E4D27AA805ACCE94C1128DA618D2781B04FCB5 -+ Добрые песни -+ Добрые песни -+ -1 -+ stereo -+ 68.51 -+ -+ -+ 12906699108A5C3D49F59F5AA489785116892F2745E5025BFDAB5E583F3BF2926C83BE -+ Радио России -+ Радио России -+ -1 -+ mono -+ 70.31 -+ -+ -+ 1290670109AC03A5A7B274C46EF2F54FB75D0E973F01E5E2CF14968E6D60D838D8DD69 -+ Радио Маяк -+ Радио Маяк -+ -1 -+ mono -+ 72.05 -+ -+ -+ 1290669458F93F12F39C5CF1E698F318744E109C1D43985D0DFDDABCFCEDCB0D74F184 -+ Русское радио -+ Русское радио -+ -1 -+ mono -+ 72.83 -+ -+ -+ 129066946284D16DEFE6A632919C49CC7B59DE24C76FF17D6659DE4F709941C1923CBF -+ Самара-Максимум -+ Самара-Максимум -+ -1 -+ mono -+ 73.61 -+ -+ -+ 1290669966CAFF3D2FE0BCA9C4ABE31755A703071613797EDBAE8220DFF911F71223C3 -+ Экспресс FM -+ Экспресс FM -+ -1 -+ stereo -+ 90.1 -+ -+ -+ 1290669496B23BBAB0F7EA2F53447A2D2B5062D6F95A5634B03B8C642B2B6AB0DA857F -+ Милицейская волна -+ Милицейская волна -+ -1 -+ stereo -+ 90.6 -+ -+ -+ 129066949955CCCD9BDF1541E3CBF2BD80CCD9D2169927CB1B7783CBD7EB7C84AB4E52 -+ Радио 7 -+ Радио 7 -+ -1 -+ stereo -+ 91 -+ -+ -+ 12906695025E8878640F18551035279789653DC1847C3ED7FCE3C17DA0DE00814C1277 -+ Ток FM / Серебряный дождь -+ Ток FM / Серебряный дождь -+ -1 -+ stereo -+ 91.5 -+ -+ -+ 12906701432579FB12F26EC4143B4075C5CA32161561C67469F2674F1D000639924769 -+ Радио Маяк -+ Радио Маяк -+ -1 -+ mono -+ 92.1 -+ -+ -+ 1290669512AA728A2909B5DA1766DCBA8FEE7319FB691CC904D364B5FD63F0E091086C -+ Юмор FM -+ Юмор FM -+ -1 -+ stereo -+ 95.7 -+ -+ -+ 1290670209D53A20DBE72609B8DD5D1C949AD9C717D957B7EA737EE0AF4555783A9568 -+ Kot FM -+ Kot FM -+ -1 -+ stereo -+ 96.3 -+ -+ -+ 1290669520AFD73B2A79481561F353ADAAA8019C899B98EBD5BBC7C8C523D8B5E1F4AC -+ Ретро FM -+ Ретро FM -+ -1 -+ stereo -+ 98.6 -+ -+ -+ 1290669523EB55855C02E8D1466C0DD69923D0AECA8D1EA4638A4324CF005F1B9396B4 -+ Эхо Москвы -+ Эхо Москвы -+ -1 -+ stereo -+ 99.1 -+ -+ -+ 1290669526015A03960BBB8AFEAE8434E5774A10912CE23D3F30E715BC3F6AF63E2B01 -+ Европа плюс -+ Европа плюс -+ -1 -+ stereo -+ 99.9 -+ -+ -+ 1290669529F2C34EF9C4054325268B74145214ED93301E756EEF49D0B6B369F0472357 -+ Русское радио -+ Русское радио -+ -1 -+ stereo -+ 100.3 -+ -+ -+ 129066953365186F4B19E0FFA6970EA7CF9BBE4CB8B4C8B29585CBEDCCADE3E0438A6B -+ Радио Шансон -+ Радио Шансон -+ -1 -+ stereo -+ 101 -+ -+ -+ 12906695360BE1FF43000028BE7DFFAC09A6D1C3D8D82F4230ADAFB8A97EA67063A617 -+ Радио Рекорд -+ Радио Рекорд -+ -1 -+ stereo -+ 101.5 -+ -+ -+ 1290670428DB6665C4DA8315E1F9C1C3AEE22FE5F400B378BF01D0C2091AD1D6351815 -+ Радио Дача -+ Радио Дача -+ -1 -+ stereo -+ 102.1 -+ -+ -+ 1290669541A995A471FD47505C9A854FA3283E543CFCF2CF49D755684FA403A8B707AE -+ NRJ -+ NRJ -+ -1 -+ stereo -+ 102.5 -+ -+ -+ 1290669543FBF9E4CC1B1852F655B37CAB7142F34981CBEE8CED47387B2B1D416A3818 -+ DFM -+ DFM -+ -1 -+ stereo -+ 102.9 -+ -+ -+ 1290669547A5146B3B559C4AF1D19A78B25BCBC6C96FC3FB2CE096DBBC08E1121BED6C -+ Радио Мегаполис -+ Радио Мегаполис -+ -1 -+ stereo -+ 103.6 -+ -+ -+ 1290669551EF9AAACB0ED236913B13084702FB32333DA1D6057709066AE87252E866F0 -+ Самара-Максимум -+ Самара-Максимум -+ -1 -+ stereo -+ 104.3 -+ -+ -+ 1290670579C8F92CAD2D08031E938BAAC59BBE4DE2F00B83A172121D8E030078F04F1B -+ Авторадио -+ Авторадио -+ -1 -+ stereo -+ 104.8 -+ -+ -+ 12906695578486108D25E6524980F6692BAAD184350B1AD0404E9FF46D5E553E800991 -+ Радио Алла -+ Радио Алла -+ -1 -+ stereo -+ 105.4 -+ -+ -+ 12906695610B4001861F6297000F9E0163510F013380B0230CB87871A69A947A5603F6 -+ Дорожное радио -+ Дорожное радио -+ -1 -+ stereo -+ 106.1 -+ -+ -+ 1290670650697A6A61F958CCF9DA5BBC65D36276B78CF50F7837A6B0102BDF4E3D51D0 -+ Love радио -+ Love радио -+ -1 -+ stereo -+ 106.6 -+ -+ -+ 1290669568AF4C3FA28BC38A7BFB9FB288E3CD453E4E732F49B3C509F3FDECA89B4E16 -+ Детское радио -+ Детское радио -+ -1 -+ stereo -+ 107.2 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,141 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.2 -+ Andrey Tomilenko (aka Thom) thom82@mail.ru -+ 2012-06-22T20:47:29 -+ Russia -+ Vladivostok -+ Antenna -+ -+ -+ -+ 1305629847E4E1C8DFAE28601AA9FF6FED89E658E93D0FB8E6CD6E38CAE5F9FD312294 -+ Радио Маяк -+ 1 -+ -+ -1 -+ dontcare -+ 69.68 -+ -+ -+ 13056302742651484CC5912F72A23F69F67301C3D59DE23FEE9DDBB143FD366F972D12 -+ Радио России -+ 2 -+ -+ -1 -+ dontcare -+ 71.84 -+ -+ -+ 1305630309F71DD598694A4024E35B0E728919D3C07279C5A8517CCD3CAF6665D50FDE -+ Авторадио -+ 3 -+ -+ -1 -+ dontcare -+ 88.3 -+ -+ -+ 1305630337CE26C7EFFA5A35679CA6A2014859F842B5784AE6CD400457AAB500DA93CA -+ Радио 7 -+ 4 -+ -+ -1 -+ dontcare -+ 91.3 -+ -+ -+ 1305630407C3530D192583FA82B955F4DC456E7280CA9FAAF485DCDB1017EF8AFDBCAD -+ Радио VBC -+ 5 -+ -+ -1 -+ dontcare -+ 101.7 -+ -+ -+ 130563042542AAA24D5F407A403C4A7197B4CFA710A0DC193EBD8830AAC41C95A4ADF1 -+ Радио Лемма -+ 6 -+ -+ -1 -+ dontcare -+ 102.7 -+ -+ -+ 1305630440AAD7287143E964761B40147B5B4300A6F0E875FD2F16CB7CF19636145C52 -+ Радио Шансон -+ 7 -+ -+ -1 -+ dontcare -+ 103.2 -+ -+ -+ 13056304542589A59330FDFD3BC5C59CF6F361BD834A851576B85BC0B2DD0882E7A094 -+ Ретро FM -+ 8 -+ -+ -1 -+ dontcare -+ 103.7 -+ -+ -+ 13056304729BC63FBCDAEACF9BF8E31BB50C14D2A3BA718D7CC67516720549D43308ED -+ Европа Плюс Владивосток -+ 9 -+ -+ -1 -+ dontcare -+ 104.2 -+ -+ -+ 130563049042596A28FF0B0A75A1EEE2646A0F66383E7ADACD04F3CCFEF9CD2D291A32 -+ Радио Дача -+ 10 -+ -+ -1 -+ dontcare -+ 104.7 -+ -+ -+ 1305630506C7D70286FAD616EDC0D58CE0E911282596E00793C5A5D9E1D402700207F7 -+ DFM -+ 11 -+ -+ -1 -+ dontcare -+ 105.3 -+ -+ -+ 1305630522CCF6CD3D24E933D486C62C00D4279BC46C85AA7B71F9170ECB4900CF7899 -+ Хит FM -+ 12 -+ -+ -1 -+ dontcare -+ 105.7 -+ -+ -+ 1305630536EF153D9BA1638772799D7C1D066D0C8E431B98476DD073FC4B05AA07C4A9 -+ Владивосток FM -+ 13 -+ -+ -1 -+ dontcare -+ 106.4 -+ -+ -+ 1305630551DEB55372DD2D6225FD2472EB4B5926B50BD2F6D652E4E9DBB8F8E8E590B8 -+ Русское Радио -+ 14 -+ -+ -1 -+ dontcare -+ 107 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp ---- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,114 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Karol Slanina -+ 2007-01-30T23:57:25 -+ Slovakia -+ Bratislava -+ -+ -+ -+ -+ 11701979358557D176BE181F7A4D73F6B3E363053727BB4B2865AEBDF6522AA23B496A4BC6 -+ R�dio FM -+ R�dio FM -+ -+ -1 -+ 89.3 -+ -+ -+ 1170197995A51B2D6F23369B1E32CD8732D47EF18E7DF3DE59A10F1E552EF0D5192E082F2F -+ Lumen -+ Lumen -+ -+ -1 -+ 93.8 -+ -+ -+ 1170197864908C92A275FF4EB11D627A70C50F184AC5025AD1EA23B1F2C2E5545DF4604377 -+ Fun Radio -+ Fun -+ -+ -1 -+ 94.3 -+ -+ -+ 1170198029A2525F10FCA4A80FC4C9920DE5317291C7E3FA88F7439AF8554FABEF2C505A7B -+ R�dio Slovensko -+ R�dio Slovensko -+ -+ -1 -+ 96.6 -+ -+ -+ 1170198058FF77AB835BD24D973DBD19FEE90CD52C897DBD56454EAC40FF6EE6299530E2BA -+ Lumen -+ Lumen -+ -+ -1 -+ 97.2 -+ -+ -+ 1170197883FEF499284D6512B6D124C6AEE06954813B19D0677B9FAE1E25841F047E506DAB -+ Regina -+ Regina -+ -+ -1 -+ 99.3 -+ -+ -+ 11701981540C8BA3C5FEE26BFEBC1C21757EAECF0F8812D60536CF462229E28D88D79D3614 -+ Hey! -+ Hey! -+ -+ -1 -+ 100.3 -+ -+ -+ 117019818318BF1A3FB6743C67752E82D4040BEE751A2DFA097586C0745590238E429B140D -+ Viva -+ Viva -+ -+ -1 -+ 101.8 -+ -+ -+ 117019823636B4E4B502BC79238346E03946C14B71DBF94119255C2C80249382E9E9596E76 -+ Dev�n -+ Dev�n -+ -+ -1 -+ 104.4 -+ -+ -+ 1170198249A7B52138DFC2490C760F9B63E3089848E5530558F197A85AF75E491DE3752EF8 -+ Okey -+ Okey -+ -+ -1 -+ 104.8 -+ -+ -+ 1170198200C27DA842FC3E41A94178717FD57CDA4B3637AEE94EE432559A51406C152BE867 -+ Jemn� mel�die -+ Jemn� mel�die -+ -+ -1 -+ 106.6 -+ -+ -+ 1170198173C7877B76C83C5A1D305D71333F95BF44E85E4981BFC901138A6D8B4161CB9DDE -+ Expres -+ Expres -+ -+ -1 -+ 107.6 -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp ---- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,95 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ -+ 2007-01-03T17:10:50 -+ -+ -+ -+ -+ -+ -+ 1167837266A46C6BD80A9B05DB8191BBA2DF07FBD9C06260FFCD10A5C14F99B37A4A1264E1 -+ Radio FM -+ radiofm -+ -+ 0 -+ 89.3 -+ -+ -+ 1167837523A6FCDE20D4D66BFB2D2DEC1BE1027C01007A26E6BBB1E674B7E9B1B5F2B69282 -+ Radio Wien -+ -+ -+ -0.01 -+ 89.95 -+ -+ -+ 1167906947508A1DFDFB2DCC3217FE7DE77F0896F34EFCE5C1F01A3481D8B13DEA5AAE0D03 -+ BBC World -+ -+ -+ -1 -+ 93.8 -+ -+ -+ 11678375991034A86E0C2F24E0262CECC9917EEADEAAAC6738B5CE2DB74B4210B84E60E6DC -+ Fun Radio -+ -+ -+ -1 -+ 94.3 -+ -+ -+ 1167837739B15816FFEC00FA6F46359F18C7E4B88DEDD1D1EDF4E2E25A5DA0117CB3CF1E73 -+ SR1 -+ -+ -+ -0.01 -+ 96.6 -+ -+ -+ 1167840523320901F854CBA0C6099B0F680738AB4EF8B7375882DD6C1C9BC639C14A0075DB -+ Radio FM4 -+ -+ -+ -1 -+ 103.8 -+ -+ -+ 11679064372E55132CD63194C6DF57BED568063822F8DB897F58D7F1F2AEAE396B1E0BF242 -+ Radio Okey -+ -+ -+ -1 -+ 104.8 -+ -+ -+ 1167906269AA3003C8F5BAE787A4B93AC008C8DF8FCE0F184E50FBA8C7EAB68F194DD47442 -+ Krone Hit -+ -+ -+ -1 -+ 105.8 -+ -+ -+ 11679069873DD5DB69565B0F08A2A6C7D0922333B8E956C9B23DC2066513ED88F091BDF922 -+ Jemné Melódie -+ -+ -+ -1 -+ 106.6 -+ -+ -+ 1167906370C374296A0729322F2FE591A959E9927D815F5AC53FEC71DF3EEF3A2B6868B6E1 -+ Radio Expres -+ -+ -+ -1 -+ 107.6 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,10 +1,13 @@ - SUBDIRS = --EXTRA_DIST = "kosice.krp" -+EXTRA_DIST = "bratislava2.krp" "bratislava.krp" "kosice.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/" -+ $(INSTALL_DATA) "$(srcdir)/bratislava2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" -+ $(INSTALL_DATA) "$(srcdir)/bratislava.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" - $(INSTALL_DATA) "$(srcdir)/kosice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp" - -- - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp kradio-3.5.13.1/kradio3/presets/spain/leon.krp ---- kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/spain/leon.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,114 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ Roberto Garrido <garrido251@terra.es> -+ 2006-10-16T18:47:38 -+ Spain -+ Leon -+ -+ Emisoras de Leon capital -+ -+ -+ 1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5 -+ RNE 1 -+ RNE 1 -+ -+ 87.60 -+ -1 -+ -+ -+ -+1116455444F58348060F6B3951D032CE2AE3962570045A854578FE3718D634442C77547493 -+ 40 Principales -+ 40 Prin. -+ -+ 88.2 -+ -1 -+ -+ -+ 111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8 -+ Radio Clasica -+ R. Clas. -+ -+ 91.10 -+ -1 -+ -+ -+ -+1116455444E3C16AFC5033065A79EA2ACB983CD130F211DD90B5191135A7A0406A415E9E32 -+ Radio 3 -+ Radio 3 -+ -+ 89.30 -+ -1 -+ -+ -+ 11164554446CAC6C1662A7B7CED73A73B393EDB080B0BDF83DB7FF69DADA2B1CE6EEB5227C -+ Cadena Ser -+ C. Ser -+ -+ 92.60 -+ -1 -+ -+ -+ 11164554447A9C68C227A551F40419A4A90C43709DE94082A0EE08024CCC55365C051D497B -+ Cadena 100 -+ C. 100 -+ -+ 93.3 -+ -1 -+ -+ -+ 1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878 -+ Cadena Dial -+ C. Dial -+ -+ 94.3 -+ -1 -+ -+ -+ -+1116455444509F0036299C12C83B7ABEA8000845DC5D38E34AAEA04346433F6ACC64860751 -+ M80 Radio -+ M80 -+ -+ 95.3 -+ -1 -+ -+ -+ 1116455444787E3904290A56E16C4808EE0C7117893EE19A27D621326FA4FEA44334A6AAB4 -+ Kiss FM -+ Kiss FM -+ -+ 96.5 -+ -1 -+ -+ -+ 1116455444C8F7100921C174D17234BB109181FB1D1891D59C31A09771D0400BA46015D36F -+ Onda Cero -+ O. Cero -+ -+ 98.3 -+ -1 -+ -+ -+ 1116455444524D3835E4E98FA48D0822236F7A2C4881D4D3314D9740CDE086B1DCF400850C -+ Radio Maria -+ R. Maria -+ -+ 101.3 -+ -1 -+ -+ -+ 111645544434E00A4B79D5AF6F50BCA073B4F0075DB98363F2965208360ADB384FC9C9261F -+ Radio 5 -+ Radio 5 -+ -+ 102.2 -+ -1 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am kradio-3.5.13.1/kradio3/presets/spain/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/spain/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,26 +1,27 @@ - SUBDIRS = --EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp" -+EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "leon.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/" -- $(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" -- $(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" - $(INSTALL_DATA) "$(srcdir)/barcelona2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp" -- $(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" - $(INSTALL_DATA) "$(srcdir)/barcelona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp" - $(INSTALL_DATA) "$(srcdir)/bilbao.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp" -- $(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" -- $(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/leon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp" - $(INSTALL_DATA) "$(srcdir)/lugo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" -+ $(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" -+ $(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" -+ $(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" -+ $(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp ---- kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp 2012-11-25 00:48:01.000000000 +0100 -@@ -0,0 +1,87 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_11_27 -+ Magnus Holmgren <magnus@kibibyte.se> -+ 2006-10-19T16:57:24 -+ Sweden -+ Link�ping -+ -+ -+ -+ -+ -+11612679722C3AE9D70B2B3DD46C4065608BA1CAACE6896B3D6F823A492BBC2530D8F59698 -+ Sveriges Radio P1 -+ P1 -+ -+ -1 -+ 88.6 -+ -+ -+ -+1161268014C8DA05F96C556DF58C27DCA0B7EB4D76C21088188AB8FD914878185BD0F9D949 -+ Sveriges Radio P2 -+ P2 -+ -+ -1 -+ 93.1 -+ -+ -+ -+1161267649469715870FF0D03695CA6A24454360C86BFBE9C63852DBE7C345B2F78588CDCA -+ Sveriges Radio P3 -+ P3 -+ -+ -1 -+ 98.2 -+ -+ -+ -+1161266725517FE1ECC390A4AD8164724F361C1BBC9663B69AE58DA4D18E922C95E7B94877 -+ Sveriges Radio P4 �sterg�tland -+ P4 -+ -+ -1 -+ 99.8 -+ -+ -+ -+1161267804D5E933F12EFCD66F8EEF4B28C4345A2D2986DE5A121E68825E481A4197D46171 -+ Link�pings n�rradio -+ N�r -+ -+ -1 -+ 95.5 -+ -+ -+ -+11612659565F0D48B7FB6AE89FFFA0F61FFC2C342AFF99E6AFC86F0E8FFAE65DE6AEAE3BCA -+ Rix FM -+ Rix -+ -+ -1 -+ 104.376 -+ -+ -+ -+11612667154BB764EE3775FEA4FC6159E50300742ADD5E58B519E357ACAE84BA532BCDD8E8 -+ Lugna favoriter -+ LF -+ -+ -1 -+ 94.5 -+ -+ -+ -+116126856640E5698A4438B690C4BFE5601F11D852BAC3164C921A42AAB231681183E40603 -+ East FM -+ East -+ -+ -1 -+ 103.2 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am 2012-11-25 00:48:01.000000000 +0100 -@@ -1,18 +1,19 @@ - SUBDIRS = --EXTRA_DIST = "gothenburg.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp" -+EXTRA_DIST = "gothenburg.krp" "linkoeping.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/" -- $(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" -- $(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" - $(INSTALL_DATA) "$(srcdir)/gothenburg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp" -+ $(INSTALL_DATA) "$(srcdir)/linkoeping.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping.krp" -+ $(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" - $(INSTALL_DATA) "$(srcdir)/stockholm.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp" - $(INSTALL_DATA) "$(srcdir)/stockholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,421 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ -+ 2008-10-29T08:32:41 -+ Schweiz -+ Baar (ZG) -+ Cable -+ -+ -+ -+ -+12252731615C37190398400074872507711380CC9F801C63990D7D1216B681209CEA7786A9 -+ Deutsche Schweiz 1� -+ DRS 1 -+ -+ -1 -+ 87.5 -+ -+ -+ -+12252731615F3EC8840F1D28547F96E5F851757FD7E43F14DAC1D84B35BBD2E4B3CBACA8EC -+ Deutsche Schweiz 2 -+ DRS 2 -+ -+ -1 -+ 87.8 -+ -+ -+ -+1225273161571CAE333F51B6DF76B9FC350D3B8241CB010CC415F45A11DDF89938B7E48F20 -+ Deutsche Schweiz 3 -+ DRS 3 -+ -+ -1 -+ 88.4 -+ -+ -+ -+122527316101F7DBAA4FC8D120BA86942BB54C774119B175AEFDBF07313E9BC380645E5979 -+ Deutsche Schweiz 4 -+ DRS 4 -+ -+ -1 -+ 94.3 -+ -+ -+ -+12252731610FD0B97EA983008980BC88F6C246C1B0DCA90B2298759E39A2485A68FBD08284 -+ Radio Eviva -+ EVIVA -+ -+ -1 -+ 89.6 -+ -+ -+ -+1225273161DD5A7B47F06219EE6B287410846E68A2F9645FBE56CDA64055EBE9FD50F400CA -+ DRS Musikwelle -+ DRS M -+ -+ -1 -+ 107 -+ -+ -+ -+122527316150F8094927669160C81E11488EE683D7D51643444F74930B441A71E741AA8D1E -+ Radio Swiss Jazz -+ CH-Jazz -+ -+ -1 -+ 93.2 -+ -+ -+ -+122527316144A1588DA40CC54E54E8FD1955699F6E590FF05128F551C188B50781BFA2E429 -+ Swiss Clasic -+ CH-Class -+ -+ -1 -+ 100.1 -+ -+ -+ -+1225273161E93DBEAB0A4B385E7F8638081FF4FE77F082AE85AFD05E79A86074C450274ED4 -+ Swiss POP -+ CH-POP -+ -+ -1 -+ 100.4 -+ -+ -+ -+1225273161A8049CE900367D1B4609C408D051B68E68CC148E1E4AFAE7C6210EB569563F5F -+ Tropica -+ TROP -+ -+ -1 -+ 91.8 -+ -+ -+ -+12252731615AE584B8080DBA4FA802E756A6CA14DC0B1999843A435E10D0C016073AC04964 -+ Rock Nation -+ SM -+ -+ -1 -+ 89.9 -+ -+ -+ -+1225273161F381A9211F4AD4D44F7DF22218F520FD15E20AEC8F90520E8EF44FDBA9D8BE49 -+ Radio Virus -+ VIRUS -+ -+ -1 -+ 102.5 -+ -+ -+ -+12252731616CA06E1C2AE30BB75D0A55BEBCDBB0430F29D75E9065E394C07C91234513F35D -+ Radio Sunshine -+ RSH -+ -+ -1 -+ 98 -+ -+ -+ -+1225273161425F93755AFA25B35C884916F0ADC90D5AD7C7FBB55A6FD8CBDC5F9FEF5DCB9F -+ Radio Pilatus -+ PIL -+ -+ -1 -+ 98.9 -+ -+ -+ -+1225273161AB5F78DEF5E32376FDFD550AEFEBC2B8D3870C2F241C3B2A799343A4B8E181C2 -+ Radio Central -+ RAS -+ -+ -1 -+ 101.9 -+ -+ -+ -+1225273161422E70DA14D5688197F0463779CDB698D20B05A5EF117F0EA81F427FF665E65D -+ Radio 105 -+ R105 -+ -+ -1 -+ 105.5 -+ -+ -+ -+12252731613B91C4CE87B38152A108B17DFF853A5EF3E30A85E31709BF2A86FF4E6FAE1EB7 -+ Radio 24 -+ R24 -+ -+ -1 -+ 107.3 -+ -+ -+ -+1225273161DEE2378679617AC0F38BFBE73B34344C5DAAB629FD54F6CA96BDE14AAE8307F8 -+ Radio LORA -+ LORA -+ -+ -1 -+ 107.9 -+ -+ -+ -+1225273161B50423C2C6D3A258BAE99CC96F1C2A7DBFA5632C321CE714DB38AAE38C346710 -+ Radio Energy -+ NRJ -+ -+ -1 -+ 107.6 -+ -+ -+ -+12252731614A07E5A4D217F410E3D11188E49B4FB392835BB6B33BB5667D39EEF9C77DFFDD -+ Suisse Romande 1 -+ RSR 1 -+ -+ -1 -+ 100.7 -+ -+ -+ -+1225273161EE7A4CB25EA346F4C855D21D92C8DA38A3FFAFDE9BFBD109E3FA6791FD9ED0C5 -+ Suisse Romande 2 -+ RSR 2 -+ -+ -1 -+ 101.3 -+ -+ -+ -+12252731617BF310CCF020C3ECB8AF3A1F9FC7ECCF63C53B2D2CDF1E8E6314EBDBB84A48FB -+ Suisse Romande 3 -+ Couleur 3 -+ -+ -1 -+ 101.6 -+ -+ -+ -+12252731612E058C045EB2E699CE7A457AD516992A350A702579000BA6C5A17EF171454EBF -+ Svizzera Italiana 1 -+ Rete uno -+ -+ -1 -+ 102.2 -+ -+ -+ -+1225273161774BDACFA3A2D1010ACDA1358A21BDEE9D11EB4BD544ACAABA25E9C81D3D9877 -+ Raetoromanisch -+ RAT -+ -+ -1 -+ 90.2 -+ -+ -+ -+1225273161DA24AD3329D2F6A2F676CD4A618F3E9B00F3398DBA3248F87B18C1062C566065 -+ Suedwestrundfunk 1 -+ SWR 1 -+ -+ -1 -+ 88.7 -+ -+ -+ -+12252731612C2E8DB69C060D2B9F6D99B76A0C6915CA9C1F570DAD0BA21633CCDCA6968999 -+ Suedwestrundfunk 2 -+ SWR 2 -+ -+ -1 -+ 89 -+ -+ -+ -+1225273161D5A748788A860FA1780DD3A85D63C4B7A24338B84D949FE74913F310D1281550 -+ Suedwestrundfunk 3 -+ SWR 3 -+ -+ -1 -+ 89.3 -+ -+ -+ -+1225273161017919BC747D3C3050F193AB1FDD0F0B82062E2AFE4A9A04A9164264186C2298 -+ Suedwestrundfunk 4 -+ SWR 4 -+ -+ -1 -+ 93.5 -+ -+ -+ -+1225273161310AC50726DB4819FF3E73563B2121FC09B2624B0AAD25AC1C639DB73EED8DD7 -+ Bayern 1 -+ BR 1 -+ -+ -1 -+ 91.4 -+ -+ -+ -+1225273161BCF2994106AAD995088C4AEDD8F0901CE0864622EA856A5E4BD8B09C8C0A481F -+ Bayern 2 -+ BR 2 -+ -+ -1 -+ 106.4 -+ -+ -+ -+1225273161F93BA8D4C7D85846202BC721054391B03E0FE53A0A25A5CFB27E56D49F5A84ED -+ Bayern 3 -+ BR 3 -+ -+ -1 -+ 92.3 -+ -+ -+ -+1225273161C5E00C7CED1D20457FD741161A38C3D2E89849DA70700FD9B4053AA554FF31D4 -+ Bayern 4 -+ BR 4 -+ -+ -1 -+ 92.9 -+ -+ -+ -+1225273161E936AD3F2AA5E9AE3C541FF6AE99ABB898C3D8FB485F46E811C7FC68DD14D70B -+ Deutschlandfunk -+ DLF -+ -+ -1 -+ 93.8 -+ -+ -+ -+122527316144EFE270366507B0E1DC5B5D9CA2650577187AC960D27D0B063152EBCF43A076 -+ RTL Radio -+ OLDI -+ -+ -1 -+ 102.8 -+ -+ -+ -+12252731615F50D3ADC6C7CADAEED6BE118E60ACE86C254FF12BE25AFC2A578EEA92F7A1A3 -+ Oesterreich 1 -+ Oe 1 -+ -+ -1 -+ 95.9 -+ -+ -+ -+1225273161EB926A11E10642DFF9732D249A77006949B6141F7E541DC09149F03447AA1B5C -+ Oesterreich 3 -+ Oe 3 -+ -+ -1 -+ 97.7 -+ -+ -+ -+122527316111AD7DEF5739C998C08D84F388A1E7AC8B6A3B44BFC614A83E2894F818E015C4 -+ Radio Vorarlberg -+ Oe 2 -+ -+ -1 -+ 103.7 -+ -+ -+ -+122527316181DDE5688DAC8A726278689857F789B201D9BFECA62AACFAD6039B1FF103AEDF -+ Klassik Radio -+ KLAS -+ -+ -1 -+ 103.4 -+ -+ -+ -+12252731619C8109156AB1A348BF532BBCF4DAF1B77311C8B00BBC1AE4259A2BF82F1A2C99 -+ Sky Radio -+ SKY -+ -+ -1 -+ 98.3 -+ -+ -+ -+12252731613FD044AB1BEE2C8AF97A15DC1A1558AEDA9FAB84399E834459AAA8E73BD6F6E6 -+ Deutsche Welle -+ DW -+ -+ -1 -+ 104.9 -+ -+ -+ -+1225273161B078B9CCFB310C45D6DF651133CF77D5E9CD6C4162A1292BF5FF9DCE6CEA6A58 -+ France musique -+ FM -+ -+ -1 -+ 105.2 -+ -+ -+ -+1225273161247F897CFB0D11FF8DDCF3BF74EEF92D78187BF0FC3BF6A48B726DE551B65D44 -+ France culture -+ FC -+ -+ -1 -+ 105.8 -+ -+ -+ -+1225273161089D4E01B7FCDE677247DBBE8112EC1B6D59860843F08720DEB6C0F314150928 -+ France inter -+ FI -+ -+ -1 -+ 106.1 -+ -+ -+ -+1225273161FB03759B05089B0E9B49DD4C1BAFBA08AF0F697E11D37F931A337DB02710F30A -+ BBC World Service -+ BBCW -+ -+ -1 -+ 95.6 -+ -+ -+ -+12252731612C2CF11CF81CAB1D6BF82A4CDFC854050815CDEFF9FC3F4EC54A3B5B9DFF71B1 -+ World Radio Switzerland -+ WRS -+ -+ -1 -+ 94.6 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,14 +1,19 @@ - SUBDIRS = --EXTRA_DIST = "diepoldsau-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp" -+EXTRA_DIST = "baar-cable.krp" "diepoldsau-cable.krp" "egg-cable.krp" "spiez-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/" -+ $(INSTALL_DATA) "$(srcdir)/baar-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp" - $(INSTALL_DATA) "$(srcdir)/diepoldsau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp" -- $(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/egg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp" -+ $(INSTALL_DATA) "$(srcdir)/spiez-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp" - $(INSTALL_DATA) "$(srcdir)/stansstad-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" - - uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp ---- kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,361 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-09-20 -+ -+ 2006-11-25T18:25:59 -+ -+ -+ -+ -+ -+ -+ -+ 1164475721C836B02D3F9FB5323F9B91DCC801F18604275400966F77F8438EE0DFD21004A3 -+ Musigw�lle 531 -+ -+ -+ -1 -+ 87.8 -+ -+ -+ -+ 1164476030DBDA7CE1895880614BD880D190BFF85874123D1EA380A59325BA85DAD0E36B75 -+ Radio BEO -+ -+ -+ -1 -+ 88.4 -+ -+ -+ -+ 116447645722BEEB11FBAE650D5B6E528AA5BE6550F03E5A316B7D12360F42AD9ABBE71A49 -+ Virus -+ -+ -+ -1 -+ 89.1 -+ -+ -+ -+ 1164476485623C22102A116C99B38AFFB8899E4C63E7CED92DF119968181A3D45E6B1E082D -+ Radio Regenbogen -+ -+ -+ -1 -+ 89.6 -+ -+ -+ -+ 1164476522F136F4B1AB6D4A0F9B8640C7C52001600D8812FC2AC614AF11B13117F9100683 -+ DRS 2 -+ -+ -+ -1 -+ 89.9 -+ -+ -+ -+ 11644766088531147C8EBFB983BD17E35EFAEFAB6AA2910217FB62BF2CC43087B928E20052 -+ DRS 3 -+ -+ -+ -1 -+ 90.8 -+ -+ -+ -+ 1164476645F8334668B73282FC0CDDE1E642E1A4B1F4068638961E8E73BFCEEEEB21E08A08 -+ Oesterreich 3 -+ -+ -+ -1 -+ 92.3 -+ -+ -+ -+ 11644767132F795AABE1F145F8EC35E7EA1D9FDD1125452F31152EF022E3D77DDE4002C436 -+ SW-Rundfunk 3 -+ -+ -+ -1 -+ 94.29 -+ -+ -+ -+ 11644768047E4A9DAFF301C6C6B33D8CC33F9BA07E6000AB137E484161BD939A14063DFCA4 -+ Bayern 4 -+ -+ -+ -1 -+ 96.5 -+ -+ -+ -+ 116447709817EED4BED4A4579737F308C6D1510E8578017F10D3D3DB349B32AAB44A1ED9CC -+ Radio Melodie -+ -+ -+ -1 -+ 102.1 -+ -+ -+ -+ 1164476632F724A008F02E6D3AD51D39DC085CE1B82F9FA9EFB1608AC16C5F26D9020A9C82 -+ Oesterreich 1 -+ -+ -+ -1 -+ 91.7 -+ -+ -+ -+ 116447711474A26EC5B9D08F4F13D196CEBA8A340ACE82EBD0B8E9FC61BAC8125C82C013D0 -+ RTL-Radio -+ -+ -+ -1 -+ 102.7 -+ -+ -+ -+ 1164476846FC95432884DBDC07B8FF2792A20AA3D097403536C233BD1BAF0BBF08C2C58F13 -+ Radio Svizzera Italiana -+ -+ -+ -1 -+ 97.8 -+ -+ -+ -+ 11644771468AA776EFE5705F034B7D8C34A8825AA572D8C8EABC803DE94A4F540E4018EF89 -+ Radio Rumantsch -+ -+ -+ -1 -+ 104.2 -+ -+ -+ -+ 116447673275A830CAE620C2602AC63CF04DC44B22EF74C7B9C0B7D34F9559968C3FA5DDC7 -+ SW-Rundfunk 2 -+ -+ -+ -1 -+ 94.6 -+ -+ -+ -+ 1164476871DC16BE6BE1FC8EBF76E8C1D96294EB0AFDFDBB681D07C6E629295715E93760EB -+ Radio Suisse Romand 1 -+ -+ -+ -1 -+ 98.7 -+ -+ -+ -+ 116447719145CA243A149CFC3CC5B277C8C952C68CC4AFE241170805028B9D8F4C6F8EFC6D -+ Sky Radio -+ -+ -+ -1 -+ 104.6 -+ -+ -+ -+ 1164476689247ADCA226D16E3A1A47B3F109347DC3A07082682F51A09946D8CDEF76FADBF0 -+ SW-Rundfunk 1 -+ -+ -+ -1 -+ 93.1 -+ -+ -+ -+ 11644772145A80A226FE3438AEB2CD7C67CC50D04D9A6963445C389F8544829335827FB68B -+ Swiss Pop -+ -+ -+ -1 -+ 105.6 -+ -+ -+ -+ 11644768870A3FC50ED9BB1F3FDEFFBBECC9510AA8113A440A46895F6467573AFFB1DF7D82 -+ Swiss Culture + Jazz -+ -+ -+ -1 -+ 99 -+ -+ -+ -+ 1164477240CF1F4C25E2A3F009578B936EE6802812D0351938C0B0A38F7E268D4F5D010653 -+ Radio Eviva -+ -+ -+ -1 -+ 106.1 -+ -+ -+ -+ 11644767613828AAB12B9DA61869FF71B91D28FA83ADEF88D7FA446D0927C3DB626A0FB90C -+ Bayern 1 -+ -+ -+ -1 -+ 95.2 -+ -+ -+ -+ 11644772595D1023FE4609DB5BC01A162A2A370269F79F81AFB6F8C6B575C778A3CD11B4BE -+ Swiss Music Radio -+ -+ -+ -1 -+ 106.8 -+ -+ -+ -+ 116447700658B7827F2F1C3EEC396586A5694F03645A8C0BC343E030D1B49F58CBE66B3E03 -+ France Inter -+ -+ -+ -1 -+ 100.15 -+ -+ -+ -+ 116447727511838E69F94FB51A15470F7EFA96E9AE099AA1836A7562ED95671C0F1E0E0C31 -+ Radio BE 1 -+ -+ -+ -1 -+ 107.3 -+ -+ -+ -+ 1164476665D42950581695565798A8D7D864F8ABCE5D945CF141430F2D7EF9245F54829B88 -+ Swiss Classic -+ -+ -+ -1 -+ 92.8 -+ -+ -+ -+ 1164477303B8282E6DA0AA48A55E59F852CA2935F99E6E4ADE05329EDC2F39F90064B8E914 -+ MDR Sputnik -+ -+ -+ -1 -+ 107.7 -+ -+ -+ -+ 116447703272325203D3A39FF25A9013A17926FC95911E8A2B3E0508C8A1911F65B54316E9 -+ France Musique -+ -+ -+ -1 -+ 100.8 -+ -+ -+ -+ 1164477369E78B9920982741ACE5BF2403152CBF4EBE4E51E9AFDDE6481FD84B61DCB539AA -+ DRS 1 Regional -+ -+ -+ -1 -+ 88.4 -+ -+ -+ -+ 11644767869F8A1A9D954FDA85F658D53C4C4F463ABF512D00DD6ACE2A7E183AE736C3E2E7 -+ Radio Network 105 -+ -+ -+ -1 -+ 95.7 -+ -+ -+ -+ 11644770561E9A7C4F01D692E947D4EB715F243D6340CAEB5FDA1AFF9BB6C38ABBC75427F0 -+ Klassik Radio -+ -+ -+ -1 -+ 101.2 -+ -+ -+ -+ 11644777782CECEA00CDCCCA218FADB5451F25842A2AB8C8D397694C6A7235EF1A892EDC9A -+ Couleur 3 -+ -+ -+ -1 -+ 97.5 -+ -+ -+ -+ 1164477077DF2B858361FA4F6EF082A705A96D694DCA0E7665C753CBC1EFD9117753616E08 -+ Capital FM -+ -+ -+ -1 -+ 101.7 -+ -+ -+ -+ 1164477882C2E4BE3D45186DC9A9DAB61CCDD0FA342DD5865C8154713B73638D36E76FC1CF -+ France Culture -+ -+ -+ -1 -+ 99.5 -+ -+ -+ -+ 1164478027D46AFC7CD8F5F0F27BC708272780F0447F1FC0E532845417F4900ED08038267C -+ BBC W-Service -+ -+ -+ -1 -+ 103.4 -+ -+ -+ -+ 1164478081D5D6FD1F78B4466274D593B544F3484C1CADE593A1668D108C4C451E287E2ED6 -+ Bayern 3 -+ -+ -+ -1 -+ 105.2 -+ -+ -+ -+ 1164477159F2E7FEB9CAF1D312DC9D665718F264E2B23BEFEF956E0F53F4D48DB4E9829CB1 -+ Sky Radio -+ -+ -+ -1 -+ 88.8 -+ -+ -+ -+ 1164478115A1CBD0F9B921FF6D38E14579A8AA498D2A05DCB3A7020A5C059EE4A507B6CAAD -+ Radio BE 1 -+ -+ -+ -1 -+ 107.3 -+ -+ -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,239 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Tolga Kaprol <tolga@kaprol.net> -+ 2009-03-22T16:56:00 -+ Turkiye -+ Istanbul -+ antenna -+ Based for Besiktas District -+ -+ -+ 1133103256F976C1C9EE76F2A0358FF48D0C8CA359A63AB04AE6170E6E6DD15E535DEDCE6F -+ TRT FM 1 -+ -+ -+ -1 -+ 95.6 -+ -+ -+ 113310325667257411AA7CDAA02CF2BF8682CFAE0730F602AE53D1E377B6AAEA8D73644F41 -+ CNN Türk Radyo -+ -+ -+ -1 -+ 92.5 -+ -+ -+ 11331032568361DC126F4320BB3A88CB142BAA17B6381608ED1FE62C0C23E09BC8385E7A40 -+ NTV Radyo -+ -+ -+ -1 -+ 102.8 -+ -+ -+ 11331032560BC71AF1443D07D68F7AA660D6ED3CB72F51561D0868328E48112C379A2ECEFF -+ Haberturk Radyo -+ -+ -+ -1 -+ 90.4 -+ -+ -+ 1133103256027AE7ACDDA8B25B6DD21B02DA5E86924D65EAC985866CA95C42D97D285CA211 -+ Radio N101 -+ -+ -+ -1 -+ 101 -+ -+ -+ 11331032564E7A550EEE6211419FBC18C3E9B0AB9BC2A5E73A99F889A811893A0BCE956F81 -+ Lig Radyo -+ -+ -+ -1 -+ 92.3 -+ -+ -+ 1133103256B7EB1EBEEFA0A2990C6F6E6CA8BBF4EDB07B47E815062EBD5D39B497610F843B -+ Radio Dinamo -+ -+ -+ -1 -+ 103.8 -+ -+ -+ 11331032560F7121DBCB34D537AD1A03F44CA586717903F6A5A280127C508F5CBFCD924991 -+ Metro FM -+ -+ -+ -1 -+ 97.2 -+ -+ -+ 11331032566E340315A3C3FFD132FE6A71D036623CD6A6D3437FF98BD12681CA47B71A784C -+ Number One -+ -+ -+ -1 -+ 102.4 -+ -+ -+ 1133103256F9BF82DF0814AD9897CB0CEDFBEBA9911945B367CA3271986F54C6F7A31D9A07 -+ Radio Mynodose -+ -+ -+ -1 -+ 106.2 -+ -+ -+ 1133103256AAC27E61C4EBB1104FBA47A7912A2D1FE2741E5C2A770041D85BE6EDC05B1BDA -+ Radyo D -+ -+ -+ -1 -+ 104 -+ -+ -+ 11331032560DAF105BA4EF17AEB45103D9129DFEA293409989B56A7C8952D1818DBB25042C -+ İstanbul FM -+ -+ -+ -1 -+ 88.6 -+ -+ -+ 123773385189517947A19528E9A57CAC0894995D3247B4AD8B5C2448FF8A873901995B2C54 -+ Joy Türk -+ -+ -+ -1 -+ 89 -+ -+ -+ 11331032563063855FA8319AA8C9683B9329810FCD7AFC25153815CFF082FB5235EA02B146 -+ Alem FM -+ -+ -+ -1 -+ 89.2 -+ -+ -+ 1133103256DA5A6933830D45EE5115C15AEBC121DA36ADCD16308642B9FE159234C4FDA992 -+ TGRT FM -+ -+ -+ -1 -+ 93.1 -+ -+ -+ 11331032564A1086A845369C8F051B1FBC9F021A505A4BD4A812D2A5049418CB3EE677E07E -+ TRT FM 3 -+ -+ -+ -1 -+ 88.2 -+ -+ -+ 11331032563CCD20721596677CE8F9F5590205147CA1F6D2E9F2F0C638C3C2A9138AB733B4 -+ TRT FM 2 -+ -+ -+ -1 -+ 91.4 -+ -+ -+ 1133103256993932C327E1E6728B2991C26A117AA31507B69F280FC07885EDD4B6C94444F9 -+ TRT FM 4 -+ -+ -+ -1 -+ 103.4 -+ -+ -+ 11331032564133D26A4C9D715126DA6A05821C2C8547ADB0B6E292ED2AC5D886CD695A9AA3 -+ Pal Station -+ -+ -+ -1 -+ 106 -+ -+ -+ 113310325652A761312F07237C7671866B97CBE6B48547F34456FCEE48957F9607C6569023 -+ Akra FM -+ -+ -+ -1 -+ 107.6 -+ -+ -+ 11331032560A559D71BE292F346B96164129EB47905681168232A8129E3FFDCD626BB1F9B3 -+ Power FM -+ -+ -+ -1 -+ 100 -+ -+ -+ 12377345702367CB1D14908BAF372C84879F6014A9EB3C2D84388EE34A0786123B38D10913 -+ Radyo 5 -+ -+ -+ -1 -+ 94.7 -+ -+ -+ 12377345953C28151FC597DC78EAE3322BD8C12AEAD7337873397BE9C3A350BE4A90D67C5C -+ K-Rock FM -+ -+ -+ -1 -+ 94.5 -+ -+ -+ 1237734609DFBDCB3B4121E1080EB6F6791918B96C2EC8453558FC2131B60AE9CB393C9FF0 -+ Açık Radyo -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1237734626985324B699C0AC2C37DDE0AF723CB325AEF1AFCA5C66DC4E9DBD1DB35570F599 -+ Radio Oxigen -+ -+ -+ -1 -+ 96 -+ -+ -+ 123773464032B65D46D84318ABFEB1E880E6B9B9691E282445A5DDB69E68E8375FA73ED14B -+ Radyo Eksen -+ -+ -+ -1 -+ 96.2 -+ -+ -+ 12377346804EA0ABAE9A3C8BA69FABB4F07B268E771F7F0BD5DE98389DF80D9F800F28E128 -+ Capital Radio -+ -+ -+ -1 -+ 99.4 -+ -+ -+ 12377346942C7A5A6FDE6C5A6E1FDFF7D6F040C823E9D0DBB9923884C7AFB5200AA05F9047 -+ Joy FM -+ -+ -+ -1 -+ 100.6 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp ---- kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp 2012-11-25 00:48:00.000000000 +0100 -@@ -0,0 +1,501 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot_2005_12_04 -+ leopartux, <leopartux@yahoo.com.tr> -+ 2006-09-24T16:19:46 -+ Turkiye -+ İzmir -+ antenna -+ -+ -+ -+ -+1159105607FA7E2E4A53A41AE958DB98159D59BEEBD842C5DF5F6322151D6BBB2A029A07D9 -+ RADYO KARADENİZ -+ -+ -+ -0.01 -+ 87.7 -+ -+ -+ -+1159105607B40A26E67591AE45B92DC144480D83B900716DBCD0608DC88818AD7C74264ADA -+ TRT-3 -+ -+ -+ -1 -+ 88 -+ -+ -+ -+1159105607DC9FC312AF54A5820F54F6D69F13B6DA7834E3EB8449B1001039ABD906FFAB6F -+ MORAL FM -+ -+ -+ -1 -+ 88.3 -+ -+ -+ -+1159105607EFF83345BFCEFBAEFAF1881B9FEB912ED88EBB5F9C4C28450B4A1C3430EDDCBF -+ RADYO 35 -+ -+ -+ -1 -+ 89 -+ -+ -+ -+115910560775C8F2F2262D92720199F1766DC82E20C507D29B926D7F027CBF7F7040CEEC62 -+ ALEM - FM -+ -+ -+ -1 -+ 89.3 -+ -+ -+ -+11591056078312289400695553F47805AC33DDE809782DE802697526527568315202F9FAED -+ SHOW RADYO -+ -+ -+ -1 -+ 89.6 -+ -+ -+ -+1159105607B5E20EC323A8E43E9553520088A61D9B0BFB32B8E61EB1A089FEF16654F633A9 -+ İMBAT FM -+ -+ -+ -1 -+ 90 -+ -+ -+ -+1159105607EC1A0C9EF7B06E83D93436764017E649C1B4F90CDE9C09E1CD414EBBCD4CCCCC -+ NUMBER ONE FM -+ -+ -+ -1 -+ 90.5 -+ -+ -+ -+1159105607FAE384F5B5F1E3B604B5612D64BCD9450BF8385755621A2DEAEEA0B1DE1AE04D -+ SÜPER FM -+ -+ -+ -1 -+ 90.8 -+ -+ -+ -+1159105607E505526A4CAF0C67C9579B9DE0ADAF67664515CA85DC1780BC78EAA24A23075C -+ TRT-FM -+ -+ -+ -1 -+ 91.2 -+ -+ -+ -+115910560756282CAC18B01D0EC3397BF5B75167B3A0B249DB684EAE9336C14A4FB71BAEE5 -+ TATLISES -+ -+ -+ -1 -+ 91.5 -+ -+ -+ -+115910560734851591640F1FB0B7CC04962AD8C2EF2CF8097700FCB7B1567A3630B9031AD0 -+ TGRT FM -+ -+ -+ -1 -+ 92 -+ -+ -+ -+1159105607B8C8EE6D45D70363E9D5FDEEA005097D8CFE64BCFB17C55CF4997EA999CF5DF6 -+ RADYO EGE -+ -+ -+ -1 -+ 92.7 -+ -+ -+ -+115910560798C8FD6E5B3CFFCDAE6FF62B05835EBA661CDAD465511335D4CE222E5EDA796C -+ S SBS TÜRK -+ -+ -+ -1 -+ 93 -+ -+ -+ -+11591056070F3750DB792C0D8E7A82C170894000493F167FC34457EA674E4C5E918F36A3C7 -+ CAN RADYO -+ -+ -+ -1 -+ 93.3 -+ -+ -+ -+115910560752926AA64A6B4EB4BF08023558E67F3934CA10086150EED0E6D724AB2D0D7F61 -+ BATI RADYO -+ -+ -+ -1 -+ 93.6 -+ -+ -+ -+1159105607C2B3A02FE39ED42C6C500CC73BC8F3348B3B0384180C28440220F9BCFBC95EB0 -+ RADYO HERKÜL -+ -+ -+ -1 -+ 94.1 -+ -+ -+ -+11591056073C37C0249646B9579684894FCBF257164C13EC62E959F45959314281D8292F84 -+ DİNİ -+ -+ -+ -1 -+ 94.4 -+ -+ -+ -+115910560748518A040B4D49C702A8234BA8B2F7F7535D057275B82E35B774E7448977B1A8 -+ TRT -+ -+ -+ -1 -+ 94.7 -+ -+ -+ -+1159105607E4D0917B5CC0C5C73B223F6F22D7027E88EC628B76F5714628215FDA0DC0B455 -+ ROMANTİK RADYO -+ -+ -+ -1 -+ 95.2 -+ -+ -+ -+11591056071310D735CBD17F34FC9E0796AD7224AA70652439B4373BCA9FCCDC28C5C8F02A -+ NTV RADYO -+ -+ -+ -1 -+ 95.7 -+ -+ -+ -+1159105607C63D293FFC07F5D40C466CBC59E902DF12D5053986DF725ECA46E9C1E6A2B5B9 -+ RADYO KLAS -+ -+ -+ -1 -+ 96 -+ -+ -+ -+1159105607E2AA531318CED2328BEFD30BE86DD8AB6C938D99A12E140D9DAFBF5FFFB5CA16 -+ KRAL FM -+ -+ -+ -1 -+ 96.2 -+ -+ -+ -+1159105607F7EAB9637AC2DEC25EF87FC9C4BA3E6053E105E3267439970F74E23271C9A94F -+ KORDON FM -+ -+ -+ -1 -+ 96.5 -+ -+ -+ -+11591056075AE767CC1742EE410890A3434BF841DE4CCF8E04384C668F48FCF7A295EBB241 -+ AKRA -+ -+ -+ -1 -+ 96.9 -+ -+ -+ -+1159105607E23C551FF00DA5D3B6900CFC96A53967A5A3D06B321E20F272B10D52B66D3A9D -+ METRO FM -+ -+ -+ -1 -+ 97.2 -+ -+ -+ -+1159105607C29AEC7E64F2BD94D8F90B69DDD92AEF6F8219916B6A4C1D6370AC3986BFE78A -+ RADYO ÖZMEN -+ -+ -+ -1 -+ 97.7 -+ -+ -+ -+11591056070AE78D419999974A013C8B1DE244AE6F8AB229050B4BFC3EF2A3C8E1818AECDD -+ RADYO ÇAĞ -+ -+ -+ -1 -+ 98 -+ -+ -+ -+1159105607A0554A722F050281FB640527CD582CD086A783D05314DF7DA99868FB51027C6E -+ BEST FM -+ -+ -+ -1 -+ 98.4 -+ -+ -+ -+1159105607261BF429647FEC9AF5F182BECE1ABFDE5E6841AB4751779F19AA4E44A48C2064 -+ TRT RADYO 3 -+ -+ -+ -1 -+ 99.1 -+ -+ -+ -+1159105607DC02FAA3C60B19BF7D463FE4E57FF6D1754E336F2EB5C09269A0C4CC9FADED7F -+ KAPİTAL RADYO -+ -+ -+ -1 -+ 99.5 -+ -+ -+ -+115910560718F41B55DA2C22C8CAFC7E646FB818DD5F3FA899E4B716D0B081E9783EF2EB1E -+ POWER FM -+ -+ -+ -1 -+ 99.8 -+ -+ -+ -+1159105607AC13C9B2E73B51979ADC9E07FE4E975B0EB34CEACEEDCE31338BD8CEAFC1565E -+ POWER FM -+ -+ -+ -1 -+ 100 -+ -+ -+ -+11591056070DE8C2C54FC76A0CE7A5804E004F6843E0993FF66783850FD14B5A27B9B06B00 -+ TRT -+ -+ -+ -1 -+ 100.5 -+ -+ -+ -+1159105607B5377E3FDAE59A8798658C4F60F97AF71D8B83DCF21BB780E63EB31AAB6A9F6A -+ FM İZMİR 101 -+ -+ -+ -1 -+ 101 -+ -+ -+ -+1159105607A2D18FDB42A8746E13B11517D5399E0C3E97810CA2137BE97264E6174A1C5F2A -+ RADYO 7 -+ -+ -+ -1 -+ 101.3 -+ -+ -+ -+11591056070AE74CCF17E01A748B57E7FB9B90E1CBD7832D22D52808F73DB4B74FF73A1B90 -+ BUCA FM -+ -+ -+ -1 -+ 101.8 -+ -+ -+ -+11591056078A9AA84174307D34A82FB4934AF5AA9FE8D127E21ED075EEDC81D3B10EF660C3 -+ YAYIN -+ -+ -+ -1 -+ 102 -+ -+ -+ -+1159105607866A5463E5CDE0B629E0448E2019F9DF6BF9FF6CAB3E5CC01371F184743D6161 -+ YAYIN -+ -+ -+ -1 -+ 102.5 -+ -+ -+ -+1159105607F161CDA7E8B7716584D06C42DCBC31ADEA54E41A89E5533C7C755FBD01457233 -+ ÇAĞRI FM -+ -+ -+ -1 -+ 102.8 -+ -+ -+ -+1159105607E3DB104F21C6D584C2470DA6757609FCB5F041BC8DF37995D178CD501CD6E3E7 -+ RADYO KLAS -+ -+ -+ -1 -+ 103.1 -+ -+ -+ -+11591056074FBE7B317764E18E47444F0C5605B7A4AA0E6E8C48E995846ED16A9D447F5DF4 -+ KISS FM -+ -+ -+ -1 -+ 104.3 -+ -+ -+ -+1159105607813B68DE1187BC92E8443057F779259412E0F5C5A19B6F48234809F58ED80E74 -+ RADYO SAHİL GÜVENLİK -+ -+ -+ -1 -+ 104.7 -+ -+ -+ -+1159105607FDD595CBC65F79B5308FA63D07B3492AF46849A8892EECF9D50907E5A49F75C3 -+ RADYO MEGA -+ -+ -+ -1 -+ 105 -+ -+ -+ -+1159105607FD0B95759823566EF1414449C2B4A747605E9C9994A559E3DD3AE72B603ED397 -+ YILDIZ - FM -+ -+ -+ -1 -+ 105.3 -+ -+ -+ -+11591056072E1066F35321AE34E12FEEF7B0EDBBB65CB33830D9026DFC936049285A0F7F90 -+ RADYO İZMİR 1 -+ -+ -+ -1 -+ 105.5 -+ -+ -+ -+1159105607F87CE144CC085AE076248CE7689A592571F142D16E26261229BE68BD99E69C0F -+ POWER TÜRK -+ -+ -+ -1 -+ 105.7 -+ -+ -+ -+1159105607957DCEA71BC3720EC830BA271A93149816AF306870516E1B4E5F62EFD22DC213 -+ RADYO MAYDANOZ -+ -+ -+ -1 -+ 106 -+ -+ -+ -+115910560765128416B0A5B64C0F1ACD2416FA82F09BC57C729FA982D1333C43016761F906 -+ RADYO 5 -+ -+ -+ -1 -+ 106.3 -+ -+ -+ -+1159105607ABADBA5D050666CD5490144F32CC52C8DFCB1697610B885FA4B3E4ACA0489C5D -+ MARMARA FM -+ -+ -+ -1 -+ 106.7 -+ -+ -+ -+1159105607B430DF02D6E1DF350808F9BB1259A2DA0C0610EF236A642DC8EB6015DE926E2B -+ RADİO SPORT -+ -+ -+ -1 -+ 107 -+ -+ -+ -+1159105607DEFBE0652474F7C9279D33917322527B9B49AB91D0F5BA571B38BCFCEC5746D4 -+ DEMOKRAT RADYO -+ -+ -+ -1 -+ 107.3 -+ -+ -+ -+1159105607D69CD982A9991158EF55CF55931CE256E36CB987D47EE8F96BAB7599DF323996 -+ RADYO GÖKKUŞAĞI -+ -+ -+ -1 -+ 107.6 -+ -+ -+ -+1159105607C5C1733FC47A4D8400C1FE885FFF45C80A378DC50971AB47AA459209E7B188B9 -+ RADYO DOKUZ EYLÜL -+ -+ -+ -1 -+ 108 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am 2012-11-25 00:48:00.000000000 +0100 -@@ -1,10 +1,14 @@ - SUBDIRS = --EXTRA_DIST = "adapazari-antenna.krp" -+EXTRA_DIST = "adapazari-antenna.krp" "istanbul-antenna.krp" "izmir.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/" - $(INSTALL_DATA) "$(srcdir)/adapazari-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/istanbul-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/izmir.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp" - - uninstall-local: - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp" -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,285 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Igor Shavrin shih@i.ua -+ 2007-09-24T01:34:37 -+ Ukraine -+ Kyiv -+ antenna -+ Generated from http://www.proradio.org.ua -+ -+ -+ -+1190568285E2B7D4E87359DE08E1C16FF2A41E2CC4B4079B9D587F66F9DAE1943C32413C48 -+ 1+1 TV -+ -+ -+ -1 -+ 91.75 -+ -+ -+ -+1190568345ADD24685A544861E9BB16C04C9E3D475CC7A53B57AB349052F68D130F313C4B1 -+ Retro FM -+ -+ -+ -1 -+ 92.4 -+ -+ -+ -+1190585238FF5CDED1F6E49D979E1C6E8586464ABC5963D3821EE8A2700E280242DBEAD939 -+ Europa Plus Ukraina -+ Europa+ -+ -+ -1 -+ 92.8 -+ -+ -+ -+1190568386558A019551B727BAA9B7E6597371BE9B786A7FA4D579B90CE762BB193AA7B441 -+ Radio Kontinent -+ Kontinent -+ -+ -1 -+ 94.2 -+ -+ -+ -+11905684061104A7FFAF246E4D84AA2387207120AA39C33D45E589BB89055F4F7FDEFB82DD -+ Love Radio -+ -+ -+ -1 -+ 95.2 -+ -+ -+ -+11905684242BF5811F0423AFCB4073E9C8A3CFFBF24665B4F909CA9A4F99CBD5BBC036BE3B -+ Jam FM -+ -+ -+ -1 -+ 95.6 -+ -+ -+ -+119056843858C509C9C78DF4C47EA8A8DAC2C52B0A337905BA53708A22DD133B01C0B1B824 -+ ERA FM -+ -+ -+ -1 -+ 96 -+ -+ -+ -+1190568357D10207D487D67CF384A86594ECAFE68E392EFCA113BFF7E46CEB0D8B931DAFB8 -+ HIT FM Ukraina -+ -+ -+ -1 -+ 96.4 -+ -+ -+ -+119056848271CC0E7F7A1FBFBCF9199138ED8A9A0C523EA5108ABA25E1307C126E7BD74401 -+ Renesans -+ -+ -+ -1 -+ 96.8 -+ -+ -+ -+11905684983370750F90BD5C902D66EBDFE5296BD5651766EFD709E4704B22548DBDAF7308 -+ Radio Kyiv -+ -+ -+ -1 -+ 98 -+ -+ -+ -+1190568511F84481912290B9578CF4B8E7919E6638815FCD4570430CD1B0DEB4C711F64BF0 -+ Russkoe Radio -+ -+ -+ -1 -+ 98.5 -+ -+ -+ -+1190585757834E40A75A390555FDAF2FD8F879BE84C1A4200B48576DE998BCEA2FC5E62DF8 -+ Nostalgie -+ -+ -+ -1 -+ 99 -+ -+ -+ -+1190568560F0EE4F93BBB53A68B0281C926A5BD23C335B5D1D329947E2C0A52DAE396749C7 -+ Radio One -+ -+ -+ -1 -+ 99.4 -+ -+ -+ -+11905679324E90F6002986D3368F12F1CFEE67E990F11A9C6DEE84CB5AF68299405FD665D2 -+ Gala Radio -+ -+ -+ -1 -+ 100 -+ -+ -+ -+1190568578411C4F3F6FA8981F3F2BFD5CCA61C19A25F35BEE712D3C71E030FACD22E99B0B -+ Narodne Radio -+ -+ -+ -1 -+ 100.5 -+ -+ -+ -+11905686031692090120A5CCB19D0C832CE9CBAF0F82401488F5D50998B59251BE3ABED287 -+ Melodiya -+ -+ -+ -1 -+ 101.1 -+ -+ -+ -+119056861728940CAC20705F67C7F2C856BBA6848E21899374B76A38EBDB313B8591A9686B -+ Music Radio -+ -+ -+ -1 -+ 101.5 -+ -+ -+ -+119056862470D26DB3B12FED7B8ED2DC4508E163BD9BAABA42D048F56B213F13C597D69025 -+ Garne Radio "Shanson" -+ -+ -+ -1 -+ 101.9 -+ -+ -+ -+11905686391B87595BB9BEC38746C9C3E947AA6D55A0A4C552772A10E0F80CE500953927FC -+ Prosto Radi.O -+ -+ -+ -1 -+ 102.5 -+ -+ -+ -+1190568655B5EB86D24DD802856EC39BBEBC51BF22050169329E05C2F860A484FBD6313DFB -+ Lux FM -+ -+ -+ -1 -+ 103.1 -+ -+ -+ -+11905686799F70922A7C9F9FD1EB52C97F2151C5AB4821C2C3BAEAB8A665CC01994442666C -+ Radio Rox -+ -+ -+ -1 -+ 103.6 -+ -+ -+ -+1190568692FD2A3434E88AE180B7DDD0B4F56A5E5AE51759D6F3F56DF9CC27718AFA269676 -+ Radio Sharmanka -+ -+ -+ -1 -+ 104 -+ -+ -+ -+1190568717454DE097A03235C880EACCC7C40BDDBFC2EB270C88B8734B91595DF4BA8D5249 -+ NRJ Hit Music Only -+ -+ -+ -1 -+ 104.6 -+ -+ -+ -+119056872687EECA44E2309197D198412A1887DE7F0B2449EF314EA607FF35B5F170FC7A37 -+ Ukrainske Radio 1, Promin 2, Kultura 3 -+ -+ -+ -1 -+ 105 -+ -+ -+ -+1190568745E5015664A7B31B09C9613B79F8EC8962BF2CB26175427DAF927F844A0287C479 -+ Perets FM -+ -+ -+ -1 -+ 105.5 -+ -+ -+ -+119056875609A0A52CFBE42B09E02389F481B47B3A0F4788D7FA244C0348D39A55E58022B0 -+ Dorosle Radio -+ -+ -+ -1 -+ 106 -+ -+ -+ -+119056876964244E846B8E8C747093DD99C135F11B0CD12BCD83B3425453F00E76FE83686E -+ Dance radio "Kiss FM" -+ Kiss FM -+ -+ -1 -+ 106.5 -+ -+ -+ -+1190568784E96F88515B6C5A632D94FD3DDA890DF833807614BA2B3B48B73E6FA2A47D2CA1 -+ Europa FM Kiev -+ -+ -+ -0.01 -+ 107 -+ -+ -+ -+11905687949FDD940404BDB04A08D1D424537F3BA1B276ADDC688AC7B08BA7F8509C9DF904 -+ Auto-Radio Ukraina -+ -+ -+ -1 -+ 107.4 -+ -+ -+ -+1190568804C04E9CCFBED42FE3B715B52A019A58DDA156C4E489D2F782F2E63C96D1DEF49C -+ Nashe radio -+ -+ -+ -1 -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,274 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ -+ -+ -+ -+ -+ -+ -+ -+ 119273391379030B77DD389261E2FBA0A991B6701AF3A5862288308F40C544DA814C20062B -+ Перший Національний -+ ТБ1 -+ -0.01 -+ 65.75 -+ -+ -+ 1193316494B73351D34EF40803093A58359F67A37F7E8ED38E149F13D094A7905E06E42474 -+ Українське Радіо 1 -+ Радіо1 -+ -1 -+ 68.5 -+ -+ -+ 11933165321752787BF1002D79ACE570EE9B87CCBBCF246E72E419A7BE774439E089F5D44A -+ GALA Радіо -+ -+ -1 -+ 69 -+ -+ -+ 1193316570E34F57BD024F9CB7EF6C51C4F87FBF1411D36A02B804C5087321F7D3DD0ECA90 -+ Радіо "Промінь" -+ -+ -1 -+ 71.3 -+ -+ -+ 11933167682F7B1489DDF8BA166B64AEAC020BD9AB32BC286C12CCABDBEA80A35B5E43BD6E -+ Студія Майдан -+ -+ 1 -+ 72.1 -+ -+ -+ 11934927917C3A29AD199B030CBC096B56CF0305BA7D65E112F492AB599F562F27493D6107 -+ Радіо "Культура" -+ -+ -0.01 -+ 72.86 -+ -+ -+ 11934928943D70A4E7FE3DAF3F5BF2705C3969F3B99BB6C0553CA824E1F68E5EA9F1A8C884 -+ Радіо "Ренесанс" -+ -+ -1 -+ 73.6 -+ -+ -+ 1193316628EC33AA5B9929BF4C2631419F0D92BD2F7383D5D729D88DBAC41A26E508A85A7A -+ 1+1 -+ ТБ2 -+ -0.01 -+ 91.75 -+ -+ -+ 1193316720AA067FCA76F0C1D40116F62296E77CA12F35FD747922056E9A187C9EB78BB8B4 -+ Радіо 5 - Ретро FM -+ -+ -1 -+ 92.4 -+ -+ -+ 1193316785C490D8F8B28F9162A65D003FFEF4671633A4A077142D6B289FB47C3FE3EC79CA -+ Радіо "Europa Plus Україна" -+ -+ -1 -+ 92.8 -+ -+ -+ 119331681445D8A1D12737761FAC73F3EBEDE3D113C96F8D7A3072F6BA50107BEC2E20C561 -+ Радіо "Континент" -+ -+ -1 -+ 94.2 -+ -+ -+ 1193316826104C89BB1C8D151978F203860D8365D823887E838A590C5647A7888B4EA98EC9 -+ Love Radio -+ -+ -1 -+ 95.2 -+ -+ -+ 11933168995119FD101E5D954F34B599ABB081A108B810AF992A1373662764B3D225A1BCB6 -+ Радіо "Джем FM" -+ -+ -1 -+ 95.6 -+ -+ -+ 11927339390C925CC6F4D2FFC1A39CB31E29BD522BCE8D9ABA40F583629678876816CE2A98 -+ Радіо "ЕРА FM" -+ -+ -1 -+ 96 -+ -+ -+ 11933169254CD9D9791B9F273C4813420DC8FC90514E836161B3CDC2F991AC54E6BC3A28A5 -+ ХIT FM Україна -+ -+ -1 -+ 96.4 -+ -+ -+ 11933169780A493D079BFF56533C5053CEA8FE02353BD90310F14495816E68CF86A74DF015 -+ Радіо "Ренесанс" -+ -+ -1 -+ 96.8 -+ -+ -+ 119331699790CF2CEFAC144AC8DE31A870920A047FC7C6032AA36CE108C2F8650447949673 -+ Радіо Київ -+ -+ -1 -+ 98 -+ -+ -+ 1193317011853A0311E4EC1F465CECA08BAB32174E31A836E55DF7CBA4888BC6F5F5A0C127 -+ Русское радио Україна -+ -+ -1 -+ 98.5 -+ -+ -+ 1193317033B598FBEDC8EABE2B9D942948474DE8A883AA4C7F8A67D09A3E95A76EE9173005 -+ Радіо "Nostalgie" -+ -+ -1 -+ 99 -+ -+ -+ 1193317086C9C8D6C58704A210A165F228AEC16247F8B762407EA5310529D31452E916770D -+ Radio One -+ -+ -1 -+ 99.4 -+ -+ -+ 1193317113A97FA7ECBFA63810E2A2057D466C163AFA77A84ED004D6B68D24C64D5B58F260 -+ GALA Радіо -+ -+ -1 -+ 100 -+ -+ -+ 11933171496457288D14D60DC35B0881F57DDF96C69A4A11E1DB04F13586FAF5E6D864C2DE -+ Народне радіо -+ -+ -1 -+ 100.45 -+ -+ -+ 1193317177C554C7CF311160E3FD986FC8CAA7BDA7710B3CB1558E3BF482BCBBABE7F5653C -+ Радіо Мелодія -+ -+ -1 -+ 101.1 -+ -+ -+ 119331719696B32B0FC85E58AA2DBE73FABAE6E48F944E6DDF47149319834D58BF72709178 -+ MusicРадіо 101.5FM -+ -+ -1 -+ 101.5 -+ -+ -+ 11934929310E6587D3850F1271122E6F0EDB876906C8322E0AC9D7420EBFE33412288DB24B -+ Гарне радіо "Шансон" -+ -+ -1 -+ 101.9 -+ -+ -+ 1193317221249DCB1C7B41AD3B55410BE79B37A6A0255EFE17FCD590BF2555F1EBBA79696B -+ Просто Раді.О -+ -+ -1 -+ 102.5 -+ -+ -+ 1193317243B36E1F3F4F27D1638AD01331ABB4A2CF35E3614E64E54BB245A8BF4646FD9098 -+ Люкс FM -+ Люкс FM -+ -1 -+ 103.1 -+ -+ -+ 1193317469ABB39852E8DC69F360F2D9D920193307D7333BE3DC2B6A661F796B316709FEA1 -+ Радіо РОКС Україна -+ -+ -1 -+ 103.6 -+ -+ -+ 1193317255835DCE993DBAD5D6179A124D84301373F933B474A95849C1B29CA26B416D6271 -+ Радіо Шарманка -+ -+ -1 -+ 104 -+ -+ -+ 11933172801EACE4A7FE3F78FCAE40F4C93C5C3C4E44F57967CD206D7567429A11898B05F7 -+ NRJ Hit Music Only -+ -+ -1 -+ 104.6 -+ -+ -+ 11933172951418D970E5224A322D5D3CDE884E17FF9A77AFEE45038A700C283BCDF4546971 -+ Промінь -+ -+ -1 -+ 105 -+ -+ -+ 1193493005253C16A430195E9F18969767B0A2C3F2ED37DF1A2C9307977481F7848345F23B -+ Радіо "Перець FM" -+ -+ -1 -+ 105.5 -+ -+ -+ 11933173102BF63585CC18E76ECAE440C6EF690DDD1F564FC7F98B900A640DA0F9FAA97FEB -+ Доросле радіо -+ -+ -1 -+ 106 -+ -+ -+ 11933173320EB03AC65D7E9302C66AC44B173E19A37F5075E812B5C13413B3E38E6AED2244 -+ Dance radio "Kiss FM" -+ Kiss FM -+ -1 -+ 106.5 -+ -+ -+ 1193317353991E196D4840CAA699A52C9560081AC37D77CC34073594673069F8B347017151 -+ Радіо "Europa FM" -+ Europa FM -+ -1 -+ 107 -+ -+ -+ 11933173660CA24F98EDC6DE77443FE71898A479B6BACAC5FE7B85C6A08CC96714689CE881 -+ Авторадіо-Україна -+ -+ -1 -+ 107.4 -+ -+ -+ 1193462232F3BBCE734B7DE4DE9B2158DC76B0AB5A88910A99720CFEC43C02F16E87E22E23 -+ Наше Радіо -+ -+ -1 -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,143 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Igor Lobov <ivl@front.ru> -+ 2009-03-09T15:03:15 -+ Ukraine -+ Lugansk -+ -+ -+ -+ -+ 1064330466317A41A714F7A3C70B22A8F4F88EFF1AD5870570230FAC49A74C6528C435FC32 -+ Люкс FM -+ Люкс FM -+ -+ -1 -+ 90.8 -+ -+ -+ 1236531204D675F1E3913FCD945685B736986EB65B4576DBEF430FA337D3355E6655114EC7 -+ Шансон -+ Шансон -+ -+ -1 -+ 91.3 -+ -+ -+ 1236532766B6BB266A8C8AF15F1FA2F7A1F4461D5DE0E36260BD220F78729380ACA3406C9B -+ Ретро FM -+ Ретро FM -+ -+ -1 -+ 91.9 -+ -+ -+ 123652999119E06577B29B9481F49463944679117D38DE47AB2BEE399E28B27C513527092D -+ Шарманка -+ Шарманка -+ -+ -1 -+ 100.4 -+ -+ -+ 123653079854CDC1FA489FD9BC0C9018688138439EF1748E7BAE978D1CF37CEE1DC221B809 -+ Мелодия -+ Мелодия -+ -+ -1 -+ 101.1 -+ -+ -+ 1236530818BA5A7BD0D0F5C8054A78EE43566C46EAABF99A316503E0B994C39788CCE173DC -+ Авторадио -+ Авторадио -+ -+ -1 -+ 101.8 -+ -+ -+ 1236532798123231CCB6DC001884D40CE507985DC23093DE1B72397A6D81CD9D2DC6BA286E -+ М-FM -+ М-FM -+ -+ -1 -+ 102.3 -+ -+ -+ 1236532812AB511522487A6B437E83DB867BD18E756C18FE228864BCE14210651F5FAC9F80 -+ Русское радио -+ Русское радио -+ -+ -1 -+ 102.9 -+ -+ -+ 1236530838F517539CE7C5DFC59F97A7B561EA5F01A545D5142C6F3D85CBA980B86B55AE19 -+ Пульс -+ Пульс -+ -+ -1 -+ 103.6 -+ -+ -+ 123653086143C3C71D4F8FCF61645F0655E43058A049124EB95D09189797463C0A6DA402F1 -+ Хит FM -+ Хит FM -+ -+ -1 -+ 104 -+ -+ -+ 1236530899DE7E038C4D62B940D7BEF4D05B90384E131BE490EEA2AEEF870D8160EDCB96B1 -+ Европа + -+ Европа + -+ -+ -1 -+ 104.8 -+ -+ -+ 123653093974B772F5351BF4CE172C68E24EF386EB62BEDE1A1180BB09765AB49F261B2A1C -+ Эхо -+ Эхо -+ -+ -1 -+ 105.5 -+ -+ -+ 123653099504B71EFC17B5F7F3EBDE2EA0617249C65BB59B7741BF1F3D849E26650E9F2C3C -+ Наше радио -+ Наше радио -+ -+ -1 -+ 106.1 -+ -+ -+ 1236531097D21AAB0774E01FCA1CFF26D1EF66074A64E316210A998AD806A60DBB741F0E18 -+ Гала радио -+ Гала радио -+ -+ -1 -+ 106.5 -+ -+ -+ 123653114112A4E959FB3005DF5381500039A1F9FC4AC640902606A73982B3F0532CDBEFB8 -+ Скайвэй (KISS FM) -+ Скайвэй (KISS FM) -+ -+ -1 -+ 106.9 -+ -+ -+ 123653282541358FF62E3196D45E6B221CB959E72B914B0D929AA066ADC7D49F90F6B1F7F6 -+ Радио ЭРА -+ Радио ЭРА -+ -+ -1 -+ 107.3 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,160 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Volodymyr Petlovy -+ 2008-11-30T16:59:00 -+ Ukraine -+ Lviv -+ Radio -+ All stations in my city -+ -+ -+ -+122799021780C192F2D1A07BFE06D065A65E515F0C739CDFCD1AA6BCDF826A4F302ED9C252 -+ Національне Радіо -+ Національне Радіо -+ -+ -1 -+ 67 -+ -+ -+ -+122799022189C2C08CBAB32132F909F1D32133FAA5D8B64531FB163C2274EC9D739AC3F934 -+ Радіо Промінь -+ Радіо Промінь -+ -+ -1 -+ 68.9 -+ -+ -+ -+12279902652D4188864C39EFFC4FF5477D13D243F6B8F3C8EAAF74C37941251E9D7739B29F -+ Ера ФМ -+ Ера ФМ -+ -+ -1 -+ 88.6 -+ -+ -+ -+1227990268237C351DE729E01F7FE8A905B3C6D2C9AB20955F906700DA9DB36C079BCC623D -+ Еко ФМ -+ Еко ФМ -+ -+ -1 -+ 89.6515 -+ -+ -+ -+1227990272C61931B94C013586810D19FA1F67FC13C5BD6CCB00B09353D41AE2C9FC113D30 -+ Радіо Ман -+ Радіо Ман -+ -+ -1 -+ 91.1 -+ -+ -+ -+122799027388059A3A027955641E923A4867BC6C48355F7D08781AF8BE81AD0F9C220A1815 -+ Love Радіо -+ Love Радіо -+ -+ -1 -+ 91.5 -+ -+ -+ -+12279902969752ED3FD1DEC7E32F6B113D4E98DFD955287B2AE274B75B0E87235E66367D43 -+ Львівська Хвиля -+ Львівська Хвиля -+ -+ -1 -+ 100.8 -+ -+ -+ -+1227990297623905720B162E2F976651CAB458673C653A82D4A4C6DA8909E9B38A9B3B867B -+ Гала Радіо -+ Гала -+ -+ -1 -+ 101.3 -+ -+ -+ -+1227990300A33527E201DA266374163FB150CF5CA19161D3980488E92D3BDD8086BA9F7970 -+ Ретро ФМ -+ Ретро ФМ -+ -+ -1 -+ 102.5 -+ -+ -+ -+12279903043A16C0F1AABD2687E1E3BE3FD9E65EC3F3194117FAB45A4F9B4C3374658E6720 -+ Радіо One -+ Радіо One -+ -+ -1 -+ 103.902 -+ -+ -+ -+1227990305979E314884161454A31F33EC95684D57F542C0C3E78721F4995C4BE15AE0FFE4 -+ М ФМ -+ М ФМ -+ -+ -1 -+ 104.3 -+ -+ -+ -+122799030605312B35769EDF40268CFB4824B5C1B88C9A9DC0A5AFCB729A3A8E0E78693D04 -+ Радіо Люкс -+ Люкс -+ -+ -1 -+ 104.7 -+ -+ -+ -+1227990308187904A3FD5401A07636FA3D523DF6D59A2C25B950519986D576180F9AA897CB -+ Авторадіо -+ Авторадіо -+ -+ -1 -+ 105.4 -+ -+ -+ -+12279903109883D98CC3DF88D59F8574CCD0E71A9B9A23180889A31A979703D600022E47A9 -+ Наше Радіо -+ Наше -+ -+ -1 -+ 106 -+ -+ -+ -+12279903121852B0BB31EFCC3B65D74FBC51A71F89C8D83D65FE6C7BEFD78DBD8B0215A47E -+ Радіо Незалежність -+ Незалежність -+ -+ -1 -+ 106.7 -+ -+ -+ -+122799031353196770DF4ED04D9D1C1CE3BB21C661B7E58D45F0A9675601C99746619519F6 -+ Радіо Мелодія -+ Мелодія -+ -+ -1 -+ 107.103 -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,17 @@ -+SUBDIRS = -+EXTRA_DIST = "kyiv-antenna.krp" "kyiv.krp" "lugansk.krp" "lviv.krp" "nikolayev.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/" -+ $(INSTALL_DATA) "$(srcdir)/kyiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/kyiv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp" -+ $(INSTALL_DATA) "$(srcdir)/lugansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp" -+ $(INSTALL_DATA) "$(srcdir)/lviv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp" -+ $(INSTALL_DATA) "$(srcdir)/nikolayev.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp ---- kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,150 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ Vadim Bu <panoptus@gmail.com> -+ 2000-01-01T00:00:00 -+ Ukraine -+ Nikolayev -+ -+ -+ -+ -+ 1281291324881640300A9656B36F2C8FB7C0CBF62F9876BF91EF206ADCD406E3854756 -+ ТВ -+ -+ -+ -1 -+ dontcare -+ 65.8 -+ -+ -+ 128129138506DF5A35A7530F941618DD6AFE504718D2EC8394947C3E26F33BCAD769D4 -+ Первый канал укр. радио -+ -+ -+ -1 -+ dontcare -+ 69.85 -+ -+ -+ 12812013750E66C763E47D9FD3AA8F5A5C0833B02B80757ABC86852CFB2538D8EE1769 -+ ХитФМ -+ ХитФМ -+ -+ -1 -+ dontcare -+ 91.5 -+ -+ -+ 1281201553DF8B2D6C7D312C77A4B85AC6D831ACA3FD386E2ACE23ECD292C52CAD4BF8 -+ Радио Алла -+ Радио Алла -+ -+ -1 -+ dontcare -+ 100.1 -+ -+ -+ 1281201897F0FEDF0D65FA7843847268C92807EC96BDFE3A601F49B2C40CC3D8256369 -+ ОкФМ -+ ОкФМ -+ -+ -1 -+ dontcare -+ 100.8 -+ -+ -+ 12812014665AC9DD7F71ABF382654AA324D618DD173C0CD43166B35167FFA6D5977CEE -+ Русское радио -+ Русское радио -+ -+ -1 -+ dontcare -+ 101.6 -+ -+ -+ 12812015256E6C171F895496A945901A91FF91C92E2F37800C256AB29AB1C5AAE8D9BF -+ Кисс ФМ -+ Кисс ФМ -+ -+ -1 -+ dontcare -+ 102.1 -+ -+ -+ 12812015381A12F5CEB14337821BD569BFB00F016CF21617F60B718F9C8E70E9563AAC -+ Наше радио -+ Наше радио -+ -+ -1 -+ dontcare -+ 102.75 -+ -+ -+ 12812909149BEFA3A4DD95C41B19CE8110C3BE638D33F712C45D21272C119512A1D552 -+ Авторадио -+ Авторадио -+ -+ -1 -+ dontcare -+ 103.35 -+ -+ -+ 12812898487D26BFE955AF336F67A743540DBB78557C3DC79C18FB7281BE35CB6ED8A2 -+ Взрослое -+ Взрослое -+ -+ -1 -+ dontcare -+ 104.1 -+ -+ -+ 128120125873F1C0A0B9F8F7844149BB02E340FB8B117B27EB34E755BF77D67BAD5A08 -+ Просто -+ Просто -+ -+ -1 -+ dontcare -+ 104.6 -+ -+ -+ 128120159508376D674AB7C609B1B38CFE0592A3F53AA7C2F2E5D369514888DF9BC255 -+ Мелодия -+ Мелодия -+ -+ -1 -+ dontcare -+ 105.1 -+ -+ -+ 128120161385DDA12FD03D03056C8707135DDC5D04AF9D8E0B91E5E1AE68BC8F8A0163 -+ Ретро -+ Ретро -+ -+ -1 -+ dontcare -+ 106.4 -+ -+ -+ 1281201626F402B08396B731E230EA16EFE90C3889ACF99F4E2E4DC4AB445D980141FD -+ Люкс ФМ -+ Люкс ФМ -+ -+ -1 -+ dontcare -+ 107.1 -+ -+ -+ 1281201639D78071860C8AB2ED93CB078E4EEDDD2B02620617AE124B5F9AB0F0D66A7E -+ Эра -+ Эра -+ -+ -1 -+ dontcare -+ 107.7 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp ---- kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,193 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-1.0beta3b -+ Lester Hinton -+ 2007-08-19T22:25:00 -+ USA -+ Newburgh, IN -+ FM Radio -+ Evansville,IN area Stations -+ -+ -+ 11875741170887A5CACEB53D24EC0C7E6446F3A2C6BEBFD9D2EC483839162385C9C7C4EB96 -+ WABX Classic Rock -+ -+ -+ -1 -+ 107.5 -+ -+ -+ 118757413136CB812379364A402F733E1BEDC25E60D77645F00831F07BE96FF30888324EBD -+ Jack Fm -+ -+ -+ -1 -+ 107.15 -+ -+ -+ 1187574832B2142319AC87045E95B530F52CA9F24B6E980A33BD87DFD04A6360A7B9768BC9 -+ Kiss FM -+ -+ -+ -1 -+ 106.1 -+ -+ -+ 11875754000F53E03278CB5C0450067CFDBE79C3BD498890A966610D9A621D2E872821D056 -+ CJ Classic Hits -+ -+ -+ -1 -+ 105.7 -+ -+ -+ 1187575470E6F0B059EEB24BCA55192507774F5AD1F0ECB78742AA260B767B22064D067140 -+ WJLT Super Hits -+ -+ -+ -1 -+ 105.3 -+ -+ -+ 11875757671EBA54F567804703E6B930BF68D50673086F33AFCEB24287086044932E622792 -+ -+ -+ -+ -1 -+ 104.7 -+ -+ -+ 11875758930AB9977E06DC0FA833EF912E98B3B9E37B31D6DA9CC5A69E229955C315BF70A6 -+ WIKY Evansville,IN -+ -+ -+ -1 -+ 104.1 -+ -+ -+ 118757661829503869856F302C684C9C601EB4CD0CE53178A44C81955A7C7807C43E92A7A9 -+ WGBF River City Rocker -+ -+ -+ -1 -+ 103.1 -+ -+ -+ 1187576723EC47FF2944185BF9C69026961B2CB67841231B5BA5E097BEA9A066318DDD386C -+ WLME Lewisport, Kentucky -+ -+ -+ -1 -+ 102.7 -+ -+ -+ 1187576885BAF94B352929D819FFDA48B3E2CC49FA4810DB9479760A951E1877585E64B8C9 -+ WQXQ 101.9 FM -+ -+ -+ -1 -+ 101.9 -+ -+ -+ 1187577250796D54BAB65FF0838225F239224D8F4C101895811597D16E8B5779F88F0AE4D4 -+ WBGW Religious Fort Branch -+ -+ -+ -1 -+ 101.5 -+ -+ -+ 11875778905CB94237C96056BEF23AC744D8C26E97ADC80A26800757CC4AE54965AF744463 -+ 97X Classic Rock Owensboro, Kentucky -+ -+ -+ -1 -+ 97.1 -+ -+ -+ 1187578481AF82158EBA23A77E7F9BC8FB829E837A56979F8466923C39C8D6A35819F8B94F -+ Hot 96 WSTO Owensboro, Kentucky -+ -+ -+ -1 -+ 96.1 -+ -+ -+ 11875787904D7AE91F09E8FE5B81045E192A2899C1650FDE2FE93ED0FC3FAE6F1249075FFA -+ Classic Rock -+ -+ -+ -1 -+ 94.9 -+ -+ -+ 1187578936195A8EE8BC81E698E18BA81AC866D658B940BC852EFB48F6AE04067439D24866 -+ WKTG Power Rock Owensboro, Kentucky -+ -+ -+ -1 -+ 93.9 -+ -+ -+ 1187579126CAB93F22412297E9BECBD5D4B65207F2223EDE413AE49F6B210CCFF9DB58BA58 -+ WUEV College Evansville, IN -+ -+ -+ -1 -+ 91.5 -+ -+ -+ 1187579275AFEB205731B134D9C4ABB89CAAFE5EEBD97C251C883F31DDB87A5558BACA39D4 -+ WVUB Vincennes -+ -+ -+ -1 -+ 91.1 -+ -+ -+ 1187579552DAB2CFE1FF6469FF4E9862013915EBF64AC189171BD06C156F12474A0C7C248B -+ WPSR Evansville, IN -+ -+ -+ -1 -+ 90.7 -+ -+ -+ 1187579681CFB4798BD9824971407C55F42514477C425A8D365844185D328C1A31F79CB744 -+ -+ -+ -+ -1 -+ 89.9 -+ -+ -+ 118757983754300B648DF30B8BCCE734305204B4F33FC53CA4C30AE14FF6A750C22896CD00 -+ Western, Kentucky Public Radio -+ -+ -+ -1 -+ 89.5 -+ -+ -+ 1187579929C4932368D87672C2DDE6B8E396BC108893903533E0567703B2F4F8E88D3DD9FC -+ The Bash Wabash Valley College -+ -+ -+ -1 -+ 89.1 -+ -+ -+ 11875800416C2FDE228F9D079430B49B1B156D28B464F36A0281D09DD1DEB2A1A62F4D8021 -+ WNIN Public Radio Evansville,IN -+ -+ -+ -1 -+ 88.3 -+ -+ -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am kradio-3.5.13.1/kradio3/presets/usa/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am 2012-06-26 02:49:50.000000000 +0200 -+++ kradio-3.5.13.1/kradio3/presets/usa/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -1,390 +1,395 @@ - SUBDIRS = --EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp" -+EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Indiana-newburgh.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "missouri-joplin-antenna.krp" "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "texas-odessa.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp" - - install-data-local: - $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/" -- $(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" -- $(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" -- $(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" -- $(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" -- $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" -- $(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" -- $(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" -- $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" -- $(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" -- $(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" -- $(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" -- $(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" -- $(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" -- $(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" -- $(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" -- $(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" -- $(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" -- $(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" -- $(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" - $(INSTALL_DATA) "$(srcdir)/Alaska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" -- $(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" -- $(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" -+ $(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" -+ $(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" -+ $(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" -+ $(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" - $(INSTALL_DATA) "$(srcdir)/California_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" -- $(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" -+ $(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" - $(INSTALL_DATA) "$(srcdir)/college-park,GA.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" -- $(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" -- $(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" -- $(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" -- $(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" -- $(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" -- $(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" -- $(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" - $(INSTALL_DATA) "$(srcdir)/Colorado.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" -- $(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" -- $(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" -- $(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" -- $(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" -- $(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" -- $(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" -- $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" -+ $(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" -+ $(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" -+ $(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" - $(INSTALL_DATA) "$(srcdir)/Delaware_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" -- $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" -- $(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" -+ $(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" - $(INSTALL_DATA) "$(srcdir)/District of Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" -- $(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" -- $(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" -- $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" -- $(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" -- $(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" -+ $(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" - $(INSTALL_DATA) "$(srcdir)/Florida_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" -- $(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" -- $(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" -+ $(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" - $(INSTALL_DATA) "$(srcdir)/Guam.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" -+ $(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" -+ $(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" -+ $(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" -+ $(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" -+ $(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" -+ $(INSTALL_DATA) "$(srcdir)/Indiana-newburgh.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp" -+ $(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" -+ $(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" -+ $(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" - $(INSTALL_DATA) "$(srcdir)/Kentucky_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" -- $(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" -- $(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" -+ $(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" - $(INSTALL_DATA) "$(srcdir)/Maine_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" -- $(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" -- $(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" -+ $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" - $(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" -- $(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" -+ $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" -+ $(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" -+ $(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" -+ $(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" -+ $(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" -+ $(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" -+ $(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/missouri-joplin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" -+ $(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" -+ $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" - $(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" -+ $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" - $(INSTALL_DATA) "$(srcdir)/New Jersey_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" -- $(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" -+ $(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" - $(INSTALL_DATA) "$(srcdir)/New York.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" -+ $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" -+ $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" -+ $(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" - $(INSTALL_DATA) "$(srcdir)/Pennsylvania_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" -- $(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" -- $(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" -- $(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" -+ $(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" -+ $(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" -+ $(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" -+ $(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" - $(INSTALL_DATA) "$(srcdir)/Tennessee_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" -+ $(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" -+ $(INSTALL_DATA) "$(srcdir)/texas-odessa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp" -+ $(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" - $(INSTALL_DATA) "$(srcdir)/Vermont_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp" -- $(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" -- $(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" - $(INSTALL_DATA) "$(srcdir)/Vermont_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" -+ $(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" -+ $(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" -+ $(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" - $(INSTALL_DATA) "$(srcdir)/West Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp" -- $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" -- $(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" -- $(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" -- $(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" -- $(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" - $(INSTALL_DATA) "$(srcdir)/Wisconsin_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" -- $(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" -- $(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" -- $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" -- $(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" -+ $(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" -+ $(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" -+ $(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" - $(INSTALL_DATA) "$(srcdir)/Wyoming_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" -- $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" -- $(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" -- $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" -- $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" -- $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" -- $(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" -- $(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" -- -+ $(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" - - uninstall-local: -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" - -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" -- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp ---- kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,96 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ Vanessa Ezekowitz -+ 2008-03-06T03:27:22 -+ USA -+ Joplin, Missouri -+ Antenna -+ -+ -+ -+ -+1204795416D327B29628F9A516E5FB37E10FE87051EC4814A5DB9310CE50567FB8CDAD8C0E -+ KXMS (Fine Arts Radio Int'l) -+ -+ -+ -1 -+ 88.7 -+ -+ -+ -+1204795416E12EDA0A2654A5BE583984CAAFC558B39A76BB7A1CD8CE2FB94A27F204F1934C -+ KSYN (Kissin') -+ -+ -+ -1 -+ 92.5 -+ -+ -+ -+120479541625C6582240A6ACB64070E43AEDF4652A7FD0B3D8F48BDD8ABAA3DA2794C6D4D8 -+ KJMK (Lite Rock) -+ -+ -+ -1 -+ 93.9 -+ -+ -+ -+1204795417914AAC2F66691FA07212B02F77AA7F5A3FCACC1F6217E9907D15444CC75D91CB -+ KXDG (Big Dog) -+ -+ -+ -1 -+ 97.9 -+ -+ -+ -+12047954174FB5470F53D45D70CA84226BC5F64B0566C0EAE6DDF701E0D6F7BC7791EE1471 -+ KBIN (Classic Country) -+ -+ -+ -1 -+ 99.7 -+ -+ -+ -+12047954170ABC15063AD62CEEECF710F339727F3F073C66C12713BBCBB2FA44C46254D61E -+ KIXQ (Kix) -+ -+ -+ -1 -+ 102.5 -+ -+ -+ -+1204795417E9D264C67939C2CA96378EE4BE54256EAF1C9DB6C5C75BA91D38AC4BFC966237 -+ KCAR (Cool 104) -+ -+ -+ -1 -+ 104.3 -+ -+ -+ -+1204795417E494F0F8E67F42AE4CFB364E20AC2E3B832C1724C5912E85C8DE2B06C467A4E1 -+ KMOQ (Q105) -+ -+ -+ -1 -+ 105.3 -+ -+ -+ -+1204795417E91429BBC4986C1F9B9BDCA2CF6FC0FFD829A66480FE077C75B70650B9FF5B36 -+ KJML (Rock 107) -+ -+ -+ -1 -+ 107.1 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp ---- kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,151 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-snapshot-2006-11-12-r497 -+ -+ -+ USA -+ Odessa,Texas -+ -+ -+ -+ -+ 116846129002F1F8194388299FC3139319A930591722CECB86569BAC9725A06B36B2FD8CC4 -+ KLVW -+ -+ -+ -1 -+ 96.9 -+ -+ -+ 11684613150AE00B186451ABD6D71B8367D23F52446D5F025EE36FED385E460193E70491A3 -+ KAWZ -+ -+ -+ -1 -+ 89.1 -+ -+ -+ 1168461334AF8D607D7EF147FF8B65CDD5C023A41ED5B062E5BC222D146F60020275063078 -+ KBMM -+ -+ -+ -1 -+ 96.9 -+ -+ -+ 11684613599F7116FBE9A5114CA9B4A2CE8D56B90F4E8C910A185DBDE551323127B9B3A568 -+ KFLB -+ -+ -+ -1 -+ 90.5 -+ -+ -+ 1168460870B8292553C2CF19E2E5FD3CA914DFC0C547A173C7B35562C20761A9BB0AE8E4D9 -+ KOCV -+ -+ -+ -1 -+ 91.3 -+ -+ -+ 1168460975331463C5B45FAB68AAFDA87E7459F3988B480B10A375BD6C1ECF8A23DE73A288 -+ KNFM -+ -+ -+ -1 -+ 92.3 -+ -+ -+ 1168461002342CFC649119A91BF7D0F4D53702C5EE4E74996C5995805A4C889B2714926578 -+ KZVT -+ -+ -+ -1 -+ 93.3 -+ -+ -+ 1168461019B99600290F3A77F620C3F956088E3543B5DB1490495E36E5BAA7240A80A95132 -+ KQRX -+ -+ -+ -1 -+ 95.1 -+ -+ -+ 1168461042CF2067ED36AAB605B6DD61F3DB4ABA0A2B62BBC7ECA3723193B29FFB6CA3CA68 -+ KMRK -+ -+ -+ -1 -+ 96.1 -+ -+ -+ 1168461068C54AB8B0F3EB77D0B55914ACC9C2C3C91A17EA3AB0BB7B62479B06962539B095 -+ KMCM -+ -+ -+ -1 -+ 96.9 -+ -+ -+ 116846108171A02F30F18036E75C6BFAC283F7F68B87AEEAB39D03C07A3D0590A4B4578F79 -+ KODM -+ -+ -+ -1 -+ 96.9 -+ -+ -+ 11684610993661B95209C8CC24B3A153BD2AB1D538BB28BF41AAC4E940E24130725F8B82AF -+ KHKX -+ -+ -+ -1 -+ 99.1 -+ -+ -+ 1168461120A076395C093FB1BA6315362B58A11EFADE461C5ACAD61AA51F7E66FB0FBEAA69 -+ KBAT -+ -+ -+ -1 -+ 99.9 -+ -+ -+ 11684611436094D7F632AB1EB4FAD57028DB098DB6E0D2055F0A96FD55525137EBD5C47A5B -+ KFZX -+ -+ -+ -1 -+ 102.1 -+ -+ -+ 1168461195282D1688F40C7FC5AA003DDC700EC5DD797FC632097B5E56176E024E04B4AF84 -+ KCRS -+ -+ -+ -1 -+ 103.3 -+ -+ -+ 1168461220137A9E713D061D38E11FB474360C007F1866EBA09325F489B29B345A15AF28F5 -+ KCHX -+ -+ -+ -1 -+ 106.7 -+ -+ -+ 1168461240BCBE9B8FD990C788128803DF787B796306066505548D89F71F3505D3BC837A6E -+ KQLM -+ -+ -+ -1 -+ 107.9 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp ---- kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,60 @@ -+ -+ -+ -+ kradio-1.0 -+ -+ kradio-4.0.0 -+ Pham Thanh Nam <phamthanhnam.ptn@gmail.com> -+ 2009-11-08T13:14:16 -+ Vietnam -+ Hanoi -+ FM -+ -+ -+ -+ 12576571600E343C50AE64ABBB128131D2438689F9BEA2D9C2BACE297416E68B309EA2 -+ Hanoi -+ -+ -+ -1 -+ stereo -+ 90 -+ -+ -+ 12576573057937209E795F1B379958B917FFDDD421456F10C75CC5AE901FFC55BC47DC -+ VOV2 -+ -+ -+ -1 -+ dontcare -+ 96.5 -+ -+ -+ 1257657101D508873DA1965BB87A96601283B0F78920CAD7DA951DD6DF74F1C98553F5 -+ VOV1 -+ -+ -+ -1 -+ dontcare -+ 100 -+ -+ -+ 12571038920FB7D70277EEDB473F783FF9C4BE09036A58A570581103530069FD2F7B7B -+ VOV3 -+ -+ -+ -1 -+ stereo -+ 102.7 -+ -+ -+ 1257657210A2BBEDF17CAE4283E948AAFFE9A8CF59ED4705780CB6C91189A1488DA04D -+ VOV5 -+ -+ -+ -1 -+ dontcare -+ 105.5 -+ -+ -+ -diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am ---- kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am 2012-11-25 00:48:02.000000000 +0100 -@@ -0,0 +1,9 @@ -+SUBDIRS = -+EXTRA_DIST = "hanoi.krp" -+ -+install-data-local: -+ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/" -+ $(INSTALL_DATA) "$(srcdir)/hanoi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp" -+ -+uninstall-local: -+ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp" diff --git a/redhat/applications/kradio/trinity-kradio-3.5.13.1.spec b/redhat/applications/kradio/trinity-kradio-3.5.13.1.spec deleted file mode 100644 index cc5903e88..000000000 --- a/redhat/applications/kradio/trinity-kradio-3.5.13.1.spec +++ /dev/null @@ -1,182 +0,0 @@ -# Default version for this component -%define kdecomp kradio - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Comfortable Radio Application for KDE [Trinity] -Version: 0.1.1.1 -Release: 5%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -Patch1: kradio-3.5.13.1-updated_preset.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: libsndfile-devel -BuildRequires: lirc-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}twolame-devel -%endif -%if 0%{?suse_version} -BuildRequires: libtwolame-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: lame-devel -%endif - -%description -KRadio is a comfortable radio application for Trinity with support for -V4L and V4L2 radio cards drivers. - -KRadio currently provides - - * V4L/V4L2 radio support - * Remote control support (LIRC) - * Alarms, sleep Countdown - * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) - * Recording capabilities, including MP3 and Ogg/Vorbis encoding - * Timeshifter functionality - * Extendable plugin architecture - -This package also includes a growing collection of station preset -files for many cities around the world contributed by KRadio users. - -As KRadio is based on an extendable plugin architecture, contributions -of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-lirc \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%{tde_bindir}/convert-presets -%{tde_bindir}/kradio -%{tde_libdir}/kradio/plugins/*.la -%{tde_libdir}/kradio/plugins/*.so -%{tde_tdeappdir}/kradio.desktop -%{tde_datadir}/apps/kradio/ -%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo - -%changelog -* Sat Dec 01 2012 Francois Andriot - 0.1.1.1-5 -- Updates presets - -* Wed Oct 03 2012 Francois Andriot - 0.1.1.1-4 -- Initial build for TDE 3.5.13.1 - -* Sun Jul 08 2012 Francois Andriot - 0.1.1.1-3 -- Rebuild for RHEL 5 -- Fix postinstall - -* Wed May 02 2012 Francois Andriot - 0.1.1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot - 0.1.1.1-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kradio/trinity-kradio-3.5.13.spec b/redhat/applications/kradio/trinity-kradio-3.5.13.spec deleted file mode 100644 index dfaedd47d..000000000 --- a/redhat/applications/kradio/trinity-kradio-3.5.13.spec +++ /dev/null @@ -1,164 +0,0 @@ -# Default version for this component -%define kdecomp kradio - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: Comfortable Radio Application for KDE [Trinity] -Version: 0.1.1.1 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: libsndfile-devel -BuildRequires: lirc-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}twolame-devel -%else -BuildRequires: lame-devel -%endif - -%description -KRadio is a comfortable radio application for Trinity with support for -V4L and V4L2 radio cards drivers. - -KRadio currently provides - - * V4L/V4L2 radio support - * Remote control support (LIRC) - * Alarms, sleep Countdown - * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) - * Recording capabilities, including MP3 and Ogg/Vorbis encoding - * Timeshifter functionality - * Extendable plugin architecture - -This package also includes a growing collection of station preset -files for many cities around the world contributed by KRadio users. - -As KRadio is based on an extendable plugin architecture, contributions -of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-lirc \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%{tde_bindir}/convert-presets -%{tde_bindir}/kradio -%{tde_libdir}/kradio/plugins/*.la -%{tde_libdir}/kradio/plugins/*.so -%{tde_tdeappdir}/kradio.desktop -%{tde_datadir}/apps/kradio/ -%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo - -%Changelog -* Sun Jul 08 2012 Francois Andriot - 0.1.1.1-3 -- Rebuild for RHEL 5 -- Fix postinstall - -* Wed May 02 2012 Francois Andriot - 0.1.1.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot - 0.1.1.1-1 -- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch b/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch new file mode 100644 index 000000000..9bb5fa5b4 --- /dev/null +++ b/redhat/applications/tde-guidance/kde-guidance-3.5.13-fix_wine_create_prefix.patch @@ -0,0 +1,73 @@ +--- kde-guidance/wineconfig/winewrite.py.wine 2010-08-12 05:25:24.000000000 +0200 ++++ kde-guidance/wineconfig/winewrite.py 2012-08-07 18:43:48.291577133 +0200 +@@ -60,14 +60,14 @@ + SetShellLinks(drives[26:]) + + def SetShellLinks(shelllinks): +- existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) ++ existingshelllinks = os.listdir(wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER']) + set(existingshelllinks) + shellregistry = wineread.GetShellRegistry() + + for link in shelllinks: + createLink = False + if link[1] in existingshelllinks: # The link exists +- linkpath = wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1] ++ linkpath = wineread.winepath + "/dosdevices/c:/users/" + os.environ['USER'] + "/" + link[1] + if link[2]: # The folder is mapped + # Compare for changes + changed = False +@@ -98,7 +98,7 @@ + continue + + if createLink: +- os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] + "/" + link[1]) ++ os.symlink(link[2], wineread.winepath + "/dosdevices/c:/windows/users/" + os.environ['USER'] + "/" + link[1]) + if shellregistry.has_key(link[1]): + SetShellRegistry(link) + +@@ -426,7 +426,7 @@ + if not path: + path = wineread.default_winepath + +- os.system("WINEPREFIX=" + path + " wineprefixcreate --wait") ++ os.system("WINEPREFIX=" + path + " wineboot") + + # ----- Theming ----- + +@@ -486,4 +486,4 @@ + winport = ports_translation[port.rstrip("012345678")] +\ + str(int(port.lstrip("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")) + 1) + os.symlink("/dev/" + port, wineread.winepath + "/dosdevices/" + winport) +- +\ Pas de fin de ligne à la fin du fichier ++ +--- kde-guidance/wineconfig/wineread.py.ORI 2012-08-07 18:44:08.910051574 +0200 ++++ kde-guidance/wineconfig/wineread.py 2012-08-07 18:44:38.675294351 +0200 +@@ -23,7 +23,7 @@ + # Assumes the fake windows is installed in ~/.wine + default_winepath = os.environ['HOME'] + "/.wine" + winepath = default_winepath +-defaultwinfolderspath = "c:\\windows\\profiles\\" + os.environ['USER'] ++defaultwinfolderspath = "c:\\users\\" + os.environ['USER'] + + # Where the dll's are + default_winebuildpath = "/usr/lib/wine" +@@ -113,7 +113,7 @@ + [30,"My Video","","","",""]) + + folder_nonexistent = "This folder does not exist, please map it." +-profilesdirectory = winepath + "/dosdevices/c:/windows/profiles/" + os.environ['USER'] ++profilesdirectory = winepath + "/dosdevices/c:/users/" + os.environ['USER'] + + def GetEmptyShellLinks(): + """ Returns a list of important windows folders """ +@@ -537,7 +537,7 @@ + if not path: + path = self.default_winepath + +- return os.path.exists(path + "/dosdevices/c:/windows/profiles/" + os.environ['USER']) and \ ++ return os.path.exists(path + "/dosdevices/c:/users/" + os.environ['USER']) and \ + os.path.exists(path + "/dosdevices/c:/windows/system32") and \ + os.path.exists(path + "/system.reg") and os.path.exists(path + "/userdef.reg") and \ + os.path.exists(path + "/user.reg") diff --git a/redhat/applications/tde-guidance/trinity-guidance-3.5.13.1.spec b/redhat/applications/tde-guidance/trinity-guidance-3.5.13.1.spec new file mode 100644 index 000000000..c0a61ba05 --- /dev/null +++ b/redhat/applications/tde-guidance/trinity-guidance-3.5.13.1.spec @@ -0,0 +1,414 @@ +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +%define __arch_install_post %{nil} + +Name: trinity-guidance +Summary: A collection of system administration tools for Trinity +Version: 0.8.0svn20080103 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.simonzone.com/software/guidance + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kde-guidance-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-pytdeextensions +BuildRequires: trinity-libpythonize0-devel +BuildRequires: python-trinity +BuildRequires: chrpath +BuildRequires: gcc-c++ + +# SIP support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +%endif +%if 0%{?suse_version} +BuildRequires: python-sip-devel +%endif +%if 0%{?rhel} == 5 +BuildRequires: trinity-sip-devel +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: sip-devel +%endif + +# PYTHON-QT support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-qt +Requires: python-qt +%endif +%if 0%{?rhel} == 5 || 0%{?suse_version} +BuildRequires: trinity-PyQt-devel +Requires: trinity-PyQt +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: PyQt-devel +Requires: PyQt +%endif + + +Requires: python-trinity +Requires: trinity-pytdeextensions +Requires: %{name}-backends +Requires: python +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +Requires: hwdata +%endif + + +%if "%{tde_prefix}" == "/usr" +Conflicts: guidance-power-manager +Conflicts: kde-guidance-powermanager +%endif + +%description +Guidance currently consists of four programs designed to help you +look after your system: + o userconfig - User and Group administration + o serviceconfig - Service/daemon administration + o mountconfig - Disk and filesystem administration + o wineconfig - Wine configuration + +These tools are available in Trinity Control Center, System Settings +or can be run as standalone applications. + + + +%package backends +Group: Applications/Utilities +Summary: collection of system administration tools for GNU/Linux [Trinity] +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +Requires: hwdata +%endif +Requires: python + +%description backends +This package contains the platform neutral backends used in the +Guidance configuration tools. + + +%package powermanager +Group: Applications/Utilities +Summary: HAL based power manager applet [Trinity] +Requires: %{name} = %{version}-%{release} + +%description powermanager +A power management applet to indicate battery levels and perform hibernate or +suspend using HAL. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n kde-guidance-3.5.13.1 + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" +export KDEDIR=%{tde_prefix} + +# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia +export PYTHONDONTWRITEBYTECODE= + +./setup.py build + + +%install +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" + +# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia +export PYTHONDONTWRITEBYTECODE= + +%__rm -rf %{buildroot} +./setup.py install \ + --prefix=%{tde_prefix} \ + --root=%{buildroot} + +# Fix building directories stored inside .py files +for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do + %__sed -i "${f}" -e "s|%{buildroot}||g" +done + +##### MAIN PACKAGE INSTALLATION +# install icons to right place +%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png +%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png + +# fix binary-or-shlib-defines-rpath +chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so + +# fix executable-not-elf-or-script +%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png + +# move python modules in %{python_sitearch} +%__mkdir_p %{buildroot}%{python_sitearch}/%{name} +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name} + +# fix the link properly +%__rm -f %{buildroot}%{tde_bindir}/* +#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig +%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig +%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig +%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig +%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig +%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig + +# (obsolete) put this here since gnome people probably don't want it by default +#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore + +# fix script-not-executable +%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py +%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py + +%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop + +##### BACKENDS INSTALLATION +# install displayconfig-hwprobe.py script +%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ + %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py + +# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} + +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB +%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB +%endif + + +##### POWERMANAGER INSTALLATION +# install icon to right place +%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ + %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%__install -D -p -m0644 kde/powermanager/pics/*.png \ + %{buildroot}%{tde_datadir}/apps/guidance/pics/ + +# install desktop file +%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ + %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop + +# copy python modules in PYSUPPORT_PATH +%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} +%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} +%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} + +# generate guidance-power-manager script +cat <%{buildroot}%{tde_bindir}/guidance-power-manager +#!/bin/sh +export PYTHONPATH=%{python_sitearch}/%{name} +%{python_sitearch}/%{name}/guidance-power-manager.py & +EOF +chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager + +# fix script-not-executable +chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py +chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py + + +# Replace all '#!' calls to python with /usr/bin/python +# and make them executable +for i in `find %{buildroot} -type f`; do + sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + $i > $i.temp; + if cmp --quiet $i $i.temp; then + rm -f $i.temp; + else + mv -f $i.temp $i; + chmod 755 $i; + echo "fixed interpreter: $i"; + fi; +done + +# Removes useless files +find %{buildroot} -name "*.egg-info" -exec rm -f {} \; +find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; + +# Removes obsolete display config manager +%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore +%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%postun +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%post powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + +%postun powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING README TODO +#%{tde_bindir}/displayconfig +#%{tde_bindir}/displayconfig-restore +%{tde_bindir}/grubconfig +%{tde_bindir}/mountconfig +%{tde_bindir}/serviceconfig +%{tde_bindir}/userconfig +%{tde_bindir}/wineconfig +%attr(0644,root,root) %{tde_tdelibdir}/*.so +%attr(0644,root,root) %{tde_tdelibdir}/*.la +%{tde_datadir}/apps/guidance/ +%{tde_datadir}/applications/kde/*.desktop +%{tde_datadir}/icons/crystalsvg/*/*/*.png +%{tde_datadir}/icons/crystalsvg/*/*/*.svg +%{python_sitearch}/%{name}/SMBShareSelectDialog.py* +%{python_sitearch}/%{name}/SimpleCommandRunner.py* +%{python_sitearch}/%{name}/fuser.py* +%{python_sitearch}/%{name}/fuser_ui.py* +%{python_sitearch}/%{name}/grubconfig.py* +%{python_sitearch}/%{name}/ktimerdialog.py* +%{python_sitearch}/%{name}/mountconfig.py* +%{python_sitearch}/%{name}/servertestdialog.py* +%{python_sitearch}/%{name}/serviceconfig.py* +%{python_sitearch}/%{name}/sizeview.py* +%{python_sitearch}/%{name}/unixauthdb.py* +%{python_sitearch}/%{name}/userconfig.py* +%{python_sitearch}/%{name}/wineconfig.py* +%{tde_tdedocdir}/HTML/en/guidance/ + +# Files from backends +%exclude %{tde_datadir}/apps/guidance/vesamodes +%exclude %{tde_datadir}/apps/guidance/extramodes +%exclude %{tde_datadir}/apps/guidance/widescreenmodes +%exclude %{tde_datadir}/apps/guidance/Cards+ +%exclude %{tde_datadir}/apps/guidance/pcitable +%exclude %{tde_datadir}/apps/guidance/MonitorsDB + +# Files from powermanager +%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png +%exclude %{tde_datadir}/apps/guidance/pics/battery*.png +%exclude %{tde_datadir}/apps/guidance/pics/processor.png + +%files -n trinity-guidance-backends +%defattr(-,root,root,-) +%{python_sitearch}/%{name}/MicroHAL.py* +%{python_sitearch}/%{name}/ScanPCI.py* +%{python_sitearch}/%{name}/infimport.py* +%{python_sitearch}/%{name}/displayconfigabstraction.py* +%{python_sitearch}/%{name}/displayconfig-hwprobe.py* +%{python_sitearch}/%{name}/displayconfig-restore.py* +%{python_sitearch}/%{name}/drivedetect.py* +%{python_sitearch}/%{name}/execwithcapture.py* +%{python_sitearch}/%{name}/wineread.py* +%{python_sitearch}/%{name}/winewrite.py* +%{python_sitearch}/%{name}/xf86misc.py* +%{python_sitearch}/%{name}/xorgconfig.py* +%{python_sitearch}/ixf86misc.so +%{tde_datadir}/apps/guidance/vesamodes +%{tde_datadir}/apps/guidance/extramodes +%{tde_datadir}/apps/guidance/widescreenmodes +%{tde_datadir}/apps/guidance/Cards+ +%{tde_datadir}/apps/guidance/pcitable +%{tde_datadir}/apps/guidance/MonitorsDB + + + +%files powermanager +%defattr(-,root,root,-) +%{tde_bindir}/guidance-power-manager +%{python_sitearch}/%{name}/MicroHAL.py* +%{python_sitearch}/%{name}/guidance-power-manager.py* +%{python_sitearch}/%{name}/powermanage.py* +%{python_sitearch}/%{name}/gpmhelper.py* +%{python_sitearch}/%{name}/powermanager_ui.py* +%{python_sitearch}/%{name}/guidance_power_manager_ui.py* +%{python_sitearch}/%{name}/notify.py* +%{python_sitearch}/%{name}/tooltip.py* +%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%{tde_datadir}/apps/guidance/pics/ac-adapter.png +%{tde_datadir}/apps/guidance/pics/battery*.png +%{tde_datadir}/apps/guidance/pics/processor.png +%{tde_datadir}/autostart/guidance-power-manager.desktop + + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.8.0svn20080103-4 +- Initial build for TDE 3.5.13.1 + +* Fri May 11 2012 Francois Andriot - 0.8.0svn20080103-3 +- Fix Python search dir + +* Tue May 01 2012 Francois Andriot - 0.8.0svn20080103-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix library locations + +* Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-guidance/trinity-guidance-3.5.13.spec b/redhat/applications/tde-guidance/trinity-guidance-3.5.13.spec new file mode 100644 index 000000000..4d9452f32 --- /dev/null +++ b/redhat/applications/tde-guidance/trinity-guidance-3.5.13.spec @@ -0,0 +1,390 @@ +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +%define __arch_install_post %{nil} + +Name: trinity-guidance +Summary: A collection of system administration tools for Trinity +Version: 0.8.0svn20080103 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.simonzone.com/software/guidance + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: kde-guidance-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: trinity-pykdeextensions +BuildRequires: trinity-libpythonize0-devel +BuildRequires: python-trinity +BuildRequires: chrpath +BuildRequires: gcc-c++ + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +BuildRequires: python-qt +Requires: python-qt +%else +%if 0%{?rhel} == 5 +BuildRequires: trinity-PyQt-devel +BuildRequires: trinity-sip-devel +Requires: trinity-PyQt +%else +BuildRequires: PyQt-devel +BuildRequires: sip-devel +Requires: PyQt +%endif +%endif + + +Requires: python-trinity +Requires: %{name}-backends +Requires: hwdata +Requires: python + +%if "%{tde_prefix}" == "/usr" +Conflicts: guidance-power-manager +Conflicts: kde-guidance-powermanager +%endif + +%description +Guidance currently consists of four programs designed to help you +look after your system: + o userconfig - User and Group administration + o serviceconfig - Service/daemon administration + o mountconfig - Disk and filesystem administration + o wineconfig - Wine configuration + +These tools are available in Trinity Control Center, System Settings +or can be run as standalone applications. + + + +%package backends +Group: Applications/Utilities +Summary: collection of system administration tools for GNU/Linux [Trinity] +Requires: hwdata +Requires: python + +%description backends +This package contains the platform neutral backends used in the +Guidance configuration tools. + + +%package powermanager +Group: Applications/Utilities +Summary: HAL based power manager applet [Trinity] +Requires: %{name} = %{version}-%{release} + +%description powermanager +A power management applet to indicate battery levels and perform hibernate or +suspend using HAL. + + +%prep +%setup -q -n applications/kde-guidance + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" +export KDEDIR=%{tde_prefix} + +# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia +export PYTHONDONTWRITEBYTECODE= + +./setup.py build + + +%install +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" + +# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia +export PYTHONDONTWRITEBYTECODE= + +%__rm -rf %{buildroot} +./setup.py install \ + --prefix=%{tde_prefix} \ + --root=%{buildroot} + +# Fix building directories stored inside .py files +for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do + %__sed -i "${f}" -e "s|%{buildroot}||g" +done + +##### MAIN PACKAGE INSTALLATION +# install icons to right place +%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png +%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ + %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png + +# fix binary-or-shlib-defines-rpath +chrpath -d %{buildroot}%{tde_tdelibdir}/kcm_*.so + +# fix executable-not-elf-or-script +%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png + +# move python modules in %{python_sitearch} +%__mkdir_p %{buildroot}%{python_sitearch}/%{name} +%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py %{buildroot}%{python_sitearch}/%{name} + +# fix the link properly +%__rm -f %{buildroot}%{tde_bindir}/* +#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig +%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig +%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig +%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig +%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig +%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig + +# (obsolete) put this here since gnome people probably don't want it by default +#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore + +# fix script-not-executable +%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py +%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py + +%__mv -f %{buildroot}%{tde_datadir}/applications/kde/displayconfig.desktop %{buildroot}%{tde_datadir}/applications/kde/guidance-displayconfig.desktop + +##### BACKENDS INSTALLATION +# install displayconfig-hwprobe.py script +%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ + %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py + +# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} +%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} + +%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB +%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB + + + +##### POWERMANAGER INSTALLATION +# install icon to right place +%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ + %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%__install -D -p -m0644 kde/powermanager/pics/*.png \ + %{buildroot}%{tde_datadir}/apps/guidance/pics/ + +# install desktop file +%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ + %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop + +# copy python modules in PYSUPPORT_PATH +%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} +%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} +%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} + +# generate guidance-power-manager script +cat <%{buildroot}%{tde_bindir}/guidance-power-manager +#!/bin/sh +export PYTHONPATH=%{python_sitearch}/%{name} +%{python_sitearch}/%{name}/guidance-power-manager.py & +EOF +chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager + +# fix script-not-executable +chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py +chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py + + +# Replace all '#!' calls to python with /usr/bin/python +# and make them executable +for i in `find %{buildroot} -type f`; do + sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + $i > $i.temp; + if cmp --quiet $i $i.temp; then + rm -f $i.temp; + else + mv -f $i.temp $i; + chmod 755 $i; + echo "fixed interpreter: $i"; + fi; +done + +# Removes useless files +find %{buildroot} -name "*.egg-info" -exec rm -f {} \; +#find %{buildroot}%{_libdir} -name "*.a" -exec rm -f {} \; + +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyc +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/*.pyo + +# Removes obsolete display config manager +%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore +%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py +%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%postun +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%post powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + +%postun powermanager +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING README TODO +#%{tde_bindir}/displayconfig +#%{tde_bindir}/displayconfig-restore +%{tde_bindir}/grubconfig +%{tde_bindir}/mountconfig +%{tde_bindir}/serviceconfig +%{tde_bindir}/userconfig +%{tde_bindir}/wineconfig +%attr(0644,root,root) %{tde_tdelibdir}/*.so +%attr(0644,root,root) %{tde_tdelibdir}/*.la +%{tde_datadir}/apps/guidance/ +%{tde_datadir}/applications/kde/*.desktop +%{tde_datadir}/icons/crystalsvg/*/*/*.png +%{tde_datadir}/icons/crystalsvg/*/*/*.svg +%{python_sitearch}/%{name}/SMBShareSelectDialog.py +%{python_sitearch}/%{name}/SimpleCommandRunner.py +%{python_sitearch}/%{name}/fuser.py +%{python_sitearch}/%{name}/fuser_ui.py +%{python_sitearch}/%{name}/grubconfig.py +%{python_sitearch}/%{name}/ktimerdialog.py +%{python_sitearch}/%{name}/mountconfig.py +%{python_sitearch}/%{name}/servertestdialog.py +%{python_sitearch}/%{name}/serviceconfig.py +%{python_sitearch}/%{name}/sizeview.py +%{python_sitearch}/%{name}/unixauthdb.py +%{python_sitearch}/%{name}/userconfig.py +%{python_sitearch}/%{name}/wineconfig.py +%{tde_tdedocdir}/HTML/en/guidance/ + +# Files from backends +%exclude %{tde_datadir}/apps/guidance/vesamodes +%exclude %{tde_datadir}/apps/guidance/extramodes +%exclude %{tde_datadir}/apps/guidance/widescreenmodes +%exclude %{tde_datadir}/apps/guidance/Cards+ +%exclude %{tde_datadir}/apps/guidance/pcitable +%exclude %{tde_datadir}/apps/guidance/MonitorsDB + +# Files from powermanager +%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png +%exclude %{tde_datadir}/apps/guidance/pics/battery*.png +%exclude %{tde_datadir}/apps/guidance/pics/processor.png + +%files -n trinity-guidance-backends +%defattr(-,root,root,-) +%{python_sitearch}/%{name}/MicroHAL.py +%{python_sitearch}/%{name}/ScanPCI.py +%{python_sitearch}/%{name}/infimport.py +%{python_sitearch}/%{name}/displayconfigabstraction.py +%{python_sitearch}/%{name}/displayconfig-hwprobe.py +%{python_sitearch}/%{name}/displayconfig-restore.py +%{python_sitearch}/%{name}/drivedetect.py +%{python_sitearch}/%{name}/execwithcapture.py +%{python_sitearch}/%{name}/wineread.py +%{python_sitearch}/%{name}/winewrite.py +%{python_sitearch}/%{name}/xf86misc.py +%{python_sitearch}/%{name}/xorgconfig.py +%{python_sitearch}/ixf86misc.so +%{tde_datadir}/apps/guidance/vesamodes +%{tde_datadir}/apps/guidance/extramodes +%{tde_datadir}/apps/guidance/widescreenmodes +%{tde_datadir}/apps/guidance/Cards+ +%{tde_datadir}/apps/guidance/pcitable +%{tde_datadir}/apps/guidance/MonitorsDB + + + +%files powermanager +%defattr(-,root,root,-) +%{tde_bindir}/guidance-power-manager +%{python_sitearch}/%{name}/MicroHAL.py +%{python_sitearch}/%{name}/guidance-power-manager.py +%{python_sitearch}/%{name}/powermanage.py +%{python_sitearch}/%{name}/gpmhelper.py +%{python_sitearch}/%{name}/powermanager_ui.py +%{python_sitearch}/%{name}/guidance_power_manager_ui.py +%{python_sitearch}/%{name}/notify.py +%{python_sitearch}/%{name}/tooltip.py +%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%{tde_datadir}/apps/guidance/pics/ac-adapter.png +%{tde_datadir}/apps/guidance/pics/battery*.png +%{tde_datadir}/apps/guidance/pics/processor.png +%{tde_datadir}/autostart/guidance-power-manager.desktop + + + +%Changelog +* Fri May 11 2012 Francois Andriot - 0.8.0svn20080103-3 +- Fix Python search dir + +* Tue May 01 2012 Francois Andriot - 0.8.0svn20080103-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix library locations + +* Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec new file mode 100644 index 000000000..30f8e8a67 --- /dev/null +++ b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.12.spec @@ -0,0 +1,108 @@ +# Default version for this component +%define kdecomp kde-style-lipstik +%define version 2.2.3 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-%{kdecomp} +Summary: Lipstik style for TDE +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.12.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Based on the plastik style, Lipstik is a purified style with many options to +tune your desktop look. + +Lipstik also provides Lipstik-color-schemes + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_libdir}/kstyle_lipstik_config.la +%{tde_libdir}/kstyle_lipstik_config.so +%{tde_libdir}/plugins/styles/lipstik.la +%{tde_libdir}/plugins/styles/lipstik.so +%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc +%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc +%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc +%{_datadir}/apps/kstyle/themes/lipstik.themerc + + +%Changelog +* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec new file mode 100644 index 000000000..d23300c5a --- /dev/null +++ b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.1.spec @@ -0,0 +1,129 @@ +# Default version for this component +%define kdecomp kde-style-lipstik + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-style-lipstik +Summary: Lipstik style for TDE +Version: 2.2.3 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +Obsoletes: trinity-kde-style-lipstik + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Based on the plastik style, Lipstik is a purified style with many options to +tune your desktop look. + +Lipstik also provides Lipstik-color-schemes + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/kstyle_lipstik_config.la +%{tde_tdelibdir}/kstyle_lipstik_config.so +%{tde_tdelibdir}/plugins/styles/lipstik.la +%{tde_tdelibdir}/plugins/styles/lipstik.so +%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc +%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc +%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc +%{tde_datadir}/apps/kstyle/themes/lipstik.themerc + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 2.2.3-3 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 2.2.3-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + +* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec new file mode 100644 index 000000000..8834e935a --- /dev/null +++ b/redhat/applications/tde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec @@ -0,0 +1,120 @@ +# Default version for this component +%define kdecomp kde-style-lipstik + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-style-lipstik +Summary: Lipstik style for TDE +Version: 2.2.3 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +Obsoletes: trinity-kde-style-lipstik + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +Based on the plastik style, Lipstik is a purified style with many options to +tune your desktop look. + +Lipstik also provides Lipstik-color-schemes + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/kstyle_lipstik_config.la +%{tde_tdelibdir}/kstyle_lipstik_config.so +%{tde_tdelibdir}/plugins/styles/lipstik.la +%{tde_tdelibdir}/plugins/styles/lipstik.so +%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc +%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc +%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc +%{tde_datadir}/apps/kstyle/themes/lipstik.themerc + + +%Changelog +* Tue May 01 2012 Francois Andriot - 2.2.3-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + +* Sat Nov 19 2011 Francois Andriot - 2.2.3-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch new file mode 100644 index 000000000..d7e8df30c --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-1.6.2-libsuffix.patch @@ -0,0 +1,11 @@ +--- kde-style-qtcurve/CMakeLists.txt.ORI 2011-11-20 22:37:40.050443616 +0100 ++++ kde-style-qtcurve/CMakeLists.txt 2011-11-20 22:40:04.355439569 +0100 +@@ -46,7 +46,7 @@ + if (QT_PLUGINS_DIR MATCHES NOTFOUND) + MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") + SET(QT_INCLUDE_DIR "/usr/include/qt4") +- SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib/trinity/plugins") ++ SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins") + endif (QT_PLUGINS_DIR MATCHES NOTFOUND) + endif (NOT QTC_QT_ONLY) + diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch new file mode 100644 index 000000000..18c9e9ee7 --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_config_ftbfs.patch @@ -0,0 +1,101 @@ +--- a/config/qtcurveconfig.cpp.ORI 2012-08-29 22:09:16.845292598 +0200 ++++ a/config/qtcurveconfig.cpp 2012-08-29 22:13:35.992935999 +0200 +@@ -671,7 +671,7 @@ + connect(activeTabAppearance, SIGNAL(activated(int)), SLOT(activeTabAppearanceChanged())); + connect(toolbarSeparators, SIGNAL(activated(int)), SLOT(updateChanged())); + connect(splitters, SIGNAL(activated(int)), SLOT(updateChanged())); +- connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged())); ++// connect(fixParentlessDialogs, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(fillSlider, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(sliderStyle, SIGNAL(activated(int)), SLOT(updateChanged())); + connect(roundMbTopOnly, SIGNAL(toggled(bool)), SLOT(updateChanged())); +@@ -749,10 +749,10 @@ + connect(gtkButtonOrder, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(mapKdeIcons, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(passwordChar, SIGNAL(clicked()), SLOT(passwordCharClicked())); +- connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged())); ++// connect(framelessGroupBoxes, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(colorMenubarMouseOver, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(useHighlightForMenu, SIGNAL(toggled(bool)), SLOT(updateChanged())); +- connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged())); ++// connect(groupBoxLine, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(fadeLines, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(menuIcons, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(stdBtnSizes, SIGNAL(toggled(bool)), SLOT(updateChanged())); +@@ -1436,7 +1436,7 @@ + opts.shadeMenubarOnlyWhenActive=shadeMenubarOnlyWhenActive->isChecked(); + opts.thinnerMenuItems=thinnerMenuItems->isChecked(); + opts.thinnerBtns=thinnerBtns->isChecked(); +- opts.fixParentlessDialogs=fixParentlessDialogs->isChecked(); ++// opts.fixParentlessDialogs=fixParentlessDialogs->isChecked(); + opts.animatedProgress=animatedProgress->isChecked(); + opts.stripedProgress=(EStripe)stripedProgress->currentItem(); + opts.lighterPopupMenuBgnd=lighterPopupMenuBgnd->value(); +@@ -1526,11 +1526,11 @@ + opts.gtkButtonOrder=gtkButtonOrder->isChecked(); + opts.mapKdeIcons=mapKdeIcons->isChecked(); + opts.passwordChar=toInt(passwordChar->text()); +- opts.framelessGroupBoxes=framelessGroupBoxes->isChecked(); ++// opts.framelessGroupBoxes=framelessGroupBoxes->isChecked(); + opts.customGradient=customGradient; + opts.colorMenubarMouseOver=colorMenubarMouseOver->isChecked(); + opts.useHighlightForMenu=useHighlightForMenu->isChecked(); +- opts.groupBoxLine=groupBoxLine->isChecked(); ++// opts.groupBoxLine=groupBoxLine->isChecked(); + opts.fadeLines=fadeLines->isChecked(); + opts.menuIcons=menuIcons->isChecked(); + opts.stdBtnSizes=stdBtnSizes->isChecked(); +@@ -1575,7 +1575,7 @@ + shadeMenubarOnlyWhenActive->setChecked(opts.shadeMenubarOnlyWhenActive); + thinnerMenuItems->setChecked(opts.thinnerMenuItems); + thinnerBtns->setChecked(opts.thinnerBtns); +- fixParentlessDialogs->setChecked(opts.fixParentlessDialogs); ++// fixParentlessDialogs->setChecked(opts.fixParentlessDialogs); + animatedProgress->setChecked(opts.animatedProgress); + stripedProgress->setCurrentItem(opts.stripedProgress); + embolden->setChecked(opts.embolden); +@@ -1651,7 +1651,7 @@ + customCheckRadioColor->setColor(opts.customCheckRadioColor); + colorMenubarMouseOver->setChecked(opts.colorMenubarMouseOver); + useHighlightForMenu->setChecked(opts.useHighlightForMenu); +- groupBoxLine->setChecked(opts.groupBoxLine); ++// groupBoxLine->setChecked(opts.groupBoxLine); + fadeLines->setChecked(opts.fadeLines); + menuIcons->setChecked(opts.menuIcons); + stdBtnSizes->setChecked(opts.stdBtnSizes); +@@ -1678,7 +1678,7 @@ + gtkButtonOrder->setChecked(opts.gtkButtonOrder); + mapKdeIcons->setChecked(opts.mapKdeIcons); + setPasswordChar(opts.passwordChar); +- framelessGroupBoxes->setChecked(opts.framelessGroupBoxes); ++// framelessGroupBoxes->setChecked(opts.framelessGroupBoxes); + customGradient=opts.customGradient; + gradCombo->setCurrentItem(APPEARANCE_CUSTOM1); + +@@ -1731,7 +1731,7 @@ + shadeMenubarOnlyWhenActive->isChecked()!=currentStyle.shadeMenubarOnlyWhenActive || + thinnerMenuItems->isChecked()!=currentStyle.thinnerMenuItems || + thinnerBtns->isChecked()!=currentStyle.thinnerBtns || +- fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs || ++// fixParentlessDialogs->isChecked()!=currentStyle.fixParentlessDialogs || + animatedProgress->isChecked()!=currentStyle.animatedProgress || + stripedProgress->currentItem()!=currentStyle.stripedProgress || + lighterPopupMenuBgnd->value()!=currentStyle.lighterPopupMenuBgnd || +@@ -1796,7 +1796,7 @@ + splitters->currentItem()!=currentStyle.splitters || + colorMenubarMouseOver->isChecked()!=currentStyle.colorMenubarMouseOver || + useHighlightForMenu->isChecked()!=currentStyle.useHighlightForMenu || +- groupBoxLine->isChecked()!=currentStyle.groupBoxLine || ++// groupBoxLine->isChecked()!=currentStyle.groupBoxLine || + fadeLines->isChecked()!=currentStyle.fadeLines || + menuIcons->isChecked()!=currentStyle.menuIcons || + stdBtnSizes->isChecked()!=currentStyle.stdBtnSizes || +@@ -1819,7 +1819,7 @@ + gtkComboMenus->isChecked()!=currentStyle.gtkComboMenus || + gtkButtonOrder->isChecked()!=currentStyle.gtkButtonOrder || + mapKdeIcons->isChecked()!=currentStyle.mapKdeIcons || +- framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes || ++// framelessGroupBoxes->isChecked()!=currentStyle.framelessGroupBoxes || + + getSquareFlags()!=currentStyle.square || + getWindowBorderFlags()!=currentStyle.windowBorder|| diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch new file mode 100644 index 000000000..f328720a7 --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_kde_style_compilation.patch @@ -0,0 +1,243 @@ +--- kde-style-qtcurve/cmake/QtCurveQt3.cmake.ORI 2012-08-29 19:47:59.470536207 +0200 ++++ kde-style-qtcurve/cmake/QtCurveQt3.cmake 2012-08-29 19:48:50.268522398 +0200 +@@ -1,5 +1,5 @@ + FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/) +-FIND_PATH(QT_PLUGINS_DIR imageformats ++FIND_PATH(QT_PLUGINS_DIR designer + $ENV{QTDIR}/plugins + ${GLOB_PATHS_BIN} + /usr/local/qt/plugins +--- a/config/CMakeLists.txt.module 2011-08-22 00:39:00.000000000 +0200 ++++ a/config/CMakeLists.txt 2012-08-29 22:21:41.673500945 +0200 +@@ -4,9 +4,23 @@ + set(kstyle_qtcurve_config_PART_SRCS qtcurveconfig.cpp) + endif (QTC_STYLE_SUPPORT) + +-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}) +-trinity_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui) +-trinity_add_kpart(kstyle_qtcurve_config ${kstyle_qtcurve_config_PART_SRCS}) +-trinity_automoc(${kstyle_qtcurve_config_PART_SRCS}) +-target_link_libraries(kstyle_qtcurve_config ${QT_AND_KDECORE_LIBS} kio kdeui) +-install(TARGETS kstyle_qtcurve_config DESTINATION ${KDE3_LIB_DIR}/trinity) ++include_directories( ++ ${CMAKE_SOURCE_DIR} ++ ${CMAKE_SOURCE_DIR}/common ++ ${CMAKE_CURRENT_BINARY_DIR} ++ ${CMAKE_BINARY_DIR} ++ ${TDE_INCLUDE_DIR} ++ ${QT_INCLUDE_DIR} ++) ++ ++link_directories( ++ ${TQT_LIBRARY_DIRS} ++) ++ ++tde_add_ui_files(kstyle_qtcurve_config_PART_SRCS qtcurveconfigbase.ui) ++tde_add_kpart(kstyle_qtcurve_config ++ MODULE ++ SOURCES ${kstyle_qtcurve_config_PART_SRCS} ++ LINK ${QT_AND_KDECORE_LIBS} kio kdeui ++ DESTINATION ${TDE_LIB_DIR}/trinity) ++tde_automoc(${kstyle_qtcurve_config_PART_SRCS}) +--- a/CMakeLists.txt.module 2012-08-29 20:30:59.679915086 +0200 ++++ b/CMakeLists.txt 2012-08-29 22:09:03.118576286 +0200 +@@ -3,7 +3,7 @@ + + set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") + set(CPACK_GENERATOR "DEB;RPM;TGZ") +-set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/KDE3") ++set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for Qt3/TDE") + set(DEBIAN_PACKAGE_SECTION "kde") + set(CPACK_SOURCE_GENERATOR "TBZ2") + set(CPACK_PACKAGE_VERSION_MAJOR "1") +@@ -16,39 +16,64 @@ + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}") + include(CPack) + ++##### include essential cmake modules ########### ++ ++include( FindPkgConfig ) ++include( CheckIncludeFile ) ++include( CheckSymbolExists ) ++include( CheckFunctionExists ) ++include( CheckCSourceCompiles ) ++include( CheckCXXSourceCompiles ) ++include( CheckTypeSize ) ++include( CheckCSourceRuns ) ++include( CheckLibraryExists ) ++ ++##### include our cmake modules ################# ++ ++set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) ++include( TDEMacros ) ++include( TDESetupPaths ) ++ ++##### setup and find essential stuff ############ ++ ++tde_setup_paths( ) ++find_package( TQt ) ++ ++ + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + endif(COMMAND cmake_policy) + + if (QTC_BUILD_CONFIG_MODULE) + if (NOT QTC_QT_ONLY) +- find_package(KDE3) +- if (NOT KDE3_FOUND) ++ find_package(TDE) ++ if (NOT TDE_VERSION) + set(QTC_QT_ONLY true) +- message("INFO: KDE3 not found! Compiling for Qt only! (Not building the config module)") +- endif (NOT KDE3_FOUND) ++ message("INFO: Trinity not found! Compiling for Qt only! (Not building the config module)") ++ endif (NOT TDE_VERSION) + endif (NOT QTC_QT_ONLY) + else (QTC_BUILD_CONFIG_MODULE) + set(QTC_QT_ONLY true) + endif (QTC_BUILD_CONFIG_MODULE) + + if (NOT QTC_QT_ONLY) +- include(KDE3Macros) ++ include(TDEMacros) + else (NOT QTC_QT_ONLY) +- if (NOT KDE3PREFIX) +- SET(KDE3PREFIX "/opt/trinity") +- endif (NOT KDE3PREFIX) ++ if (NOT TDEPREFIX) ++ SET(TDEPREFIX "/opt/trinity") ++ endif (NOT TDEPREFIX) ++endif (NOT QTC_QT_ONLY) + + set(QT_MT_REQUIRED TRUE) + find_package(Qt3 REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) + include(QtCurveQt3) ++ set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) + if (QT_PLUGINS_DIR MATCHES NOTFOUND) + MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") + SET(QT_INCLUDE_DIR "/usr/include/qt4") +- SET(QT_PLUGINS_DIR "${KDE3PREFIX}/lib${LIB_SUFFIX}/trinity/plugins") ++ SET(QT_PLUGINS_DIR "${TDEPREFIX}/lib${LIB_SUFFIX}/trinity/plugins") + endif (QT_PLUGINS_DIR MATCHES NOTFOUND) +-endif (NOT QTC_QT_ONLY) + + #if (NOT QTC_QT_ONLY) + exec_program(kde-config +@@ -56,18 +81,15 @@ + OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX) + #endif (NOT QTC_QT_ONLY) + +-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT") + + # NASTY HACK TO FORCE COMPILATION + # REMOVE WHEN FIXED + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include") + +-SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "") +-SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "") +- + exec_program(kde-config + ARGS --install locale --expandvars +- OUTPUT_VARIABLE KDE3_LOCALE_PREFIX) ++ OUTPUT_VARIABLE TDE_LOCALE_PREFIX) + + file(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS) + +@@ -87,31 +109,31 @@ + endif(KDE4_KDECONFIG_EXECUTABLE) + + if(NOT KDE4PREFIX) +- set(KDE4PREFIX ${KDE3PREFIX}) ++ set(KDE4PREFIX ${TDEPREFIX}) + endif(NOT KDE4PREFIX) + + configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h) + #if (NOT QTC_QT_ONLY) +- add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS}) +- include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDES}) ++ add_definitions(${QT_DEFINITIONS} ${TDE_DEFINITIONS}) ++ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${TDE_INCLUDES}) + #else (NOT QTC_QT_ONLY) + # add_definitions(${QT_DEFINITIONS}) + # include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + #endif (NOT QTC_QT_ONLY) + +-set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps) ++set(DATA_INSTALL_DIR ${TDEPREFIX}/share/apps) + +-if(QTC_DEFAULT_TO_KDE3) +- message("INFO: Defaulting to reading KDE3 settings if KDE_SESSION_VERSION is not set") +-else(QTC_DEFAULT_TO_KDE3) ++if(QTC_DEFAULT_TO_TDE) ++ message("INFO: Defaulting to reading TDE settings if KDE_SESSION_VERSION is not set") ++else(QTC_DEFAULT_TO_TDE) + message("INFO: Defaulting to reading KDE4 settings if KDE_SESSION_VERSION is not set") +-endif(QTC_DEFAULT_TO_KDE3) ++endif(QTC_DEFAULT_TO_TDE) + + add_subdirectory(style) + #if (NOT QTC_QT_ONLY) + if (QTC_BUILD_CONFIG_MODULE) + message("**************************************************************\n" +- "Warning: The KDE3 config module is deprecated, and is no longer\n" ++ "Warning: The TDE config module is deprecated, and is no longer\n" + " actively maintained. This module NO LONGER COMPILES!\n" + " It is recommended to use the KDE4 version instead.\n" + "**************************************************************\n") +--- kde-style-qtcurve/po/CMakeLists.txt.ORI 2012-08-30 20:03:49.306967361 +0200 ++++ kde-style-qtcurve/po/CMakeLists.txt 2012-08-30 20:03:55.714827822 +0200 +@@ -18,7 +18,7 @@ + add_custom_command(TARGET translations + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile} + DEPENDS ${_poFile}) +- install(FILES ${_gmoFile} DESTINATION ${KDE3_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) ++ install(FILES ${_gmoFile} DESTINATION ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) + endif( _langCode ) + endforeach(_poFile ${PO_FILES}) + endif(NOT GETTEXT_MSGFMT_EXECUTABLE) +--- kde-style-qtcurve/style/CMakeLists.txt.cmake 2011-08-22 00:39:00.000000000 +0200 ++++ kde-style-qtcurve/style/CMakeLists.txt 2012-08-30 20:20:04.645840572 +0200 +@@ -1,14 +1,25 @@ + if (NOT QTC_QT_ONLY) + set(qtcurve_SRCS qtcurve.cpp pixmaps.h) + add_definitions(-DQT_PLUGIN) +- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/common) +- link_directories(${KDE3_LIB_DIR}) +- trinity_automoc(${qtcurve_SRCS}) +- add_library(qtcurve MODULE ${qtcurve_SRCS}) +- set_target_properties(qtcurve PROPERTIES PREFIX "") +- target_link_libraries(qtcurve ${QT_LIBRARIES} kdefx) +- install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/trinity/plugins/styles) +- install(FILES qtcurve.themerc DESTINATION ${KDE3PREFIX}/share/apps/kstyle/themes) ++ include_directories( ++ ${CMAKE_SOURCE_DIR} ++ ${CMAKE_CURRENT_BINARY_DIR} ++ ${CMAKE_BINARY_DIR} ++ ${TDE_INCLUDE_DIR} ++ ${QT_INCLUDE_DIR} ++ ${CMAKE_SOURCE_DIR}/common ++ ) ++ link_directories( ++ ${TDE_LIB_DIR} ++ ) ++ tde_add_library(qtcurve ++ MODULE ++ PROPERTIES PREFIX "" ++ SOURCES ${qtcurve_SRCS} ++ LINK ${QT_LIBRARIES} kdefx ++ DESTINATION ${TDE_LIB_DIR}/trinity/plugins/styles ++ ) ++ install(FILES qtcurve.themerc DESTINATION ${TDEPREFIX}/share/apps/kstyle/themes) + else (NOT QTC_QT_ONLY) + set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h) + QTCURVE_QT_WRAP_CPP(qtcurve_MOC_SRCS ${qtcurve_MOC_CLASSES}) +--- a/style/qtcurve.cpp.ORI 2012-08-30 20:57:36.256639146 +0200 ++++ a/style/qtcurve.cpp 2012-08-30 20:57:40.338552798 +0200 +@@ -8684,4 +8684,3 @@ + resetHover(); + } + +-#include "qtcurve.moc" diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch new file mode 100644 index 000000000..c12fa1ebb --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13-fix_tqt_renaming.patch @@ -0,0 +1,237 @@ +--- a/style/qtcurve.h.ORI 2012-08-30 20:50:02.179242022 +0200 ++++ a/style/qtcurve.h 2012-08-30 20:51:22.372546460 +0200 +@@ -1,5 +1,5 @@ +-#ifndef __TQTCURVE_H__ +-#define __TQTCURVE_H__ ++#ifndef __QTCURVE_H__ ++#define __QTCURVE_H__ + + /* + TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com +@@ -51,7 +51,7 @@ + */ + + #include "config.h" +-#ifdef TQTC_TQT_ONLY ++#ifdef QTC_QT_ONLY + #include "tqtc_kstyle.h" + #else + #include +@@ -68,7 +68,7 @@ + class TQTimer; + class TQSlider; + +-#ifdef TQTC_TQT_ONLY ++#ifdef QTC_QT_ONLY + #define BASE_STYLE TQtCKStyle + #else + #define BASE_STYLE KStyle +@@ -126,7 +126,7 @@ + ENTRY_NONE + }; + +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + TQtCurveStyle(const TQString &name=TQString()); + #else + TQtCurveStyle(); +@@ -278,7 +278,7 @@ + mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1]; + EApp itsThemedApp; + mutable TQCache itsPixmapCache; +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + bool itsIsTransKicker; + #endif + EHover itsHover; +--- a/style/qtcurve.cpp.tqt 2012-08-30 21:28:00.664141509 +0200 ++++ a/style/qtcurve.cpp 2012-08-30 21:28:18.078781087 +0200 +@@ -62,7 +62,7 @@ + #include + + #include "config.h" +-#ifndef TQTC_TQT_ONLY ++#ifndef QTC_QT_ONLY + #include + #endif + #include +@@ -196,7 +196,7 @@ + ? atoi(sessionVersion)<4 + ? 3 + : 4 +-#ifdef TQTC_DEFAULT_TO_KDE3 ++#ifdef QTC_DEFAULT_TO_KDE3 + : 3; + #else + : getenv("TDE_FULL_SESSION") +@@ -292,7 +292,7 @@ + return kdeHome[trinity ? 0 : 1]; + } + +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + static void getStyles(const TQString &dir, const char *sub, TQStringList &styles) + { + TQDir d(dir+sub); +@@ -349,7 +349,7 @@ + TQStringList list; + list << "TQtCurve"; + +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + getStyles(kdeHome(useTQt3Settings()), list); + getStyles(kdeHome(!useTQt3Settings()), list); + getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list); +@@ -363,7 +363,7 @@ + { + return "qtcurve"==s.lower() + ? new TQtCurveStyle +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + : 0==s.find(THEME_PREFIX) + ? new TQtCurveStyle(s) + #endif +@@ -375,7 +375,7 @@ + + #define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp) + +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + #include + #endif + +@@ -393,7 +393,7 @@ + + #define DW_BGND 105 + +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + // Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent... + + static bool kickerIsTrans() +@@ -802,7 +802,7 @@ + p->restore(); + } + +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + TQtCurveStyle::TQtCurveStyle(const TQString &name) + #else + TQtCurveStyle::TQtCurveStyle() +@@ -820,7 +820,7 @@ + itsMdiColors(0L), + itsThemedApp(APP_OTHER), + itsPixmapCache(150000, 499), +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + itsIsTransKicker(false), + #endif + itsHover(HOVER_NONE), +@@ -835,7 +835,7 @@ + itsDragWidget(0L), + itsDragWidgetHadMouseTracking(false) + { +-#ifdef TQTC_STYLE_SUPPORT ++#ifdef QTC_STYLE_SUPPORT + TQString rcFile; + if(!name.isEmpty()) + { +@@ -1161,7 +1161,7 @@ + if ("kicker"==appName || "appletproxy"==appName) + { + itsThemedApp=APP_KICKER; +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + itsIsTransKicker=kickerIsTrans(); + #endif + } +@@ -1196,7 +1196,7 @@ + else if ("korn"==appName) + { + itsThemedApp=APP_KORN; +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + itsIsTransKicker=kickerIsTrans(); + #endif + } +@@ -1236,7 +1236,7 @@ + + if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName)) + opts.menuStripe=SHADE_NONE; +-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT ++#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT + if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde"))) + opts.fixParentlessDialogs=false; + #endif +@@ -1762,7 +1762,7 @@ + ((TQGroupBox *)widget)->setFlat(false); + ((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame); + } +-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT ++#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT + else if(opts.fixParentlessDialogs && ::tqqt_cast(widget)) + { + TQDialog *dlg=(TQDialog *)widget; +@@ -1931,7 +1931,7 @@ + } + else if(widget->inherits("KTabCtl")) + widget->removeEventFilter(this); +-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT ++#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT + else if(opts.fixParentlessDialogs && ::tqqt_cast(widget)) + widget->removeEventFilter(this); + #endif +@@ -2277,7 +2277,7 @@ + break; + } + +-#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT ++#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT + if(opts.fixParentlessDialogs && ::tqqt_cast(object)) + { + TQDialog *dlg=(TQDialog *)object; +@@ -3152,7 +3152,7 @@ + if(flags&Style_Down) + flags=((flags|Style_Down)^Style_Down)| Style_Sunken; + flags|=Style_Enabled; +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + #if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 + if(HOVER_KICKER==itsHover && itsHoverWidget) // && itsHoverWidget==p->device()) + flags|=Style_MouseOver; +@@ -3161,7 +3161,7 @@ + #endif + drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL, + getFill(flags, use), use, true, false); +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + itsFormMode=false; + #endif + } +@@ -3313,7 +3313,7 @@ + ? cg.background().dark(DW_BGND) + : */cg.background(), + p, r, cg, glassMod ? flags : flags|Style_Horizontal, +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || + #endif + operaMdi || mdi +@@ -3345,7 +3345,7 @@ + + drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal, + flags&CHECK_BUTTON +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) + #endif + ? ROUNDED_NONE : ROUNDED_ALL, +@@ -5540,7 +5540,7 @@ + bflags|=NO_ETCH_BUTTON; + + // If we're pressed, on, or raised... +-#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 ++#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 + if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons) + #else + if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) || diff --git a/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec b/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec new file mode 100644 index 000000000..f7f0f040c --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.1.spec @@ -0,0 +1,141 @@ +# Default version for this component +%define kdecomp kde-style-qtcurve + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-style-qtcurve +Summary: This is a set of widget styles for Trinity based apps +Version: 0.55.2 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Obsoletes: trinity-kde-style-qtcurve +Provides: trinity-kde-style-qtcurve + +%description +This package together with gtk2-engines-qtcurve aim to provide a unified look +and feel on the desktop when using TDE and Gnome applications. + +This package is most useful when installed together with +gtk2-engines-qtcurve. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "CMakeLists.txt" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ + -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ + -DQTC_QT_ONLY=false \ + -DQTC_STYLE_SUPPORT=true \ + -DBUILD_ALL=on \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang qtcurve + + +%clean +%__rm -rf %{buildroot} + + + +%files -f qtcurve.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/kstyle_qtcurve_config.la +%{tde_tdelibdir}/kstyle_qtcurve_config.so +%{tde_tdelibdir}/plugins/styles/qtcurve.so +%{tde_tdelibdir}/plugins/styles/qtcurve.la +%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc +%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc +%{tde_datadir}/apps/QtCurve/*.qtcurve + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.55.2-4 +- Initial build for TDE 3.5.13.1 + +* Sun Sep 09 2012 Francois Andriot - 0.55.2-3 +- Switch to v3.5.13-sru branch + +* Tue May 01 2012 Francois Andriot - 0.55.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + +* Sat Nov 19 2011 Francois Andriot - 0.55.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec b/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec new file mode 100644 index 000000000..2fcec0dd2 --- /dev/null +++ b/redhat/applications/tde-style-qtcurve/trinity-kde-style-qtcurve-3.5.13.spec @@ -0,0 +1,140 @@ +# Default version for this component +%define kdecomp kde-style-qtcurve + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-style-qtcurve +Summary: This is a set of widget styles for Trinity based apps +Version: 0.55.2 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: cmake-3.5.13.tar.gz + +# [qtcurve] Version 3.5.13-sru +Patch0: kde-style-qtcurve-3.5.13-sru-20120909.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +Obsoletes: trinity-kde-style-qtcurve +Provides: trinity-kde-style-qtcurve + +%description +This package together with gtk2-engines-qtcurve aim to provide a unified look +and feel on the desktop when using TDE and Gnome applications. + +This package is most useful when installed together with +gtk2-engines-qtcurve. + + +%prep +%setup -q -n applications/%{kdecomp} +%setup -q -n applications/%{kdecomp} -a 1 +%__mv -f cmake-3.5.13/* cmake/ + +%patch0 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "CMakeLists.txt" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|g" \ + -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|g" + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}" + +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ + -DQTC_QT_ONLY=false \ + -DQTC_STYLE_SUPPORT=true \ + -DBUILD_ALL=on \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang qtcurve + + +%clean +%__rm -rf %{buildroot} + + + +%files -f qtcurve.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_tdelibdir}/kstyle_qtcurve_config.la +%{tde_tdelibdir}/kstyle_qtcurve_config.so +%{tde_tdelibdir}/plugins/styles/qtcurve.so +%{tde_tdelibdir}/plugins/styles/qtcurve.la +%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc +%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc +%{tde_datadir}/apps/QtCurve/*.qtcurve + + +%Changelog +* Sun Sep 09 2012 Francois Andriot - 0.55.2-3 +- Switch to v3.5.13-sru branch + +* Tue May 01 2012 Francois Andriot - 0.55.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + +* Sat Nov 19 2011 Francois Andriot - 0.55.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory new file mode 100644 index 000000000..687a493c4 --- /dev/null +++ b/redhat/applications/tde-systemsettings/kde-settings-laptops.directory @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Laptops & Power +Name[br]=Gremm +Name[el]=Ισχύς +Name[it]=Energia +Name[mt]=Elettriku +Name[nl]=Energie +Name[pa]=ਊਰਜਾ(power) +Name[pt_BR]=Energia +Name[ru]=Управление питанием +Name[sv]=Effekt +Icon=energy diff --git a/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec b/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec new file mode 100644 index 000000000..2107afe79 --- /dev/null +++ b/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.1.spec @@ -0,0 +1,159 @@ +# Default version for this component +%define kdecomp kde-systemsettings + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +# Currently, menu files under /etc/xdg conflict with KDE4 +%define tde_sysconfdir %{tde_prefix}/etc +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-systemsettings +Summary: easy to use control centre for TDE +Version: 0.0svn20070312 +Release: 5%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz +Source1: kde-settings-laptops.directory + +Provides: trinity-kde-systemsettings = %{version}-%{release} +Obsoletes: trinity-kde-systemsettings < %{version}-%{release} + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils + +Requires: trinity-guidance + +%description +System preferences is a replacement for the TDE +Control Centre with an improved user interface. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --sysconfdir=%{tde_sysconfdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/ + +# Unwanted files +%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop +%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory +%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +xdg-user-dirs-update + +%postun +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +xdg-user-dirs-update + +%files +%defattr(-,root,root,-) +%doc README TODO +%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu +%{tde_sysconfdir}/xdg/menus/system-settings.menu +%{tde_bindir}/systemsettings +%{tde_datadir}/applications/kde/audioencoding.desktop +%{tde_datadir}/applications/kde/defaultapplication.desktop +%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop +%{tde_datadir}/applications/kde/laptoppowermanagement.desktop +%{tde_datadir}/applications/kde/medianotifications.desktop +%{tde_datadir}/applications/kde/systemsettings.desktop +%{tde_datadir}/apps/systemsettings/systemsettingsui.rc +%{tde_datadir}/config/systemsettingsrc +%{tde_datadir}/desktop-directories/*.directory +%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png + + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.0svn20070312-5 +- Initial build for TDE 3.5.13.1 + +* Wed Jul 11 2012 Francois Andriot - 0.0svn20070312-4 +- Fix XDG menu directory location (again) + +* Sun Jul 08 2012 Francois Andriot - 0.0svn20070312-3 +- Updates 'Requires: trinity-guidance' to reflect package renaming + +* Wed Dec 14 2011 Francois Andriot - 0.0svn20070312-2 +- Fix XDG menu directory location + +* Sat Dec 03 2011 Francois Andriot - 0.0svn20070312-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.spec b/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.spec new file mode 100644 index 000000000..ed156aba8 --- /dev/null +++ b/redhat/applications/tde-systemsettings/trinity-kde-systemsettings-3.5.13.spec @@ -0,0 +1,150 @@ +# Default version for this component +%define kdecomp kde-systemsettings + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +# Currently, menu files under /etc/xdg conflict with KDE4 +%define tde_sysconfdir %{tde_prefix}/etc +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-systemsettings +Summary: easy to use control centre for TDE +Version: 0.0svn20070312 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: kde-settings-laptops.directory + +Provides: trinity-kde-systemsettings = %{version}-%{release} +Obsoletes: trinity-kde-systemsettings < %{version}-%{release} + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + +Requires: trinity-guidance + +%description +System preferences is a replacement for the TDE +Control Centre with an improved user interface. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --sysconfdir=%{tde_sysconfdir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/ + +# Unwanted files +%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop +%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory +%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +xdg-user-dirs-update + +%postun +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : +xdg-user-dirs-update + +%files +%defattr(-,root,root,-) +%doc README TODO +%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu +%{tde_sysconfdir}/xdg/menus/system-settings.menu +%{tde_bindir}/systemsettings +%{tde_datadir}/applications/kde/audioencoding.desktop +%{tde_datadir}/applications/kde/defaultapplication.desktop +%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop +%{tde_datadir}/applications/kde/laptoppowermanagement.desktop +%{tde_datadir}/applications/kde/medianotifications.desktop +%{tde_datadir}/applications/kde/systemsettings.desktop +%{tde_datadir}/apps/systemsettings/systemsettingsui.rc +%{tde_datadir}/config/systemsettingsrc +%{tde_datadir}/desktop-directories/*.directory +%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png + + + +%Changelog +* Wed Jul 11 2012 Francois Andriot - 0.0svn20070312-4 +- Fix XDG menu directory location (again) + +* Sun Jul 08 2012 Francois Andriot - 0.0svn20070312-3 +- Updates 'Requires: trinity-guidance' to reflect package renaming + +* Wed Dec 14 2011 Francois Andriot - 0.0svn20070312-2 +- Fix XDG menu directory location + +* Sat Dec 03 2011 Francois Andriot - 0.0svn20070312-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..00ca8561c --- /dev/null +++ b/redhat/applications/tdeio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,40 @@ +--- kio-locate/src/SConscript.ORI 2012-05-02 00:23:36.637608539 +0200 ++++ kio-locate/src/SConscript 2012-05-02 00:23:44.142459165 +0200 +@@ -28,7 +28,7 @@ + pattern.cpp + """ + obj.libs='tqt kio' +-obj.linkflags='-module' # add more link flags ++#obj.linkflags='-module' # add more link flags + obj.execute() + + # Install the protocol files +--- kio-locate/admin/kde.py.install 2011-07-07 08:10:05.000000000 +0200 ++++ kio-locate/admin/kde.py 2012-05-06 20:29:48.236024293 +0200 +@@ -337,7 +337,7 @@ + opts.Save(cachefile, env) + + ## set default variables, one can override them in sconscript files +- env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ], ++ env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ], + LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ]) + + env['QT_AUTOSCAN'] = 1 +@@ -773,7 +773,7 @@ + ## Define this to 1 if you are writing documentation else to 0 :) + #if lenv.has_key('i_am_a_documentation_writer'): + for file in docbook_list: +- lenv.Depends( folder+'index.cache.bz2', nodefile ) ++ lenv.Depends( folder+'index.cache.bz2', file ) + + if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder) + +@@ -781,7 +782,7 @@ + lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') ) + + if env['_INSTALL']: +- dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination) ++ dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination) + comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir) + lenv.Execute(comp) + diff --git a/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.12.spec b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.12.spec new file mode 100644 index 000000000..f24f3a2f7 --- /dev/null +++ b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.12.spec @@ -0,0 +1,111 @@ +# Default version for this component +%define kdecomp kio-locate + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: kio-slave for the locate command [Trinity] +Version: 0.4.5 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.12.tar.gz + +# [kio-locate] Fix compilation with GCC 4.7 +Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + +BuildRequires: scons + +%description +Adds support for the "locate:" and "locater:" +protocols to Konqueror and other TDE applications. + +This enables you to perform locate searches as you +would in a terminal. The result is displayed just +as a directory. + + +%prep +%setup -q -n applications/%{kdecomp} +#patch1 -p1 -b .install + +# Ugly hack to modify TQT include directory inside SCONS files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "admin/kde.py" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export CXXFLAGS="-I%{tde_includedir}/tqt ${CXXFLAGS}" +scons configure +scons + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +scons install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING TODO +%{tde_tdelibdir}/kio_locate.la +%{tde_tdelibdir}/kio_locate.so +%{tde_tdedocdir}/HTML/en/kio-locate/ +%{tde_datadir}/services/locate.protocol +%{tde_datadir}/services/locater.protocol +%{tde_datadir}/services/rlocate.protocol +%{tde_datadir}/services/searchproviders/locate.desktop + + +%Changelog +* Tue May 01 2012 Francois Andriot - 0.4.5-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Fix compilation with GCC 4.7 + +* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.1.spec b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.1.spec new file mode 100644 index 000000000..f673baeb6 --- /dev/null +++ b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.1.spec @@ -0,0 +1,135 @@ +# Default version for this component +%define kdecomp kio-locate + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: kio-slave for the locate command [Trinity] +Version: 0.4.5 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils + +BuildRequires: cmake >= 2.8 + +%description +Adds support for the "locate:" and "locater:" +protocols to Konqueror and other TDE applications. + +This enables you to perform locate searches as you +would in a terminal. The result is displayed just +as a directory. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside SCONS files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "admin/kde.py" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL=ON \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING TODO +%{tde_tdelibdir}/kio_locate.la +%{tde_tdelibdir}/kio_locate.so +%{tde_tdedocdir}/HTML/en/kio-locate/ +%{tde_datadir}/services/locate.protocol +%{tde_datadir}/services/locater.protocol +%{tde_datadir}/services/rlocate.protocol +%{tde_datadir}/services/searchproviders/locate.desktop + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.4.5-3 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 0.4.5-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Fix compilation with GCC 4.7 + +* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.spec b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.spec new file mode 100644 index 000000000..72b4e1032 --- /dev/null +++ b/redhat/applications/tdeio-locate/trinity-kio-locate-3.5.13.spec @@ -0,0 +1,113 @@ +# Default version for this component +%define kdecomp kio-locate + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: kio-slave for the locate command [Trinity] +Version: 0.4.5 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +# [kio-locate] Fix compilation with GCC 4.7 +Patch1: kio-locate-3.5.13-fix_gcc47_compilation.patch + +Patch2: kio-locate-3.5.13-downgrade_3512.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + +BuildRequires: scons + +%description +Adds support for the "locate:" and "locater:" +protocols to Konqueror and other TDE applications. + +This enables you to perform locate searches as you +would in a terminal. The result is displayed just +as a directory. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch1 -p1 -b .install +%patch2 -p7 + +# Ugly hack to modify TQT include directory inside SCONS files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "admin/kde.py" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +scons configure +scons + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +scons install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING TODO +%{tde_tdelibdir}/kio_locate.la +%{tde_tdelibdir}/kio_locate.so +%{tde_tdedocdir}/HTML/en/kio-locate/ +%{tde_datadir}/services/locate.protocol +%{tde_datadir}/services/locater.protocol +%{tde_datadir}/services/rlocate.protocol +%{tde_datadir}/services/searchproviders/locate.desktop + + +%Changelog +* Tue May 01 2012 Francois Andriot - 0.4.5-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Fix compilation with GCC 4.7 + +* Sat Dec 03 2011 Francois Andriot - 0.4.5-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop b/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop new file mode 100644 index 000000000..22b716ad5 --- /dev/null +++ b/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop @@ -0,0 +1,74 @@ +[Desktop Entry] +ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted +Actions=MediaSafelyRemove; +X-TDE-Priority=TopLevel +X-TDE-MediaNotifierHide=true + +[Desktop Action MediaSafelyRemove] +Name=Safely Remove +Name[af]=Verwyder veilig +Name[ar]=أحذف بأمان +Name[be]=Бяспечна адлучыць +Name[bg]=Безопасно изваждане +Name[bn]=নিরাপদভাবে সরাও +Name[bs]=Sigurno ukloni +Name[ca]=Extreu amb seguretat +Name[cs]=Bezpečně odstranit +Name[csb]=Remôj na bezpieczny ôrt +Name[da]=Fjern sikkert +Name[de]=Sicher entfernen +Name[el]=Ασφαλής αφαίρεση +Name[eo]=Sekura Forigo +Name[es]=Extracción segura +Name[et]=Eemalda turvaliselt +Name[eu]=Atera arriskurik gabe +Name[fa]=حذف امن +Name[fi]=Poista turvallisesti +Name[fr]=Enlever en toute sécurité +Name[fy]=Feilich ferwiderje +Name[ga]=Bain Amach go Sábháilte +Name[gl]=Eliminar de Maneira Segura +Name[he]=שליפה בבטחה +Name[hr]=Slobodno uklonite +Name[hu]=Biztonságos leválasztás +Name[is]=Fjarlægja öruggt +Name[it]=Rimozione sicura +Name[ja]=安全に取り除く +Name[kk]=Қауіпсіз алып шығу +Name[km]=យកចេញ​ដោយ​សុវត្ថិភាព +Name[lt]=Saugiai pašalinti +Name[mk]=Безбедно отстрани +Name[ms]=Buang Dengan Selamat +Name[nb]=Sikker fjerning +Name[nds]=Seker rutnehmen +Name[ne]=सुरक्षीत रुपमा हटाउनुहोस् +Name[nl]=Veilig verwijderen +Name[nn]=Trygg fjerning +Name[pa]=ਸੁਰੱਖਿਅਤ ਹਟਾਓ +Name[pl]=Usuń w sposób bezpieczny +Name[pt]=Retirar com Segurança +Name[pt_BR]=Remover de Modo Seguro +Name[ro]=Scoate în siguranță +Name[ru]=Безопасно извлечь +Name[rw]=Gukuramo Neza +Name[se]=Dorvvošlaš eretváldin +Name[sk]=Bezpečne odpojiť +Name[sl]=Varno odstrani +Name[sr]=Безбедно уклони +Name[sr@Latn]=Bezbedno ukloni +Name[sv]=Säker urkoppling +Name[ta]=பாதுகாப்பாக நீக்கு +Name[te]=జాగరత్తగా తియి +Name[tg]=Баровардани бехетар +Name[th]=ถอดออกอย่างปลอดภัย +Name[tr]=Güvenli Kaldır +Name[tt]=İmin Çığaru +Name[uk]=Безпечно вилучити +Name[uz]=Эҳтиётлик билан узиш +Name[vi]=Gỡ ra An toàn +Name[wa]=Ositer e såvrité +Name[zh_CN]=安全删除 +Name[zh_TW]=安全的移除 +Exec=kio_umountwrapper %u + +X-Ubuntu-Gettext-Domain=desktop_tdebase diff --git a/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec b/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec new file mode 100644 index 000000000..20b3ceef4 --- /dev/null +++ b/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.1.spec @@ -0,0 +1,157 @@ +# Default version for this component +%define kdecomp kio-umountwrapper + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: progress dialog for safely removing devices in Trinity. +Version: 0.2 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://frode.kde.no/misc/kio_umountwrapper/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz +Source1: media_safelyremove.desktop + + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils + + +%description +Wrapper around kio_media_mountwrapper. +Provides a progress dialog for Safely Removing of devices in Trinity. + + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper +#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper +%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + + +%clean +%__rm -rf %{buildroot} + +%post +for f in konqueror d3lphin; do +%if 0%{?suse_version} + update-alternatives --install \ +%else + alternatives --install \ +%endif + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ + media_safelyremove.desktop_${f} \ + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ + 20 +done + + +%postun +if [ $1 -eq 0 ]; then + for f in konqueror d3lphin; do +%if 0%{?suse_version} + update-alternatives --remove \ +%else + alternatives --remove \ +%endif + media_safelyremove.desktop_${f} \ + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper + done +fi + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kio_umountwrapper +%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper +#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper +%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.2-4 +- Initial build for TDE 3.5.13.1 + +* Sun Jul 08 2012 Francois Andriot - 0.2-3 +- Add 'desktop' file, to make this program useful :-) + +* Wed May 02 2012 Francois Andriot - 0.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + +* Sat Dec 03 2011 Francois Andriot - 0.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec b/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec new file mode 100644 index 000000000..352e39845 --- /dev/null +++ b/redhat/applications/tdeio-umountwrapper/trinity-kio-umountwrapper-3.5.13.spec @@ -0,0 +1,140 @@ +# Default version for this component +%define kdecomp kio-umountwrapper + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: progress dialog for safely removing devices in Trinity. +Version: 0.2 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://frode.kde.no/misc/kio_umountwrapper/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Source1: media_safelyremove.desktop + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + + +%description +Wrapper around kio_media_mountwrapper. +Provides a progress dialog for Safely Removing of devices in Trinity. + + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper +#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper +%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + + +%clean +%__rm -rf %{buildroot} + +%post +for f in konqueror d3lphin; do + alternatives --install \ + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ + media_safelyremove.desktop_${f} \ + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ + 20 +done + + +%postun +if [ $1 -eq 0 ]; then + for f in konqueror d3lphin; do + alternatives --remove \ + media_safelyremove.desktop_${f} \ + %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper + done +fi + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kio_umountwrapper +%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper +#%{tde_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper +%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + +%Changelog +* Sun Jul 08 2012 Francois Andriot - 0.2-3 +- Add 'desktop' file, to make this program useful :-) + +* Wed May 02 2012 Francois Andriot - 0.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + +* Sat Dec 03 2011 Francois Andriot - 0.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 + diff --git a/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch b/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch new file mode 100644 index 000000000..fa36c7341 --- /dev/null +++ b/redhat/applications/tderadio/kradio-3.5.13.1-updated_preset.patch @@ -0,0 +1,26417 @@ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am kradio-3.5.13.1/kradio3/presets/australia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/australia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/australia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,18 +1,19 @@ + SUBDIRS = +-EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "sydney2.krp" "sydney.krp" ++EXTRA_DIST = "brisbane-antenna-2.krp" "brisbane-antenna.krp" "brisbane.krp" "melbourne-antenna.krp" "sydney2.krp" "sydney.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/" ++ $(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" + $(INSTALL_DATA) "$(srcdir)/brisbane-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/brisbane.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp" +- $(INSTALL_DATA) "$(srcdir)/brisbane-antenna-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" +- $(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" ++ $(INSTALL_DATA) "$(srcdir)/melbourne-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/sydney2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/sydney.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/brisbane-antenna-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/melbourne-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/australia/sydney.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/australia/melbourne-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/australia/melbourne-antenna.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,161 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Peter D. ++<p13@g-node.com.au> ++ 2007-12-12T17:01:51 ++ Australia ++ Melbourne ++ Antenna ++ Radio Stations for Melbourne, Australia ++ Contains merged Data ++ ++ ++ ++11974366782D0E540F17C02C9C4E20988BCD2C0C7100B2FC5ED1319E83350C0E4C0563EF35 ++ 3LIGHT FM community ++ light ++ ++ -0.01 ++ 89.9252 ++ ++ ++ ++1197436698FF15BCA070FB6227B18EBB68B9715621C393D7AF82C80F67F6E80CAB666759EC ++ 3SYN FM comminity ++ syn ++ ++ -0.01 ++ 90.7002 ++ ++ ++ ++1197436719C0EC401C5D0333A6E5B547782E8121B1901809FFD98F727201ADE6DB74303AE2 ++ 3VEGA FM ++ vega ++ ++ -0.01 ++ 91.5253 ++ ++ ++ ++1197436737017BC3859256567C06F74FC6AD3F7B1915F042A77FF112BED373F401AC4028B4 ++ 3ZZZ FM comminity ++ zzz ++ ++ -0.01 ++ 92.3003 ++ ++ ++ ++1197436756249596085B3207542A09E11A9C8C74ACB46070D13973A137F67B4136EE86C962 ++ 3SBS FM ++ sbs ++ ++ -0.01 ++ 93.1254 ++ ++ ++ ++1197436810A51A6903E91CFB581EF498645A805CD95387B9E149D05F4F5C0E57C69CFE6AB5 ++ 3GOLDEN DAY FM community ++ G' Day ++ ++ -0.01 ++ 95.6755 ++ ++ ++ ++119743691153837110B029B161953DDE804D73EA2E5861F76E507D7DA97C4FAFF5BEC1C2ED ++ 3NOVA FM ++ nova ++ ++ -0.01 ++ 100.326 ++ ++ ++ ++11974369293DC812D3A5A7BF790997A673EDAAEFEDD1A50135D09CEC74C0F2841593C9BBC8 ++ 3MIX FM ++ mix ++ ++ -0.01 ++ 101.101 ++ ++ ++ ++1197436948238C94F5ED52E042F96B82ED364BFECD1DE876F7DB212F590ADDA1BEBC6D7FE3 ++ 3FOX FM ++ fox ++ ++ -0.01 ++ 101.926 ++ ++ ++ ++1197437931AB81E5CE2324D406F215FA19A0B8C1927CD558960CFD9313FBE47E47A749C011 ++ 3RRR FM ++ rrr ++ ++ -0.01 ++ 102.751 ++ ++ ++ ++11974379481316966853D5FF30386493899394FFC3B3A8FAE73B28F93DD5E7DBB61F8CAC3E ++ 3MBS FM classical ++ mbs ++ ++ -0.01 ++ 103.476 ++ ++ ++ ++1197437004F27F07648029E5F0A761C4BBBF1408C189B69DCA872F9FDB68E6BCE1B3F8952A ++ 3GOLD FM ++ gold ++ ++ -0.01 ++ 104.301 ++ ++ ++ ++11974370239B06749375C9E77BB6AC1CADEAC4566B123E8E0C903EE4B9DB0C00A192400277 ++ 3MMM FM ++ mmm ++ ++ -0.01 ++ 105.151 ++ ++ ++ ++11974370423878D22E02EDF44D97ACEC2419689134C4700903D136AF45C56CE08F7D3E1CFE ++ ABC FM classical ++ abc classic ++ ++ -0.01 ++ 105.926 ++ ++ ++ ++119743706068B59CCAFF4E0462729EE829A55E3311AD32AEFFEF1067064919CCBD6AD1C465 ++ 3PBS FM community ++ pbs ++ ++ -0.01 ++ 106.701 ++ ++ ++ ++11974380497211583134DCDBC719C69479C5454C567A662FA3CC75A2EC69DECB6C4D440E7E ++ 3JJJ FM ++ jjj ++ ++ -0.01 ++ 107.526 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp kradio-3.5.13.1/kradio3/presets/belarus/brest.krp +--- kradio-3.5.13.1/kradio3/presets.old/belarus/brest.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/belarus/brest.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,258 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.1-rc1 ++ Blaze ++ 2010-08-08T09:00:13 ++ Belarus ++ Brest ++ ++ ++ ++ ++ 1207729347B95CF236E42587F6871F53D00304A13643B98948622764D589238FDFE6F550A1 ++ Першы нацыянальны ++ ++ ++ -0.01 ++ dontcare ++ 70.9 ++ ++ ++ 120772620854C001667C47982987BFB58FF2B485A2C828F99A875C28AD6C2A5FC61D587D2B ++ Культура ++ ++ ++ -0.01 ++ dontcare ++ 71.7 ++ ++ ++ 1207726041C55D9585D3A616D7E90CDB8AB1B343638DA19EFFB7DC7557602C2D76F312A07F ++ радыё Сталiца ++ ++ ++ -0.01 ++ dontcare ++ 72.5 ++ ++ ++ 1207725781B1CE695E03A103A33EA30C2AEE33B4FDB5757DAF907F0964F5A1EA23C553A8AD ++ radio 1 Polska ++ ++ ++ -0.01 ++ dontcare ++ 88.25 ++ ++ ++ 1195418551882952DFC8A3913F8D3C68504C0E93BF72377B5CD67E045D20F27280F00F25E1 ++ Культура ++ ++ ++ -0.01 ++ dontcare ++ 88.4 ++ ++ ++ 11954185650FE254953641925E551685E06E70EAD8660CF8C010FF4B5446BAFB8FB597D918 ++ radio 3 Polska ++ ++ ++ -0.01 ++ dontcare ++ 90.5 ++ ++ ++ 1194713996F0E7E992470C24D4CE8060E398D7B24CF79C675808B56A957BA315E32BA9D3A2 ++ RMF FM ++ ++ ++ -0.01 ++ dontcare ++ 91.9 ++ ++ ++ 1194713863838DF5C3D87638EA1BC0C2F69C8A18EBEC793462C87EB1097DDDB0DC02663030 ++ Новое радио ++ ++ ++ -0.01 ++ dontcare ++ 92.8004 ++ ++ ++ 1194713867D9F544C68EE0C5E183652BAB20149AB9DD906EE04173894C48A482E29C744AB5 ++ radio Belarus ++ ++ ++ -0.01 ++ dontcare ++ 96.4 ++ ++ ++ 12077294984C448D1D756B4422108C36E16C7249BF7B2ABEFA33119A5CB5BAEE6C417DAB58 ++ радыё Рацыя ++ ++ ++ -0.01 ++ dontcare ++ 99.2 ++ ++ ++ 1207687158AC1EFA6C9DD0FFFCEB20D5C4A1422DB3DB9EAA460E874326A65D4A9D1CC34C3E ++ Першы нацыянальны ++ ++ ++ -0.01 ++ dontcare ++ 99.9998 ++ ++ ++ 128051385121F1B431D096F125FCAF235ECCA45C414ABE8DC64C8F2E3D0A41A4C9A843 ++ радио Минск ++ ++ ++ -0.01 ++ dontcare ++ 100.4 ++ ++ ++ 1227190558E55550FD0D68E6DDC089D3DFF7FB85A40F0D37900E0680BF1A78667166E99C21 ++ Альфа радио ++ ++ ++ -0.01 ++ dontcare ++ 100.8 ++ ++ ++ 1202244062D3B1BD6E67E93C3D3186F73B8AE89D4FCCD9E3ECDD51E328F65036A365381747 ++ радио Рокс ++ ++ ++ -0.01 ++ dontcare ++ 101.201 ++ ++ ++ 1207729844804970DB985A067502CCD04CDB8CF67CDE973A3AC5C311998F80CA6212141C2D ++ radio Podlaśia ++ ++ ++ -0.01 ++ dontcare ++ 101.7 ++ ++ ++ 1202244168B63FB1467284BF12B788C73B54412EA827276731841EA311E5DB412E3D67CA73 ++ Unistar ++ ++ ++ -0.01 ++ dontcare ++ 102.3 ++ ++ ++ 12171720541E9003C323E0451C23BA71BA9F04DA8800CD68AFCD2F7ECCD5D5D1DA9609C3D2 ++ radio 2 Polska ++ ++ ++ -0.01 ++ dontcare ++ 102.55 ++ ++ ++ 1202245059AE9EBED37F3B7BA219E0733F6FEA9A2D2E4CE4A9D006BFC4723557997AF0D836 ++ Pilot fm ++ ++ ++ -0.01 ++ dontcare ++ 102.9 ++ ++ ++ 1202292997527C0FCFE4DA7276A2330178ECA3662FAF3EA3011796C416CABF38144D1033D2 ++ Radio dla ćiebię ++ ++ ++ -0.01 ++ dontcare ++ 103.4 ++ ++ ++ 120224528899157BF6DA7064D0D1325986522D67E3DB3D58B772CA8BF58F0EA566FE32BD74 ++ Радиус fm ++ ++ ++ -0.01 ++ dontcare ++ 103.7 ++ ++ ++ 1217172241D354DFEB01909925C0A8B485DBB22A3CC748619A388FF492F225D71D178C9C51 ++ radio 3 Polska ++ ++ ++ -0.01 ++ dontcare ++ 104.2 ++ ++ ++ 12171722879ACB44A1C2A18FFC543900D4F9C57067C662618247DD7BB7EE8FBC35FFAB0BB9 ++ radio Maria ++ ++ ++ -0.01 ++ dontcare ++ 104.45 ++ ++ ++ 1202245826D98B15CBF4743EBD4AC7C3244B952B551AB6CBBE876309603D97FFED2F1D5F05 ++ радио Брест ++ ++ ++ -0.01 ++ dontcare ++ 104.8 ++ ++ ++ 1194714022A97BEC079991179A7F6AB786705AB0DF6B834ED0C23B271D19E19CD7D702EF35 ++ radio Zet ++ ++ ++ -0.01 ++ dontcare ++ 105.4 ++ ++ ++ 1194714205A5F11E788B848B143CFA9E2350F74BD56902514359C51CD39AC07D1FC0FD786A ++ радио "ba" ++ ++ ++ -0.01 ++ dontcare ++ 106.2 ++ ++ ++ 1281248050E5DD39785E5EFE11D82C9436E6AA3A48E0F6D1B19CF029CF43EAA6922846 ++ радио Мир ++ ++ ++ -1 ++ dontcare ++ 106.6 ++ ++ ++ 121717241561F47D14C239BC8C669D47D567F9F82EF98251001C54207E8DD9AB2177D5D58E ++ radio Maria ++ ++ ++ -0.01 ++ dontcare ++ 107.7 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/belarus/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/belarus/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,9 @@ ++SUBDIRS = ++EXTRA_DIST = "brest.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/" ++ $(INSTALL_DATA) "$(srcdir)/brest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belarus/brest.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/belgium/antwerpen-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/belgium/antwerpen-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,133 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ ++ 2008-05-01T21:00:03 ++ Belgium ++ Antwerpen ++ Antenna ++ ++ ++ ++ ++1209668864D2A04359F84AB8D3733E1CCF1279310F0493587FB93BF7F74A854DC9EE0557BC ++ VRT Radio 1 ++ Radio 1 ++ ++ -1 ++ 94.2 ++ ++ ++ ++12096688808089E6109077979C4D5922F72F137891BE7D38EDB299D525C158F7327D572466 ++ VRT Radio 2 ++ Radio 2 ++ ++ -1 ++ 97.5 ++ ++ ++ ++120966879513F8100817BD88AA03A7C918008327682640E59AD2246DBBED22C6DB52078977 ++ VRT Radio Klara ++ Klara ++ ++ -1 ++ 92 ++ ++ ++ ++120966874819E4357D2D5E93338F402C2507FFEBCA071AB41A30CC5F896C6952354A73E2B3 ++ VRT Radio Donna ++ Donna ++ ++ -1 ++ 89 ++ ++ ++ ++1209668807766DF511EEBD78100CFC98FEEEBA67E6406CDCC92F0A81653F9A0C095C98C7FB ++ VRT Studio Brussel ++ StuBru ++ ++ -1 ++ 100.9 ++ ++ ++ ++120966871597D85D822EE8C9D809E676A272FC62AC0E3F341DB79144F45C256253BA386310 ++ Q-Music ++ Q-Music ++ ++ -1 ++ 92.9 ++ ++ ++ ++12096693197B8AC6F5BEF2CADB6CE975EA1905FC7A036C26B395D8F124021E86496E3E5C31 ++ 4FM ++ 4FM ++ ++ -1 ++ 103.4 ++ ++ ++ ++120966910628654CADD557C4BD8BD8F1562939C077433F6221B369C63BE717942C856647D7 ++ Radio Minerva ++ Minerva ++ ++ -1 ++ 98 ++ ++ ++ ++120966920982AE695B3C21D74EDB282A0D8BF32564BFFDD15F67D640AF26D2AD24DD74329B ++ Radio Nostalgie ++ Nostalgie ++ ++ -1 ++ 102.9 ++ ++ ++ ++1209669397A89F41C973ECA289106883F6D088775F413EC43F9682C7AA854800F994C25DEA ++ Crooze FM ++ Crooze FM ++ ++ -1 ++ 104.2 ++ ++ ++ ++1209669501A71E45127C44908BA58078E5F433C86E1A50E77981BDB0E7961CFCAF66B6BEFC ++ Be One ++ Be One ++ ++ -1 ++ 104.6 ++ ++ ++ ++12096695556FC4775E17AE0D976314928CB5B8097E33C695491B12A46CBD634F996C11376F ++ Cool FM Antwerpen ++ Cool FM ++ ++ -1 ++ 105.4 ++ ++ ++ ++120966965615DC568C10D8100275FBAB0E32892335B8627A158E0EFEBBBF6CDFE608D03FB3 ++ Radio Echo (TOPRadio) ++ ++ ++ -1 ++ 106.3 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp +--- kradio-3.5.13.1/kradio3/presets.old/belgium/bilzen.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/belgium/bilzen.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,205 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Roeland Moors ++ 2008-07-05T14:57:10 ++ Belgie ++ Bilzen ++ ++ Contains merged Data ++ ++ ++ 1082619533D0EF312578B2C12F4D76EE3E45054110BED5B081ABF144AEAE7E0E23E51FCEB6 ++ Radio1 (VRT) ++ Radio1 (VRT) ++ ++ -0.01 ++ 94.5 ++ ++ ++ 121526266366A4F91967AAFD7340DFA2354AB1E0B0953070B481BD60DE45EB158429D9CE11 ++ Radio2 (VRT) ++ Radio2 (VRT) ++ ++ -1 ++ 95 ++ ++ ++ 1215262732B6CFFDFD9EE3DDA03BC69D81B3607BEE359C5782A6C5CF2600670A3476067C19 ++ Donna (VRT) ++ Donna (VRT) ++ ++ -1 ++ 93 ++ ++ ++ 1215262778F380B95C0963A856E4BCA4758D380E971B58C807E61054FED586B5697679FC06 ++ Studio Brussel (VRT) ++ Stubru (VRT) ++ ++ -1 ++ 92.7 ++ ++ ++ 12152628270707ED8F73E3365F315BF3F0197030E52CAE0AA84042712972E9FA0CC9C77D0A ++ Radio Vlaanderen Internationaal (VRT) ++ RVI (VRT) ++ ++ -1 ++ 94.1 ++ ++ ++ 1215262923ED9EC63654C6B06E16F90402F226CF58E3DCD28F8955F98C8379907DA2BD3547 ++ Klara (VRT) ++ Klara (VRT) ++ ++ -1 ++ 95.8 ++ ++ ++ 121526295602E09EEAB3D203004C4EFF337334F8F2CD1F5EB215BD3B9CE0C2D15CB1380E0A ++ Radio1 (NL) ++ Radio1 (NL) ++ ++ -1 ++ 97.4 ++ ++ ++ 12152630627C3408C0B9033C392BDBCDDCF6DDD41503B56474238AD1B7888BF535D0D327F0 ++ Radio2 (NL) ++ Radio2 (NL) ++ ++ -1 ++ 97.2 ++ ++ ++ 12152635620BF54DC6411AD7AC204ECF8D99A6C6539146C49BFDF75E9363996EC938AB9302 ++ Radio3 (NL) ++ Radio3 (NL) ++ ++ -1 ++ 97.6 ++ ++ ++ 1215263237792D55D9D3007EC6934A83E8A91906B3A011C9E11CD71882074A1F2CBF4F07EE ++ Radio4 (NL) ++ Radio4 (NL) ++ ++ -1 ++ 96.5 ++ ++ ++ 12152633215918E45416B70B36915C5447EF08FC2D698B1ADBB26FFDBE0E8B8C4BA60617C9 ++ 4FM ++ 4FM ++ ++ -1 ++ 96.2 ++ ++ ++ 12152633665237A15C2EDF4B82DCAD1414FB185F88EE629C94CB4201F4482B25DC9E55F893 ++ Q-music ++ Q-music ++ ++ -1 ++ 97.8 ++ ++ ++ 1215263397F320B0728B535D76E996EE0D6F5C0F9540BEBF2B8FAED6E9CF66AEDF356E1CD8 ++ BBC World ++ BBC World ++ ++ -1 ++ 90.3 ++ ++ ++ 1215263435410BB4AA6ABE12E2C3C9DB5D0DB850F7D3C415A3289A2D2B29509C1B6491A181 ++ BBC 2 ++ BBC 2 ++ ++ -1 ++ 95.4 ++ ++ ++ 12152634678854A21F1A0C01FFA3A5E6E235B37C0C306FAF5617F305D5F924E739B15D430C ++ BBC3 ++ BBC3 ++ ++ -1 ++ 100.3 ++ ++ ++ 12152632098F327814F8708422B8670F872234946D641AAFFA5A67C46947398C3CA7910071 ++ Classic 21 (RTBF) ++ Classic 21 (RTBF) ++ ++ -1 ++ 92.3 ++ ++ ++ 12152638141A9295AB35F2F119D0F5CB6EC63BA523A8256BB0A1E41432016D03B4BFB61BD7 ++ Musique 3 (RTBF) ++ Musique 3 (RTBF) ++ ++ -1 ++ 91.9 ++ ++ ++ 12152638542B98B42A3DD4AF0FB042498092849D753A1A6A9C28E098C5A4A498AD7AB94A46 ++ Viva Cite (RTBF) ++ ++ Viva Cite (RTBF) ++ ++ ++ -1 ++ 97.6 ++ ++ ++ 1215263895E17E4FC1BB559557C961B24DD5F77A1BA5CDB57891797D2B0D5E27E91C36ABC3 ++ Viva Cite ++ Viva Cite ++ ++ -1 ++ 91.4 ++ ++ ++ 12152640255FAE61BC958F1D9B0B77400462FB6309D5AC1BE3DB309A956FD09B034B9DA6E6 ++ BRF ++ ++ BRF ++ ++ ++ -1 ++ 99.9 ++ ++ ++ 1215264045475CC0A5EB09DBC99EFF53CE27532E793FF6A9EFF69CB86BCBC4A99A5BC6E78F ++ Deutsche Welle ++ ++ Deutsche Welle ++ ++ ++ -1 ++ 93.9 ++ ++ ++ 121526350496BB70933EDA4409C2127EB51B05C994C2D679D5A87C0B0DB93066F0B8ECFA2A ++ La premiere (RTBF) ++ La premiere (RTBF) ++ ++ -1 ++ 97.6 ++ ++ ++ 121526407469366F46B22C57462B698052BE78CB8947776AEBA38AA7CB78857EEC834466B3 ++ Sporza ++ Sporza ++ ++ -1 ++ 98.3 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/belgium/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/belgium/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,14 +1,17 @@ + SUBDIRS = +-EXTRA_DIST = "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp" ++EXTRA_DIST = "antwerpen-antenna.krp" "bilzen.krp" "buellingen-antenna.krp" "ieper-cable.krp" "limburg-cable.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/" ++ $(INSTALL_DATA) "$(srcdir)/antwerpen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/bilzen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp" ++ $(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/ieper-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp" + $(INSTALL_DATA) "$(srcdir)/limburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/buellingen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" +- + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/antwerpen-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/bilzen.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/ieper-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/limburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/belgium/buellingen-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp +--- kradio-3.5.13.1/kradio3/presets.old/brazil/campinas-sp.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/brazil/campinas-sp.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,159 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0-rc2 ++ Hélio Polessi <hcpcamp@gmail.com> ++ 2010-02-14T23:00:00 ++ Brazil ++ Campinas-SP ++ ++ ++ ++ ++ 126618494637241F4F8061AEF9182D981F7B7468052284DFB1E6618F268A85B9341A9E ++ Notícia FM ++ ++ ++ -0.01 ++ dontcare ++ 88.9 ++ ++ ++ 126618501643BEDF9B833C1844F4BF68530E3D71D64610CEDCE25933824EF0941AA8B0 ++ Vox FM ++ ++ ++ -0.01 ++ dontcare ++ 90.3 ++ ++ ++ 12372390231F7155089C8FC8A96366D96D657AA4EAF8023A2F46C14594141F50B5C9E6 ++ Educadora ++ ++ ++ -0.01 ++ dontcare ++ 91.7 ++ ++ ++ 123723906031FBA978DAFC484F7EAEB3333FDD4CFFB2DDC7C832F26D2E60EB8510D26D ++ Cidade ++ ++ ++ -1 ++ dontcare ++ 92.5 ++ ++ ++ 1237239087A51A3D3B08532CFEDEE91EFCA74C037C11F14827452DB492C680B081C40C ++ Laser ++ ++ ++ -1 ++ dontcare ++ 93.3 ++ ++ ++ 12661850370C13437F6FF803AFE53C2E06EE0DA14DE34FAA8CFE0AD0EA744556CC3B92 ++ Oi FM ++ ++ ++ -1 ++ dontcare ++ 94.1 ++ ++ ++ 12661850830E51099D751D008F7F1AAFBBF4D5066EE30E30A7A174895460903AFDFBC5 ++ Mundial FM ++ ++ ++ -1 ++ dontcare ++ 95.7 ++ ++ ++ 123723911232AFC94ED9C86FE77C42754DEFF95019FF96C018B6F9E266ADF4CC311141 ++ CBN ++ ++ ++ -1 ++ dontcare ++ 99.1 ++ ++ ++ 12661851107493B0A58FD97F214400B5FCF30959E762E4FEB5A55FEC934F7EE1D78389 ++ Educativa ++ ++ ++ -1 ++ dontcare ++ 101.9 ++ ++ ++ 1237239133465FE65E06B9C09990FF2CF85417CDB3FD0442A38B6C0D761828F7F35AE0 ++ Nova FM ++ ++ ++ -1 ++ dontcare ++ 103.7 ++ ++ ++ 1237239162D54181C9DF565AEB384BEE8AB15519B0A0F537442B7B4FF6FC829DEAFDAB ++ Dumon FM ++ ++ ++ -1 ++ dontcare ++ 104.3 ++ ++ ++ 1237239193D67830A2911A6C35CA0949D66AFA4DBDF491A365682C4614B789A1C6D9C3 ++ 105 FM ++ ++ ++ -1 ++ dontcare ++ 105.1 ++ ++ ++ 12372392300091B35163BBF9C7C389AE885EA8131E1D519647A0A17E1FD0C580E4FA3B ++ Onda Livre ++ ++ ++ -1 ++ dontcare ++ 105.3 ++ ++ ++ 12661851466F2B4913E272B35C34ADF28EB2287050FF7A47A68A31CD45C82BCA63629D ++ Band News FM ++ ++ ++ -1 ++ dontcare ++ 106.7 ++ ++ ++ 12372392551C50902A4785BC42C95B2C4903991FFDBC61D0D328E517864920C8DF3003 ++ Antena 1 ++ ++ ++ -1 ++ dontcare ++ 107.5 ++ ++ ++ 1237239273DF9EC3314BAA3D7EF50884AB0B3BC0F7D929B9DCA4BD3A750A9663650B21 ++ Kiss FM ++ ++ ++ -1 ++ dontcare ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/brazil/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/brazil/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,14 +1,20 @@ + SUBDIRS = +-EXTRA_DIST = "brasilia.krp" "rio-de-janeiro.krp" "sao-paulo.krp" ++EXTRA_DIST = "brasilia.krp" "campinas-sp.krp" "rio-de-janeiro2.krp" "rio-de-janeiro.krp" "sao-paulo2.krp" "sao-paulo.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/" ++ $(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" ++ $(INSTALL_DATA) "$(srcdir)/campinas-sp.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp" ++ $(INSTALL_DATA) "$(srcdir)/rio-de-janeiro2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp" + $(INSTALL_DATA) "$(srcdir)/rio-de-janeiro.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp" ++ $(INSTALL_DATA) "$(srcdir)/sao-paulo2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp" + $(INSTALL_DATA) "$(srcdir)/sao-paulo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp" +- $(INSTALL_DATA) "$(srcdir)/brasilia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" +- + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/campinas-sp.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/rio-de-janeiro.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/sao-paulo.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/brazil/brasilia.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp +--- kradio-3.5.13.1/kradio3/presets.old/brazil/rio-de-janeiro2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/brazil/rio-de-janeiro2.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,529 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.5 ++ Paulo Roma ++ 2012-04-26T07:20:16 ++ Brasil ++ Rio de Janeiro ++ FM ++ ++ ++ ++ 110852260463B1FF53E1CD96CF530D5073BBDC2E5E6D4E3CAB9B34065943518B4BAD5410A9 ++ Rede TV ++ Rede TV ++ -0.01 ++ dontcare ++ 87.65 ++ ++ ++ 1108522606CF0E16071B00E33871043B85546C70AA2AF543A71B4C24B9B04E1817131E5CCC ++ Rádio Globo ++ Globo ++ -1 ++ stereo ++ 89.5 ++ ++ ++ 11085226079713E38261AB9287D23763C4D825CBFAB4756409F233A41E405EDAAFF360E6CA ++ MPB ++ MPB ++ -1 ++ stereo ++ 90.3 ++ ++ ++ 1108522610E1E698C5DE74602CACD88D4BD92DB5A333FF31F77FACA15E10ACA36575E5B882 ++ CBN ++ CBN ++ -1 ++ stereo ++ 92.5 ++ ++ ++ 110852261107A4883E351F621F0ADEBADCF0BD45E7877F69B1DB48282598F8F6D0556C88BA ++ 93 FM ++ ++ -1 ++ stereo ++ 93.3 ++ ++ ++ 1143339804A5D28DF1EE170111D80B121BD62FEB305F0930127C1CC62B221F686E2ACF14A7 ++ Roquette Pinto ++ Roquete ++ -1 ++ stereo ++ 94.1 ++ ++ ++ 11085226135301AB1B95E41ACE07478D6F2C86942A06944D1BDD11C73CED9D3A56D0850081 ++ Band News FM ++ BandNews ++ -1 ++ stereo ++ 94.9 ++ ++ ++ 1108522621C91B5E7DFEC5C77575BF0B195FD21551C5BBB8A413C1CF0A129C7004CC7D7163 ++ Paradiso ++ Paradiso ++ -1 ++ stereo ++ 95.7 ++ ++ ++ 1108522615798A0B2E248B18387E6433FD51190E66587E9A13EEA19E005588B98DAFEFC51F ++ Tupi ++ Tupi ++ -1 ++ stereo ++ 96.5 ++ ++ ++ 11433383473BEC1138AFC3903343768372D4EB8FA0B5AB2718054CDE6B0F901A2DFE8CEA8C ++ Beat98 ++ Beat 98 ++ -1 ++ stereo ++ 98.1 ++ ++ ++ 110852261861A65E9E025217236634A2FED71D33BA90B39E7DBB47F575E638DDD14D6AA426 ++ Rádio MEC ++ MEC ++ -1 ++ stereo ++ 98.9 ++ ++ ++ 1108522619C23DF4E4945D4514733F38BD25957B583A8AE4F1BB703CFCE6E675892585D4FB ++ JB FM ++ JB ++ -1 ++ stereo ++ 99.7008 ++ ++ ++ 11433391060DF3E724233493F9D3C1C37F9136C26F8E9C32956A1CD4AA89929794DD7E2E28 ++ FM O Dia ++ O Dia ++ -1 ++ stereo ++ 100.5 ++ ++ ++ 1143339296D7F1D09A3AFAB2EBE6D36E9EFD26D78FE78FF7C9BBA969AAA9661E754898F806 ++ Transamérica Pop ++ Transamérica ++ -1 ++ stereo ++ 101.3 ++ ++ ++ 11085226228543DC58DACD263E20C489701FB95A1815555AB77BDA2BEF2D8F524D2CDC0680 ++ Mix ++ Mix ++ -1 ++ stereo ++ 102.1 ++ ++ ++ 1108522623AA9FD006C835CEB5488A4806543277E5A79D0C98EB07A1A0C4D39E223B5636D0 ++ Jovem Pan ++ JP ++ -0.01 ++ stereo ++ 102.9 ++ ++ ++ 1108522624E2D9B6ED883B4EAB1CE5CF9F97016D7D3AD176F6E2998D9765721D682E0937C2 ++ Nativa ++ Nativa ++ -0.01 ++ stereo ++ 103.7 ++ ++ ++ 1108522625CCA35BA2EE3A557BCCB3286C12658116BBC858D6673C1D88CA89B156851EE570 ++ RádioCom ++ ++ -1 ++ stereo ++ 104.5 ++ ++ ++ 1108522628F19FBF0FD0B62A4A7781AF7D8603BEB1215F1819E5028AA008748BBABFC34D39 ++ Catedral ++ Católica ++ -1 ++ stereo ++ 106.7 ++ ++ ++ 11085226298BC8211EE7A66460385578D487B6729DA83550DF85F2517F514D9C019A93FF34 ++ Gospel ++ Evangélica ++ -1 ++ stereo ++ 107.9 ++ ++ ++ 1335605678EE85AF1020B8DF8362741004FE16087079630F7DB4CB0CFB62DD2CD05FE0 ++ _______________________________ ++ ++ -1 ++ dontcare ++ 0 ++ ++ ++ 132964209102A9E373176AC345769BF95FCDDAED10FB54E88137B307776909426B6C56 ++ Rádio MEC AM 800 ++ ++ -0.01 ++ dontcare ++ http://radioslivres.radiobras.gov.br:8080/mecam.mp3 ++ ++ auto ++ auto ++ ++ ++ 1336644686598A6CE56A5C9830626FA81717D9A01E731EC60FA3B6AF59CD4AB5B3A732 ++ Tamoio AM 900 ++ ++ -1 ++ dontcare ++ http://187.110.226.22:8038/ ++ ++ auto ++ auto ++ ++ ++ 13284779563ADDF256BA86B8FC0F07902C774D4E69BF5C55175E5516936186668A1E0A ++ Rádio Nacional AM 1130 ++ Nacional ++ -1 ++ dontcare ++ http://radioslivres.radiobras.gov.br:8080/nacionalrio.mp3 ++ ++ auto ++ auto ++ ++ ++ 1238681020F4AA90589682D934172A4DB15EC4A4C4A424EDA082486D4B12937E556280 ++ Globo AM 1220 ++ ++ -0.01 ++ stereo ++ mms://wm-sgr-live.globo.com/sgr_off_globoamrj_live.wma ++ asf ++ auto ++ auto ++ ++ ++ 13356057218399B5BC913429CADDBA31F3BFA6BAC21E8937216AB392FE91E9809A7809 ++ _______________________________ ++ ++ -1 ++ dontcare ++ 0 ++ ++ ++ 1241912811385B06FDB95068194C12F870D6E306E21E52A93991673FD9A33EFD54FE66 ++ MPB FM 90.3 ++ MPB ++ -0.01 ++ stereo ++ http://69.31.54.133:3690/MPBFM903AAC ++ ++ auto ++ auto ++ ++ ++ 13374327174E01A225AE834F813CF5FDB60EEEB0412AE69F60A691A52776326CD37649 ++ Bradesco Esportes FM ++ Bradesco ++ -1 ++ dontcare ++ http://208.80.54.47:3690/94_1FMAAC ++ ++ auto ++ auto ++ ++ ++ 133522364599C458AA2A85B35A918926F023F98BE5BB28B91CF0D8694A0555EC9F538B ++ 93 FM ++ 93 ++ -1 ++ dontcare ++ http://208.80.52.116:3690/FM93AAC ++ ++ auto ++ auto ++ ++ ++ 1335405280FCCDE167E4908818F689FA3D41031FA10768F902A5ABCC2876A5EED361AA ++ CBN 92.5 ++ ++ -1 ++ dontcare ++ mms://wm-sgr-live.globo.com/sgr_off_cbnfmrj_live.wma ++ ++ auto ++ auto ++ ++ ++ 1241911980183645EA2E4C247D327AD84BF532AF96F33271106F18B8882403861A32E4 ++ Roquette Pinto 94.1 ++ ++ -0.01 ++ dontcare ++ mms://roquette.94fm.rj.gov.br:8000/ ++ ++ auto ++ auto ++ ++ ++ 13353557754B5172FDD46B8EB4D8BA35E9154441E9EC339FA9CD0A197374035E482AAE ++ Band News FM 94.9 ++ ++ -1 ++ dontcare ++ http://69.31.54.135:3690/NEWSRIOAAC ++ ++ auto ++ auto ++ ++ ++ 124191172671DC04E508F9A1D3362A912E1F854FA07FDB3ADA063131E4DD0AB040D5BB ++ Paradiso FM 95.7 ++ Paradiso ++ -1 ++ stereo ++ mms://p.mm.uol.com.br/paradisofm ++ ++ auto ++ auto ++ ++ ++ 132964185813145D4AD44B972E36DB138819AAE5DBF3CE5BB3473D7344BEB83F1A0ED8 ++ Rádio Nacional FM 96.1 ++ Nacional ++ -1 ++ stereo ++ http://radioslivres.radiobras.gov.br:8080/nacionalfm.mp3 ++ ++ auto ++ auto ++ ++ ++ 13355333701F162639AD78EE2E18697712D5F192ADF258987197C411D5AE1A34B9292E ++ Super Rádio Tupi AM 1280 + FM 96.5 ++ Tupi ++ -1 ++ dontcare ++ http://174.122.109.90:8888/;stream.nsv ++ ++ auto ++ auto ++ ++ ++ 13355348680B1FB972724DB59A39863C1C5D9B21EF95FF4EA1C3C90D39AC2E0D2842DE ++ Melodia 97.5 ++ ++ -1 ++ dontcare ++ mms://streaming3.joinhost.com.br:80/radio_melodia ++ ++ auto ++ auto ++ ++ ++ 13352238428A36568CBE8FE46E0C6B2CBD31197D3F5E6BDB12916A4A49F98165C43283 ++ Beat98 FM 98.1 ++ ++ -1 ++ dontcare ++ mms://wm-sgr-live.globo.com/sgr_off_98fmrj_live.wma ++ ++ auto ++ auto ++ ++ ++ 1244201041C189FB35391781907985642BA71B78711FC0CAE3A34D1F0D608D045257B3 ++ Rádio MEC FM 98.9 ++ MEC ++ -1 ++ stereo ++ http://radioslivres.radiobras.gov.br:8080/mecfm.mp3 ++ ++ auto ++ auto ++ ++ ++ 123868105729D7E1299035CBCBA570A5A24F356BE7D9D223BCA0C3BDDD6ECCCA2AE11B ++ JB FM 99.7 ++ JB ++ -0.01 ++ stereo ++ http://5923.live.streamtheworld.com:80/JBFMAAC1 ++ acc ++ auto ++ auto ++ ++ ++ 1335529955E1A22D934A874936D0D88353FBDFA33AF011B13156DD75C64F4C5483BCD5 ++ FM O Dia 100.5 ++ O DIa ++ -0.01 ++ dontcare ++ http://208.80.54.128/FMODIAAAC ++ ++ auto ++ auto ++ ++ ++ 13352190307C9B15684F734B7E4B18D36C631B14DF9E09A38B8727354C2584CF33712E ++ Mix FM 102.1 ++ Mix ++ -1 ++ dontcare ++ mms://p.mm.uol.com.br/mixriofm ++ ++ auto ++ auto ++ ++ ++ 1335353779649713E5D0A6BB8A85BC827406176719BCCB1B51AC83755B450738B932AA ++ Nativa FM 103.7 ++ Nativa ++ -1 ++ dontcare ++ http://174.122.109.82:8886/ ++ ++ auto ++ auto ++ ++ ++ 13355282288C45165B0BBDECB759392355069E5BE468AD7A55C30A1F1514358A762CB6 ++ RádioCom 104.5 FM ++ ++ -1 ++ dontcare ++ http://67.23.248.77:8000/aovivo.m3u ++ ++ auto ++ auto ++ ++ ++ 1335699232EAD8EF7FB5319FA0106BBDE01E023AFCA7617548C0BED9720F656C7038FA ++ Aleluia 105.1 FM ++ Aleluia ++ -1 ++ dontcare ++ http://servidor5.crossdigital.com.br:8016/;stream.nsv ++ ++ auto ++ auto ++ ++ ++ 1335698861C025BAFB1EF74C6A2C8DA652B1C34CDB5B75B799E3B2F86AA23B42A00FCA ++ Catedral FM 106.7 ++ Catedral ++ -1 ++ dontcare ++ http://67.205.76.171:8092 ++ ++ auto ++ auto ++ ++ ++ 13356959814BA482B505F6D897EC382C8B7815ABE593C6D2F0CF52E8A1934E32DE2212 ++ Gospel 107.9 FM ++ Gospel ++ -1 ++ dontcare ++ http://173.192.184.70:8358/live ++ ++ auto ++ auto ++ ++ ++ 133560574414161FAD76ADBCF1007E27A277E0AD8217CC4ED0A0E9F0171F236180826C ++ _______________________________ ++ ++ -1 ++ dontcare ++ 0 ++ ++ ++ 126182762802DF5F4526D4D07BB0BC6E56A040A7C4C9C7EC8CB2701522EB06BEA69A8F ++ Antena 1 ++ Antena 1 ++ -0.01 ++ dontcare ++ http://a1rj.streams.com.br:7801/stream ++ ++ auto ++ auto ++ ++ ++ 1238680874AB4FA8C5EA96C4654CBFE110206A226CFCB5B48C6941FE5D9453ECE7B65C ++ Globo FM ++ ++ 0.3 ++ stereo ++ mms://wm-sgr-live.globo.com/sgr_off_globofmrj_live.wma ++ asf ++ auto ++ auto ++ ++ ++ 13352802088D62569EA16EC2CD29B6F997067230DEC4294CFA2274B1253F297B47948D ++ Oi FM ++ Oi ++ -0.01 ++ dontcare ++ http://173.236.58.98:9470/;stream.mp3 ++ ++ auto ++ auto ++ ++ ++ 1238681086AABDFCAFFEDB4F0B52BCC889E6BDD5AC00AADB1DB9FF67CCA23685633656 ++ Transamérica ++ ++ -0.01 ++ stereo ++ mms://wmedia.telium.com.br/transrjpop ++ asf ++ auto ++ auto ++ ++ ++ 13284445512FDABAA1CA058AEAAD0E7A618DAAF8A3694549C7B185EB9291D3F1D3A55B ++ Tupi FM ++ ++ -1 ++ dontcare ++ mms://servidor10.crossdigital.com.br:8000/tupifm ++ ++ auto ++ auto ++ ++ ++ 13283722598C2F9B55731F7F7A4313A4F3A75BC13B5B983DFFFCA7B153803582085B0E ++ WestDeutscher Rundfunk ++ ++ -1 ++ dontcare ++ http://www.wdr.de/wdrlive/media/wdr5.m3u ++ ++ auto ++ auto ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp +--- kradio-3.5.13.1/kradio3/presets.old/brazil/sao-paulo2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/brazil/sao-paulo2.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,375 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.2 ++ Igor Isaias Banlian <igorisaiasbanlian@gmail.com> ++ 2011-06-21T16:25:53 ++ Brazil ++ São Paulo ++ ++ Fonte das informações: http://pt.wikipedia.org/wiki/Anexo:Lista_de_rádios_do_Brasil#S.C3.A3o_Paulo ++ ++ ++ 1068544851063A4998A78195FDC4F511AD5E39A77EDF4A99545FEFEE1BA09A5159FB2DFC85 ++ Gazeta (Popular) ++ ++ ++ -1 ++ dontcare ++ 88.1 ++ ++ ++ 1068544851FA44B51067379B772E91D69C3F36BFD1BE373BFAAB02FB267BB9E79745D094DD ++ Fast 89 FM (Antiga Rádio Rock) (Pop, Black, Dance) ++ ++ ++ -1 ++ dontcare ++ 89.1 ++ ++ ++ 106854485192E7A1C2D349D37CBD77495D3ADB558CD7D921C3160003AE475BF39F3F0CA024 ++ Nova Brasil FM (MPB) ++ ++ ++ -1 ++ dontcare ++ 89.7 ++ ++ ++ 1068544851D8831804C6159634263FC359AE57CB8B96FF009B4FB4CB79FF39DB2CBF31EEBF ++ Gospel FM ++ ++ ++ -1 ++ dontcare ++ 90.1 ++ ++ ++ 10685448518D7B45F6186E596C2A56A3F91C4FC1B773F7133E30BC2AA6FE1898DB34D5F4BA ++ CBN (Jornalismo) ++ ++ ++ -1 ++ dontcare ++ 90.5 ++ ++ ++ 10685448519B29A95C1A4F8B221A919B011D9296D15B5227225A5A7E27C9DA6703B1E3469A ++ Rádio Bandeirantes (Jornalismo, Esportes) ++ ++ ++ -1 ++ dontcare ++ 90.9 ++ ++ ++ 10685448517DD84085761847C094F78696B91D9B023BA80862F534827883165058CD06133E ++ Rádio Disney Brasil (Jovem, Pop, Rock, Dance) ++ ++ ++ -1 ++ dontcare ++ 91.3 ++ ++ ++ 1068544851707ADA489310244DA5D4FAB004D99CD01601FA9FF7F5424A4660A53D88D5ECBE ++ Rádio SulAmérica Trânsito (Trânsito de SP) ++ ++ ++ -1 ++ dontcare ++ 92.1 ++ ++ ++ 1068544851C9201AFEE47247B9A616E705AEAB7E3DAE707A43BD1824390AE427C12EB9B9FB ++ Mitsubishi FM ++ ++ ++ -1 ++ dontcare ++ 92.5 ++ ++ ++ 1068544851C5394861FBDFCE6794363776BC90E7F84124E8816818200879AD3CA2859D9632 ++ Estadão ESPN (Antiga Eldorado) (Jornalismo, Adulto) ++ ++ ++ -1 ++ dontcare ++ 92.9 ++ ++ ++ 1068544851D0289AC2B0AEFDED22C4D9341F534BF08DF140FE238FEA37C8A72639352C846D ++ USP FM (MPB, Alternativas, Informação) ++ ++ ++ -1 ++ dontcare ++ 93.7 ++ ++ ++ 1068544851F9AFD5FC0F3384511069DC8DCF2220A0F7A12D5501388F4D66F8A72180CF7873 ++ Oi FM ++ ++ ++ -1 ++ dontcare ++ 94.1 ++ ++ ++ 10685448518696F96431246C0E8811A76A86CE07D3ADEF74C0D19B888A8B826160DBFD203C ++ Rede Antena 1 (Flashback, Pop Romântico) ++ ++ ++ -1 ++ dontcare ++ 94.7 ++ ++ ++ 1068544851A8F04BB0725196CA919E38D5B9EF9A0DF5F0FF0C920636BFE7466E5C6FAF623E ++ Nativa FM (Popular, Sertanejo) ++ ++ ++ -1 ++ dontcare ++ 95.3 ++ ++ ++ 10685448512EF7D6A7AF70B101A36763BE25A3FB5C486C40C0B9BC29B17EBF2EA27536562E ++ Mundial (Esotérica) ++ ++ ++ -1 ++ dontcare ++ 95.7 ++ ++ ++ 10685448518BB559FF1125C773021E9DE13BA19BED84E488D4B73448D879DE9ECFF21C5DE7 ++ Band FM (Popular, Black, Pop, Dance) ++ ++ ++ -1 ++ dontcare ++ 96.1 ++ ++ ++ 106854485184EF62D3E00617144EDB7EF0E3160F9A94464D4E529D28B4E160C5A0B44A45D8 ++ Rádio Vida FM (Gospel) ++ ++ ++ -1 ++ dontcare ++ 96.5 ++ ++ ++ 10685448515838BB6F8E6831C577DB6BEF8B55E18F5A2179AE031EC4C4A76B809918137072 ++ BandNews FM (Jornalismo) ++ ++ ++ -1 ++ dontcare ++ 96.9 ++ ++ ++ 1068544851337DE5C347B8E19FF0E880A2B9E38392C48EE37BEF918272CCCCF4E084AFE46F ++ Energia 97 (Dance, House, Black, D&B, Techno) ++ ++ ++ -1 ++ dontcare ++ 97.7 ++ ++ ++ 10685448513711C1C26ADA91953A177554A9796A2B4BF879C198A82715BAB4D241F0BB73E6 ++ IMPD 98.1 FM ++ ++ ++ -1 ++ dontcare ++ 98.1 ++ ++ ++ 10685448516A0B12A86C5DAD2C72F95B4991D5A9B5D1A490DFF605544AD7972C0A484A0A5A ++ Metropolitana (Pop, Black, Dance) ++ ++ ++ -1 ++ dontcare ++ 98.5 ++ ++ ++ 1068544851AF15E6AD95800F485702F159914B0A93E46E5CD68DDB11EB583B3C37F08F02F4 ++ Rádio Terra FM (Sertanejo) ++ ++ ++ -1 ++ dontcare ++ 98.9 ++ ++ ++ 10685448519842A5E231775F250B013D3604832F184655D2BCEA1CFD1DCA1B572B9F26A4B3 ++ Rede Aleluia (Evangélica) ++ ++ ++ -1 ++ dontcare ++ 99.3 ++ ++ ++ 106854485168590AD0DB7DB99C33772D5B362AB8C2575DB634C5F44FE18158E50FDD895B3B ++ Transamérica (Pop, Black, Dance) ++ ++ ++ -1 ++ dontcare ++ 100.1 ++ ++ ++ 1068544851BDAF9DFE698BB91435D5C87510098BC54A6B834354B76112E5DB9F191BA03DAC ++ Jovem Pan 2 FM (Pop, Dance, Black) ++ ++ ++ -1 ++ dontcare ++ 100.9 ++ ++ ++ 1068544851218C33FE44396A6CDD072A46BFE3A2F19DF815140048DD499C8AF8CEFE4A2A70 ++ Alpha FM (Flashback, Pop Romântico, MPB) ++ ++ ++ -1 ++ dontcare ++ 101.7 ++ ++ ++ 1068544851D6B3C38519AC4F100AFBFF40437A2A057346EDF60B8807F52960204DD1CE389D ++ Kiss FM (Classic Rock) ++ ++ ++ -1 ++ dontcare ++ 102.1 ++ ++ ++ 13086474014771276F6D1BA9B00AFB695144042EDED6BB404D402F81B027F40384964F ++ Imprensa (Forró, Música Regional) ++ ++ ++ -1 ++ dontcare ++ 102.5 ++ ++ ++ 130864745047ED7EFBBF90962261A79A431A64CB0ECD2EAAABF66F8E5311C226B6A5A1 ++ Scalla FM ++ ++ ++ -1 ++ dontcare ++ 102.9 ++ ++ ++ 1308647468484F8C0F98D8735571D9B96214477C9DAB79D700CF25B9881D22115226FC ++ Cultura (Clássico, Jazz) ++ ++ ++ -1 ++ dontcare ++ 103.3 ++ ++ ++ 130864748710A1608AF577C02453814307DFD3655C0E861E79F78791ACD6CE495C96BB ++ Tupi FM (Sertanejo) ++ ++ ++ -1 ++ dontcare ++ 104.1 ++ ++ ++ 1308647494E822E4E85F316E1C17F8EC537A030FC331E04BAAF0CBBA6810992A66AE7B ++ Dumont FM (Pop, Rock, Dance, Black) ++ ++ ++ -1 ++ dontcare ++ 104.3 ++ ++ ++ 1308647510BDB203D6312D5A3BCC630E7BB8B0A4BC78BFEF1379F8F6199D24A09278A3 ++ Transcontinental (Pagode, Black) ++ ++ ++ -1 ++ dontcare ++ 104.7 ++ ++ ++ 1308647524F17E6261EFB800C8F3C8ADF362AFA88B11F34592467EEC7664D775156F51 ++ 105 FM (Samba, Pagode, Black, Soul, Rap) ++ ++ ++ -1 ++ dontcare ++ 105.1 ++ ++ ++ 130864754047125139D3E46F3A0C763A2BE51930358CEB355F4519F848AF19119760FE ++ Musical (Gospel) ++ ++ ++ -1 ++ dontcare ++ 105.7 ++ ++ ++ 130864756116CA5CC9C506A3261D2D4A41BB16A6AACC553A25126997731A6D0FE37FBE ++ Mix FM (Pop, Black, Dance) ++ ++ ++ -1 ++ dontcare ++ 106.3 ++ ++ ++ 130864756972F0365E169147F735A06E5B9725A745726FB42524895A11269E28536CF6 ++ RBR (Rede Brasil de Radiodifusão) (Popular) ++ ++ ++ -1 ++ dontcare ++ 106.7 ++ ++ ++ 1308647624EE4ABB9AA1AA1DEDFBFAA05A523E62E6CEE3DBB91670F11484C7C906FCC9 ++ Nossa Rádio FM (Evangélica) ++ ++ ++ -1 ++ dontcare ++ 106.9 ++ ++ ++ 1308647642AA11EFF0E0E71AB18CFCAB5956BD81E12BF480CDDB6410C67926DA129328 ++ Rádio Eldorado (Antiga Brasil 2000) (Pop, Rock) ++ ++ ++ -1 ++ dontcare ++ 107.3 ++ ++ ++ 13086476879578B3D1BB9352761178E199CF7CE9A3070997936A161A0B366E2F30DBFE ++ Tropical (Popular) ++ ++ ++ -1 ++ dontcare ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/bulgaria/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/bulgaria/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,12 +1,16 @@ + SUBDIRS = +-EXTRA_DIST = "sofia.krp" "stara-zagora.krp" ++EXTRA_DIST = "plovdiv-antenna.krp" "sofia.krp" "stara-zagora.krp" "varna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/" +- $(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" ++ $(INSTALL_DATA) "$(srcdir)/plovdiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/sofia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp" +- +- ++ $(INSTALL_DATA) "$(srcdir)/stara-zagora.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" ++ $(INSTALL_DATA) "$(srcdir)/varna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/varna.krp" ++ + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/plovdiv-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/sofia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/bulgaria/stara-zagora.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/bulgaria/plovdiv-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/bulgaria/plovdiv-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,222 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Peter Georgiev ++ 2008-08-16T00:00:37 ++ Bulgaria ++ Plovdiv ++ FM Radio Stations ++ ++ ++ ++ ++1218755983103051C38B8B249D2344A212E4BBAC4C8252F16C03DBB01C2DBBB225CB1D23B4 ++ BNR Horizont ++ Horizont ++ ++ -0.01 ++ 88.1 ++ ++ ++ ++121875619304FD8AEAF0436E6E3F68691C3A88479AFE09B9BD072600BCFCC2B541E1E28911 ++ FM+ ++ ++ ++ -1 ++ 89.1 ++ ++ ++ ++1218756211F3F3933BDE80E7AA3C470335E9E28ABF237083FA40CF476A6A4DF1A68EA0488C ++ Focus ++ ++ ++ -1 ++ 89.9 ++ ++ ++ ++121875622134469FC01380505EAB32A823EC8AC6A57A03CF7C46293BC75F9A63522650C86E ++ NRJ ++ ++ ++ -1 ++ 90.6 ++ ++ ++ ++1218756506728FE149E449E172DA3CB5CEB06BB61319A661E1A678DB8F15BC5247159F639B ++ City ++ ++ ++ -1 ++ 91.1 ++ ++ ++ ++12187562445C4F4905B8D44257C83BE277C97E6C2CEB00D605E60FE1B34B677A38145BF53F ++ BNR Hristo Botev ++ ++ ++ -1 ++ 91.7 ++ ++ ++ ++1218756259D8B0B6FD38E46BA38AB996A5CC11308B08ED929A778D35EEB1A2727DA55EFB79 ++ Veronnica ++ ++ ++ -1 ++ 93.4 ++ ++ ++ ++12187562782B98DD0067A9F9BD9B433FA0A26DAD119D6B6720083F7382883AA06DA294A07C ++ BNR Plovdiv ++ Plovdiv ++ ++ -1 ++ 94 ++ ++ ++ ++12187562909F31EB8EA5C45271C58C673B169FD86C76D84B4C5CD8A6C5FEB302CE57A564A3 ++ BG Radio ++ ++ ++ -1 ++ 94.6 ++ ++ ++ ++1218756302BF3B89A8D4F7A36486490CCD7CA317A83507E5FEAA8B25795E9D48A45768FAA6 ++ Radio 1 ++ ++ ++ -1 ++ 95.5 ++ ++ ++ ++12187563157326C5907EFECE6A9812E710B63BAAEEE132ABE1B71A7F3F71E985AE56E7F0BE ++ Vitosha ++ ++ ++ -1 ++ 97 ++ ++ ++ ++1218756328DBB067CCDA069586C783D62CA7C81D48EEE4A006509008FB7086CFD553314FA2 ++ Atlantic ++ ++ ++ -1 ++ 97.7 ++ ++ ++ ++1218756337F1AC64F857AC04B4F13C7DAC79FF75C2013396341C1C2010DCDF11AFA47C95FF ++ Focus ++ ++ ++ -1 ++ 98.1 ++ ++ ++ ++12187563503316E105C2302EDA39CC05C368D8ADD46203A5F7256547BB31695448E6E45F1E ++ Katra FM ++ ++ ++ -1 ++ 100.4 ++ ++ ++ ++121875636546F1F7FED4FE10744198F3AB02D08D11B45112BD598346417ECD0B60C6294277 ++ BNR Horizont ++ ++ ++ -1 ++ 100.9 ++ ++ ++ ++1218756375FC8B5BAA8FAA6D96CA42868CFF96EC5717CBB4B06F0E316E1423CF84F5410A7B ++ N-JOY ++ ++ ++ -1 ++ 102 ++ ++ ++ ++1218756390D22E5095442D86638C8C0B2271F17C138E8FCA2BA92A3CEA1B324646BA3428EB ++ Star FM ++ ++ ++ -1 ++ 102.7 ++ ++ ++ ++1218756400104A27C8E187BC595602C7F4C7A99006883D31C6B41FAD0424275806C4DE7F50 ++ Fresh! ++ ++ ++ -1 ++ 103.3 ++ ++ ++ ++1218756409BB2AD6C9ED6AFB914064F854E57C2A96E8ACBEF1CFC62114A3D5E76F7C670822 ++ Z-Rock ++ ++ ++ -1 ++ 103.7 ++ ++ ++ ++12187564528FE4024BA8FF5D3A386E31BF6B3020DD542D510B1BBB8D15E65E8DDA41DE3E12 ++ Radio 1 Rock ++ ++ ++ -1 ++ 104.3 ++ ++ ++ ++12187564747011B06D9E28650DD839FA3B76A1FA6A021AF3D0083AFDB9AF63D5526242B601 ++ Darik ++ ++ ++ -1 ++ 105.4 ++ ++ ++ ++1218756491255B3BDC321998858D18DF9504D6B6F81431FACFE60073CB6754903B6B26030B ++ The Voice ++ ++ ++ -1 ++ 106 ++ ++ ++ ++12377236317EDEEEAEEA0ACF5224257DB772ECB06DEDD8763D3E15F8393C685BC0819D072B ++ Vesselina ++ ++ ++ -1 ++ 106.5 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp +--- kradio-3.5.13.1/kradio3/presets.old/bulgaria/varna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/bulgaria/varna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,198 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Velislav Kolev ++ 2006-10-31T20:30:38 ++ Bulgaria ++ Varna ++ ++ Contains merged Data ++ ++ ++ ++1162318601827F4BDBFB0362A1D195E998F26869054B35EB2A4133F2B068DE1E87351E98CB ++ ����� ++ 1 ++ ++ -1 ++ 89.5002 ++ ++ ++ ++116231862165D42300AC75574DAD46E7381F9C93EB1FD9F04C49732B1B31BD89E352AA96DA ++ N-JOY ++ 2 ++ ++ -1 ++ 90.6 ++ ++ ++ ++116231898247C9A0A9FA6F41FA374BF8D9FADA75EB293AE78E20F5044AE5989F6AB16B638C ++ NRJ ++ ++ ++ -1 ++ 91.2 ++ ++ ++ ++11623190256F1A743C47333B5DBAC8EC95970F73319C494DFBE0D90199F853F6CC77959659 ++ ���� ++ ++ ++ -1 ++ 91.7 ++ ++ ++ ++1162319025C18D07591DBE40AE364CC03F7559CCE3EB0DBF667E767D0AB8D4A0B572D3086F ++ ������ ++ ++ ++ -1 ++ 92.6 ++ ++ ++ ++116231902528FD115D22B4CAB0F75E43F2C449518602931232AEFC4E9F643DA5B723D70152 ++ ����� 1 ++ ++ ++ -1 ++ 93.8 ++ ++ ++ ++1162319020974CF47AAC09D713E9BDE91F99518F10803F0CA237492B4D045A00B63D341151 ++ F�+ ++ ++ ++ -1 ++ 94.6 ++ ++ ++ ++116231852111FB56C8F8E8D463ADE5DA5176AEED10ECBCA3EC2F6EB9B73D6E4785BE1D33D1 ++ Z Rock ++ 1 ++ ++ -1 ++ 95.9005 ++ ++ ++ ++1162319026415C16452006790E85B0DB4FF2B600523F6F47D47235EEF7081EF3B29C18E700 ++ Bravo ++ ++ ++ -1 ++ 96.4 ++ ++ ++ ++1162319149B07AE40DE4E3B3C221C45C92834103E19B2EAE290F54417383AA9A6CB8C185C2 ++ ���� ++ ++ ++ -1 ++ 97.3 ++ ++ ++ ++116231852883AA85312F5A295E668B26009730955AB1B1A006FAAB7FC788B061F504CDAB40 ++ �� ����� ++ 2 ++ ++ -1 ++ 97.8257 ++ ++ ++ ++1162319151D21DAE9E87577C193EE4B1212F61FE7A1C8C169D13FBEFDEE1E17D678D6A2CDB ++ �ity ++ ++ ++ -1 ++ 98.6 ++ ++ ++ ++1162319151367F929877E122D879FEF5A43C27ADACCE22CD433A2A898F7F2B73D662E67DF7 ++ ����� ++ ++ ++ -1 ++ 99.3 ++ ++ ++ ++1162318536AE9D3E77D17C2E559FD9B91C654BB0F5380041C8FE423F92F76050D7A55EEDC9 ++ Fresh! ++ 3 ++ ++ -1 ++ 100.351 ++ ++ ++ ++1162319152F38CD5CCDABC8831D587FEE4D112D376BFFF6826DA0B7FF13B1725470CE93D92 ++ �������� ��� ++ ++ ++ -1 ++ 100.9 ++ ++ ++ ++11623186397EA1E3928F80CB55F77E8896255E9F314E389BA20FB7236EFE21484D7B0387E7 ++ Retro ++ 3 ++ ++ -1 ++ 101.501 ++ ++ ++ ++116231854791205EADF3CF6B3AB1B99504DFB800EB833FA840E32C324838B9CC809CA8E6D0 ++ ����� ��� ++ 4 ++ ++ -1 ++ 103.426 ++ ++ ++ ++1162318554BADC777E26831193C2AE2EFD0DC856441F623AF5C44A753914372AD84FDF486A ++ ���� ++ 5 ++ ++ -1 ++ 105.7 ++ ++ ++ ++1162319336A868FA0C3FF819F5F337E69A1A8CC90031DB64DFA4E828ACC791FBAEC19D8194 ++ ������� ++ ++ ++ -1 ++ 106.3 ++ ++ ++ ++1162319337ACD11AA2581E8EDCD9F7C4E20B2FF6639118CDEFBA59900D1503B896CBE6D72F ++ ����� ++ ++ ++ -1 ++ 106.8 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Alberta ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853787DD40C1BEEE3947B3134F34252210E517164CC5FDE203EAA19C29972D39B139B ++ News/Talk @ CHQR-AM ++ 15 ++ ++ 0.77 ++ -1 ++ ++ ++ 1063385378FE7442F39084CB89C3B5E38960A058F0B9D6B0AFC789AB4AF3EF8EC5470FE06F ++ Country @ CKGY-AM ++ 16 ++ ++ 1.17 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Alberta_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,126 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Alberta ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853778674CD580E00787E07AC1528B7CE8861157AB80B1ACBE1285D16CF68661D1EB9 ++ Country @ CFWE-FM ++ 1 ++ ++ 89.9 ++ -1 ++ ++ ++ 10633853774ABE9752541CE4B9628567B81024E05450628AB02E5E25E6942B9046C41F9ACF ++ Rhythmic Oldies @ CJSW-FM ++ 2 ++ ++ 90.9 ++ -1 ++ ++ ++ 106338537733E08552CF2DFD0C7925003F6EC2B02D2801E37F0C694335DB228F2E39CF35EE ++ Rock @ CJAY-FM ++ 3 ++ ++ 92.1 ++ -1 ++ ++ ++ 10633853776C25F86C70CCD31CEA23564BB708A57EF5F9085A7688B43DC6FD872014910FFB ++ Alternative @ CKNG-FM ++ 4 ++ ++ 92.5 ++ -1 ++ ++ ++ 10633853772A8F9E92C1CB29A7A59350909BED4BBFDF7F39660C352B878D9113D14013712D ++ Classic Hits @ CHHK-FM ++ 5 ++ ++ 93.3 ++ -1 ++ ++ ++ 10633853773611391247EE7FA954C7D9B66FF417A1608BCDB991260EC536CF043E5908BF78 ++ Country @ CHLB-FM ++ 6 ++ ++ 95.5 ++ -1 ++ ++ ++ 1063385377096D0B37514F6B02B594995C4461722DF8DEB8C60824F18245CA27A729986A3C ++ CHR @ CHFM-FM ++ 7 ++ ++ 95.9 ++ -1 ++ ++ ++ 10633853775B02D76F9E43FA4A53B9795FF14D1A1D22A970EDA59D3D43C9F507E715EE112E ++ CHR @ CJTS-FM ++ 8 ++ ++ 97.1 ++ -1 ++ ++ ++ 10633853770337181A7624FFA5AC1B478A0805106E22AB7FBAFB49A68C7D7AEE9534A97007 ++ Classic Rock @ CIRK-FM ++ 9 ++ ++ 97.3 ++ -1 ++ ++ ++ 1063385377A83A6C70A32728E42BE200437F2605AAFF3BFB342F0A7596AA60C88442F49700 ++ Hot AC @ CFGP-FM ++ 10 ++ ++ 97.7 ++ -1 ++ ++ ++ 106338537734C34BAC629451F47196D3C1E703AC8E6513CDD2740FBBFFA54CD6995FC0B642 ++ Classic Rock @ CFBR-FM ++ 11 ++ ++ 100.3 ++ -1 ++ ++ ++ 10633853770976EAE07E91233E016FB68C6D0EC2ECAEEB6662F974C444D3CA59F2958C9118 ++ New Country @ CISN-FM ++ 12 ++ ++ 103.9 ++ -1 ++ ++ ++ 10633853773DEE94D38AB8333A773EDFB9ADE76F0F8161D381D1A7AA36906EAD1DC10D39EF ++ AC @ CFMG-FM ++ 13 ++ ++ 104.9 ++ -1 ++ ++ ++ 10633853776C4C04904D4EBF1B4B6CF03AD5B98DF21541D8AF56F763E7D6935D45D34CDC64 ++ Rock @ CKIK-FM ++ 14 ++ ++ 107.3 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Alberta.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Alberta.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,142 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Alberta ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853780FAE1C6C25061440A80A603674BE0548BE72CF9FA55F35ED9EE4D5BD8C0363A0 ++ Country @ CFWE-FM ++ 1 ++ ++ 89.9 ++ -1 ++ ++ ++ 1063385378C0AADE85A43442C43CE31F22BFA5F05EAB2CEBE52AC7A0CA28965C42A8061F66 ++ Rhythmic Oldies @ CJSW-FM ++ 2 ++ ++ 90.9 ++ -1 ++ ++ ++ 10633853783A71CA9D83193792249CEE100AB8927715CAEA722FA7240A6744558DCB6C319F ++ Rock @ CJAY-FM ++ 3 ++ ++ 92.1 ++ -1 ++ ++ ++ 1063385378AD37014EE4E733A5ACA31247FE51168ACD129E2B22CE7FC884C06561EF1B22D2 ++ Alternative @ CKNG-FM ++ 4 ++ ++ 92.5 ++ -1 ++ ++ ++ 10633853785F2EB74C8B58F3AA9BCD474B30D7C13A78DB847009E914B1E0EB3F3D8C1A175A ++ Classic Hits @ CHHK-FM ++ 5 ++ ++ 93.3 ++ -1 ++ ++ ++ 1063385378F6E51ED3C76252FA6524D27E5109BFA743791D5C56A86B11AE5E14E4E9A254A6 ++ Country @ CHLB-FM ++ 6 ++ ++ 95.5 ++ -1 ++ ++ ++ 10633853787B2AA8D76B6F7627D521207BE1E1727C415C3CBCAC18CA22E29B5A83E60E973E ++ CHR @ CHFM-FM ++ 7 ++ ++ 95.9 ++ -1 ++ ++ ++ 1063385378CDF63872C81ED21D08337FC844CD89E7C95F5FB5AF367A8BE45F277B8A473423 ++ CHR @ CJTS-FM ++ 8 ++ ++ 97.1 ++ -1 ++ ++ ++ 10633853784B3D9C8D49E1503081AFEAF9F4E1AA3F4D00062F4711C58FDBED37A190BD7B53 ++ Classic Rock @ CIRK-FM ++ 9 ++ ++ 97.3 ++ -1 ++ ++ ++ 10633853780D4C3A7F642534552322E8E2D5BE2F913D8E94568FCE9B9A93B5A586740F4ABF ++ Hot AC @ CFGP-FM ++ 10 ++ ++ 97.7 ++ -1 ++ ++ ++ 1063385378A60ECF6358DA10AD893E14FF5F6EA521FEBC59BD8F4BD26CE0E041DBFF56C4F7 ++ Classic Rock @ CFBR-FM ++ 11 ++ ++ 100.3 ++ -1 ++ ++ ++ 1063385378312FBB264D4A90BBA83EF41FF6D5FB60F1933C759111D733CCC46D8010F38D48 ++ New Country @ CISN-FM ++ 12 ++ ++ 103.9 ++ -1 ++ ++ ++ 106338537844B72671AA9A88CA5D5934C4C15852741904DE3B6F7B93BDE3A49E88F270EC49 ++ AC @ CFMG-FM ++ 13 ++ ++ 104.9 ++ -1 ++ ++ ++ 1063385378FE4CE6C37EB5F1811CD58132512AE292849E04893DB76F057732703C8D64F89E ++ Rock @ CKIK-FM ++ 14 ++ ++ 107.3 ++ -1 ++ ++ ++ 1063385378E0379B23681449EB8C901A44454F0E59D23ED3B51D872513A1C89CD13F68E3EB ++ News/Talk @ CHQR-AM ++ 15 ++ ++ 0.77 ++ -1 ++ ++ ++ 10633853783FC783D1673373FF08C16C68DD4930E57F3DE24D1289E2E31D08EC123E749EAD ++ Country @ CKGY-AM ++ 16 ++ ++ 1.17 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,118 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ British Columbia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385359E5A2DBA3F6BFD77DD674D149FC604C4F7A0936A253710318B042B49A09995ABF ++ CHR @ CKPG-AM ++ 23 ++ ++ 0.55 ++ -1 ++ ++ ++ 1063385359DEECE66A5C95CE02E6FA5674424B3AFD9E4814AB5DC04DC6EDDDAFADF5429A72 ++ Country @ CJCI-AM ++ 24 ++ ++ 0.62 ++ -1 ++ ++ ++ 1063385359427537B107932F2983F3D1D0D44CA2506DCC66A5F53C1B83DE6045B010B40B97 ++ Oldies @ CISL-AM ++ 25 ++ ++ 0.65 ++ -1 ++ ++ ++ 1063385359F44A29C1C5F4DA4F3D073EF63EF6A55861CB5EA72D75EFAD5FF2881F33636C35 ++ Country @ CKQR-AM ++ 26 ++ ++ 0.76 ++ -1 ++ ++ ++ 106338535922F1BC67CE0B8A3E32521C82ACFDEB520AE5E4218C6632F10B598F407879ADD1 ++ CHR @ CKKC-AM ++ 27 ++ ++ 0.88 ++ -1 ++ ++ ++ 10633853599EFD17AD0095E71E572E37BB8B56588EBF6CAC82FA4065A5A2D29E663E9CD565 ++ News/Talk @ CJVI-AM ++ 28 ++ ++ 0.9 ++ -1 ++ ++ ++ 10633853596D496E7338CACD5A2A0D5823FEBC25DF8D3037DB3D5DF4D6CAC3C441322C98F4 ++ News/Talk @ CKNW-AM ++ 29 ++ ++ 0.98 ++ -1 ++ ++ ++ 10633853592EE5091A6A34B19E2C4A6EF25D0E241096F3F31DDF66F588E5033BF9D208F0D4 ++ Classic Hits @ CKST-AM ++ 30 ++ ++ 1.04 ++ -1 ++ ++ ++ 1063385359AC95EB6E19BCCA350D209B8BE4B23F27B5776EC48ADBC1E9396A50D6CF916DF5 ++ News/Talk @ CFAX-AM ++ 31 ++ ++ 1.07 ++ -1 ++ ++ ++ 1063385359C31F7F7ED4DE20DAB0166BA881C584F64C6E6E4330F234B5252BB1CFFED8F348 ++ News/Talk @ CKWX-AM ++ 32 ++ ++ 1.13 ++ -1 ++ ++ ++ 1063385359658EB256EC4AD36DD8F6A61BD1DE02EBA0814619463FC7B6D744D4D480E63268 ++ AC @ CJAV-AM ++ 33 ++ ++ 1.24 ++ -1 ++ ++ ++ 1063385359228FDE7DCE8C430CCF137F5F5AB3D1EB7AA95E1092A8EEE04F9264DB2F335185 ++ News/Talk @ CHMB-AM ++ 34 ++ ++ 1.32 ++ -1 ++ ++ ++ 10633853593F73FB4F279E229596A57660ABB5C7392D69FF785C19F2B362EAB67C1CD5F4D5 ++ Country @ CKGF-AM ++ 35 ++ ++ 1.34 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,190 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ British Columbia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853590D470913EFF51B2E353F3ADE718349C4AF7C0AFD4222586C8074F52E97281DAE ++ AC @ CJSU-FM ++ 1 ++ ++ 89.7 ++ -1 ++ ++ ++ 10633853598DEB5D6CCB6220FB51C87F8542D06F962F8F46FCEA7369CC6C62C7A1C1542EA7 ++ Country @ CJJR-FM ++ 2 ++ ++ 93.7 ++ -1 ++ ++ ++ 1063385359EC9F32C83C8CD51CA92EE014B64585F70B4795EF42F6F9BAE724190A2D382FD4 ++ Various @ CJSF-FM ++ 3 ++ ++ 93.9 ++ -1 ++ ++ ++ 1063385359407D77C53DC9D578813E568E34073FA92102C995570DC6FF13C7D015986B18F1 ++ Rock @ CIRX-FM ++ 4 ++ ++ 94.3 ++ -1 ++ ++ ++ 106338535932CD0CFF6C389736FA7CD3248111742DFC335DFF2D743DD5F272B85BEC177541 ++ CHR @ CKZZ-FM ++ 5 ++ ++ 95.3 ++ -1 ++ ++ ++ 10633853593166C89AD687C9854C5F92E569B032E78677E0E3BA1562B1913FC8ADA5541CE1 ++ CHR @ CJAT-FM ++ 6 ++ ++ 95.7 ++ -1 ++ ++ ++ 1063385359F067608C6F11E5DA3F31447A8AF5783D28BFB5C46A6FBB5A94B913FF77E399FC ++ AC @ CKKS-FM ++ 7 ++ ++ 96.9 ++ -1 ++ ++ ++ 10633853591D4B72FC5F5F6A0287A2933BAFD58E30CAAB997576EEE3665370CDB53101163B ++ Hot AC @ CJMG-FM ++ 8 ++ ++ 97.1 ++ -1 ++ ++ ++ 1063385359D582AA50D1BC56FC1064A087A25684950DDED72ECC3B54ED2A112A9925001C01 ++ AC @ CIOC-FM ++ 9 ++ ++ 98.5 ++ -1 ++ ++ ++ 10633853592D38CA7610711D5D51231A8AE8DE0EF88AAB7C9A24955420EB51A122C060EC32 ++ Rock @ CFOX-FM ++ 10 ++ ++ 99.3 ++ -1 ++ ++ ++ 1063385359B22CAF40A16FFC20B1BA2BB6F7D61336072726150F9DEE61FEF2241CD82C7D94 ++ CHR @ CHSU-FM ++ 11 ++ ++ 99.9 ++ -1 ++ ++ ++ 106338535902A7FCBBE58AAFD8D958D2E9661731AFA87E565A7F9CA40D72FF247BCCC79CF2 ++ Rock @ CKKQ-FM ++ 12 ++ ++ 100.3 ++ -1 ++ ++ ++ 10633853598C23C12C9F97E562E09D3EAF8173F6E28B6C129B84FBD940BB519FA1241D56DD ++ Classic Rock @ CFMI-FM ++ 13 ++ ++ 101.1 ++ -1 ++ ++ ++ 106338535998E0E628C51AB2DCBFD1061E392851023B8EB9B207D8D781F04CBFE0653606C9 ++ Hot AC @ CKKN-FM ++ 14 ++ ++ 101.3 ++ -1 ++ ++ ++ 1063385359680649EC02D1E110145649B23CCB744C33FA008846AD78598CD46CDABE40BA50 ++ Nostalgia @ CFUV-FM ++ 15 ++ ++ 101.9 ++ -1 ++ ++ ++ 1063385359DBCEAA7F0DC6E8C73261E912CAC0BFE60FC66692BC44BCBC8225B365CA17CFE2 ++ CHR @ CISW-FM ++ 16 ++ ++ 102.1 ++ -1 ++ ++ ++ 1063385359B368E35C2BBD3F01B51027029FCBDF631CE9B019CA9D58B55499ADA58E812C9E ++ Ethnic @ CKMO-FM ++ 17 ++ ++ 103.1 ++ -1 ++ ++ ++ 10633853599BD2AE95C3F9AB2B89997A030A18FFD39CCB35072A4945807960B8BEC5E06E51 ++ AC @ CHQM-FM ++ 18 ++ ++ 103.5 ++ -1 ++ ++ ++ 1063385359B54D9766475D0D613D1C5604ADDE7D0F49E91F7B56C22E524D94F156373CFCD9 ++ AC @ CKSR-FM ++ 19 ++ ++ 104.9 ++ -1 ++ ++ ++ 106338535905B485F99B1F3D8448C8EF1D69BE9473F472F7D58D47160F90E1668A570D7D1A ++ Classical @ CBU-FM ++ 20 ++ ++ 105.7 ++ -1 ++ ++ ++ 1063385359123885D3FDDD740756AD138F88B2676EB0D6324453529C5BB1F5C826090A2018 ++ AC @ CISQ-FM ++ 21 ++ ++ 107.1 ++ -1 ++ ++ ++ 10633853595E73E741DA155239CA2CD23C6BDEA442B856714F6CF309C70E573B062CD88A1C ++ AC @ CKIS-FM ++ 22 ++ ++ 107.5 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/British Columbia.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/British Columbia.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,294 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ British Columbia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385359D5F2CDD6F12A5F08FF862B6F04EA76E90E0991B9C7D7458CF70C393634632D94 ++ AC @ CJSU-FM ++ 1 ++ ++ 89.7 ++ -1 ++ ++ ++ 1063385359F6AC17F18E655860B8E7A65E0ACEA3DCEAF1CFBC707956A527D23FEF188F82E1 ++ Country @ CJJR-FM ++ 2 ++ ++ 93.7 ++ -1 ++ ++ ++ 1063385359F097F1B15886BD01849C57468F86A3DF45DB5CB8C9C99029C95731643002E89D ++ Various @ CJSF-FM ++ 3 ++ ++ 93.9 ++ -1 ++ ++ ++ 106338535915DBA56B6EDE5B843C04601D2FE4268B3268753DCF93F5163A854CCF922AC458 ++ Rock @ CIRX-FM ++ 4 ++ ++ 94.3 ++ -1 ++ ++ ++ 10633853593BCA4073FFDA7F36A62A318B05925FA115E4ACFBC36E577C9B117D7EA141D92D ++ CHR @ CKZZ-FM ++ 5 ++ ++ 95.3 ++ -1 ++ ++ ++ 1063385359A7EAAC3B45AA6CE4523502CD83FEC0F72BE631F30D8E4678C3BF3378233805B0 ++ CHR @ CJAT-FM ++ 6 ++ ++ 95.7 ++ -1 ++ ++ ++ 10633853592A292C842356FD1D291AEFD315BD4D7783C877CA847D3E3653A6388A4C9D1238 ++ AC @ CKKS-FM ++ 7 ++ ++ 96.9 ++ -1 ++ ++ ++ 106338535948C956430AA3776A8778C16544612BB332ED8200CA7E8AC3E75D1390F39F4E67 ++ Hot AC @ CJMG-FM ++ 8 ++ ++ 97.1 ++ -1 ++ ++ ++ 10633853598906ADEE03A37745D1E98FD6E7381F0EF6AB1263856188CD3DC3A69275AA5148 ++ AC @ CIOC-FM ++ 9 ++ ++ 98.5 ++ -1 ++ ++ ++ 1063385359BC752064BB4DCA331A9A0069107485A8F1D01BFDC7F65A9EDF34F798421C8CB6 ++ Rock @ CFOX-FM ++ 10 ++ ++ 99.3 ++ -1 ++ ++ ++ 1063385359560FB9E2053F54D71A04853510FD008F006060176BFE043D77BE11F5CD486A44 ++ CHR @ CHSU-FM ++ 11 ++ ++ 99.9 ++ -1 ++ ++ ++ 10633853594FDBC3B886FDCDBFF49FEE354B2BC4821D5689BEA38809EE8273D58BE6A3DB8B ++ Rock @ CKKQ-FM ++ 12 ++ ++ 100.3 ++ -1 ++ ++ ++ 106338535969D7D59575FFD8F0EC4CBF739E4639BDA43AE5C2EBAC6EAD9BC7D623D157DF4F ++ Classic Rock @ CFMI-FM ++ 13 ++ ++ 101.1 ++ -1 ++ ++ ++ 106338535995DF4F9F6E889895A10D733C97DFBBF922DF50AD582DF00330002ED3CED541AF ++ Hot AC @ CKKN-FM ++ 14 ++ ++ 101.3 ++ -1 ++ ++ ++ 1063385359CD92F5B64E70F31826D15141911D3765A9E610892208309C26C6C60294BD2BCD ++ Nostalgia @ CFUV-FM ++ 15 ++ ++ 101.9 ++ -1 ++ ++ ++ 1063385359A3CF06A48F737C1199BBDDF557FE48C66ECE84796B92EA76A29BA5B84B89BE19 ++ CHR @ CISW-FM ++ 16 ++ ++ 102.1 ++ -1 ++ ++ ++ 106338535959DDAA60D9DE068BC3EBD8D39F2D64376F3CD34B7E4DB871D99E4E90E7326900 ++ Ethnic @ CKMO-FM ++ 17 ++ ++ 103.1 ++ -1 ++ ++ ++ 1063385359E9D75073B921265DB610B1AC0E4EC4984B42A155EEECDFC4CE2F021F83984BE1 ++ AC @ CHQM-FM ++ 18 ++ ++ 103.5 ++ -1 ++ ++ ++ 1063385359A86C3AEDCD0A5B0F28BBEF316913D1B5DC58E60348B09D8A18E1F35B00498736 ++ AC @ CKSR-FM ++ 19 ++ ++ 104.9 ++ -1 ++ ++ ++ 1063385359D542249A6C677F5F03CE3A40DD5A2EE487CA792B44BEC9CFD7D3D2C73CF38FBF ++ Classical @ CBU-FM ++ 20 ++ ++ 105.7 ++ -1 ++ ++ ++ 10633853599FF38288DD86E0286B6161E6F3479C02B06D69B4286D4B7E95B6B0AF3EEB5DF0 ++ AC @ CISQ-FM ++ 21 ++ ++ 107.1 ++ -1 ++ ++ ++ 10633853597B45BBF753EF6A529D838E94FBFED83E44AA192B4ABC6B9653AFA84BCC6702D2 ++ AC @ CKIS-FM ++ 22 ++ ++ 107.5 ++ -1 ++ ++ ++ 1063385359C551EE7983FBE6F50676A1589616E8776CD1440F3A9CC531C77EA7D83E1B46C4 ++ CHR @ CKPG-AM ++ 23 ++ ++ 0.55 ++ -1 ++ ++ ++ 106338535928ECE0C3208B4C9F52EE381CAFEEC6DB8F5AF2C3167DD9D50932DCEA0BB8FCD9 ++ Country @ CJCI-AM ++ 24 ++ ++ 0.62 ++ -1 ++ ++ ++ 1063385359CE6FEA4D0940467DCAC059101954593CFF0BD234C58D8857B9527E9E4F3A03EC ++ Oldies @ CISL-AM ++ 25 ++ ++ 0.65 ++ -1 ++ ++ ++ 1063385359701D86995E780498A6FC3FD0772E8F5599BBC17FA8FF9EB7C202DE12D4ECFCF0 ++ Country @ CKQR-AM ++ 26 ++ ++ 0.76 ++ -1 ++ ++ ++ 1063385359740D66F68A08A73502B36460F77D6168494179F8C928CE9DA4104AAD5423E8A2 ++ CHR @ CKKC-AM ++ 27 ++ ++ 0.88 ++ -1 ++ ++ ++ 106338535962BD3E066AE7DBD6DDE0011ED9F372CB301FEAE8D57C38B065A5AA56081D69D7 ++ News/Talk @ CJVI-AM ++ 28 ++ ++ 0.9 ++ -1 ++ ++ ++ 1063385359EBEFAE79981DC478EDB0BAD7EF80A1206C7638F975AAFCDCE0627C6F724952DE ++ News/Talk @ CKNW-AM ++ 29 ++ ++ 0.98 ++ -1 ++ ++ ++ 1063385359349E399273A6FE830A43975752CDD50BC23546EDBE9075D597F25119DD274E4B ++ Classic Hits @ CKST-AM ++ 30 ++ ++ 1.04 ++ -1 ++ ++ ++ 1063385359B2E704463BC0D4C38CF3F3EAC9EB6E370FC9F6EB41BBC238539318D425E9F117 ++ News/Talk @ CFAX-AM ++ 31 ++ ++ 1.07 ++ -1 ++ ++ ++ 1063385359899124E77D5F886672AB575E45B1155B6F318E584D613582DF9CB2A2C0F52476 ++ News/Talk @ CKWX-AM ++ 32 ++ ++ 1.13 ++ -1 ++ ++ ++ 106338535953AE20D883ED79AB9F258DCAEF6D01D97445E45412C6397C06F7A2AA8F5B079A ++ AC @ CJAV-AM ++ 33 ++ ++ 1.24 ++ -1 ++ ++ ++ 1063385359A28D4D85FFC1AC307A2CA461DC1244D6C80D781E090AC6B6EED2D427563048AC ++ News/Talk @ CHMB-AM ++ 34 ++ ++ 1.32 ++ -1 ++ ++ ++ 1063385359278A3675076B786C676F1819843CFD9EC039C049A15DE1EE2CC3EF87FD3AAC97 ++ Country @ CKGF-AM ++ 35 ++ ++ 1.34 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am kradio-3.5.13.1/kradio3/presets/canada/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/canada/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/canada/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,10 +1,64 @@ + SUBDIRS = +-EXTRA_DIST = "montreal-antenna.krp" ++EXTRA_DIST = "Alberta_am.krp" "Alberta_fm.krp" Alberta.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "montreal-antenna.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/" ++ $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp" + $(INSTALL_DATA) "$(srcdir)/montreal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp" ++ $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp" + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Alberta.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/British Columbia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Manitoba.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/montreal-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/New Brunswick.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Newfoundland.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Nova Scotia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Ontario.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Quebec.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/canada/Saskatchewan.krp" ++ +\ Pas de fin de ligne à la fin du fichier +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,54 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Manitoba ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385372567FAEECC546FCB8B698C0DED0B9B7FC373F54964E7269E6F2097D2F6321EC32 ++ Rock @ CFAR-AM ++ 9 ++ ++ 0.59 ++ -1 ++ ++ ++ 1063385372679E852386AF719E9EC2C0601E13253D76516464D916D13E2E2218A53E35BA4D ++ News/Talk @ CJOB-AM ++ 10 ++ ++ 0.68 ++ -1 ++ ++ ++ 1063385372202F08C60092B519D009A5E700CAF1C11B3C09E77CE91F77E76455ADDB9DADBF ++ Country @ CKDM-AM ++ 11 ++ ++ 0.73 ++ -1 ++ ++ ++ 1063385372B5DA577EE59D667B19180D54335E981108E68BC90E0919C8CBA341B41CBC7893 ++ Ethnic @ CKJS-AM ++ 12 ++ ++ 0.81 ++ -1 ++ ++ ++ 1063385372AD587F819284AD479EEB5F9DC22F6E9943725A1B1D4947CC648E60D33D351EC9 ++ News/Talk @ CIFX-AM ++ 13 ++ ++ 1.29 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,78 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Manitoba ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338537233399A62D25D77EA4D8FCC8451783B38A249F29DAF3B7B03FAD172B65B4414FC ++ Rock @ CITI-FM ++ 1 ++ ++ 92.0 ++ -1 ++ ++ ++ 1063385372DFE8BDBA148E3963997DEF32EB5D5E93B957D65BB9ECFAF940EA366559D2CCE1 ++ Hot AC @ CHIQ-FM ++ 2 ++ ++ 94.3 ++ -1 ++ ++ ++ 1063385372D0B0F1A1389C0B2AB983EBD8A2C2CCAC76562832487F17212C24E460130E789F ++ Modern AC @ CKLF-FM ++ 3 ++ ++ 94.7 ++ -1 ++ ++ ++ 1063385372F0903CAA44A0BE6DEC41C707F448B54EC32CC456A7EF3BD8181D9F99FEFA2C46 ++ Rock @ CJKR-FM ++ 4 ++ ++ 97.5 ++ -1 ++ ++ ++ 10633853725B4397003ED0D58C0716AA707AFC1514FBD02743786B8046E096CE1EAB1F79AE ++ Classic Hits @ CFWM-FM ++ 5 ++ ++ 99.9 ++ -1 ++ ++ ++ 1063385372DA36B4034B53FC9324D0610397E9822DE88345715E3F76F05540630E30D84965 ++ CHR @ CKXA-FM ++ 6 ++ ++ 101.1 ++ -1 ++ ++ ++ 1063385372396A871B304FBF1790A2A9C8BDE4E0115996BB60EFB0A30F342E1AF1092E8F27 ++ CHR @ CKMM-FM ++ 7 ++ ++ 103.1 ++ -1 ++ ++ ++ 10633853725038DB07B1019C3E2BC42E00FD6F0B6ACCE0E4B964D44D13B9167B31185B0DDF ++ Country @ CFQX-FM ++ 8 ++ ++ 104.1 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Manitoba.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Manitoba.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,118 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Manitoba ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338537235DE40FE931DDE7AB4ACE93C959304E7BFA062E7E5B078E9E2A01CF696F2C8A7 ++ Rock @ CITI-FM ++ 1 ++ ++ 92.0 ++ -1 ++ ++ ++ 1063385372BE099D03BC51FBEBDE20CBC70FC10423AD5E613054C0DDF72E787FF8CF0E4F0B ++ Hot AC @ CHIQ-FM ++ 2 ++ ++ 94.3 ++ -1 ++ ++ ++ 106338537209A1EFF7611EAFD085F8936930DA9BBA09B829C7A6E6FD9BBE8C74694407A208 ++ Modern AC @ CKLF-FM ++ 3 ++ ++ 94.7 ++ -1 ++ ++ ++ 10633853728D66D9EE218394C91355E5D110E08F362D8B68BBD1F281EAD0F96C16A0BDED62 ++ Rock @ CJKR-FM ++ 4 ++ ++ 97.5 ++ -1 ++ ++ ++ 1063385372C40013266B5DD98E82519FBE4A396847FA9B64C7A303AE48FCA527F959CD69FD ++ Classic Hits @ CFWM-FM ++ 5 ++ ++ 99.9 ++ -1 ++ ++ ++ 1063385372D6F63A9BFC233D2F9662065C4724A4C512492F510295A78A5629A0292F4B4C02 ++ CHR @ CKXA-FM ++ 6 ++ ++ 101.1 ++ -1 ++ ++ ++ 106338537265D6BD981E58BCA3B70DD320903417E3E9FF7641AC4171E60AD659F904793636 ++ CHR @ CKMM-FM ++ 7 ++ ++ 103.1 ++ -1 ++ ++ ++ 106338537215E89F1BD490A98711E71261CFB0CF5DE9A9FF96DD0C3449E30AEC487EA1C7C0 ++ Country @ CFQX-FM ++ 8 ++ ++ 104.1 ++ -1 ++ ++ ++ 10633853723C92632B65EAA085F8ADA5C1A7E22F1B6B92B68D36C334D43C2356640AC20A59 ++ Rock @ CFAR-AM ++ 9 ++ ++ 0.59 ++ -1 ++ ++ ++ 1063385372D6D1E62FC77378744328333B87F77C3F55ED107D2104BFE45F4E2413407747A4 ++ News/Talk @ CJOB-AM ++ 10 ++ ++ 0.68 ++ -1 ++ ++ ++ 10633853729BE68A608EB4852F2FB94CFE385841CC1A8CCF6C0A2FD4821CFBABB967998978 ++ Country @ CKDM-AM ++ 11 ++ ++ 0.73 ++ -1 ++ ++ ++ 1063385372B082179F3FC50164F20D1A2EFB2BB65907F17A40B9D05FEE0D6EAACFBFC11252 ++ Ethnic @ CKJS-AM ++ 12 ++ ++ 0.81 ++ -1 ++ ++ ++ 1063385372ADE418EAF6819DDE4859A0610BCC0D3EE140129A23EBA859986E76B7EBF718AA ++ News/Talk @ CIFX-AM ++ 13 ++ ++ 1.29 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,22 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ New Brunswick ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385355CF17CC34E34861B4F07366466A551EFDCD3C87604508C1C731313F6A1D69874C ++ Country @ CKCW-AM ++ 6 ++ ++ 1.22 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,54 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ New Brunswick ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338537563FF343F7028276A4D0BFF553004AAF1257E6C11F66596198596FDFE45456169 ++ Pop/Alt @ CKUM-FM ++ 1 ++ ++ 93.5 ++ -1 ++ ++ ++ 1063385375B1927CA7E6D2FD84C8C6FDD9B726EF1EF99751E38B86269C516642CE4B375A34 ++ CHR @ CHSR-FM ++ 2 ++ ++ 97.9 ++ -1 ++ ++ ++ 10633853752D3E8314F46B5E97EA4E77C8FF16C17EDDDBF8D32F0D52DBE7B354746497682D ++ Rock @ CJMO-FM ++ 3 ++ ++ 103.1 ++ -1 ++ ++ ++ 1063385375B19B7BE82B799670C8A81C520BBFA43073BE523360FEDCD3C77EFB1A3E5DEAA3 ++ Country @ CFQM-FM ++ 4 ++ ++ 103.9 ++ -1 ++ ++ ++ 10633853757DD605858EE796661C1F97538865E8065BF849CA2F8440D084118B0B434F3A1E ++ Alternative @ CHMA-FM ++ 5 ++ ++ 106.9 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/New Brunswick.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/New Brunswick.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,62 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ New Brunswick ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385376727BBC1B83D1C2F21F016FA3C6FE07FF94C5943890D6204C290509F65F6F0106 ++ Pop/Alt @ CKUM-FM ++ 1 ++ ++ 93.5 ++ -1 ++ ++ ++ 1063385376925157412BAB49F3429F192B5B21AB1143E5E47CEF2AB3AD13FA2060D36B0816 ++ CHR @ CHSR-FM ++ 2 ++ ++ 97.9 ++ -1 ++ ++ ++ 106338537685E1131CEC97874856FC0B0C909388AD46A2E1BCB6A030DAB5B599F000DA370A ++ Rock @ CJMO-FM ++ 3 ++ ++ 103.1 ++ -1 ++ ++ ++ 1063385376F66B38C11B08AD05960B95CA93F34DBF9F296F090FB64E493B961D9F7870E86D ++ Country @ CFQM-FM ++ 4 ++ ++ 103.9 ++ -1 ++ ++ ++ 1063385376BD5CE49E5E3B5B55B5BACD887351669D2E469BC93AA63A6C900638D0E40D69A8 ++ Alternative @ CHMA-FM ++ 5 ++ ++ 106.9 ++ -1 ++ ++ ++ 106338537661A9F1D1C79A49DA630E16FBB7B98E764266736BEE7B3E8EA404537E60E6C747 ++ Country @ CKCW-AM ++ 6 ++ ++ 1.22 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,14 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Newfoundland ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,22 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Newfoundland ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338537789B29E90B35F99179A0AA91933650FC46E824CA5B6BF68F576B3182B55DD9056 ++ Rock @ CHOZ-FM ++ 1 ++ ++ 94.7 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Newfoundland.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Newfoundland.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,22 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:53 2003 ++ USA ++ Newfoundland ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385377D11D9B16595E641E697405179F8C6D5B562D2D0A7D84F70287AD185594E0FA2B ++ Rock @ CHOZ-FM ++ 1 ++ ++ 94.7 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,22 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Nova Scotia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853835DC9A764A70C2E9080B031E63EAFD6F705632BEC8F8F43860CFB55EA53C20AE5 ++ News/Talk @ CJCH-AM ++ 3 ++ ++ 0.92 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Nova Scotia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853833F7B08CF4B773E874FD58D80B7FA0043373DB324A256C12C866E5244AD386EB0 ++ Various @ CJLS-FM ++ 1 ++ ++ 96.3 ++ -1 ++ ++ ++ 10633853833C8F899020527563BD1F5DA705ED43D2A3FA9B43391135053FBBB273A7C0B3D0 ++ CHR @ CFRQ-FM ++ 2 ++ ++ 104.3 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Nova Scotia.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Nova Scotia.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,38 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Nova Scotia ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385383878D2D92A7691A444275FCF3189047A309CB29737D425D132E3C8976E9C05A4B ++ Various @ CJLS-FM ++ 1 ++ ++ 96.3 ++ -1 ++ ++ ++ 10633853839ECF21389639F415BDA39F7E8FBEFD0C6F5579F10594475BA801BD9CB1EED5C5 ++ CHR @ CFRQ-FM ++ 2 ++ ++ 104.3 ++ -1 ++ ++ ++ 106338538376D203B4C09F3B3B261D56F2F0617A7D339FD7432DD788E6D85A850461D0E6F0 ++ News/Talk @ CJCH-AM ++ 3 ++ ++ 0.92 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,222 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Ontario ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385387734E601B33CF7FEF66FC8FCC05F0446D3C26E705D641C4085E63983229A98AB7 ++ Oldies @ CFOS-AM ++ 51 ++ ++ 0.56 ++ -1 ++ ++ ++ 106338538710E0424C6B045B2192E52A41633294FBC4D6D0DCE9718E7767AD3CBBB64FF418 ++ CHR @ CKGL-AM ++ 52 ++ ++ 0.57 ++ -1 ++ ++ ++ 1063385387CA3C1F727A8B13541CEAB051C5D5336D7F23E176EA7D27B3836170FC8C5B9BE0 ++ News/Talk @ CKPR-AM ++ 53 ++ ++ 0.58 ++ -1 ++ ++ ++ 1063385387020E218DD974FB8F1AB6C6CB4D8B197FF37F614974BAFF0FF04D1DF9C9FAFBDA ++ Sports @ CJCL-AM ++ 54 ++ ++ 0.59 ++ -1 ++ ++ ++ 106338538700312BA43D080B58538D302DB860E404750984DD0074A916B39EC545CF1379CD ++ Oldies @ CFCO-AM ++ 55 ++ ++ 0.63 ++ -1 ++ ++ ++ 1063385387F68BD20A5BE999DE81DDEDDAA11FFC6752A43D51514986B902D70B410ACB4955 ++ News/Talk @ CHOG-AM ++ 56 ++ ++ 0.64 ++ -1 ++ ++ ++ 1063385387E1DE75E2BE0F5CE4D3D2ACB40AABFDFAE5C25084D6BF6FFB203FB792C27F3F14 ++ News @ CFTR-AM ++ 57 ++ ++ 0.68 ++ -1 ++ ++ ++ 10633853879B10E0A091EF756AFFECD007746EE2EEB4C3D64E3375308E0FCC45453FB047F9 ++ Country @ CJBQ-AM ++ 58 ++ ++ 0.8 ++ -1 ++ ++ ++ 10633853874C8509AF11B4F856F570DA531316397FBE7B222BE943BCDD051780EEC0124963 ++ Country @ CHAM-AM ++ 59 ++ ++ 0.82 ++ -1 ++ ++ ++ 1063385387E71997B442DCB3952D89AB290835AD5670783C9DA03A6AFCB50B2EACA5A981BB ++ Oldies @ CHML-AM ++ 60 ++ ++ 0.9 ++ -1 ++ ++ ++ 10633853873FD423C2E1562B89C4E345BD4A1B1B73C677BE771291E8DB38A9F17173B4846E ++ AC @ CFPL-AM ++ 61 ++ ++ 0.98 ++ -1 ++ ++ ++ 1063385387D001E4C61E6DE920B1575B190BD9B5B37B020977E04F38576F64BA3004AD06CC ++ News/Talk @ CFRB-AM ++ 62 ++ ++ 1.01 ++ -1 ++ ++ ++ 1063385387424294ACA2638A9FA5C88E253B77DD51925A1E90878FF04CC63E7C07F8487A69 ++ Oldies @ CHUM-AM ++ 63 ++ ++ 1.05 ++ -1 ++ ++ ++ 10633853875A66270416082CB4C06DCA096DB2B946C67D50326720D285714C28771A8CF959 ++ News/Talk @ CHOK-AM ++ 64 ++ ++ 1.07 ++ -1 ++ ++ ++ 10633853877193518E7AC5D4F38FF398E79985586E2C3760CCAFC0890073424B1D3D33CC9E ++ Oldies @ CKKW-AM ++ 65 ++ ++ 1.09 ++ -1 ++ ++ ++ 10633853872A8B3612D1E39C534F5656C13D01AAF4CDCBEA0F2D4CAAB2A4F411A8B9296CEB ++ Oldies @ CKOC-AM ++ 66 ++ ++ 1.15 ++ -1 ++ ++ ++ 1063385387876C5EB7785C42C34B17B6D5CDCD10459D37CEF452A533816684EA26C0AC8F07 ++ CHR @ CJTT-AM ++ 67 ++ ++ 1.23 ++ -1 ++ ++ ++ 10633853872BA99262573FDC126085ABAC358017391E5D5BF908BC54367785928491852922 ++ Oldies @ CJCS-AM ++ 68 ++ ++ 1.24 ++ -1 ++ ++ ++ 106338538751515E14FC1C0CAD503EA9C3A53AEE3A11A50A1D0D603C1B326586F08BD3526F ++ AC @ CJTN-AM ++ 69 ++ ++ 1.27 ++ -1 ++ ++ ++ 106338538758A816DDFEA98055904B262B12A86C5EDD86C30B93890A4AD0CF90B69C56549B ++ News/Talk @ CJBK-AM ++ 70 ++ ++ 1.29 ++ -1 ++ ++ ++ 106338538721ACEEACE356B2E0820D2EC3DF821EB31EBAB6CFFEFDEF2572DA4945DC923155 ++ Classic Hits @ CKPC-AM ++ 71 ++ ++ 1.38 ++ -1 ++ ++ ++ 10633853875B79C7F4383E6C762706370AEACF739D47C5712E7B832D36B04B47FC073F0186 ++ Oldies @ CKSL-AM ++ 72 ++ ++ 1.41 ++ -1 ++ ++ ++ 106338538752429D53A9F687C70E8E352F36219AD716D879F1AD41DC8FF5EE9C82EEE7734D ++ AC @ CKPT-AM ++ 73 ++ ++ 1.42 ++ -1 ++ ++ ++ 106338538724737608C2A2A616DE49B424135B50A4F242108E8F619DD35474EAA9AF6D517B ++ Oldies @ CJOY-AM ++ 74 ++ ++ 1.46 ++ -1 ++ ++ ++ 10633853875C1CE8727F5626C388394BF70085CE39E7B36CF507C902058A6CAD31C0FC32D5 ++ Oldies @ CFPS-AM ++ 75 ++ ++ 1.49 ++ -1 ++ ++ ++ 1063385387A9A9AEDC27F800BD96818465CFBB3423E08FD4C3C27B99B27644D01A0B56DC85 ++ Ethnic @ CHIN-AM ++ 76 ++ ++ 1.54 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Ontario_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,414 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Ontario ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385386BBD3399B483508CE617495612BC49B9EB8EEDDEC91D03918C1A7D9B78D05879F ++ Urban AC @ CKLN-FM ++ 1 ++ ++ 88.1 ++ -1 ++ ++ ++ 1063385386402F58A2FC9ACB1732F00E4AD6953A0ACAD6002D06D280C1448BBF25C2C7CBED ++ Alternative @ CKDX-FM ++ 2 ++ ++ 88.5 ++ -1 ++ ++ ++ 1063385386A6B5C6A56C654D1EF53FED84ECF71E7495689028C4209B738B97EDB64E6809C5 ++ CHR @ CIUT-FM ++ 3 ++ ++ 89.5 ++ -1 ++ ++ ++ 10633853862AC1C308E19A22CE8EDCFEA3A4694B6E75D0061BE24E5184D717EE80F1F5D648 ++ Classical @ CJRT-FM ++ 4 ++ ++ 91.1 ++ -1 ++ ++ ++ 10633853869940994CE36F56CC91E3755811501083CF75F3FA147B35C59EF501C6A9232BA5 ++ CHR @ CKPC-FM ++ 5 ++ ++ 92.1 ++ -1 ++ ++ ++ 1063385386C0B06FEBDC29742E738362C21488B6DC53E9C5467BEFF1FA1918066F33397CFF ++ CHR @ CISS-FM ++ 6 ++ ++ 92.5 ++ -1 ++ ++ ++ 1063385386767DEDBC4C618CE65EB00E1860D9CD677EB6D635AA871AAC88C2E2C15C69F453 ++ Rock @ CJRQ-FM ++ 7 ++ ++ 92.7 ++ -1 ++ ++ ++ 1063385386DB863E27395DD2F381433DE2A61E5D129CECCE4E0054420979979EA1839E2ABE ++ Community @ CKCU-FM ++ 8 ++ ++ 93.1 ++ -1 ++ ++ ++ 1063385386FAADF7AD44886F1E35744A0E93A4E52D8D4D8A28A788AC5BAE47478660A3F456 ++ AC @ CFRU-FM ++ 9 ++ ++ 93.3 ++ -1 ++ ++ ++ 106338538636200C8C40FE3BD9B35EDDD7376635BDB460DC2E212299F8F2F1382765D7F890 ++ Urban @ CFXL-FM ++ 10 ++ ++ 93.5 ++ -1 ++ ++ ++ 1063385386D7CE8D51E849BDB4DE57B733127F04B060F9C4B673440FFA7C6BDBD913028F56 ++ CHR @ CKKL-FM ++ 11 ++ ++ 93.9 ++ -1 ++ ++ ++ 10633853864100CBE1F6361692B6F3281A8439F7DE20DCE4DA62A2BCD12A08CCEEA8C5121C ++ Rock @ CJSD-FM ++ 12 ++ ++ 94.3 ++ -1 ++ ++ ++ 10633853866C8E41CC7F246EEFE0FC7B12D48CB32DED00F264AC4C5B0E5A41CE94A022E503 ++ Nostalgia @ CHRW-FM ++ 13 ++ ++ 94.7 ++ -1 ++ ++ ++ 1063385386168B69AB7EE5A725F393872C2E8D9D4A4CA1DA4B5AC15A9A0EE48A1425242D82 ++ Hot AC @ CKGE-FM ++ 14 ++ ++ 94.9 ++ -1 ++ ++ ++ 1063385386982D84F66D2D1D415FE025064382691931D36666BAD901546E8DD9C3AA5E1266 ++ AC @ CKSY-FM ++ 15 ++ ++ 95.1 ++ -1 ++ ++ ++ 10633853864E34CBBC7BB3CBFBEF03686C4DD8BFEB0F1BD15F978DBF3E604AC42458E23AF5 ++ Classic Rock @ CJXY-FM ++ 16 ++ ++ 95.3 ++ -1 ++ ++ ++ 106338538619435BCB06CD70B3E72F9FC66A82CF7174E4715995B1119B18A415B4CA86E010 ++ Rock @ CFJB-FM ++ 17 ++ ++ 95.7 ++ -1 ++ ++ ++ 1063385386F02EE0FE6FC1F7CC06BD0C51E16448BF0589256C1599B36B0AB1E6D559ABD829 ++ Rock @ CFPL-FM ++ 18 ++ ++ 95.9 ++ -1 ++ ++ ++ 1063385386D8F3258DB9CAD4B877B6436F47C1A8CDFE0A1D98357CFDB87B12ACE9569390B0 ++ Country @ CHVR-FM ++ 19 ++ ++ 96.7 ++ -1 ++ ++ ++ 1063385386FDA3B5B00A3CC38D48CBD83E67390B5739A60D9D4BF59648F5F1F39E7B629783 ++ AC @ CJEZ-FM ++ 20 ++ ++ 97.3 ++ -1 ++ ++ ++ 1063385386DCE128C871AE0B3E88AD8914186744CEC297E7FA2695A2576E624132CFEA57F8 ++ AC @ CIQM-FM ++ 21 ++ ++ 97.5 ++ -1 ++ ++ ++ 1063385386C478FABC579AC6F910B9F2145AFA3BE45A40C7780894B9A7D4C90B8C4C26BE35 ++ CHR @ CHFI-FM ++ 22 ++ ++ 98.1 ++ -1 ++ ++ ++ 106338538624D94F399AE7ACBF41F43E81FDA05AB1882D1059DA7BCFAEA87482B5DA5D376B ++ AC @ CFLY-FM ++ 23 ++ ++ 98.3 ++ -1 ++ ++ ++ 1063385386B4E7858A1C16F77774B6D60317734B9435A111C79867EAF33F5EEA019B2ED14A ++ Country @ CYSS-FM ++ 24 ++ ++ 99.5 ++ -1 ++ ++ ++ 106338538654DEA9EA7D68F0D485BB980FF9E387487FE9278A486C32D34FD052CF4732A621 ++ AC @ CKMX-FM ++ 25 ++ ++ 99.9 ++ -1 ++ ++ ++ 1063385386447C292FF745659014EF1F8DBF6B58414ACA6047FF9678E6DA5E5F2C7DA5A9FF ++ Ethnic @ CHIN-FM ++ 26 ++ ++ 100.7 ++ -1 ++ ++ ++ 106338538625ACB8C48033773DC6DAD8B8DB3A65944A10B7624E11D6C25D091B078217ACC8 ++ Alternative @ CFMO-FM ++ 27 ++ ++ 101.1 ++ -1 ++ ++ ++ 1063385386A164237B20FB1A881985DA52D64EFCC9D2057843BB88E3BA50B4E307BA4A86B1 ++ Rock @ CKWF-FM ++ 28 ++ ++ 101.5 ++ -1 ++ ++ ++ 106338538614A744DB3C84630BD3EA779761735CA6DF75FFB6E9FC2DCACCA1C25B531EA392 ++ AC @ CFRC-FM ++ 29 ++ ++ 101.9 ++ -1 ++ ++ ++ 10633853868D109D1121D6084BA5617FAFBF61511320C88427C243BCC345849F3E392133F1 ++ Alternative @ CFNY-FM ++ 30 ++ ++ 102.1 ++ -1 ++ ++ ++ 106338538690FB3CF0893E18C64F51903A11D73A99F4793CDBD16628E3CB2E39345FAA9B2D ++ Hot AC @ CHST-FM ++ 31 ++ ++ 102.3 ++ -1 ++ ++ ++ 10633853863DD41F785B586BD29B07CC961DBE78A8F850040EFA43E443195FEBFC9FA3F151 ++ CHR @ CFHK-FM ++ 32 ++ ++ 103.1 ++ -1 ++ ++ ++ 1063385386047F08B748ABA7CD3880814BF9F66C32342F7C80BFDC82DB99170F1B246BDC66 ++ AC @ CKLP-FM ++ 33 ++ ++ 103.3 ++ -1 ++ ++ ++ 1063385386637F85CB8ACF831AA1DF14A40AA9131182F2D8C4FFB4F3B15D88E9CD3B8F6614 ++ CHR @ CIDC-FM ++ 34 ++ ++ 103.5 ++ -1 ++ ++ ++ 1063385386907E950B4E21779DE4B34E4DEF7304C4519D2BB982DC9D366E14E741132BD337 ++ Rock @ CHXL-FM ++ 35 ++ ++ 103.7 ++ -1 ++ ++ ++ 1063385386787853E1D7749B900FC8BC37FBABF2E367DEF584D4CB213DF45252F9E3D8E16E ++ Nostalgia @ CKDK-FM ++ 36 ++ ++ 103.9 ++ -1 ++ ++ ++ 1063385386F831810F48B27ED2DC2C77C3416D074C11EA8BFBC21B2433C8B03A916AA544ED ++ Country @ CICZ-FM ++ 37 ++ ++ 104.1 ++ -1 ++ ++ ++ 10633853861CB5A9AEF68F8CAB403B2EB4ED350D89C35A007EF3C5046B1B334B55C430BB7D ++ Country @ CJQM-FM ++ 38 ++ ++ 104.3 ++ -1 ++ ++ ++ 1063385386CAA5542509AEBBCE1AB227BA3C8ED4AE99D4DEB801FF6A015F37190B0431E607 ++ AC @ CHUM-FM ++ 39 ++ ++ 104.5 ++ -1 ++ ++ ++ 1063385386965E058688936CD2A8F1AF38046DE6DA764D5B7F21F64BB0E2F0E80CFAF6A946 ++ Country @ CKQM-FM ++ 40 ++ ++ 105.1 ++ -1 ++ ++ ++ 1063385386A7CD1C9CF70CC34FF19A8EE55023FDE89ED1B6F4B2111C66D34EC3495BDABEFA ++ Classic Rock @ CFCA-FM ++ 41 ++ ++ 105.3 ++ -1 ++ ++ ++ 106338538693A78B680171A292CA2F2BAE4415910E9495EF3A4F345AAADA1C0AA914000FCC ++ NPR @ CHRY-FM ++ 42 ++ ++ 105.5 ++ -1 ++ ++ ++ 1063385386F04D219347EF9006074AB70D3A4405A0F119E046A838F334B5FC99D3C5F9C376 ++ AC @ CHRE-FM ++ 43 ++ ++ 105.7 ++ -1 ++ ++ ++ 1063385386EE619BE656B906FA217A860731E54AECC2F3058CF53FCF6F7C447C7618F1E553 ++ Nostalgia @ CIMJ-FM ++ 44 ++ ++ 106.1 ++ -1 ++ ++ ++ 1063385386BE62C1CE01ED24B2F557DF4EE9EC54C4DC91909802DBAA0671CFFF6AB02CE793 ++ Rock @ CHKS-FM ++ 45 ++ ++ 106.3 ++ -1 ++ ++ ++ 106338538608B1EE52D64B3DF96C6B8FA637F4990A904E03ADC15038EB887EB7A2E32C1FF8 ++ AC @ CIXK-FM ++ 46 ++ ++ 106.5 ++ -1 ++ ++ ++ 10633853862F38341D678AFB178E35BC9E2EC81177E6ECF02F346AC8BE73F202C17B5506A8 ++ AC @ CHCD-FM ++ 47 ++ ++ 106.7 ++ -1 ++ ++ ++ 10633853863B768122EE5ABF32DF9AA18A8D489F5F232AC368ACB3FC301098A40DCACDB7F1 ++ Rock @ CKQB-FM ++ 48 ++ ++ 106.9 ++ -1 ++ ++ ++ 1063385386ACDF712DD3826C57ECA305F40BCBFAAF5D8F34ADE81651E53F140E4A995E4D90 ++ Classic Rock @ CILQ-FM ++ 49 ++ ++ 107.1 ++ -1 ++ ++ ++ 1063385386F20F122F17C34424B4B3101B3FDEC0388E96395E48711F1ED50F3141B6ECFCC4 ++ CHR @ CING-FM ++ 50 ++ ++ 107.9 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Ontario.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Ontario.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,622 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Ontario ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853876E98DEFC969A09D6C13E4CD7C19F81DF1E95174BB71FA595BFA91E7BE4AFEF30 ++ Urban AC @ CKLN-FM ++ 1 ++ ++ 88.1 ++ -1 ++ ++ ++ 10633853878C9BF92E01972A10CE22FB12F7BAC5F40CBDE7A7F6855ADBC109FF4E662EE8A7 ++ Alternative @ CKDX-FM ++ 2 ++ ++ 88.5 ++ -1 ++ ++ ++ 1063385387612ACBF8CCC9F553967792F51C7544AB3DB850030A05917786D7A4A07A42AF97 ++ CHR @ CIUT-FM ++ 3 ++ ++ 89.5 ++ -1 ++ ++ ++ 10633853875CABE542CBF6AA88AEF61FCA1863EE48E8FCB8B2B0993E9277BC8FF154F51E4A ++ Classical @ CJRT-FM ++ 4 ++ ++ 91.1 ++ -1 ++ ++ ++ 1063385387E8B15BCDD0565BC5F357AD4FC826051D3DC2CD93853F25A9CAE1A95C329C46AF ++ CHR @ CKPC-FM ++ 5 ++ ++ 92.1 ++ -1 ++ ++ ++ 10633853874CB71B000668424DB4C117AD087DBD06DCCA25DD31AE334B14F9098269CFE919 ++ CHR @ CISS-FM ++ 6 ++ ++ 92.5 ++ -1 ++ ++ ++ 10633853873A28020387BE95260D4016A3858A071421107AE6F60AF9BCE6EEED8E9DD3166A ++ Rock @ CJRQ-FM ++ 7 ++ ++ 92.7 ++ -1 ++ ++ ++ 1063385387B6A7C22A5CC4619A2BCF91F1D813F4F60AFCB9D4BDDEED5A500103BF8D5E9815 ++ Community @ CKCU-FM ++ 8 ++ ++ 93.1 ++ -1 ++ ++ ++ 1063385387E79B7801EF38DD6A0FE7758A9DCFE13F96E5A1573CC12699F6DD63A0C57E7167 ++ AC @ CFRU-FM ++ 9 ++ ++ 93.3 ++ -1 ++ ++ ++ 10633853875189655E80CC025AB1797DF35A9969AC6BF51D1B656AE48319719662E0655A14 ++ Urban @ CFXL-FM ++ 10 ++ ++ 93.5 ++ -1 ++ ++ ++ 1063385387DB5EAEE982BDB34BBBDA7D40DC39B1DE7E927B7ED50AC8F08AC15B44D5C7B366 ++ CHR @ CKKL-FM ++ 11 ++ ++ 93.9 ++ -1 ++ ++ ++ 1063385387B7D3B73330648DDC480DD5D4BB40045EBE59EF06C36D95E926059096DEE7130A ++ Rock @ CJSD-FM ++ 12 ++ ++ 94.3 ++ -1 ++ ++ ++ 10633853878E460B2401661EA007EC2CCA2BAD6EAFED60BEB86503C6FAAF0CDA52D09D0FCC ++ Nostalgia @ CHRW-FM ++ 13 ++ ++ 94.7 ++ -1 ++ ++ ++ 1063385387763E811BE7BF239EB35E6580D3D9936E7CDEEA4B28B13B8B6F59BDAED1CC0D1E ++ Hot AC @ CKGE-FM ++ 14 ++ ++ 94.9 ++ -1 ++ ++ ++ 1063385387A486E26543E4F633D83587B4162E2347FF26FE1AFB99C26DF5FAACC62C14A096 ++ AC @ CKSY-FM ++ 15 ++ ++ 95.1 ++ -1 ++ ++ ++ 1063385387F7F7BC8A4760F68353D6B1B6039F80C7AF4FBA3B68565C9FB4C825B03374167C ++ Classic Rock @ CJXY-FM ++ 16 ++ ++ 95.3 ++ -1 ++ ++ ++ 1063385387B6E1CDC4D0369144EFD50DD7ECCB059291B9C5A5349973E76EAFB8660D28054F ++ Rock @ CFJB-FM ++ 17 ++ ++ 95.7 ++ -1 ++ ++ ++ 10633853877F705CD0E90EB7C924C230EA29DA271ECF194E6E8AF366AE10A6B8DC2F913BF5 ++ Rock @ CFPL-FM ++ 18 ++ ++ 95.9 ++ -1 ++ ++ ++ 106338538723656F97FF16DE7B18CD714B91CD7EB15A511821CF22B155893157BFAFEDF679 ++ Country @ CHVR-FM ++ 19 ++ ++ 96.7 ++ -1 ++ ++ ++ 1063385387AF261A8D40335B9B4BFAA43FDA39D7A7F5A53E976E6AA80CE1E85C5A4C04EC8F ++ AC @ CJEZ-FM ++ 20 ++ ++ 97.3 ++ -1 ++ ++ ++ 10633853876D561577E3DC788C19571674B29C5AD5AF5D520ECFF670E7C75BE09250012207 ++ AC @ CIQM-FM ++ 21 ++ ++ 97.5 ++ -1 ++ ++ ++ 106338538774FFC8229642E61F322532AF4FC6DC63ECBB4AD33DDD4D658C22E4F9CC0F0A8D ++ CHR @ CHFI-FM ++ 22 ++ ++ 98.1 ++ -1 ++ ++ ++ 10633853872A10FB5967CD90064B72DE60A7A25A13FE2F8ABC3466C4E40784578BF82F4E49 ++ AC @ CFLY-FM ++ 23 ++ ++ 98.3 ++ -1 ++ ++ ++ 10633853879EE628DA1882AC0D30A792250251A7A742AE1DDBBA5811A59B0246388426B65B ++ Country @ CYSS-FM ++ 24 ++ ++ 99.5 ++ -1 ++ ++ ++ 1063385387BE5A36CABF9B65A0B70E478CA2CF20F8F546636BD882184D0FDF54B74B7094C4 ++ AC @ CKMX-FM ++ 25 ++ ++ 99.9 ++ -1 ++ ++ ++ 1063385387F32B6EF72C8B152DAF03FED92D12EB2FFC3D12CDE01AA4FB7CF118C736D6700A ++ Ethnic @ CHIN-FM ++ 26 ++ ++ 100.7 ++ -1 ++ ++ ++ 1063385387C4397050BB9E7BBAA1E26DCEB254B67F43984158D5F2575C1441005633392C6A ++ Alternative @ CFMO-FM ++ 27 ++ ++ 101.1 ++ -1 ++ ++ ++ 106338538706412BAD92E6149D2AA9DD54571AFD4E1B42384A2BAED7979FFF6C45E0BB752D ++ Rock @ CKWF-FM ++ 28 ++ ++ 101.5 ++ -1 ++ ++ ++ 1063385387DD4F3EBC5658F6F0A62CDD8F3C26F303F4E14AB1A19328DC4FB0D90682D998C1 ++ AC @ CFRC-FM ++ 29 ++ ++ 101.9 ++ -1 ++ ++ ++ 10633853873BDA2F6A481DDDC9D578BE1587FEFF50428EBC9F88C650404F2B89ACEA75AE8B ++ Alternative @ CFNY-FM ++ 30 ++ ++ 102.1 ++ -1 ++ ++ ++ 106338538716473ED7B07ED3D3427F033B89DA601941B27D9750CF6AB19DAE2877839827EB ++ Hot AC @ CHST-FM ++ 31 ++ ++ 102.3 ++ -1 ++ ++ ++ 1063385387EDCCD75C62578153A960662DC007092A1AEFC29D9263CB1A0802B257D1F4DCE0 ++ CHR @ CFHK-FM ++ 32 ++ ++ 103.1 ++ -1 ++ ++ ++ 1063385387FCC1575AC7B63E73F65A4FF62360D7EF02D4E7A9108CCEEF414501862763ACA0 ++ AC @ CKLP-FM ++ 33 ++ ++ 103.3 ++ -1 ++ ++ ++ 1063385387D9A3E774AF8667AA1BFC1BA5907836D84DE0C4C002604B8E9E5F8C3766526AF4 ++ CHR @ CIDC-FM ++ 34 ++ ++ 103.5 ++ -1 ++ ++ ++ 1063385387256BC2D33EE81620BB8BE2BC2D01FCE6DED69B151C37604A399C817D01D97C57 ++ Rock @ CHXL-FM ++ 35 ++ ++ 103.7 ++ -1 ++ ++ ++ 10633853877BA40CEA39347B184BFD4CCC74D19EA2E61950BBED79671F3ED4970E7290FB50 ++ Nostalgia @ CKDK-FM ++ 36 ++ ++ 103.9 ++ -1 ++ ++ ++ 10633853877817B483F401A31D7828E8206898387283FCA1540CC07958302B35D487BFDAE6 ++ Country @ CICZ-FM ++ 37 ++ ++ 104.1 ++ -1 ++ ++ ++ 10633853870538B7B1497ED02C3E1919285BCFC3E00AE8219008687ABA87CF50519DD9EC99 ++ Country @ CJQM-FM ++ 38 ++ ++ 104.3 ++ -1 ++ ++ ++ 1063385387B642EE3194250F31ECDDC410157AF67B1CEE6692429B92F4C8C5FD87EFAF34F6 ++ AC @ CHUM-FM ++ 39 ++ ++ 104.5 ++ -1 ++ ++ ++ 10633853878F35BF4F80A7C66A66CB3E5D240042CF41DFD7F476614CDC8058D585A091559A ++ Country @ CKQM-FM ++ 40 ++ ++ 105.1 ++ -1 ++ ++ ++ 1063385387A7CDF81610B0B74DFA711AD53B1401F5BCBF2808E4EC1F541290037D908E03C7 ++ Classic Rock @ CFCA-FM ++ 41 ++ ++ 105.3 ++ -1 ++ ++ ++ 106338538735B590EA8B14262A3D7E5C26F381BD2B3F672388C6A3CB8189E27540CC3197C9 ++ NPR @ CHRY-FM ++ 42 ++ ++ 105.5 ++ -1 ++ ++ ++ 10633853876A79F38B234FEA9275F17E25A009CCCC3799FC24DA620AB235D9402C68241EA9 ++ AC @ CHRE-FM ++ 43 ++ ++ 105.7 ++ -1 ++ ++ ++ 1063385387225BDA02BA932246643D745C36BC2939BEA4210C339B412E994B663E6235A7AB ++ Nostalgia @ CIMJ-FM ++ 44 ++ ++ 106.1 ++ -1 ++ ++ ++ 1063385387F38D87244563679468C2B4BEBE2A54E7E4FB21AC53179493CD6CBBEA483D165F ++ Rock @ CHKS-FM ++ 45 ++ ++ 106.3 ++ -1 ++ ++ ++ 10633853876B6A06BA95EF9D75A3471C9D7B5CD6F3F7A9DC29F948B3109B928E7A763508B6 ++ AC @ CIXK-FM ++ 46 ++ ++ 106.5 ++ -1 ++ ++ ++ 10633853875D7E4E4EB1D04567335789330CDCBBDCB57C9450282F5F7D9AE8DBB02EB2AD15 ++ AC @ CHCD-FM ++ 47 ++ ++ 106.7 ++ -1 ++ ++ ++ 1063385387F8B40F9449181478EB112D7094B5084E3F568BDCBE08A688413E354F96766BCD ++ Rock @ CKQB-FM ++ 48 ++ ++ 106.9 ++ -1 ++ ++ ++ 1063385387C094B26D0BDE6C803C37923CC5FB32CD1EDF8DF52A3D6CB2122284A2A6C3016B ++ Classic Rock @ CILQ-FM ++ 49 ++ ++ 107.1 ++ -1 ++ ++ ++ 106338538755F98172903403007BAC06168BDCD9F06B491E6C6BA44988736EC1A94A7575A4 ++ CHR @ CING-FM ++ 50 ++ ++ 107.9 ++ -1 ++ ++ ++ 106338538726EEE0485C0FBBD70981AE736AE24CC1474499C447208C5082513B20660644B8 ++ Oldies @ CFOS-AM ++ 51 ++ ++ 0.56 ++ -1 ++ ++ ++ 1063385387C07E21EECF0A25E16F6A656EE640F2FAC4E53BA47D8AE32EC9E57F78D30E12F8 ++ CHR @ CKGL-AM ++ 52 ++ ++ 0.57 ++ -1 ++ ++ ++ 10633853878E6A34F02069592943599C06BAEFC372F3FB968695248C35544F8F65EECA9771 ++ News/Talk @ CKPR-AM ++ 53 ++ ++ 0.58 ++ -1 ++ ++ ++ 1063385387D0E33C0BCF07B05815CB61EB9FC244BB4C73BCBF2B736C92284EE8D2F4D19B55 ++ Sports @ CJCL-AM ++ 54 ++ ++ 0.59 ++ -1 ++ ++ ++ 1063385387EE790E6B43D12C980ECF8C55D5E947CBE9CD297B731275B2230DB86F56043C28 ++ Oldies @ CFCO-AM ++ 55 ++ ++ 0.63 ++ -1 ++ ++ ++ 10633853877E9CA0E6E7161E815266E8E12837CD9D97AD81ED5EBB768D0EF51FCF5F394DCD ++ News/Talk @ CHOG-AM ++ 56 ++ ++ 0.64 ++ -1 ++ ++ ++ 10633853879538D6491E52FAA18DB3BC50F9241867A79B00DA53907C76D9BFCF19D50145E5 ++ News @ CFTR-AM ++ 57 ++ ++ 0.68 ++ -1 ++ ++ ++ 1063385387E8D4CB03138624F10498976E0EEFE9B6E8A1414BC9CF9334848C3BEB7D7CEBB4 ++ Country @ CJBQ-AM ++ 58 ++ ++ 0.8 ++ -1 ++ ++ ++ 10633853873B47018A34F2913969C1379711467738CC1447C6D8A96A10BC816E3D08D2DF36 ++ Country @ CHAM-AM ++ 59 ++ ++ 0.82 ++ -1 ++ ++ ++ 1063385387A17C05D5E7313B59164DB319C9CB5CBBE6D3648A73118ED9F1EC9B3EEFDC03E1 ++ Oldies @ CHML-AM ++ 60 ++ ++ 0.9 ++ -1 ++ ++ ++ 106338538764CE1690FF419201C02E1732BA9391BF94CFFBD00B8C9C1FBEA494D3171FA0F0 ++ AC @ CFPL-AM ++ 61 ++ ++ 0.98 ++ -1 ++ ++ ++ 1063385387FAA32280A36E1881D28192C0585393D38DB29182FBFF509BE97BC71318317802 ++ News/Talk @ CFRB-AM ++ 62 ++ ++ 1.01 ++ -1 ++ ++ ++ 10633853876E80525B1EE7E7496987C5644DF0920681FA7843AD4EDA1D8397D8337DFCD145 ++ Oldies @ CHUM-AM ++ 63 ++ ++ 1.05 ++ -1 ++ ++ ++ 1063385387E28F26BA719DEC29D74AD9414D1227E22215DB299264C5424D3DBE465BD5C3A1 ++ News/Talk @ CHOK-AM ++ 64 ++ ++ 1.07 ++ -1 ++ ++ ++ 10633853872D7635F61027AEB8847B27D16C08909EFEC3ABA42FF0F3F54C3FDE4F71B0F0D5 ++ Oldies @ CKKW-AM ++ 65 ++ ++ 1.09 ++ -1 ++ ++ ++ 10633853876C9E8B06257C7A1924CFDC270AB4C4D2C10372854AA18B8DAC4A51BD5141D0BF ++ Oldies @ CKOC-AM ++ 66 ++ ++ 1.15 ++ -1 ++ ++ ++ 1063385387E05F4659A976BDD0877DBE5DF0B38C58FAE13E0BF65A5506A0F63E4586FB0923 ++ CHR @ CJTT-AM ++ 67 ++ ++ 1.23 ++ -1 ++ ++ ++ 10633853877217F9D5FF93CE68A7A42842A02D56A35ABD3745D9379126BBA635F8CA6AEA11 ++ Oldies @ CJCS-AM ++ 68 ++ ++ 1.24 ++ -1 ++ ++ ++ 10633853876111C32C65B2382E4D8D19B92D3D315BC2F78BCF3E02A1D2811153DCA52AB765 ++ AC @ CJTN-AM ++ 69 ++ ++ 1.27 ++ -1 ++ ++ ++ 1063385387F790B9D10F6151C81BB1E55667CFB7375A8065F19F3A0B7585763823F73BE172 ++ News/Talk @ CJBK-AM ++ 70 ++ ++ 1.29 ++ -1 ++ ++ ++ 1063385387067AB80B3AAF92C801A95FF4F71399F279E8B452D4AA089F8D75C2D061A0B09D ++ Classic Hits @ CKPC-AM ++ 71 ++ ++ 1.38 ++ -1 ++ ++ ++ 1063385387193CFE62DC76D42AD202E169C6834AC313DDE061924E1411330D09CBDDB7270D ++ Oldies @ CKSL-AM ++ 72 ++ ++ 1.41 ++ -1 ++ ++ ++ 1063385387E63DEDF4DD5851C889E843FDDFB37136B4F9650F2F4DB3F54B18B8C827FCE779 ++ AC @ CKPT-AM ++ 73 ++ ++ 1.42 ++ -1 ++ ++ ++ 106338538776DA0BA89CCAAC57A9D6082AA848EA0CE7A2D20CEC2AE4DC02880F2ADD40671B ++ Oldies @ CJOY-AM ++ 74 ++ ++ 1.46 ++ -1 ++ ++ ++ 10633853870C27702D5C4578D660CC1600408AFE1127C1DE8958808BD7B55B66BD0D8C7F4B ++ Oldies @ CFPS-AM ++ 75 ++ ++ 1.49 ++ -1 ++ ++ ++ 1063385387DFD4D0AA3FED72182CA5555E2FC4A576570722C696FFABFD40BED9B946F28915 ++ Ethnic @ CHIN-AM ++ 76 ++ ++ 1.54 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Quebec ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385389651181978E67E42215B4D30FD0060862B14D472B7E30917A978E36DC88F0313B ++ Talk @ CIQC-AM ++ 11 ++ ++ 0.6 ++ -1 ++ ++ ++ 1063385389E338FDF6FABED3D9A576513AECF04FD40E5001DC5B003893B4671B73BDDA9150 ++ Talk @ CHRC-AM ++ 12 ++ ++ 0.8 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Quebec_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,94 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Quebec ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385356CD9DD1A93794AB3675AB047B8E4E884FAA312F187A73AA6CB6919076C39CEB7B ++ Alternative @ CFAK-FM ++ 1 ++ ++ 88.5 ++ -1 ++ ++ ++ 10633853563B41E95179A54ECB4A00D6E0A80861B7BD22AA334A618FB85F0555F265EE2EE1 ++ Ethnic @ CHCR-FM ++ 2 ++ ++ 89.9 ++ -1 ++ ++ ++ 10633853568287524B70496005D97E3E9487853AB5A9DAF272E9A5F099D853C2D940097BD8 ++ AC @ CFQR-FM ++ 3 ++ ++ 92.5 ++ -1 ++ ++ ++ 10633853569402DBD98AB56C5A1D2A3705D4D023215C970130602DCCF105A42753CFDAFFE8 ++ Alternative @ CFLX-FM ++ 4 ++ ++ 95.5 ++ -1 ++ ++ ++ 10633853566FDEC9652755850D746766CFF88B7B4420EA0D990C5CD2A17A7C52E2E572C1DC ++ Hot AC @ CJFM-FM ++ 5 ++ ++ 95.9 ++ -1 ++ ++ ++ 106338535667B9AB049DC36A573F0B8AC3C73B78082A6CE5B36B640F94B9785CA51D5E536C ++ CHR @ CHOM-FM ++ 6 ++ ++ 97.7 ++ -1 ++ ++ ++ 1063385356A8AF6535A854DF52826B4E93CC763A9FC1610BC78163BFB0C30969DCDA6A02EA ++ Alternative @ CHOI-FM ++ 7 ++ ++ 98.1 ++ -1 ++ ++ ++ 10633853561CA6E44132CAFF8CDD7F6911708046B4EB1540F7156FE27DC8EE2F833EFAAECD ++ Oldies @ CFOM-FM ++ 8 ++ ++ 102.9 ++ -1 ++ ++ ++ 1063385356C718716056A273CAC1E4EABF02B9692085AA575B90A02139B050E05B4AAB0535 ++ CHR @ CFJO-FM ++ 9 ++ ++ 103.3 ++ -1 ++ ++ ++ 1063385356B14958EA8D57D93486064ADB374F0E1E3E6F15DE22BFA26C3D01B26708F902C9 ++ Urban AC @ CITF-FM ++ 10 ++ ++ 107.5 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Quebec.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Quebec.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,110 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Quebec ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338538917B618E7F0EEC470EB266AF65B527C0FC38A8E8BBBAC09E65D149B9ACC737FD4 ++ Alternative @ CFAK-FM ++ 1 ++ ++ 88.5 ++ -1 ++ ++ ++ 1063385389DFF8E8EFF4060F58A180BC540D88960C7D3BAF568F774DA3DBB94AC70C1AFE1F ++ Ethnic @ CHCR-FM ++ 2 ++ ++ 89.9 ++ -1 ++ ++ ++ 106338538963B8F0086E9B6B22C97B41C51136DC2D2DB620421A9368BF07C32F1FBED1F98F ++ AC @ CFQR-FM ++ 3 ++ ++ 92.5 ++ -1 ++ ++ ++ 10633853895625E419BD1CDDBAE521E96DC15523CA7EA87DE945BC22354195F46E4E7FAB5C ++ Alternative @ CFLX-FM ++ 4 ++ ++ 95.5 ++ -1 ++ ++ ++ 1063385389D50371EF969ECC882716053C947FE4AA98147B1C354409E4FDCAA99C7765B9D0 ++ Hot AC @ CJFM-FM ++ 5 ++ ++ 95.9 ++ -1 ++ ++ ++ 1063385389ABF38CC786A66D9E071AC6D4BA04CC8EE646205D74BC4CE9784A39BD07382AF3 ++ CHR @ CHOM-FM ++ 6 ++ ++ 97.7 ++ -1 ++ ++ ++ 10633853893C7A2C1B5B37A7D3DFF22237A0876D496FBFD44757541ABBD3FDBF572AF1630C ++ Alternative @ CHOI-FM ++ 7 ++ ++ 98.1 ++ -1 ++ ++ ++ 1063385389468260BA2B79BAAA971EFECA5B2C8AAC389782E3B85C726356AF8AB4A431B8FC ++ Oldies @ CFOM-FM ++ 8 ++ ++ 102.9 ++ -1 ++ ++ ++ 106338538903A7AB9379C1918F3F321B18682958D071C70B0BE42F443DAD8E2B79550E32DE ++ CHR @ CFJO-FM ++ 9 ++ ++ 103.3 ++ -1 ++ ++ ++ 1063385389D76EFB944D1D56D794BAFC219FA7911878F0EDCAC12BDD561549C32F1F334EB8 ++ Urban AC @ CITF-FM ++ 10 ++ ++ 107.5 ++ -1 ++ ++ ++ 106338538925183644B8075C87D6A37CC43D6B9136D5FC77CE7F72D51CEDA492CDE6D56582 ++ Talk @ CIQC-AM ++ 11 ++ ++ 0.6 ++ -1 ++ ++ ++ 1063385389174B649D33F7845E1E4B9435DAEFFCF97ECABAABE3E4D191B018DEFA410D187E ++ Talk @ CHRC-AM ++ 12 ++ ++ 0.8 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_am.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_am.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,70 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Saskatchewan ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 10633853922CBE03E5BF8155703EC10D3E0C3FAE6A256CB4FD8AB3CE2D3832C8F3E1951C2A ++ Country @ CJWW-AM ++ 6 ++ ++ 0.6 ++ -1 ++ ++ ++ 1063385392C81C9FB8F948767E9597ED261EA84C3C81BB082E9D5132C5CF46707342AD1930 ++ Oldies @ CKCK-AM ++ 7 ++ ++ 0.62 ++ -1 ++ ++ ++ 10633853928B14DAA96CD8E42A0B7BA74D75F99D64FFD6DF1E7B04DBA5D1C39C723B01164E ++ Country @ CJVR-AM ++ 8 ++ ++ 0.75 ++ -1 ++ ++ ++ 10633853923BCD4914F1F6A90B213F161DC962B060AE5C9819AE5586728D7A879F69A5A8CB ++ New Country @ CKBI-AM ++ 9 ++ ++ 0.9 ++ -1 ++ ++ ++ 106338539297B6A4F7667AE83208F641C1019592CCC7D78CEFB54B6B192061CD27F954DCFD ++ Country @ CKRM-AM ++ 10 ++ ++ 0.98 ++ -1 ++ ++ ++ 106338539203382F7D0844AAC2ED0844A0D0A75B2783B6FA435382D0E81B1B41E06D605034 ++ Hot AC @ CFYM-AM ++ 11 ++ ++ 1.21 ++ -1 ++ ++ ++ 106338539243EDB5DB93FBF91FE7E44DF60204953F4C2C29742D7541272FA4919CC9DBBEE3 ++ Hot AC @ CJYM-AM ++ 12 ++ ++ 1.33 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan_fm.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan_fm.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,54 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Saskatchewan ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 106338539149CCF4BDBBBE1DD4D4D882464CECF011290172C50BB99EA9E69086A9B6EA4764 ++ CHR @ CHMX-FM ++ 1 ++ ++ 92.1 ++ -1 ++ ++ ++ 1063385391CEEAF5E63A4936D1346D7EB79F9E7A6D4729E3E96C3B91153E69312BFB219596 ++ Country @ CFQC-FM ++ 2 ++ ++ 92.9 ++ -1 ++ ++ ++ 10633853912B0A5E29B34ECDF206DADE105BF251C8F1941E50C2206F9987AE54446F9503CB ++ CHR @ CFMC-FM ++ 3 ++ ++ 95.1 ++ -1 ++ ++ ++ 10633853918828B2B765310949888688E194181918A9F8AF854094462A385790FA81FA6E73 ++ CHR @ CFMM-FM ++ 4 ++ ++ 99.1 ++ -1 ++ ++ ++ 106338539163B0B17992A2632030645ED944EFD4395A96939F2340A9E77F5937735BFAD899 ++ Rock @ CFWF-FM ++ 5 ++ ++ 104.9 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp +--- kradio-3.5.13.1/kradio3/presets.old/canada/Saskatchewan.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/canada/Saskatchewan.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,110 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ G. Richard Raab, rraab@plusten.com ++ Sat Jan 18 14:31:54 2003 ++ USA ++ Saskatchewan ++ antenna ++ Generated from http://links.radio-online.com/stations.htm ++ ++ ++ 1063385392F117413BFADF22E4E72F4745D7323B099F1F28A2CAD22EFC5D33B66661E24D2D ++ CHR @ CHMX-FM ++ 1 ++ ++ 92.1 ++ -1 ++ ++ ++ 106338539234488E7C829A5C45B21E9214262665CEEED21A70823942A69FD442B2B97368D3 ++ Country @ CFQC-FM ++ 2 ++ ++ 92.9 ++ -1 ++ ++ ++ 1063385392F46C1FA4EBE0AB793FE0C6672232B68810CD9149C8C68F32E553421A62FF6098 ++ CHR @ CFMC-FM ++ 3 ++ ++ 95.1 ++ -1 ++ ++ ++ 10633853926160480419127C9EAA00305CF902A6E1781A04134A1D2A264E8E727AD473448A ++ CHR @ CFMM-FM ++ 4 ++ ++ 99.1 ++ -1 ++ ++ ++ 10633853922E23923749C3468C56ACA0DE9C402916DDBEBE083BAC6E34763BC5F2A1CB6725 ++ Rock @ CFWF-FM ++ 5 ++ ++ 104.9 ++ -1 ++ ++ ++ 1063385392ACA62862EA04E38850B9CCCF44BAD3AC95E05FD6938B4D23E561108F68EEB6AF ++ Country @ CJWW-AM ++ 6 ++ ++ 0.6 ++ -1 ++ ++ ++ 10633853921246AA0CC5D6569CAAD7B9122EBC9BA3BF74F4A56486DEF9E37B77AB4C7A900C ++ Oldies @ CKCK-AM ++ 7 ++ ++ 0.62 ++ -1 ++ ++ ++ 1063385392BAA64D7CDCCD7C1CF46A513FFE2815B12F602FE0BA67F5C1A699B302A66E26C9 ++ Country @ CJVR-AM ++ 8 ++ ++ 0.75 ++ -1 ++ ++ ++ 1063385392454E721BD87FB3F8D707CB0E681E8D981EDF4092A809A109AB55708657D82DF0 ++ New Country @ CKBI-AM ++ 9 ++ ++ 0.9 ++ -1 ++ ++ ++ 106338539242BD87899BB87FF733DB4E48EEB3CA70C5F65526232C1CC039A3395C4EDC90DA ++ Country @ CKRM-AM ++ 10 ++ ++ 0.98 ++ -1 ++ ++ ++ 106338539225BCE8632827B870192D3E43907F7CE2A240C38B527EA85F0D9EEF6B32C9D4B9 ++ Hot AC @ CFYM-AM ++ 11 ++ ++ 1.21 ++ -1 ++ ++ ++ 1063385392A4B7EBA582A1129D21179B617FFF95C3CDA93BC906C357943486E5516E0EB716 ++ Hot AC @ CJYM-AM ++ 12 ++ ++ 1.33 ++ -1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp +--- kradio-3.5.13.1/kradio3/presets.old/colombia/bogota.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/colombia/bogota.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,330 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ Camilo Guevara Isidro <mylosoft@gmail.com> ++ 2010-02-07T17:07:49 ++ Colombia ++ Bogotá ++ ++ ++ ++ ++ 1265586572E5657722177EBEA73DA4FF0518811C3484A717A9C12CC4C4BFB3B0340A8B ++ 88,9 - Radio Uno ++ ++ ++ -1 ++ dontcare ++ 88.9 ++ ++ ++ 126558534656E8020B1D8585EC1EE27CA7DB8365FCF5703EC1AE1EFBE7CFB12ABBA2CA ++ 89,9 - 40 Principales ++ ++ ++ -1 ++ dontcare ++ 89.9 ++ ++ ++ 1265585398C027C4454EE87E3CF0BF2626DE27ECF258CBAD3A77F9F1651FA97A221841 ++ 90,4 - EMISORA HJUD LAUD (Universidad Distrital) ++ ++ ++ -1 ++ dontcare ++ 90.4 ++ ++ ++ 126558544558FC2009395BF1D9EF06D190DF6C4DC5B57BF0DC09F842010FEAAA002E3D ++ 90,9 - La Mega ++ ++ ++ -1 ++ dontcare ++ 90.9 ++ ++ ++ 1265585512B2A5E1E6BCF0D7755E8809B02B4E2EFFAD5E7EB5CC1539019249A85D88E4 ++ 91,3 - Vilmar Stereo (Faca) ++ ++ ++ -1 ++ dontcare ++ 91.3 ++ ++ ++ 12655855391167AC86413F107081FE6AC284347816867044B554DF12CBAF74502AD604 ++ 91,9 - Javeriana Estereo ++ ++ ++ -1 ++ dontcare ++ 91.9 ++ ++ ++ 1265585568699A8595F69B73223A07CA49137AE95C4DF49FB268AC8BEAA7FB6E1EA027 ++ 92,4 - Radio Policía Nacional ++ ++ ++ -1 ++ dontcare ++ 92.4 ++ ++ ++ 126558560029169A35872F465CB876832E32CBBAC8FA092BCACDB8321092BB2BD99E34 ++ 92,9 - La Z ++ ++ ++ -1 ++ dontcare ++ 92.9 ++ ++ ++ 1265585620BB32D339B7D584101BDB753F8543163ACF118BA83B2130D1AA6639098061 ++ 93,3 - Unilatina Stereo ++ ++ ++ -1 ++ dontcare ++ 93.3 ++ ++ ++ 12655856443DAAFEE2E8E0208C6DFFE33E3FCAE978CD0DA7A86C2EAE9466AC299E13C3 ++ 93,4 - Colombia Stéreo ++ ++ ++ -1 ++ dontcare ++ 93.4 ++ ++ ++ 1265585687761E6CB5384A4183D5B3CAEADF288BB781333F3C148B36E58C949C05378A ++ 93,9 - Amor Stéreo ++ ++ ++ -1 ++ dontcare ++ 93.9 ++ ++ ++ 1265585715EA2BE0C18E090093A7DD6EC6EF328ED54FF6AC5B26C7685D2F591156BC94 ++ 94,4 - Despecho stéreo ++ ++ ++ -1 ++ dontcare ++ 94.4 ++ ++ ++ 1265585747C397779EDAECA1EBBE137D71D7FDE6D7A1FD9368B4317A4788B183C5DB0C ++ 94,9 - La F.M. ++ ++ ++ -1 ++ dontcare ++ 94.9 ++ ++ ++ 1265585765AE4E456336743FADC6F062B0A5EC912CE7449E771EE244C1AA69ADAF553D ++ 95,4 - Quinta Stéreo ++ ++ ++ -1 ++ dontcare ++ 95.4 ++ ++ ++ 126558588417E1F181DA2BFEDF54050C1B5A634AC21D3F20B07AFAFBD83AB5B83A29EC ++ 95,9 - Radio Nacional de Colombia ++ ++ ++ -1 ++ dontcare ++ 95.9 ++ ++ ++ 126558592626C3EA5E78B816C4F441F8125FE77A2DD2F2E08684DA94FB8EC9C799C500 ++ 96,3 - Alternativa Stéreo / RCN Radio Stéreo ++ ++ ++ -1 ++ dontcare ++ 96.3 ++ ++ ++ 126558595451674B61A73EDD66BEE83371394479C90D318B2616CF3EBAE27DF8A020A5 ++ 96,9 - Melodía FM Stéreo ++ ++ ++ -1 ++ dontcare ++ 96.9 ++ ++ ++ 1265585990BF6F27CAB43016860538C68D61C6D28D09664C3DB7ABB76124585B13A85F ++ 97,4 - La Vallenata ++ ++ ++ -1 ++ dontcare ++ 97.4 ++ ++ ++ 126558605213FD122E47EFCE1529547FCFA5E5A62F78B752F91DA2AD6FF29292AB0D8B ++ 97,9 - RadioActiva ++ ++ ++ -1 ++ dontcare ++ 97.9 ++ ++ ++ 1265586077C1C779B863DF0AEFD7A40C691FF5CB0B316400AF784A5A2B4280C098C078 ++ 98,5 - UN Radio - Emisora Universidad Nacional ++ ++ ++ -1 ++ dontcare ++ 98.5 ++ ++ ++ 1265586107CBDDE91DE818CF1DC7C165DBEE97FC6EA7D00310919651673631A9A21498 ++ 99,1 - Radionica ++ ++ ++ -1 ++ dontcare ++ 99.1 ++ ++ ++ 1265586123ECADAEB507405B7C51062AA1EF04E1DCDBE4852B39D1463C904FC044A969 ++ 99,9 - W Radio ++ ++ ++ -1 ++ dontcare ++ 99.9 ++ ++ ++ 1265586139D948BCFA0F57A6F8459CCE29055C6E59B51D21799318B84A18BA5FF97426 ++ 100,4 - Oxígeno ++ ++ ++ -1 ++ dontcare ++ 100.4 ++ ++ ++ 12655861609F8D34C018D14435BD84EAE180213E1DAC209A38B5CFEAEF16822B791A64 ++ 100,9 - Caracol Radio ++ ++ ++ -1 ++ dontcare ++ 100.9 ++ ++ ++ 1265586188B331F176F32CFDF203ED323F3DF5DD9739B102B58F881754E128E80AB301 ++ 101,3 - Mauro Stereo - Funza ++ ++ ++ -1 ++ dontcare ++ 101.3 ++ ++ ++ 1265586210C72E262B4123BE023000CF7B19BAAC35096F216B6FDB89829E279DF14B3B ++ 101,9 - Candela Stéreo ++ ++ ++ -1 ++ dontcare ++ 101.9 ++ ++ ++ 1265586239A3A27E61661E60A972C3FAFE8AAE4EBEC0215906927FD023370BC7D03B51 ++ 102,9 - Tropicana Stéreo ++ ++ ++ -1 ++ dontcare ++ 102.9 ++ ++ ++ 1265586271BD4564DEB5AFA57B5D623461D8F41378348E7E7787065469DE8EAA9FD30B ++ 103,9 - La X ++ ++ ++ -1 ++ dontcare ++ 103.9 ++ ++ ++ 12655862903E11B0402AC81471A11C5DE3D5D3A6B3878A58676B737A9F90371D0EA834 ++ 104,4 - RCN Radio ++ ++ ++ -1 ++ dontcare ++ 104.4 ++ ++ ++ 1265586314D4AEB10D8887486F301C61C4D7CED780A7AF5F53B9AEB1C05D122B6BA293 ++ 104,9 - Vibra Bogotá ++ ++ ++ -1 ++ dontcare ++ 104.9 ++ ++ ++ 12655863376F22B915AA76D4DC6A6343E990918ADEB5D27FAB7066CC7EBDF303997C68 ++ 105,4 - Rumba Stéreo ++ ++ ++ -1 ++ dontcare ++ 105.4 ++ ++ ++ 1265586361EA6092AAB1DC59589F99C73013CD37B554E7F95D8E5F652F26AB7D206BEB ++ 105,9 - Olímpica Stéreo ++ ++ ++ -1 ++ dontcare ++ 105.9 ++ ++ ++ 12655863869246EB11A58366B4091C5A068AE0FA22C8759324D2527E1AB7EE1ED5D0B9 ++ 106,9 - Universidad Jorge Tadeo Lozano ++ ++ ++ -1 ++ dontcare ++ 106.9 ++ ++ ++ 126558641326CC0554E127440B8CCF9533F9BA88BFB6CE48DDBF1932B0E5F006DB5400 ++ 107,4 - Radio Rumbo Stéreo ++ ++ ++ -1 ++ dontcare ++ 107.4 ++ ++ ++ 126558644096CF476B3D0758B75660C491437181EE5702DC2CB4C54A7A46CCFCCF817D ++ 107,9 - Minuto de Dios ++ ++ ++ -1 ++ dontcare ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/colombia/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/colombia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,9 @@ ++SUBDIRS = ++EXTRA_DIST = "bogota.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/" ++ $(INSTALL_DATA) "$(srcdir)/bogota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/colombia/bogota.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/croatia/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/croatia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,9 @@ ++SUBDIRS = ++EXTRA_DIST = "split-cable.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/" ++ $(INSTALL_DATA) "$(srcdir)/split-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/croatia/split-cable.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/croatia/split-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/croatia/split-cable.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,231 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0-rc1 ++ Ivica Božulić <ibozulic@gmail.com> ++ 2008-04-05T16:59:08 ++ Croatia ++ Split ++ Cable ++ ++ ++ ++ 120740751328238D2159D5831AD30B26BA2A5A66CD1984B82075078737563C2FD2EA5E1557 ++ RADIO SPLIT ++ 11 ++ ++ -1 ++ dontcare ++ 97.4006 ++ ++ ++ 1207407508E3A4EBB3E570DD94433A956AB7448DB5968860538E1D6A359FD70C0938F32171 ++ OTVORENI ++ 8 ++ ++ -1 ++ dontcare ++ 95.8505 ++ ++ ++ 120740751775D937D8C6A07B0E5A3FF7A690E85481ED81940F462705AD3A45FACE5161BFB5 ++ DALMACIJA ++ 14 ++ ++ -1 ++ dontcare ++ 99.0257 ++ ++ ++ 1207407510D1E25B12ACC9660E602B300E6CF8E54E477F3C115442852B575AB2CDF5F27679 ++ KL EURODOM ++ 9 ++ ++ -1 ++ dontcare ++ 96.6256 ++ ++ ++ 1207407504EB158B4F1CF4176B28BF214BD88BA8A96C7FB26B6B17EA660FEFEC8092D303DF ++ RIVA ++ 6 ++ ++ -1 ++ dontcare ++ 94.6504 ++ ++ ++ 1207407500E9B6C096D64A894A068FABE75A019716C3B748D916EA2E354D69D7BAB862E5C4 ++ RADIO SALONA ++ 3 ++ ++ -1 ++ dontcare ++ 92.7253 ++ ++ ++ 122097750466D2BAFC3BC580FF5394F5F374F90D3DBB4AAC5A5155453A54F2E57A163BBE5E ++ DIN-DON ++ ++ ++ -1 ++ dontcare ++ 90.9 ++ ++ ++ 1220977448C1DF1B92704B74A403BBFA80772DC0AAE78099963484B94A4FCAD98D69E3EC2F ++ RADIO TROGIR ++ 21 ++ ++ -1 ++ dontcare ++ 90.3 ++ ++ ++ 1207407498389C4F99C767482BD69BF12E465DB9E0E5909D7655D16EB4A11E06DB9696C81C ++ RADIO KAŠTELA ++ 2 ++ ++ -1 ++ dontcare ++ 92.15 ++ ++ ++ 1207407516A0B01C6CA2CB9A40C6EC11394D665983073B0D42444011652721645FEA061C30 ++ HR 1 ++ 13 ++ ++ -1 ++ dontcare ++ 98.6507 ++ ++ ++ 12074075150544492C037A467AC5F2A3B7FBC286954BF27034A44EEC379C1FC5CB1FDE64EC ++ HR 2 ++ 12 ++ ++ -1 ++ dontcare ++ 98.2007 ++ ++ ++ 1220977646E1B29A182D5572F2B7CBCF7F2814D50923CB1CA312E83C75CE29E5E6D638678B ++ HR 3 ++ ++ ++ -1 ++ dontcare ++ 95 ++ ++ ++ 1207407511DBF4FAC44CA53796F2D74A357697A1E212F00C53838EFFD7AA648B2E147EC50E ++ NARODNI ++ 10 ++ ++ -1 ++ dontcare ++ 97.0506 ++ ++ ++ 12074075011E1E049ACABAB05DB23C164C4FD4102C4CD48A1C66CE8F9C12A6427A8B0EDBF2 ++ RADIO BRAČ ++ 4 ++ ++ -1 ++ dontcare ++ 93.3504 ++ ++ ++ 120740749651539469F93B7B572ACF9BA16639803013B692A1925A4CA5336FB9BCA7708A47 ++ MEGA MIX HVAR ++ 1 ++ ++ -1 ++ dontcare ++ 91.5252 ++ ++ ++ 120740750359F725F0F47690F7ED5EB1771CAE0D65DD4A7B6A1C8D51B26E69F0802E5A3A60 ++ NAUTIC ++ 5 ++ ++ -1 ++ dontcare ++ 93.9254 ++ ++ ++ 1207407507B8D6C9AE7C806221B94CB81132248F208BE1546980C50BAC1B99DD42A3056760 ++ KATOLIČKI RADIO ++ 7 ++ ++ -1 ++ dontcare ++ 95.4255 ++ ++ ++ 12074075240C0FA4E55B55464681E3185E457C820E0E3791E4AEA8E3C7A26A1698DBB83A65 ++ 1 LIVE (ẆDR) ++ 15 ++ ++ -1 ++ dontcare ++ 101.626 ++ ++ ++ 120740752872ED80D1CA5FAB754D53BFE3FB2AC696485DF2D97C7D2A95C2F001196206CF9E ++ SUNSHINE RADIO (Pro Sieben) ++ 16 ++ ++ -1 ++ dontcare ++ 103.251 ++ ++ ++ 12074075337B5A5DCC896803FEF4ED2896F3E9C95A7A4C1644C0CF9D421AB1C63855FE5BCE ++ KLASIK RADIO (Vox) ++ 17 ++ ++ -1 ++ dontcare ++ 105.126 ++ ++ ++ 1207407535BDE94774C396714FA26A50F5CFCA6513E8CCAFF38F1C27A21D4050165345ED78 ++ RTL RADIO(Vox) ++ 18 ++ ++ -1 ++ dontcare ++ 105.951 ++ ++ ++ 12074075381C8E6295357ED296DADEF6A7D2E294F8C14A621F0326E02C50F5B8EBD46809CC ++ ROCK ANTENNE (Kabel 1) ++ 19 ++ ++ -1 ++ dontcare ++ 107.101 ++ ++ ++ 1207407539569A37859951819D18B33C11C57D6FFB95D75DA69461023B1157880CB90BDEAB ++ ANTENNE BAYERN (Kabel 1) ++ 21 ++ ++ -1 ++ dontcare ++ 107.651 ++ ++ ++ 12209778051F47033DD3C846295AFC5E1DE6F5AEB5C075DBB37FFE4ECE772BBC8EC12E4F16 ++ JAM FM (RTL2) ++ 21 ++ ++ -1 ++ dontcare ++ 99.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/czechia/ceske-budejovice-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/czechia/ceske-budejovice-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,143 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Petr Urban <urbanp1@seznam.cz> ++ 2008-04-08T17:03:40 ++ Czech republic ++ Ceske Budejovice ++ Air ++ ++ ++ ++ 1207666974509EE882BDBA2D87DC38D38A0BCEF0D51C991F4DBB617CD0208EDA11DAD9CAA9 ++ ČRo1 - Radiožurnál ++ ČRo1 ++ ++ -1 ++ 91.1 ++ ++ ++ 120766698430190D64A0BA139E954D1E43B89612D5502C1F86C80C1642E1DD430B845549A5 ++ ČRo2 - Praha ++ ČRo2 ++ ++ -1 ++ 103.7 ++ ++ ++ 1207667006DBB1303ED14BC81ADF7DF384A388B2943FB58EC931A293F9112CBB4D761B0871 ++ ČRo3 - Vltava ++ ČRo3 ++ ++ -1 ++ 96.1 ++ ++ ++ 1207667008A26C97E5F7612C0820EE87362AB88E2EA0DBC8B74339996B5D14DFA56E79E3C3 ++ ČRo5 - České Budějovice ++ ČRo5 ++ ++ -1 ++ 106.4 ++ ++ ++ 120766702720B7E904410567F2DFB9CBEBEBD8BE64101515C6C1F9D6187482402554A9D1D7 ++ Kiss Jižní Čechy ++ Kiss ++ ++ -1 ++ 87.8 ++ ++ ++ 1207667739D293C26B631ACC80488CCCFE98D8A3CC0A7C56AFA7B7981B91AEB345E6E07054 ++ Rádio Blaník JČ ++ Blaník ++ ++ -1 ++ 88.4 ++ ++ ++ 1207668015852339FEC6B77D79165DE45D45965DAA1E179ECC574D4A3CA3B2F10077FB99B8 ++ Frekvence 1 ++ F1 ++ ++ -1 ++ 94.1 ++ ++ ++ 1207668044C717459C7325BF313BF5FC6BE2ECA70D06BDDFEEB4E66AEA7AB5B8460F85DB99 ++ Radio Impuls ++ Impuls ++ ++ -1 ++ 102.9 ++ ++ ++ 12076680971544CB58DA52B02BDB7A3E8D1D02AFEF2F7B2E31DDBC891EE5FE6F5E814081DB ++ Hitrádio Faktor ++ Faktor ++ ++ -1 ++ 104.3 ++ ++ ++ 12076681867F98C7B592723F35E8EF67EC33A823C164F88A740681041EDE7FBFEDA1DC6AD4 ++ Evropa 2 ++ Evropa 2 ++ ++ -1 ++ 90.5 ++ ++ ++ 120766823348F4850F00D515F62DA7FBFF0A75C47701649A96D6F2EBC8F7FC6F2A0333FC4E ++ Radio Proglas ++ Proglas ++ ++ -1 ++ 92.3 ++ ++ ++ 1207668324BA0EAC424584D6FA18AEE86392411AEB1B1625B2B8019CBC58FF6A01BC9E9C35 ++ Radio Faktor Gold ++ Gold ++ ++ -1 ++ 99.7 ++ ++ ++ 12076670307AE2B3DF6C6D8F3223287781D174FA9B1C92B75F4239837EBCD5DA4C40C9FCDC ++ Rádio Beat ++ Beat ++ ++ -1 ++ 101.2 ++ ++ ++ 1207668385CFDDA6ED02FA809768C7939C1A2CCBFD9C6D688BE6C2A654A58024802A9A4C26 ++ BBC/ČRo - Rádio Česko ++ BBC ++ ++ -1 ++ 89.8 ++ ++ ++ 12076705683C91C317574ADC848753E468585597BF46A7348C65F6F01083B97486AA04908B ++ Radio Šumava ++ Šumava ++ ++ -1 ++ 91.8 ++ ++ ++ 12076727277A7919C9F95D6C9B86F7D8EAB2CC76B3D139085C6125F0CBA4561344CBE73AD1 ++ Life Radio Ober Oesterreich ++ Life ++ ++ -1 ++ 100.5 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/czechia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/czechia/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,16 +1,18 @@ + SUBDIRS = +-EXTRA_DIST = "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp" ++EXTRA_DIST = "ceske-budejovice-antenna.krp" "ostrava-antena.krp" "plzen-antenna.krp" "plzen-cable.krp" "prague-antenna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/" ++ $(INSTALL_DATA) "$(srcdir)/ceske-budejovice-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" + $(INSTALL_DATA) "$(srcdir)/plzen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/plzen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/ostrava-antena.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/prague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ceske-budejovice-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/plzen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/ostrava-antena.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/czechia/prague-antenna.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am kradio-3.5.13.1/kradio3/presets/england/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/england/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/england/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,18 +1,20 @@ + SUBDIRS = buckinghamshire +-EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "newcastle-upon-tyne.krp" "sheffield.krp" ++EXTRA_DIST = "exeter-antenna.krp" "leeds-antenna.krp" "london.krp" "milton-keynes-antenna.krp" "newcastle-upon-tyne.krp" "sheffield.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/england/" ++ $(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/london.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp" ++ $(INSTALL_DATA) "$(srcdir)/milton-keynes-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/newcastle-upon-tyne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp" +- $(INSTALL_DATA) "$(srcdir)/exeter-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/sheffield.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp" +- $(INSTALL_DATA) "$(srcdir)/leeds-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" +- + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/london.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/milton-keynes-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/newcastle-upon-tyne.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/exeter-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/sheffield.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/england/leeds-antenna.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/england/milton-keynes-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/england/milton-keynes-antenna.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,72 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Ian Hay, <ian@rotodyne.co.uk> ++ 2003-01-25T22:35:18 ++ England ++ Milton Keynes, BUCKS ++ Antenna ++ A poorly served and weak area for reception ++ ++ ++ 1063385353C6B88DA43D60485F93CE285F49666657543D54E610AB347EB1D73FDA2FC7C510 ++ BBC Radio 2 ++ BBC Radio 2 ++ ++ 0.8 ++ 88.6097 ++ ++ ++ 10633853532D933FCEF3A7613BDDD56EBF088F9B6362B69E0FCABB21DFFC26D9AC81DC28BD ++ BBC Radio 3 ++ BBC Radio 3 ++ ++ 1 ++ 90.8185 ++ ++ ++ 1063385353C8BE87758A09C21FC727E3B7C8DE412595703F2E19438F5B7FBCD509531751D5 ++ BBC Radio 3 ++ BBC Radio 3 ++ ++ 1 ++ 90.8634 ++ ++ ++ 10633853533F24308814CEC86F7F2D451AF6CE0ADAA1EBBDED5507D7E1ED04AF7BB93C5E2C ++ BBC Radio 4 ++ BBC Radio 4 ++ ++ 1 ++ 93.0197 ++ ++ ++ 1063385353606298F24CB48B4D31470EF41B4AF40F4BF19AF4CA0019E972419C5E5FDF2A7B ++ Classic FM ++ Classic FM ++ ++ 0.8 ++ 100.446 ++ ++ ++ 1063385353E2F2EB1467A831526FB14696A5FE35FAD1623929349D8A8C9DC7F9A3EFB87F93 ++ Horizon FM ++ Horizon FM ++ ++ 0.8 ++ 103.324 ++ ++ ++ 10633853535F8DF276212D9521388835FE08AFEA463B8A2AE6BDFBD3B6AC34D330F9EE2613 ++ BBC 3 Counties Radio ++ BBC 3 Counties Radio ++ ++ 0.8 ++ 104.518 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp kradio-3.5.13.1/kradio3/presets/france/abbeville.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/abbeville.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/abbeville.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,127 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ abbeville ++ antenna ++ ++ ++ ++ 1284670092CBB4B2223036021E901E948C5C89F0B128B7A4FE4844AA89DB5E2B9A9608A5A3 ++ Europe 1 ++ ++ ++ -1 ++ 104.9 ++ ++ ++ 1284670092648660A98566A70CACE41486F03F4399DB65FB3ABACD5C055203FB39AE440499 ++ Fun Radio ++ ++ ++ -1 ++ 102.0 ++ ++ ++ 1284670092B3619B5DE060324713328B8FAA5A7693FE9DA955C0889589E7E77119581F401C ++ France Musique ++ ++ ++ -1 ++ 89.8 ++ ++ ++ 12846700922805BF9C1B19351F89DEA4E887493DF8F908A77B809BF5264FF30920CED7D361 ++ Radio Soleil ++ ++ ++ -1 ++ 107.1 ++ ++ ++ 1284670092CCD737EC9A595C0FA42A693AE4B9BD9BDEE561D29B035D9A3E934FBB538861E0 ++ Contact ++ ++ ++ -1 ++ 91.2 ++ ++ ++ 1284670092AF1640DAE80035EBA6DFDB4900619CA63A09B5BE7E696D9E588444209E814B74 ++ RTL ++ ++ ++ -1 ++ 104.1 ++ ++ ++ 12846700923B52A20FAE2A9AD685AED4BCFDFA22D434AAD14CE9FE60EA08EE5144532BA8C8 ++ Skyrock ++ ++ ++ -1 ++ 96.7 ++ ++ ++ 1284670092AE5A89FF1501F8389594E2F77D608534EBA38EF82983388C01851326D10A90F2 ++ France Inter ++ ++ ++ -1 ++ 93.1 ++ ++ ++ 12846700924E2152476AFE9B26576E130FE4A3537120E816F60944D84557FB4D04058A18DF ++ France Bleu - Picardie ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 128467009240334916A605A6359ABA11A3201B2DBF572D26EA1A453835C7718FD16E810DF1 ++ Chérie FM ++ ++ ++ -1 ++ 99.2 ++ ++ ++ 12846700925022C005489EB6C1C182D5E3A7DE856419EFF889EC7E79F4C928A913871F465D ++ NRJ ++ ++ ++ -1 ++ 102.7 ++ ++ ++ 1284670092160F1146D4E5A9B6FFA578AF3EF1E9E4B9B6DEB84ED95244934E3AEADF7CACFA ++ France Culture ++ ++ ++ -1 ++ 97.4 ++ ++ ++ 1284670092E69028D981D566C9E356F1C57F4D731C82424DDD41F57280CF409001BBC12F1A ++ Europe 2 - Fréquence Picardie ++ ++ ++ -1 ++ 99.6 ++ ++ ++ 1284670092A04C60A71A8CED83F526DAFC306DBF70B846B68D5D86BAC9223AAD392C852AF7 ++ France Info ++ ++ ++ -1 ++ 105.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp kradio-3.5.13.1/kradio3/presets/france/amiens.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/amiens.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/amiens.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,187 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Erjon Seferi, <erseferi@wanadoo.fr> ++ 2008-07-12T14:58:40 ++ France ++ Amiens ++ ? ++ ++ ++ ++ ++12158657143024D1EC38E41C3981C2A3DED5B2457328B7E3D46BE37F8131554A8535B6E3B6 ++ France Musique ++ Musique ++ ++ -1 ++ 89.3 ++ ++ ++ ++1215865745F6AE866FAC40BCC63AED628D4F1970C5D65A7925430C2CC4AB71D97B7C900A6E ++ Rire et Chansons ++ Rire ++ ++ -1 ++ 91.4 ++ ++ ++ ++12158657683AED59C29FA1CE49EB3BC433950CBFA0209C58F56D95E554EF3ECEE97DB80CFB ++ Fun Radio ++ Fun ++ ++ -1 ++ 91.8 ++ ++ ++ ++121586578595DEB7BF34B66CE3552438EAE9718FD81AF0CE86C74D203E1D8DF2361F680733 ++ France Inter ++ France Inter ++ ++ -1 ++ 92 ++ ++ ++ ++1215865804D363782D3576B0FBBCECFE63C84407FBC46B81B8A0C73B13B9F64C9EA83A2A1D ++ Nostalgie ++ Nostalgie ++ ++ -1 ++ 92.2 ++ ++ ++ ++12158658460F51E43754E99E634F4E0359806CBEE1A23027BDE386DAAB9250F2C907D1F3EF ++ Contact ++ Contact ++ ++ -1 ++ 94.2 ++ ++ ++ ++121586582586BD714C746F57B98DED30C59AC90EB9EDD276AC5786D5A95EA49D76F91E2BEE ++ Europe 2 ++ Europe 2 ++ ++ -1 ++ 93.6 ++ ++ ++ ++121586586532CE40330DA5033BDD651073E6B76B1C208FD9E394903E0885B3C9CD82F041D7 ++ Fugue ++ Fugue ++ ++ -1 ++ 96.3 ++ ++ ++ ++1215865961A716CB4A7953401BF3FC007B882977487203F6039F220DF078DD72876831E2E0 ++ France Culture ++ France Culture ++ ++ -1 ++ 97 ++ ++ ++ ++1215865987C3DCAF25A4F999955F0B225AED2A4B6D6CA4406D744DE1DEB9B382CFD2659B8E ++ Skyrock ++ Skyrock ++ ++ -1 ++ 98.4 ++ ++ ++ ++1215866650FA0E943EBD524C07EEA5B189A237D52A2759A90ED57AA894437438E9F58BB0D6 ++ NRJ ++ NRJ ++ ++ -1 ++ 99 ++ ++ ++ ++12158666739C0B0FBE2B6AD890ED1C3A71C6899295BE980AE361D0A334C96D489D43104C26 ++ France Bleu Picardie ++ France Bleu Picardie ++ ++ -1 ++ 100.2 ++ ++ ++ ++1215866771F115C902CA9CFB8363685C34DD934FC4AAD3FDCABF254F2A62FE92F8720C91DA ++ Cherie FM ++ Cherie FM ++ ++ -1 ++ 101 ++ ++ ++ ++12158667960E6580CE771ED7D39736049B44DF55D2D66B88010293973D68D84ACCED55DB48 ++ Radio Classique ++ Radio Classique ++ ++ -1 ++ 101.4 ++ ++ ++ ++121586683984614CDE9D8A4B0F5FD6C2C23D2E881550DB9B20C0C0C2A97D92C29DAB51342A ++ RTL 2 ++ RTL 2 ++ ++ -1 ++ 103.2 ++ ++ ++ ++1215866858C0950D166660B91CC2A693AAD69008C04E7BD7BA817901090031BF0EA672243D ++ RTL ++ RTL ++ ++ -1 ++ 104.3 ++ ++ ++ ++12158668803D46BEEDD6D924EEABF943B4CC79573350C106691AF039E2035B55DF86476D1B ++ Europe 1 ++ Europe 1 ++ ++ -1 ++ 104.7 ++ ++ ++ ++1215866898947135C6305A6B43ED1E14548DF7D15C1DF509C26D3A9842587D39E2ED300109 ++ France Info ++ France Info ++ ++ -1 ++ 105.5 ++ ++ ++ ++1215865886EF1E5CA01719EEF06AF6F67D90FC7787ED543F376CF4BD66CF3C08990455B83F ++ Radio Soleil ++ Radio Soleile ++ ++ -1 ++ 107.1 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/bar-le-duc.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/bar-le-duc.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,111 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ bar le duc ++ antenna ++ ++ ++ ++ 128467009288848970E8B69F47F999D2B14FFD01D05E874529B3BAA15BE6B3BE4B7100D226 ++ Europe 2 - Pyramide FM ++ ++ ++ -1 ++ 102.0 ++ ++ ++ 1284670092F31430AEFF6F705EB72DC9E0DAD72038B1DC637A1033572C0EFDDD78E086EA06 ++ RFM ++ ++ ++ -1 ++ 98.3 ++ ++ ++ 12846700922503FFDDF37D311B2AB5B08CE2EB6F8A36D83AD15C69C99AE30A047A5596F35B ++ NRJ ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 1284670092B0E43A29C4478F7948793BF32BD9139B06AD9C05F46479187E1758FF6F8414B4 ++ France Musique ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 1284670092DF6970930CFED3954B7E0A0F8C0763B41149F05801B9DCAA8628F820F8ADA225 ++ Europe 1 ++ ++ ++ -1 ++ 107.0 ++ ++ ++ 12846700927823C30BED79D2D6DC0DF09D0F8922B83B76DA0E3F2B1B1F051240594DDE88AB ++ France Inter ++ ++ ++ -1 ++ 90.9 ++ ++ ++ 1284670092AE58ECECFDDA4D3B2ED21AD8D4BA98A75D7D5433B2DE5324F9C777897FA83419 ++ Skyrock ++ ++ ++ -1 ++ 90.2 ++ ++ ++ 12846700929D83CE99148380CB4CFDBD9F465ABC4C217D158DF80AB0EAC512AF0DACCF4B9D ++ RTL ++ ++ ++ -1 ++ 105.0 ++ ++ ++ 1284670092CB3DEAA6BBF2183C3A12D96C6951FF1D81056BE35A32568FAF1EEA4C4AE2B9A7 ++ France Culture ++ ++ ++ -1 ++ 88.4 ++ ++ ++ 1284670092630FC18571A977D3BFDC29DE4F8F57EF8A7F3987FF9DCC957B9F7408B613E91B ++ Fun Radio ++ ++ ++ -1 ++ 101.1 ++ ++ ++ 1284670092044892468F7073A7F9A858036B0B8645166B405C34963D602D3D0B416B4B788E ++ Meuse FM ++ ++ ++ -1 ++ 99.0 ++ ++ ++ 1284670092BEE4497AC8C30E3DE1154FA2EDDFF410EBDD0CC645BAE422D2A31C7EE1380B23 ++ France Info ++ ++ ++ -1 ++ 104.5 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp kradio-3.5.13.1/kradio3/presets/france/forbach.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/forbach.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/forbach.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,87 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ forbach ++ antenna ++ ++ ++ ++ 1284670092F6AED1720BC4C25CC80DF8508E978A4C880F08C85AB37E648BA42865BC9172A5 ++ France Musique ++ ++ ++ -1 ++ 93.6 ++ ++ ++ 1284670092ED7DF6074EA2290C8D25113C4A6C6430D19F356D0FE9D36943D3D95853CA6A48 ++ FIP ++ ++ ++ -1 ++ 98.8 ++ ++ ++ 128467009246F3514DE657AF735CC78E204020871D0E51B79A67AC20E125976A57C2F8019B ++ France Culture ++ ++ ++ -1 ++ 90.7 ++ ++ ++ 128467009227EE0EA3F0AC5FD8060857AC31F5DA1A87AA5E0D17B717ABAC47D09945E7FC20 ++ Europe 2 - Rockin'Chair ++ ++ ++ -1 ++ 102.3 ++ ++ ++ 128467009277F842697A2C414EA61BB59D140D42C729CAA955E82F9B61E4B8D962C0EF2D3C ++ France Info ++ ++ ++ -1 ++ 106.4 ++ ++ ++ 12846700927706F0C7EF1D2345D8EF050CB3BB6E2DD967BE4125561BCC7360C5C7A14A9B2B ++ RTL2 ++ ++ ++ -1 ++ 94.8 ++ ++ ++ 128467009277DF30BEB0273483BDF86A77D935CAB6055D923829B5DABC4F8EA519325FF5C9 ++ France Inter ++ ++ ++ -1 ++ 96.6 ++ ++ ++ 12846700920A3536E83EE0521FD84D6BA42D1295870629514B2E789BAA18A6F7516D652CD5 ++ Jerico ++ ++ ++ -1 ++ 101.3 ++ ++ ++ 1284670092427AAC75D4854737F1B0AC010DE15B74539F00FBF85AEE5B695E69330C622DA0 ++ Europe 1 ++ ++ ++ -1 ++ 104.5 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am kradio-3.5.13.1/kradio3/presets/france/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/france/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/france/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,18 +1,35 @@ + SUBDIRS = +-EXTRA_DIST = "angers.krp" "lille-antenna.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp" ++EXTRA_DIST = "abbeville.krp" "amiens.krp" "angers.krp" "bar-le-duc.krp" "forbach.krp" "lille-antenna.krp" "metz.krp" "nancy.krp" "paris-antenna.2.krp" "paris-antenna.krp" "rennes.krp" "strasbourg.krp" "thionville.krp" "verdun.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/france/" +- $(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/abbeville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp" ++ $(INSTALL_DATA) "$(srcdir)/amiens.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp" + $(INSTALL_DATA) "$(srcdir)/angers.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp" +- $(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" ++ $(INSTALL_DATA) "$(srcdir)/bar-le-duc.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp" ++ $(INSTALL_DATA) "$(srcdir)/forbach.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp" ++ $(INSTALL_DATA) "$(srcdir)/lille-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/metz.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp" ++ $(INSTALL_DATA) "$(srcdir)/nancy.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp" + $(INSTALL_DATA) "$(srcdir)/paris-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/paris-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/rennes.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" ++ $(INSTALL_DATA) "$(srcdir)/strasbourg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp" ++ $(INSTALL_DATA) "$(srcdir)/thionville.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp" ++ $(INSTALL_DATA) "$(srcdir)/verdun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/abbeville.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/amiens.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/angers.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/bar-le-duc.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/forbach.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/lille-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/metz.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/nancy.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/paris-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/rennes.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/strasbourg.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/thionville.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/france/verdun.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/metz.krp kradio-3.5.13.1/kradio3/presets/france/metz.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/metz.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/metz.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,135 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ metz ++ antenna ++ ++ ++ ++ 1284670092466690E5BD84B440D3BFB7C132EBBC6C027EBF679FC8A0C78472CF9799EE2CDA ++ NRJ ++ ++ ++ -1 ++ 107.3 ++ ++ ++ 1284670092132340B2BCAE77B6B4A18ECF3B7F896A259A4796D6BBF59B695E4DE09CFAED52 ++ Jerico ++ ++ ++ -1 ++ 102.0 ++ ++ ++ 12846700929B027D8D8DD1B4CA30CF8B1E31EA6CF765064D930499CF85134F3C5310EA5F95 ++ FIP ++ ++ ++ -1 ++ 98.5 ++ ++ ++ 1284670092A55DB1F4E72BE260B77B1A2988A3F156231B8F99231287A5C2BD7D3372901F02 ++ France Culture ++ ++ ++ -1 ++ 94.5 ++ ++ ++ 12846700921EF8E854DEE3F789FB23B8A70F9D79B4C63D179CBBEC7E418E25DDE303C85D56 ++ France Info ++ ++ ++ -1 ++ 106.8 ++ ++ ++ 1284670092DF970F5DC03F51880A418A6EA0F1AAE8E7C7859763B3884B02C930A04C840A2A ++ RTL2 ++ ++ ++ -1 ++ 92.2 ++ ++ ++ 12846700923DE7FD365EF2845589D012B14E55A24CB5D48BED38BDBBF1DD16D5FD0116367F ++ Europe 1 ++ ++ ++ -1 ++ 105.3 ++ ++ ++ 12846700922AC40738DF237B073ED19EE9580C08766B1E327226751B156B0596C8D77F3FC1 ++ France Inter ++ ++ ++ -1 ++ 99.8 ++ ++ ++ 1284670092F6E60CFF47589D64AEAD4D38A78D30F5BD1364441DD81ED7E131A153C7127DE9 ++ Chérie FM ++ ++ ++ -1 ++ 103.0 ++ ++ ++ 1284670092568C98D1C04445A19B98E9AABD38C3DD7E1C77A2877FF89584E6CFB7F133BB03 ++ France Musique ++ ++ ++ -1 ++ 89.7 ++ ++ ++ 1284670092D2CDD7D4A88A032E5C2278B9C43936080BD71DCB4444A4B1C263803C973BBC85 ++ Nostalgie ++ ++ ++ -1 ++ 101.1 ++ ++ ++ 1284670092131E3465106EAFE3D5E6DD2FC460A297972E8C8CCDD93449F95A65AA84C7541B ++ RFM ++ ++ ++ -1 ++ 99.0 ++ ++ ++ 128467009221D81E4678C70A8397098A47334FB521DC6CD66B87D681DBCB08F3FFEE53E22C ++ Europe 2 ++ ++ ++ -1 ++ 97.6 ++ ++ ++ 1284670092EB4D99794BDA559BBCB972C3D4FD37968CB1B682D48CE952B5848654E557C304 ++ Radio Peltre Loisirs ++ ++ ++ -1 ++ 89.2 ++ ++ ++ 128467009236146D220BA2293EEE3E862EAFFD6EDAA5989D562C8D482D83FB62CF3505D9ED ++ RTL ++ ++ ++ -1 ++ 104.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp kradio-3.5.13.1/kradio3/presets/france/nancy.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/nancy.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/nancy.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,199 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ nancy ++ antenna ++ ++ ++ ++ 12846700928C28BDB4C167CC28ABE2F241150B6BFBCD84D19B6A112F1CD6CA74E85031FED6 ++ RTL ++ ++ ++ -1 ++ 105.1 ++ ++ ++ 1284670092925044DE1D2F730CEA2C1A285B1431D3D6A1A62A01FFAE143F04650990DEDB6C ++ Fun Radio ++ ++ ++ -1 ++ 103.3 ++ ++ ++ 1284670092874B5F769CD83F20B7E29F9C9855201FC0ACDA9BE56C452B71F38D668E236C31 ++ France Inter ++ ++ ++ -1 ++ 96.9 ++ ++ ++ 1284670092589C2D6A0A64D385B1405DB122A475BE6D4E34D17ACFDDF31002311421A96982 ++ NRJ ++ ++ ++ -1 ++ 107.1 ++ ++ ++ 12846700923CA73B2F862BA6838D7E2340C6411A0C705A5F7864F55781C3DF48B9D319C1DF ++ Chérie FM - RDS ++ ++ ++ -1 ++ 95.7 ++ ++ ++ 1284670092486003F914B38CEAD941AE7AE3465C16B2E55208FE8C65177E59A044EDBB6D85 ++ France Culture ++ ++ ++ -1 ++ 88.7 ++ ++ ++ 1284670092519CBAAD8B3B3F4F761B09C25EA30591D3DF4825A6E9E009A7F0E3D97530D116 ++ Fajet ++ ++ ++ -1 ++ 94.2 ++ ++ ++ 128467009261139B2CAAD7FC4047642B8B9AC99362418DA14030B701C8FC44368B7C236D73 ++ Graffiti ++ ++ ++ -1 ++ 101.5 ++ ++ ++ 1284670092C0899A5EA8982054D3FE6153DC62053B513B9B249CDB0557DCB6BE0EC58C737D ++ France Bleu - Nancy-Lorraine ++ ++ ++ -1 ++ 100.5 ++ ++ ++ 12846700925FF6A09B43FCC5C952391AC09C782236A1991F521147DB6F6F998F908863A421 ++ BFM ++ ++ ++ -1 ++ 104.1 ++ ++ ++ 1284670092D7958B2205E340B1F556994057D6048A8505FD97444C0F3572CC522718934901 ++ Europe 1 ++ ++ ++ -1 ++ 105.5 ++ ++ ++ 1284670092A1BBD823EBA8304505C54F27BA10A34B286BB7717DB662CCA3997DEBD7B5C103 ++ Europe 2 ++ ++ ++ -1 ++ 96.1 ++ ++ ++ 1284670092C59EDEAFDDF5BD12421941363887E3FC1F9C02F7C42CB51C289B0D78686DC789 ++ Caraïb Nancy ++ ++ ++ -1 ++ 90.7 ++ ++ ++ 1284670092178423C7130AD6033A41F5B4E4A5358431D0C32D39C449F5F9643AC462B3AA42 ++ RFM ++ ++ ++ -1 ++ 102.3 ++ ++ ++ 128467009286C289A67EC2856C8E11C575436249337356E1D03AE5D7D69869C72C304D32A2 ++ Jerico ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 128467009280EDAF82A0E4C8E0791A7771F0EBFAF85FBF47E1AF2D356DF5E0B96D09C0E41C ++ RTL2 ++ ++ ++ -1 ++ 94.8 ++ ++ ++ 1284670092057A818064C625FFDF8FFDCEE8F7D5157C9593B328C71E8CB46BE8D94F8D32EE ++ Radio Classique ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 12846700923D4B26C666F75F4638E96D4255851CA819B612F0202473CDA1AAB81820959CB5 ++ Radio Soleil ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 12846700925253237B2FE53DB85D6E8D08261D3C72C556A4A87C11C99CFA324A4F9E013B54 ++ France Info ++ ++ ++ -1 ++ 105.9 ++ ++ ++ 128467009291EACD5C3118FCB39650CF2F50282CB1C146292978DD88FC5D28F919CBC8BE23 ++ Nostalgie ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 12846700926B71E5FD4D48F337AFF56F29B63844FA3AAAB9BD6E12F3A30205817D406BA13B ++ MFM - Lor'Music ++ ++ ++ -1 ++ 91.1 ++ ++ ++ 1284670092C852D374AC6E276A0197ED5FD76639F419A4233DFE7D34E0927294F93473D56D ++ Skyrock ++ ++ ++ -1 ++ 100.9 ++ ++ ++ 1284670092BC391D3495405E5BFC39A74705C00EBB8380C4D8A46634943831BE05186A64AD ++ France Musique ++ ++ ++ -1 ++ 91.7 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/strasbourg.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/strasbourg.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,159 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ strasbourg ++ antenna ++ ++ ++ ++ 12846700923E4B393E5A415A8821F0950DB7ADC911B451101CB8A83412BDB214AC10A45BDB ++ Europe 1 ++ ++ ++ -1 ++ 103.3 ++ ++ ++ 1284670092F28C30CF2C2D2F21B5B8EEC4272B5482D4B9AD3891B867090DC1E331C9371C89 ++ RTL ++ ++ ++ -1 ++ 105.7 ++ ++ ++ 128467009295FB4D21C567A53288C5F50B80FFC6C8BF145F8CF3383E618B92336E1D80AA04 ++ Top Music ++ ++ ++ -1 ++ 94.5 ++ ++ ++ 128467009240B254A71CC061CEFCE36E499A4F8FA23A8870EC6E62A2C9E35AD659F542319E ++ BFM ++ ++ ++ -1 ++ 106.9 ++ ++ ++ 12846700920E56FC721B1DD85B12528F3EFCE9324E65CB8D128293432024E0428D4F6177A2 ++ Nostalgie ++ ++ ++ -1 ++ 105.3 ++ ++ ++ 128467009206068A852BBB11271575C4A56F5B695A4FB59D705589CB5D879F47FA4A5567A7 ++ France Musique ++ ++ ++ -1 ++ 95.0 ++ ++ ++ 1284670092C350A16918E618B81BF46CEBB4612AB0CC2E07EB4E51AA2A2667D12FE43213D4 ++ France Bleu - Alsace ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 12846700922CEAE73C2850068D80764A919CB121BFF1522809542BEA48AA524CB01AF72E7B ++ RFM ++ ++ ++ -1 ++ 102.1 ++ ++ ++ 1284670092B329F2B0ECC0EC64A450996A322C488139AA62AB9F532F3559C36259F4667F35 ++ Arc-en-ciel - Campus ++ ++ ++ -1 ++ 90.7 ++ ++ ++ 12846700926567B2DE55046AE0D42756D179C7BFB06F6CD4F7469218EE2D0EAF766EDB7F9C ++ France Inter ++ ++ ++ -1 ++ 97.3 ++ ++ ++ 12846700924E0A4633D0BA750F8D7AE08237AE8FB305705F3EA70FE80ED55AB2169AF7B689 ++ France Culture ++ ++ ++ -1 ++ 87.7 ++ ++ ++ 128467009238F063D7AF81EC70CD704A4AF075C8CC1D9A5BE138EB40820C837F9959C5E26D ++ FIP ++ ++ ++ -1 ++ 92.3 ++ ++ ++ 1284670092AEF9E1B9AFEFDA210D407EC70E08F732821737BA5FF2335FBDBEEF8F1163F927 ++ NRJ ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 128467009297A9C9DB6F0E218ED83A72CAC3B14EBBCFB2698792B11E4678A3F78C0E1D141D ++ R.B.S. 91.9 ++ ++ ++ -1 ++ 91.9 ++ ++ ++ 128467009246A97CDEE4F12958FCDC501FA941CDD2A95750EFDA463A3048A4E1BBD432B19D ++ Accent 4 ++ ++ ++ -1 ++ 96.6 ++ ++ ++ 12846700925FF9BA22396CB3511FC436859ECBF2A6EDEB6A7D9FD33BB42B87769B55A415E0 ++ Europe 2 - Capital ++ ++ ++ -1 ++ 89.5 ++ ++ ++ 1284670092A47372115FBCDFEC1344E4B52CABFDC219F5E8B64F58C601749B0169C18C6594 ++ France Info ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 12846700923FD02A9CC9511880575B654239FA8DB65BD22E4EAE13E47C9CCEF6826813824E ++ Judaïca ++ ++ ++ -1 ++ 102.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp kradio-3.5.13.1/kradio3/presets/france/thionville.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/thionville.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/thionville.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,95 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ thionville ++ antenna ++ ++ ++ ++ 1284670092B6F6DC3DB805642C794D30675BD3F7BBB2B568458B4E640F0F8DC278951BBCC8 ++ France Culture ++ ++ ++ -1 ++ 94.5 ++ ++ ++ 12846700924930B52A844DAF1F8B3D70B171143D4848AA2EB1E22BAC78016919ACCF1E34F5 ++ France Info ++ ++ ++ -1 ++ 106.8 ++ ++ ++ 1284670092B308F6A499A6CDE3B8A1DC841B12B211E2879945EA920FE31B21D90E755B39D0 ++ France Inter ++ ++ ++ -1 ++ 99.8 ++ ++ ++ 1284670092A66DC5CB34CFD20DE722EC83BD5D73B65EF98AFD5C4DE633BC07AFC2AF3B4BB4 ++ RTL2 ++ ++ ++ -1 ++ 96.7 ++ ++ ++ 1284670092B715B5EAEAEC0E37343B21D3D2FA59614E630A255D9589196CBC97282EBB0027 ++ NRJ ++ ++ ++ -1 ++ 90.2 ++ ++ ++ 1284670092AE16D76A22DB50E7D816F2CCA6A5FA30F830A55BAFD174FE70CFB8CCA290E7FB ++ Skyrock ++ ++ ++ -1 ++ 95.8 ++ ++ ++ 128467009234F204DB71A42CF68454454369DCDA9104674FBE22456DB4BB1678D0B566E77C ++ France Musique ++ ++ ++ -1 ++ 89.7 ++ ++ ++ 12846700928D34A3FE9629FEC8AAB358615C846D492D094222270127FA1647632DF7588C9F ++ Europe 1 ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 12846700926944E469E73757903A6CBE0A72B9FB05CA95E18ED5C195176959D034DF93B889 ++ Fun Radio ++ ++ ++ -1 ++ 95.2 ++ ++ ++ 128467009244FEB99A0C2D7D723F3A7DF3751067708051BBA745E4331BC03FEC8B5D6A64ED ++ Jérico ++ ++ ++ -1 ++ 103.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp kradio-3.5.13.1/kradio3/presets/france/verdun.krp +--- kradio-3.5.13.1/kradio3/presets.old/france/verdun.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/france/verdun.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,87 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-unknown ++ Ren Riassetto <rene.riassetto@fcvnet.net> ++ 2010-07-22T20:37:19 ++ France ++ verdun ++ antenna ++ ++ ++ ++ 128467009278010A2D5434A6F6F22E5A66CE7708D2CA6DBD3C316A474FE9854D82B9FD736F ++ Nostalgie ++ ++ ++ -1 ++ 100.0 ++ ++ ++ 12846700922278AD8A45B5150E6E2D361484A17DBA8CAD7D3A22A60177D20BC4CE8F8C9863 ++ Meuse FM ++ ++ ++ -1 ++ 95.0 ++ ++ ++ 128467009262F715217EDC9DE27775EC7EC16290810351190A7E478E603A4B7B29DDC5466D ++ France Musique ++ ++ ++ -1 ++ 97.4 ++ ++ ++ 1284670092D93351740E07CF987C5221762D5D2207BAD1BF579913FF192622F84C211D1D83 ++ Fun Radio ++ ++ ++ -1 ++ 93.9 ++ ++ ++ 128467009268CA66D4B2BA14EE0CED2D0C2C92D1F8EFAEBAF010136F72A52D21E43D165CAA ++ Europe 2 ++ ++ ++ -1 ++ 87.8 ++ ++ ++ 128467009252BF0EE1D79A69F3B35D35D917B006FB1AEA51528D5B864BFA1FF39B98B252FD ++ France Info ++ ++ ++ -1 ++ 106.3 ++ ++ ++ 1284670092BCCF1C1AF114AD7CC0A33CAED6391C0BB37556BDD28F5ABBE3E33384CA789323 ++ France Culture ++ ++ ++ -1 ++ 99.3 ++ ++ ++ 1284670092B5A21674EB0CB60DFAD1EE5289C13B2E5E4024EFFB9282A45D087EC9F3E539D4 ++ France Inter ++ ++ ++ -1 ++ 92.1 ++ ++ ++ 12846700922BD31A6A4F8FE9EE920303802128940DDAA4F90C5B1884666F646153DE0A98CA ++ NRJ ++ ++ ++ -1 ++ 93.0 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/amtzell-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/amtzell-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,225 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-10-29-3 ++ Michael Wlotkowski ++ 2006-11-04T08:00:33 ++ Germany ++ 88279 Amtzell ++ Kabel Amtzell ++ ++ ++ ++ ++1162625143B8F60924DFBD4124E7C3A6EFCD28D74818B50E090DDCD4FFCD570CD1F0789530 ++ Bayern 1 ++ BR1 ++ ++ -1 ++ 87.55 ++ ++ ++ ++11626252039C1FA9FA1F8752C1AA3B4848D497EF40289663E34FE856DCDF9C02D7B1642621 ++ Bayern 2 ++ BR2 ++ ++ -1 ++ 88 ++ ++ ++ ++1162625276BC3D5BA7B8BE66A16376C5112C2366C99749CBED7DA2DE68E1CAF767D51939A9 ++ Bayern 3 ++ BR3 ++ ++ -1 ++ 88.4 ++ ++ ++ ++116262527893232B6703651D7A7EC14292A1A45DFACC78B0B2F1CD334BA5CF908D316109DB ++ Bayern 4 ++ BR4 ++ ++ -1 ++ 89.3 ++ ++ ++ ++1162625278532D106A2CB47925F5CA62600A8925F6B53F988629962D4B960B0518370B6AA5 ++ Bayern 5 Akt. ++ BR5 ++ ++ -1 ++ 99.25 ++ ++ ++ ++1162625278AC5E844387B48B03022F370F779B44D6F2C9BB14D6B49918D0244CCE918C791B ++ Antenne Bayern ++ AT_BY ++ ++ -1 ++ 89.98 ++ ++ ++ ++11626252791F9B2E4F29EB7725663A8C96FD2661AD0950A1FB8E579E43687C5101A2408DF3 ++ Radio 7 ++ RA7 ++ ++ -1 ++ 95.65 ++ ++ ++ ++1162625279001DB03F038C523AD3F613ACCA261072D65947D9580939351E46A7BD39EB2DFB ++ S�dwestfunk Stuttgart ++ S�d_Stut ++ ++ -1 ++ 93.5 ++ ++ ++ ++11626256245813E9094294405282DD336F1ECFBD9C00B1BADFAB396C5D6E92379FC881E3FB ++ S�dwestfunk 2 ++ SWR2 ++ ++ -1 ++ 94.2 ++ ++ ++ ++1162625624B83C31DB6A49ED5BF1E5875A67F72F3E71DF8EA075ACAC5DE848F3AA9A270EC8 ++ S�dwestfunk 3 ++ SWR3 ++ ++ -1 ++ 95.15 ++ ++ ++ ++116262562504B184DB45DE35AEB046DD049C34735A6594D782304DB0B6C94EDA261F262166 ++ �sterreich 3 ++ �3 ++ ++ -1 ++ 90.45 ++ ++ ++ ++1162625625D2EA7E951DBB437CAE61C7B164AC10AE4E6873A812589AA9C2B1AB7E47767D8F ++ �sterreich Vorarlberg ++ �Vor ++ ++ -1 ++ 91.55 ++ ++ ++ ++1162625625A4662613704BFBCC8D54F84E970F74768580146F5223E2C0BE7594D4E44B53B6 ++ DRS 1 ++ DRS1 ++ ++ -1 ++ 92.3 ++ ++ ++ ++1162625879F0D63A6C3DCEC52C12E4B355759BB782F2399FFEAE5FD07DA923C5819BF953DB ++ DRS 3 ++ DRS3 ++ ++ -1 ++ 93.1 ++ ++ ++ ++11626258797A1228AD9BB871940E56976EE2279071ACF759F4C7AF61F227BE3C03A1F6AA3B ++ S�dwestfunk 1 ++ SWR1 ++ ++ -1 ++ 96.65 ++ ++ ++ ++1162625880695B4EA1E6A17A598FC40A29BDD8951E13C57266565A7010FCED0BB0B23C430D ++ Radio Lindau ++ RaLi ++ ++ -1 ++ 97.1 ++ ++ ++ ++11626258808F8679ED6AAFE17B9A7BD6571386E3A7BDC71C16F571F19028B7A5F92E546C4D ++ BDR-FM 4 ++ BDR4 ++ ++ -1 ++ 97.85 ++ ++ ++ ++11626258806B01BF5B8FE3F46A1D5DE3A11AC59525AF4804E7ED213C808095FFC27C0BC519 ++ RTL Oldies ++ RTLO ++ ++ -1 ++ 101.3 ++ ++ ++ ++116262588182BBFD4700519E8ACFACA2FAE19E10B64F80814B8F767932C7298178FC003A83 ++ MDR-Sputnik ++ MDRS ++ ++ -1 ++ 101.7 ++ ++ ++ ++116262588190642A6E97E8F2335C9D2A217C89C49A4C53A012A6D060D31345E1ECA1D28B22 ++ WDR / 1-Life ++ WDR1 ++ ++ -1 ++ 102.6 ++ ++ ++ ++1162625881E85B022A640DBC7504130C464F72E9DB1D4766676E0AEA1B39D02E5D0675D406 ++ Klassik Radio ++ KlRa ++ ++ -1 ++ 104.75 ++ ++ ++ ++1162625881BD9FFF78EE575F4DB03FDE70923DCA044D332AD6338DE4CFFD5F5C84DCC0C57B ++ Seefunk FN ++ SEFN ++ ++ -1 ++ 106.2 ++ ++ ++ ++11626258827BB56022653275D2B3D2D71D01FE7460C903744F9BA18C9BBB8CB69D3548D5CB ++ Schweiz 2 ++ SW2 ++ ++ -1 ++ 108 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/bayreuth.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/bayreuth.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,227 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Ralf Großerhode ++<ralf.grosserhode@t-online.de> ++ 2006-09-25T11:25:28 ++ Germany ++ Bayreuth ++ cable ++ Angaben stützen sich auf ++kabeldeutschland.de. Alle Angaben ohne Gewähr ++ ++ ++ ++1159176370F91BDD0EEE856DEAD20664F469A498EE506C3656D1C93C2E54C2ACD9F0945EDC ++ NDR 2 ++ ++ ++ -1 ++ 107.5 ++ ++ ++ ++115917641582A8F885CA1B60018EF4FAD96CD127D49F8716D87774563060A742D4FE57FB05 ++ Radio Plassenburg ++ ++ ++ -1 ++ 106.3 ++ ++ ++ ++1159176449A125C3340338A9019B847ABAB591E2BDA1AF0D472BE6E72A00397D75BD2298FF ++ Radio Melodie ++ ++ ++ -1 ++ 105.4 ++ ++ ++ ++115917647341F42319F3A75DC00E9BE5123BBB9CD08E65C94CC7F3C44AACB292842D1B27A1 ++ Klassik Radio ++ ++ ++ -1 ++ 104.65 ++ ++ ++ ++1159176506B42E1656C242954B4CE5F86F64E27F65D80D0457C46E0EF5A780FB31CCE2B5F5 ++ ERF Evangeliums-Rundfunk ++ ++ ++ -1 ++ 104.05 ++ ++ ++ ++1159176552292C30B53790A995DC66F2503C83DA6B3308D8C98D168D6190F5C756A5639488 ++ RTL Radio ++ ++ ++ -1 ++ 103.65 ++ ++ ++ ++1159176584EECCEDD8A70AA99D90F48D3735FCDB8138614666FB801EEFA7EDBDFD1246CBCB ++ sunshine live ++ ++ ++ -1 ++ 102.8 ++ ++ ++ ++11591766482EAFE02B575BDDA5B1167B3999CF8F3B36AA9A1959DBF0B467FFB8523B14160F ++ JAM-FM ++ ++ ++ -1 ++ 101.7 ++ ++ ++ ++1159176674300CF3DCE4ADDB188E4C7E67B7DC1948C06026FF3F2A92B05ED2957F7F2D38F2 ++ Deutschlandfunk ++ dlf ++ ++ -1 ++ 101.3 ++ ++ ++ ++1159176717DA67BDB605A5176C4B583B9CBE4EB7893615243D77B7AA31664A8ADD580146C6 ++ Antenne Thüringen ++ ++ ++ -1 ++ 100.7 ++ ++ ++ ++11591767428362F9949DF6118DB0CE2C4B7FF40F530700FCB20D480431F63765C17BA9D342 ++ Landeswelle Thüringen Suhl ++ ++ ++ -1 ++ 99.9 ++ ++ ++ ++11591767674E301B719648F56C922A9933FDD4E2DB6E4D2C0409CE62224C8A687CF05879AB ++ JUMP ++ ++ ++ -1 ++ 99.65 ++ ++ ++ ++11591768140C2188DDC2ECD8A7BB27822638F84F84359A378ECF3B5AB4004B27A881CF021C ++ mdr1 Radio Thüringen ++ mdr1 ++ ++ -1 ++ 98.6 ++ ++ ++ ++1159176895232978E557EF2CF353C2F816B6B193FB01B3490C802A6C3D5709D148601A4525 ++ mdr Figaro ++ ++ ++ -1 ++ 97.55 ++ ++ ++ ++1159176932A0E4BF414E39CD3EB016EF9F1B4EC8A54151B435C47AB97968FFD702A168C50F ++ DeutschlandRadio Kultur ++ dradio ++ ++ -1 ++ 96.65 ++ ++ ++ ++1159177049F8673E03B331FB756142AAFC347BFA37B2770D94F1A8230DE9B4CBFAF650FB7E ++ Bayern3 ++ BR3 ++ ++ -1 ++ 95.45 ++ ++ ++ ++115917709191D3D432F33F531306770B400ACC263BF3CC8F8A42D5E419143A24DF79C17310 ++ B5 aktuell ++ BR5 ++ ++ -1 ++ 95.1 ++ ++ ++ ++115917712194A3CA5B3209D4226A467F2556EEC51C3A4AFCEE6F031FA5F446AB5632F766D9 ++ BR2 Oberfranken ++ ++ ++ -1 ++ 94.45 ++ ++ ++ ++1159177150435518411DDFFDAE21AD099566B3C331266E1AA5F083962544043DD6C1158792 ++ BR1 Oberfranken ++ ++ ++ -1 ++ 93.6 ++ ++ ++ ++1159177190AED3B92961E90467002B8D036062364F82B2CBFE8256B1D5070B6B57D3F16622 ++ Bayern 4 Klassik ++ BR4 ++ ++ -1 ++ 92.4 ++ ++ ++ ++1159177233793063353EAC9E8F1F8C2D65BA5A87B40718AB9308B687AD55411E5B1B56E754 ++ Radio Galaxy ++ ++ ++ -1 ++ 88.7 ++ ++ ++ ++1159177364D6FF08C3DA4F93B14F8DFDB5C57FACBC86F4B832ACA66CB636EABE05DD5BD670 ++ Radio Mainwelle ++ ++ ++ -1 ++ 88.4 ++ ++ ++ ++1159177393A85981F6062ADAF5C8B6364C5F6761469184E847AAA93EE4DF6E49052E6C8993 ++ Antenne Bayern ++ ++ ++ -1 ++ 87.65 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/berlin-cable.3.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/berlin-cable.3.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,333 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ juergen kauer<jkauer@arcor.de> ++ 2007-03-20T22:46:38 ++ Germany ++ Berlin ++ Cable ++ Kabelnetz von Kabel Deutschland in Berlin-Lankwitz ++ ++ ++ ++1072791566EE4FC1594E6E6DC394DB75EEA2E9938CA67BA6682313127E3DC8CFD562686A13 ++ BBC Worldservice ++ 1 ++ ++ -0.01 ++ 87.495 ++ ++ ++ ++10727915677F9936FA0BAB670FB58F07C35C232BF6C8F65DB1C7A491480937848532CBB384 ++ RTL RADIO ++ 2 ++ ++ 0.82 ++ 88.055 ++ ++ ++ ++1072791567CC15FD02795828846ABF82393E35836D35535ACE3BE8DE23A3D666764EC92EEE ++ Klassik Radio ++ RTL ++ ++ -0.01 ++ 88.35 ++ ++ ++ ++10727915686667AAF2ABA643A8427136F1FF23B13680686E00AC029D20C746F82110E15883 ++ 100,6 Motor FM ++ 4 ++ ++ -0.01 ++ 89 ++ ++ ++ ++107279157082D00D133FC0C7F0A736DF9DA658240AE74C45890AE0A3E2E074448807441213 ++ Fritz ++ 5 ++ ++ -1 ++ 89.85 ++ ++ ++ ++10727915708CED28FBC443431F076E8E377DDFECDC96801422442D7A89DBD4567F05E915A8 ++ Radio Energy ++ 6 ++ ++ -0.01 ++ 90.455 ++ ++ ++ ++10727915716F7ED9C758E6C5CC9F58FBFA5957EA22BFF20B19CCBE47E9741A6A6C0E5ADF57 ++ Radio Melodie ++ 7 ++ ++ -1 ++ 90.805 ++ ++ ++ ++10727915727A649C66B9C75FF3ED4CB90B686BF3ADE3F27A658F1446CA1DB599E759B2719B ++ JAM FM ++ 8 ++ ++ -0.01 ++ 96.68 ++ ++ ++ ++1072791573F82AE782CEEEBD775EB38501C64B71B14C8DFEC95D001474317959E6581A1F8E ++ infoRADIO ++ 9 ++ ++ -1 ++ 92.05 ++ ++ ++ ++107279157430C736B8ED87C5571B6FDEB10504E28CCD9486F62DF082CFD590A699C3E0248E ++ Offener Kanal Berlin ++ 10 ++ ++ -1 ++ 92.6 ++ ++ ++ ++107279157482B2FA653974785D4655257398C16A26A4B8EFFB21FADE3262D2159C55F235AE ++ 94,8 Metropol FM ++ 11 ++ ++ -1 ++ 92.9 ++ ++ ++ ++1072791575013759401591C315632A40F3F6734FC75048A4345ACBB02D99067C5CF553DBC3 ++ DEFJAY ++ 12 ++ ++ -1 ++ 93.85 ++ ++ ++ ++107279157688C1348A5C55ACED6747F7B0FDBD4863B36F11EFA5C80443FFE52355AE8C7EDC ++ Star FM ++ 13 ++ ++ -0.01 ++ 94.551 ++ ++ ++ ++1072791577C45B6C9771EA973DF94328D91A5FDFF87B11790B23AD6001B218FC777E6CE2F1 ++ radio BERLIN 88,8 ++ 14 ++ ++ -1 ++ 94.9255 ++ ++ ++ ++107279157865A27D18F805B7F2DF9873794B299DEF581B7AB615949944EB0A232683FCAD38 ++ KulturRadio ++ 15 ++ ++ -1 ++ 95.35 ++ ++ ++ ++107279157937EE7B714C71289579A1C99C508664996231F58F92529F7FE46E2B38FBF06657 ++ BB Radio ++ 16 ++ ++ -1 ++ 95.996 ++ ++ ++ ++1072791579332D9366F17BD87251985FC7C429E2952A69E06EFDD85D254BB4DDF8816A4408 ++ Radio Paradiso ++ 17 ++ ++ -1 ++ 96.546 ++ ++ ++ ++10727915801AC51F36D9DB58534B0CC40DF6055C0717ADE6B59776D1C04AF4C5E0E33D7718 ++ RADIOmultikulti ++ 18 ++ ++ -1 ++ 96.851 ++ ++ ++ ++1072791581F1329D24372E9ED5171891011B1D34792BB423B640A0DD0248E6D82A403FA220 ++ DeutschlandRadio Berlin ++ 19 ++ ++ -1 ++ 97.496 ++ ++ ++ ++107279158182E86933E311515E8355B8D72F1AE2E65F5887BF78E9F5B84BE1155BCABDCC8D ++ 98,8 KISS 99 FM ++ 20 ++ ++ -1 ++ 97.901 ++ ++ ++ ++10727915836948510D2C8FE10382E670931472C2D1CFFF6D2F80A617CDA8483EB678FA4321 ++ Berliner Rundfunk ++ 21 ++ ++ -1 ++ 99.251 ++ ++ ++ ++10727915848BC80E6D186BC53D388A41307E314B3C977185BB7BB24B0D86F329BEB29D1003 ++ RADIO EINS ++ 22 ++ ++ -1 ++ 99.9508 ++ ++ ++ ++107279158571AE18245596E9390E46457F573BBC152F4A7DCD02C52641CE192E727E60CD69 ++ mdr SPUTNIK ++ 23 ++ ++ -1 ++ 100.301 ++ ++ ++ ++107279158593519FA971426F180D2376830F7095EA51761ED137E43058D7B80A638CF58620 ++ 94 3 r.s.2 ++ 24 ++ ++ -1 ++ 100.746 ++ ++ ++ ++1072791587EA7AA8881EF9FFE900E6B0BED14F01B38BA22CBC16526397AEDD3FB7D38C2758 ++ Antenne Brandenburg ++ 25 ++ ++ -1 ++ 101.646 ++ ++ ++ ++10727915873FF901E6FC22915B56137882D60DEE023706BDB5FCF368209061582D2614758B ++ Deutschlandfunk ++ 26 ++ ++ -1 ++ 102.001 ++ ++ ++ ++1072791588378E9D932C33F1231837B9A2014E604CDE9DF44EAB8EB5FB2B55B5A6E9E3A1DB ++ Jazz Radio ++ 27 ++ ++ -1 ++ 102.446 ++ ++ ++ ++1072791589A310930786205964A1A672504FEFCFE0C3FC34AE2A43CCEC4345556C6167B580 ++ Spreeradio ++ 28 ++ ++ -1 ++ 103.001 ++ ++ ++ ++11744269309D360EE4BFE2B2A775AEC8F16A1CBF4D46AF5BB75B1CB610639E346802A431B9 ++ JAM FM ++ 34 ++ ++ -1 ++ 103.746 ++ ++ ++ ++107279159044714ABF2F837EFA328827AD05695552023C89D6B4DC728EB175EE1BAC4A4D8C ++ 104,6 RTL Berlin ++ 29 ++ ++ -1 ++ 104.076 ++ ++ ++ ++10727915928FF2DFF1847AC9ACEF507F3353229A2B67EFF320AB9712C200E002F37A28895F ++ SWR3 ++ 30 ++ ++ -1 ++ 104.951 ++ ++ ++ ++1072791593C28480C8972B00751352BBA74BC446B3A7338BF5E581C0C38BBA95C063B479BA ++ sunshine live ++ 31 ++ ++ -1 ++ 105.846 ++ ++ ++ ++1072791593A55AE94E136B46AC1EF61FF2A8AA2DA703EA17189BA6C7B18BD9506CB4EB6DC5 ++ Radio France Internationale ++ 32 ++ ++ -1 ++ 106.201 ++ ++ ++ ++1072791594E4FCB64702D7F3190369EE339FF4229396A4791AA1A1446012FA58BE91F25A95 ++ WDR 2 ++ 33 ++ ++ -1 ++ 106.946 ++ ++ ++ ++1072791596546338507FEBC23B2130D3E3BC0F909B6C7047EEDA64CF7EB6BD2938F03DA3A0 ++ SWR2 - Baden-Wuerttemberg ++ 34 ++ ++ -1 ++ 107.876 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/bonn-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/bonn-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,285 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.4 ++ Gereon Schueller email@gereon.de ++ 2012-07-30T23:43:39 ++ Germany ++ Bonn ++ Unitymedia Cable Network ++ ++ ++ ++ 10919654322C2EF9495C225621B9F02F38D65CFC19F781211D908E273732E406391CD83D79 ++ EINS LIVE ++ 32 ++ ++ -0.01 ++ dontcare ++ 89.5 ++ ++ ++ 1091965432DBB1C47689A796F5A1C31D13160E84E4B0B2B2BCF238ADFCD56D5291ECBE7D34 ++ WDR 2 ++ 21 ++ ++ -1 ++ dontcare ++ 103 ++ ++ ++ 1091965432E620D2DEA57DE8D3425869D9B61FAE8A909EBC1722C46E9FBF9B76D67ED16064 ++ WDR 3 ++ 15 ++ ++ -1 ++ dontcare ++ 88.5 ++ ++ ++ 109196543276474D50DC0126736B1119DD90EC0AB7BE3055817859732721E8D84396EAD0F4 ++ WDR 4 ++ 10 ++ ++ -1 ++ dontcare ++ 105.2 ++ ++ ++ 1091965432C0D8D51BEC7FF0F3D80EE649446D9DBD6C644D5B40BBF847B78C06DEAE0528A5 ++ WDR Radio 5 ++ 35 ++ ++ -1 ++ dontcare ++ 92 ++ ++ ++ 109196543202597F652196A8D0009727B698654FF01A73E446650AB4B0F7D78128268F10BF ++ WDR Radio 5 Funkhaus Europa ++ 23 ++ ++ -1 ++ dontcare ++ 95.2 ++ ++ ++ 10919654327FC5DE92D726B62F116DC19AB42A5B9E50F4C2B6D9EE8CEB885CF5CD95743CD0 ++ HR 1 ++ 6 ++ ++ -1 ++ dontcare ++ 97.25 ++ ++ ++ 1091965432EB0D627AD9EA1893AB97AF05E283F9818B9C5BC03A96828A824CAB2794F2422C ++ HR 2 ++ 13 ++ ++ -1 ++ dontcare ++ 106.05 ++ ++ ++ 1091965432AC1714188FE3DED94E17643578A3E62ACFD719E0B45742C3E2382DB18AEDEEB2 ++ HR 3 ++ 20 ++ ++ -1 ++ dontcare ++ 96 ++ ++ ++ 109196543242548D5CC887023C30BAAD21DEC259799CD610808DB84512ED0F5E0110243B96 ++ SWR 1 Rheinland Pfalz ++ 16 ++ ++ -1 ++ dontcare ++ 89.9 ++ ++ ++ 10919654322B538342EF91D6B54D33F4DA945A72439271B8204D1BEEB61270FC81F43ACB36 ++ SWR 2 Rheinland-Pfalz ++ 5 ++ ++ -1 ++ dontcare ++ 107.7 ++ ++ ++ 1091965432F2368F7A2CD6FA43903E86319637E767C98EE31AA5AE1432E44AF7F9E45BA023 ++ SWR 3 ++ 28 ++ ++ -1 ++ dontcare ++ 107.25 ++ ++ ++ 1091965432E125008DF90996BFD0997C7D3DE02B0A794DD3F6ADED22025500878964ED059D ++ SWR 4 Rheinland ++ 13 ++ ++ -1 ++ dontcare ++ 96.7 ++ ++ ++ 109196543207D0720F7D31DA8771BA01EBAFF4F6B36550DB8DAA86DAA1A032F0EDCE5B0BAE ++ Deutschlandfunk ++ 25 ++ ++ -1 ++ dontcare ++ 104.8 ++ ++ ++ 109196543266466AC67416B83BD8FD516241243783C74023FD75DFAEAB17F8325BD1BCCDE5 ++ DeutschlandRadio Kultur ++ 7 ++ ++ -1 ++ dontcare ++ 98.45 ++ ++ ++ 1091965432BEBF709E0B4332DDBCB8F94C34EE848CF5BEE1A4F28AC37966378C7017DA1BE2 ++ Radio Bonn/Rhein-Sieg ++ 33 ++ ++ -0.01 ++ dontcare ++ 99.75 ++ ++ ++ 1091965432C2CF129CEA931E111DA60CFC9D36C588FD72ACA92ABD44763DED1F050E820FE5 ++ Radio Köln ++ 20 ++ ++ -1 ++ dontcare ++ 90.4 ++ ++ ++ 1091965432CCE146C86E2248511CF3373E685BDA8F54A8D8CC97C5C9CD56039CB4F5943CC9 ++ sunshine live ++ 23 ++ ++ -1 ++ dontcare ++ 94.25 ++ ++ ++ 1091965432520C12ECD249D970FE383731DCF2C796233E6A13D8EAFF413FE07A6C4FEDB6EB ++ DomRadio ++ 8 ++ ++ -1 ++ dontcare ++ 93.95 ++ ++ ++ 1091965432DAA66E312D952479B2ECB430EE509F8625E0F64C3866C454AE02F2E272DE8A60 ++ Jam-FM ++ 11 ++ ++ -1 ++ dontcare ++ 94.65 ++ ++ ++ 10919654324719F08B7D922C9956CBC1794CF886037C6FE8210D0D44107D04DA2F323329AB ++ RTL Radio ++ 1 ++ ++ -1 ++ dontcare ++ 98.75 ++ ++ ++ 1343691592BA7AA01237F6E3E7E9F6FA677EDA32DC604054ED37608748B137AFD320E4 ++ Radio Paloma ++ ++ ++ -1 ++ dontcare ++ 91.7 ++ ++ ++ 10919654329D3E62F7898B303285904EB4D7400A8051766199D279E9B4970DCE53AA35FFE4 ++ Radio RPR Eins Rheinland ++ 26 ++ ++ -1 ++ dontcare ++ 99.35 ++ ++ ++ 10919654320ADB8A8DA2451E866A10421A346F0CECD55A0B9F270AB263D9DABCD1D62946A0 ++ Klassik Radio ++ 12 ++ ++ -1 ++ dontcare ++ 96.4 ++ ++ ++ 1091965432A0454782B1B958D30B59CD7FC2C02811E9EB63432F55469EEE5121577C35A39B ++ Belgischer Rundfunk (deutsch) ++ ++ ++ -1 ++ dontcare ++ 100.85 ++ ++ ++ 134369151654628D560CDE8CB1DF82669C0CAA2EA2C46F94C0C7171605343B76E2A301 ++ bigFM - Hot Music Radio ++ ++ ++ -1 ++ dontcare ++ 91 ++ ++ ++ 1343691539C50D1F861456D49146F6FED5AA9704E68D632C68536BDEE9E306F9A27ED9 ++ ERF (Evangeliums-Rundfunk) ++ ++ ++ -1 ++ dontcare ++ 88.2 ++ ++ ++ 134369175436874EEA444FE168D7CD968569EC60A1BD656ECA93B8493B82804E8A1056 ++ AFN - Frankfurt ++ ++ ++ -1 ++ dontcare ++ 106.35 ++ ++ ++ 1091965432D540169A28BE38B5BC636CC5958B619A5EBF736B6534AC1DE7BD3021AC5FDEB1 ++ BFBS ++ 27 ++ ++ -1 ++ dontcare ++ 102.15 ++ ++ ++ 13436915630ECC4585C73D9671B8255ADF510E275F8F2C688684315D9AA259D8707517 ++ FM 3 (niederl.) ++ ++ ++ -1 ++ dontcare ++ 92.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/bremerhaven-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/bremerhaven-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,261 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-10-29-3 ++ Tim Gollnik, <Tim.Gollnik@t-online.de> ++ 2004-06-09T11:18:14 ++ Germany ++ Bremerhaven ++ cable ++ ++ ++ ++ ++1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E ++ NDR 2 ++ 1 ++ ++ -1 ++ 87.95 ++ ++ ++ ++1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11 ++ NDR 1 Niedersachsen ++ 4 ++ ++ -1 ++ 88.4 ++ ++ ++ ++10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3 ++ NDR 4 / Parlament ++ 5 ++ ++ -1 ++ 88.95 ++ ++ ++ ++10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684 ++ NDR 90,3 ++ 4 ++ ++ -1 ++ 89.6 ++ ++ ++ ++10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6 ++ NDR Kultur ++ 5 ++ ++ -1 ++ 90.9 ++ ++ ++ ++1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90 ++ Deutschlandfunk ++ 6 ++ ++ -1 ++ 91.55 ++ ++ ++ ++109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A ++ Radio Bremen 1 ++ ++ ++ -1 ++ 92.75 ++ ++ ++ ++109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141 ++ Nordwest Radio ++ 8 ++ ++ -1 ++ 94 ++ ++ ++ ++1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41 ++ Funkhaus Europa ++ 9 ++ ++ -1 ++ 93.45 ++ ++ ++ ++1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6 ++ Radio Bremen 4 ++ 10 ++ ++ -1 ++ 94.8 ++ ++ ++ ++10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366 ++ Energy Bremen ++ ++ ++ -1 ++ 95.1 ++ ++ ++ ++1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202 ++ Radio HH ++ 11 ++ ++ -1 ++ 95.75 ++ ++ ++ ++10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C ++ Radio ffn ++ 10 ++ ++ -1 ++ 96.15 ++ ++ ++ ++10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178 ++ OFFENER KANAL ++ 13 ++ ++ -1 ++ 96.95 ++ ++ ++ ++10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E ++ AFN Power Network ++ 14 ++ ++ -1 ++ 97.25 ++ ++ ++ ++1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D ++ Delta Radio ++ 12 ++ ++ -1 ++ 97.85 ++ ++ ++ ++1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02 ++ Radio RSH ++ 16 ++ ++ -1 ++ 99.9 ++ ++ ++ ++1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6 ++ HitRadio Antenne Niedersachsen ++ 18 ++ ++ -1 ++ 101.3 ++ ++ ++ ++10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734 ++ BFBS Radio 1 ++ ++ ++ -1 ++ 101.75 ++ ++ ++ ++1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F ++ DeutschlandRadio Kultur ++ 19 ++ ++ -1 ++ 102.05 ++ ++ ++ ++1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2 ++ 106!8 rock'n pop ++ 19 ++ ++ -1 ++ 102.9 ++ ++ ++ ++1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189 ++ sunshine live ++ 21 ++ ++ -1 ++ 103.65 ++ ++ ++ ++109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C ++ RTL Radio ++ ++ ++ -1 ++ 103.95 ++ ++ ++ ++1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4 ++ n-joy radio ++ 22 ++ ++ -1 ++ 104.5 ++ ++ ++ ++1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844 ++ Klassik Radio ++ 23 ++ ++ -1 ++ 104.95 ++ ++ ++ ++10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B ++ JAM-FM ++ 25 ++ ++ -1 ++ 106.3 ++ ++ ++ ++1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC ++ Radio Melodie ++ ++ ++ -1 ++ 106.7 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp kradio-3.5.13.1/kradio3/presets/germany/coswig.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/coswig.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/coswig.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,294 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Hagen Edlich ++ 2007-04-11T01:39:29 ++ Germany ++ 06869 Coswig (Anhalt) ++ Kabelnetz ++ ++ ++ ++ ++1176247707A0C82B606E65CC7F2FBEA0866020438DF24632426678DC361F7C193C7B8845BE ++ Sunshine Live ++ Sunshine Live ++ ++ -1 ++ 87.5 ++ ++ ++ ++117624703266B62F9E009559DBD9A294B32B2F73EAF63A8B28AF83431F80E5593786641AC1 ++ NDR 1 Niedersachsen ++ NDR 1 Niedersachsen ++ ++ -1 ++ 87.8 ++ ++ ++ ++117624708971E9A8A2BDD50B839C80F17E99FC2615603B9AF02F3B9705EB71FBEF5CD7DDFB ++ NDR 2 ++ NDR 2 ++ ++ -1 ++ 88.5 ++ ++ ++ ++1176247163E70DCE726F2CFBE3BEDFE8B05EE6C384D5318795E41C4466A9D7D48A19F3D8E9 ++ NDR Kultur ++ NDR Kultur ++ ++ -1 ++ 88.8 ++ ++ ++ ++1176245349AF57021CB5F93E2F5A44202078E3D594898EF9872CAB0F55A5829328C7EAD2E8 ++ Jump ++ Jump ++ ++ -1 ++ 89.65 ++ ++ ++ ++1176247446EA0C211D139184145EA8064C5E02087F1E93344C014ECC142E373A46EE7E77AD ++ Fritz ++ Fritz ++ ++ -1 ++ 90.15 ++ ++ ++ ++11762474728BDF3F755C240D8D8EB9781F3A928DD4F22EAB34B36E9CCE9F6C24F4FB22831D ++ NRJ ++ NRJ ++ ++ -1 ++ 90.75 ++ ++ ++ ++1176245354F9792D14D7A4C02FED7644C6303C3E62B96E1E359B27F35F29846AA304932DE4 ++ MDR Sputnik ++ MDR Sputnik ++ ++ -1 ++ 91.2 ++ ++ ++ ++1176247621B215007AC7280D5AE46B6F93A29A9DFFE3294F7CA63684D265D00ED5D2D70365 ++ Radio Leipzig ++ Radio Leipzig ++ ++ -1 ++ 91.6 ++ ++ ++ ++11762477071EAC736A707A9AD5509666EAB5FF92E6CF5A6C7EA071BFEC4DA56D97BF4BDD7E ++ Radio Brocken ++ Radio Brocken ++ ++ -1 ++ 92.2 ++ ++ ++ ++1176247708D821B8DDC4E76242BCC0BB4BF906412069F6ED1FCAEAC1B8D03964B1CBE8678C ++ Radio SAW ++ Radio SAW ++ ++ -1 ++ 92.5 ++ ++ ++ ++1176247708D5E33AC1D3235A3B271AC0E9B528BF08E3F7AA040E83CBD48DFEEE1DB9C8E3B8 ++ MDR Figaro ++ MDR Figaro ++ ++ -1 ++ 92.95 ++ ++ ++ ++11762469094F443FA4C67B3C73A1E9E0BAA1E3B014646B4C654F4EE1C450FDA11CC6493A67 ++ Antenne Bayern ++ Antenne Bayern ++ ++ -1 ++ 93.4 ++ ++ ++ ++11762453616DC96E98F9F2BB736BF0BED0642CDC2DE88F1991EA915DEF2D2962229D1B30FB ++ Rockland SA-AN ++ Rockland SA-AN ++ ++ -1 ++ 93.7 ++ ++ ++ ++11762453621223D1F049DF97DBE0F4A9A9E6B39671D21628044599F72342464C97D6F22081 ++ Eins live ++ Eins live ++ ++ -1 ++ 94.0004 ++ ++ ++ ++1176245363C836DBABFAB34DBBB91AC2D42AF7CE1454F2A0FF095FF31E9F70F40E2211AD56 ++ Nordwestradio ++ Nordwestradio ++ ++ -1 ++ 94.3 ++ ++ ++ ++11762453641AABE4D81D8EF0C27DB3C48B078D6C93E30FE3830E9053F195CD9D2108AA7481 ++ Radio 1 ++ Radio 1 ++ ++ -1 ++ 94.85 ++ ++ ++ ++1176245365D229F90373EB6CA1F4E2ADF2097BA1AA1A8363E83A2D5EF4557F7573070B87BB ++ MDR Info ++ MDR Info ++ ++ -1 ++ 95.4 ++ ++ ++ ++1176245367AE96165F2EC516BBF2F71FB44077D98C704EFD0B7F99481BC98E91B6E8DE4400 ++ Stadtradio 88,88 ++ Stadtradio 88,88 ++ ++ -1 ++ 95.8 ++ ++ ++ ++1176245368B945284318577B0B720618D63FAB35CE85F9F45D77BBF0A87F71C0BA8FC19D42 ++ DLF ++ DLF ++ ++ -1 ++ 96.3 ++ ++ ++ ++1176246864242513E9CE92BAF25CBB8433B11384AC93E9F35FA2E7F978FCDB5F903ECC5CAD ++ MDR 1 Radio SA-A ++ MDR 1 Radio SA-A ++ ++ -1 ++ 97.2 ++ ++ ++ ++117624682132A6A74354D08337EB493D374072B03763DC26FE4F5F1386FA8CC1AAFC644F7F ++ MDR 1 Radio SA ++ MDR 1 Radio SA ++ ++ -1 ++ 97.7 ++ ++ ++ ++1176245373B9B0F90767273A2D459B78EC67A5E9236696975DC9B3B77297618818D1CDCAFA ++ Radio Melodie ++ Radio Melodie ++ ++ -1 ++ 98.1 ++ ++ ++ ++11762453744C9A303A5C5A7E3504F75EAB55DE2ED1D6615AFF845F83C7ACC1BB6AD3A36E04 ++ n-joy ++ n-joy ++ ++ -1 ++ 98.65 ++ ++ ++ ++117624537733B9E8D7B049EB078A4CE72545B28E4EEA9B24ECA20C3B72B9AE5175D3E83E4F ++ Deutschlandradio ++ Deutschlandradio ++ ++ -1 ++ 99.9 ++ ++ ++ ++117624537973BF9927DDB11CCCA2E1DC331145C184763291A36FB37FE6C83EA4A5B3F320FE ++ RTL Radio ++ RTL Radio ++ ++ -1 ++ 100.5 ++ ++ ++ ++11762467554B0CD17FAECDE5837EE6588BB3C6369BCDE6991A787DF809A1CD7B3631CBF982 ++ Hitradio Antenne SA ++ Hitradio Antenne SA ++ ++ -1 ++ 101 ++ ++ ++ ++1176246795DD47990D17CF58ABB65DFEFCFE0438780A7ABB4861B01A39D4B30B4659B06C34 ++ R.SA ++ R.SA ++ ++ -1 ++ 101.3 ++ ++ ++ ++1176245383C0A242E951364EE884AAB9286100E06033AFB09A165DFCAD9CE6AC787472FC34 ++ Das Ding ++ Das Ding ++ ++ -1 ++ 102.05 ++ ++ ++ ++11762453843AAEDF886054B17B1394DF7B17678D7E1F85FC029CDD541FF69E7C7882B9A316 ++ Radio Kultur ++ Radio Kultur ++ ++ -1 ++ 102.7 ++ ++ ++ ++1176245389E77366541FAE828839AA3E4F8503FB21940E7A40E81E566E64B118AFC18F681C ++ FFH ++ FFH ++ ++ -1 ++ 105.15 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/erlensee.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/erlensee.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,304 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Werner Muehl <info@ib-muehl.de> ++ 2006-10-03T17:36:01 ++ Germany ++ Erlensee ++ Cabel ++ Stations/Frequencies for Hanau, Bruchkoebel, Maintal, Erlensee, ++Rodenbach, Neuberg, Langenselbold ++ ++ ++ 106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101 ++ Antenne Bayern ++ Antenne Bayern ++ ++ -1 ++ 94 ++ ++ ++ 1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C ++ AFN ++ AFN ++ ++ -1 ++ 105.15 ++ ++ ++ 1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632 ++ Bayerischer Rundfunk 1 (Main / Franken) ++ BR 1 ++ ++ -1 ++ 91.2 ++ ++ ++ 10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B ++ Bayerischer Rundfunk 2 (Main / Franken) ++ BR 2 ++ ++ -1 ++ 92.15 ++ ++ ++ 1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6 ++ Bayerischer Rundfunk 3 ++ BR 3 ++ ++ -1 ++ 92.45 ++ ++ ++ 10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F ++ Bayerischer Rundfunk 4 Klassik ++ BR 4 KLassik ++ ++ -1 ++ 93.55 ++ ++ ++ 1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D ++ Bayerischer Rundfunk 5 ++ BR 5 ++ ++ -1 ++ 95.75 ++ ++ ++ 1159888999C88F220598C7CA2D533194FF95E4EF0629E3EA1144151F13104F3D0A957F6975 ++ BIG-FM ++ BIG-FM ++ ++ -1 ++ 100.95 ++ ++ ++ 1159889239AFCB7A4D3F499D83C998312C5314A3374819A63E5DD848F26D2A28724A188BF5 ++ Deutschlandfunk Köln ++ DLF ++ ++ -1 ++ 104.05 ++ ++ ++ 10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2 ++ Deutschlandradio Kultur ++ DLR Kultur ++ ++ -1 ++ 90.1 ++ ++ ++ 11598894980E90DF6E12053843D94648E3AC2B00607502F7B3338DBE6C237AAC528179BBE1 ++ Harmony FM ++ Harmony FM ++ ++ -1 ++ 107.5 ++ ++ ++ 1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359 ++ Hessischer Rundfunk 1 ++ HR 1 ++ ++ -1 ++ 87.6 ++ ++ ++ 106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45 ++ Hessischer Rundfunk 2 ++ HR 2 ++ ++ -1 ++ 99.45 ++ ++ ++ 1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812 ++ Hessischer Rundfunk 3 ++ HR 3 ++ ++ -1 ++ 88.55 ++ ++ ++ 10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C ++ Hessischer Rundfunk 4 Rhein-Main ++ HR 4 Rhein-Main ++ ++ -1 ++ 89 ++ ++ ++ 11367224732DD9647905D1A0E3003D6727D6C6A468489AE8E1B8349C8BDE108A1BE864F4DF ++ Hessischer Rundfunk - Info ++ HR - Info ++ ++ -1 ++ 88.2 ++ ++ ++ 11598893448B33C4FDC7C5C5B9B501188282E8B21D0B19A89E026C9BC0E284F344F9DB8C3D ++ Hessischer Rundfunk - Info MW ++ HR-info MW ++ ++ -1 ++ 105.8 ++ ++ ++ 10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1 ++ Hit-Radio FFH Rhein-Main ++ FFH ++ ++ -1 ++ 90.75 ++ ++ ++ 1136724537075C78FBD2816E19C6B77CC4DAFDC888A9DC10DEBA65983A0B76537048067AE1 ++ JAM-FM ++ JAM-FM ++ ++ -1 ++ 107.8 ++ ++ ++ 106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34 ++ Klassik Radio ++ Klassik ++ ++ -1 ++ 107.2 ++ ++ ++ 11367244420E0433EBB9A7933AE1DFCAE9AC5968416B2B9C1718E31FED01DFD0676DC2505B ++ MAIN FM ++ MAIN FM ++ ++ -1 ++ 106.2 ++ ++ ++ 1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447 ++ Planet Radio ++ Planet ++ ++ -1 ++ 103.75 ++ ++ ++ 1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186 ++ Radio Fortuna ++ Fortuna ++ ++ -1 ++ 87.9 ++ ++ ++ 1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3 ++ Radio Melodie ++ Melodie ++ ++ -1 ++ 98.15 ++ ++ ++ 1159889106EC20DC8D1EA0580D1BC060B8B6D873182E34D8269303B75B03A36EC11810BDC9 ++ Radio Primavera ++ Primavera ++ ++ -1 ++ 102.75 ++ ++ ++ 1136724286E5985147114BB716FE9E15FA357C38BBB0CB331B5396CEB9EBDBCE94915F4A18 ++ Radio RPR Eins ++ RPR 1 ++ ++ -1 ++ 96.95 ++ ++ ++ 106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC ++ RTL Radio ++ RTL ++ ++ -1 ++ 103.3 ++ ++ ++ 10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6 ++ Sunshine Live ++ Sunshine ++ ++ -1 ++ 97.25 ++ ++ ++ 1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC ++ SWR 1-Rheinland-Pfalz ++ SWR 1-Rh.Pfalz ++ ++ -1 ++ 94.65 ++ ++ ++ 106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5 ++ SWR 2-Rheinland-Pfalz ++ SWR 2-Rh.Pfalz ++ ++ -1 ++ 94.95 ++ ++ ++ 1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765 ++ SWR 3 ++ SWR 3 ++ ++ -1 ++ 96.2 ++ ++ ++ 1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839 ++ SWR 4 - Pfalz ++ SWR 4 ++ ++ -1 ++ 91.5 ++ ++ ++ 115988887190FF89418BFC2D560EB0F3E672896E7B59B292E3B85FA8AB6AC579E5FF5ECB05 ++ Sky Radio ++ Sky Radio ++ ++ -1 ++ 99.05 ++ ++ ++ 1136724325091824FE3A7B2E74B15CCE068D71760C4BA8271CE5F3511F5BA9F69098A9C9C8 ++ WDR 2 (Siegen) ++ WDR 2 ++ ++ -1 ++ 101.25 ++ ++ ++ 106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68 ++ WDR 3 ++ WDR 3 ++ ++ -1 ++ 101.7 ++ ++ ++ 11367226162FF388CE9717148283756F57FE37EEE28DD6148247865CBD8BC64CF3C8EF3A01 ++ YOU FM ++ Y ++ ++ -1 ++ 89.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/erwitte-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/erwitte-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,295 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Skutek <grf-chz@gmx.de> ++ 2007-12-18T15:31:54 ++ Germany ++ Erwitte/Lippstadt/Soest/Paderborn/Warstein ++ cable ++ Stand November 2007 ++ ++ ++ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 ++ hr1 ++ ++ ++ -1 ++ 87.9 ++ ++ ++ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 ++ hr2 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 ++ hr3 ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 ++ hr4-Rhein-Main-Journal ++ ++ ++ -1 ++ 88.95 ++ ++ ++ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 ++ 1LIVE (WDR) ++ ++ ++ -1 ++ 89.4 ++ ++ ++ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A ++ Deutschlandfunk ++ ++ ++ -1 ++ 90.1 ++ ++ ++ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 ++ Deutschlandradio Kultur ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 ++ WDR2 - Siegen ++ ++ ++ -1 ++ 90.75 ++ ++ ++ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 ++ NDR1 Radio NDS - Südwest ++ ++ ++ -1 ++ 91.15 ++ ++ ++ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 ++ NDR2 ++ ++ ++ -1 ++ 92.4 ++ ++ ++ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 ++ WDR3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F ++ NDR Kultur ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 ++ JUMP ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F ++ WDR4 ++ ++ ++ -1 ++ 94.25 ++ ++ ++ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF ++ Klassik Radio ++ ++ ++ -1 ++ 94.55 ++ ++ ++ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 ++ BR1 - Main/Franken ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 ++ WDR Radio 5 ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D ++ domradio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 ++ ERF (Evangeliums Rundfunk) ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 ++ Funkhaus Europa (WDR) ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 ++ SWR1 -Rheinland Pfalz ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C ++ SWR2 -Rheinland Pfalz ++ ++ ++ -1 ++ 98.25 ++ ++ ++ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B ++ SWR3 ++ ++ ++ -1 ++ 98.75 ++ ++ ++ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A ++ BFBS (engl.) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB ++ DEFJAY ++ ++ ++ -1 ++ 100.2 ++ ++ ++ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 ++ radio ffn - Osnabrück ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF ++ JAM FM ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E ++ Radio Melodie ++ ++ ++ -1 ++ 101.75 ++ ++ ++ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 ++ RTL Radio - Die besten Hits aller Zeiten ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D ++ sunshine live ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 ++ WDR2 Bielefeld/HIT RADIO FFH ++ ++ ++ -1 ++ 103.9 ++ ++ ++ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 ++ 2255LIVE Ihr Gewinnradio ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 ++ Radio Hochstift/AFN - Frankfurt ++ ++ ++ -1 ++ 106.85 ++ ++ ++ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 ++ Radio Siegen/Hellweg Radio/Radio Sauerland ++ ++ ++ -1 ++ 107.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/frankfurth-am-main-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/frankfurth-am-main-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,355 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0-beta1-r664 ++ Andreas Karl ++ 2005-03-04T19:15:35 ++ Germany ++ Frankfurt / Hessen ++ Cabel ++ Stations/Frequencies for Frankfurt Main ++ ++ ++ ++1068545254870A846605C88985C8D465AA421B30FF35FDBEBB55A43E57FCAFD16154206359 ++ HR1 ++ HR1 ++ ++ -1 ++ dontcare ++ 87.6 ++ ++ ++ ++1068545254933EFC46CF2BFFE13CC182D4B05FF2D2461E6F6D7589DDAF3C87DA473962E186 ++ HR-KLASSIK ++ HR4 KL ++ ++ -1 ++ dontcare ++ 87.9 ++ ++ ++ ++106854525467DD7BA14D8A886573BE9AED9A64A86C9F8E5AF487245E4146D0307E1EBAFF45 ++ HR-Info ++ HR-Info ++ ++ -1 ++ dontcare ++ 88.2 ++ ++ ++ ++1068545254702E9C08B12CD8B1420A2124B447183B0A668DFCB197EE89DF93E6ACF98E9812 ++ HR3 ++ HR3 ++ ++ -1 ++ dontcare ++ 88.55 ++ ++ ++ ++10685452546CFB27CC9962BF5D8977046D34628F539AA5D68B836F03732D03EC4943541F6C ++ HR4-RheinMain ++ HR4 ++ ++ -1 ++ dontcare ++ 89 ++ ++ ++ ++10685452549B0EB616A99AF727280D11B619234DFFABDAA8F588578B31D946064A1E4F0CE1 ++ YOU FM ++ YOU FM ++ ++ -1 ++ dontcare ++ 89.9 ++ ++ ++ ++1068545254ADEF6022D469FC3619A861A9696292F20C8DCBA6AD9F0B18313132367BD9CEE8 ++ DeutschlandRadio-Berlin ++ DLR-B ++ ++ -1 ++ dontcare ++ 90.1 ++ ++ ++ ++1068545254C3EDE8BB17AC69C6BFAE1D0C57D3226A907A7420C6B2B792CF8EA9D2844D5BFC ++ Hitradio FFH ++ FFH ++ ++ -1 ++ dontcare ++ 90.75 ++ ++ ++ ++106854525444FF41C1C7E711CF7C74D8AC38A735064E85E5376AC0F57D568D429B9E913BD5 ++ BR1 (Mainz/Franken) ++ BR1 ++ ++ -1 ++ dontcare ++ 91.2 ++ ++ ++ ++1068545254CC505A9B2AEF4B7C6BDA243798B7AED04B2D39569524C28CC4BE3EC0CA46D765 ++ SWR4-Pfalz ++ SWR4 ++ ++ -0.01 ++ dontcare ++ 91.5 ++ ++ ++ ++10685452546D14E1356C2246B3F5D7185F12B04FCCA6FD2489D136AFD321BD33231C2C4DB4 ++ BR3 ++ BR3 ++ ++ -1 ++ dontcare ++ 92.45 ++ ++ ++ ++1068545254355DB6BC4C4A688C5E1FEF7DBF78B7FB62C40545D488ADA1A4CCF51AF702F839 ++ BR4 Klassik ++ BR4 ++ ++ -1 ++ dontcare ++ 93.55 ++ ++ ++ ++106854525435295B421B71BB719FFC423427D88A13394AC09A41C7FADE4CFAF34CF20A967D ++ Antenne Bayern ++ ANT-BAY ++ ++ -1 ++ dontcare ++ 94 ++ ++ ++ ++1068545254A4F642897A3A7A2FDCF75CC91EC34AB83409A44E520926B65616CB71A888A632 ++ SWR1-Rheinaland Pfalz ++ SWR1 ++ ++ -1 ++ dontcare ++ 94.65 ++ ++ ++ ++10685452545BFB673861F03BE773365B16486F1312D0E67EE191A44D3E6E8A2EDE9CFF860B ++ SWR2-Rheinaland Pfalz ++ SWR2 ++ ++ -1 ++ dontcare ++ 94.05 ++ ++ ++ ++1068545254A50C8E4F463384279978E9990FE99AD5E8D02892DC85239B19FF5D03D0B2D2E6 ++ BR5 ++ BR5 ++ ++ -1 ++ dontcare ++ 95.75 ++ ++ ++ ++10685452542B850A62AFBC32E86A8AEEAFB6ADDB4471C997F6EC31B99A4705C034891FF15F ++ SWR3 ++ SWR3 ++ ++ -1 ++ dontcare ++ 96.2 ++ ++ ++ ++1068545254AFA422E0A4F4D99F24FFC42C2EA3E5563D518014CAAD3D29F69BC15105EA2B8D ++ Radio RPR Eins ++ RPR1 ++ ++ -1 ++ dontcare ++ 96.95 ++ ++ ++ ++106854525432A288014DF7C85A99EB501E082B06B4F96949EBAE12DD4A859C19C3636C7101 ++ Sunshine LIVE ++ SUNSHINE ++ ++ -1 ++ dontcare ++ 97.25 ++ ++ ++ ++1068545254E6194286DD3604C97905284DBD5755FEA2D0D8243E97D5BC889C76C1B6E91888 ++ Radio Melodie ++ MELODIE ++ ++ -1 ++ dontcare ++ 98.15 ++ ++ ++ ++106854525480DD9CEA8D762EF40365B81DC415F98E8D8D49BB5077BACB848F33AB8FFC1154 ++ RADIO BOB!(ex Sky Radio) ++ SKY ++ ++ -1 ++ dontcare ++ 99.05 ++ ++ ++ ++10685452547C658BFD8AB9FE93566A1D66601EE06F430A26079E188A0E4E304860235DE200 ++ HR2 ++ HR2 ++ ++ -1 ++ dontcare ++ 99.45 ++ ++ ++ ++1068545254739FC26D6EA0AFF43BCC062A18F2B696DD53495A4DB3E0CE961695FDE6CF251C ++ radio-x ++ radio-x ++ ++ -1 ++ dontcare ++ 99.95 ++ ++ ++ ++106854525431E0BF7A1159B68FE9747EC8803E96EDE40295B8DCDFC2ADE2D50090859A2AF3 ++ BIG-FM ++ BIG-FM ++ ++ -1 ++ dontcare ++ 100.95 ++ ++ ++ ++10685452544B20BEB753EDDA4B34C42E483252E211C5BCB770258F801EE1840268FD85CCA2 ++ WDR2-Siegen ++ WDR2 ++ ++ -1 ++ dontcare ++ 101.25 ++ ++ ++ ++1068545254C2A9AD17F3E452CBB5EDA1FC41F3E91A2CE003910634BC8F3FC0472D24C5BE3B ++ WDR3 ++ WDR3 ++ ++ -1 ++ dontcare ++ 101.7 ++ ++ ++ ++1068545254886BEA32C5981E47D8085FAC639673F691BBEA7D08BEA9437C8168874C4FF3DA ++ Radio Fortuna ++ FORTUNA ++ ++ -1 ++ dontcare ++ 102 ++ ++ ++ ++106854525483F9405C61CE3EED8B1790B72AE42D9ECF45255D65635DCCA1A185EDB0876D34 ++ RTL RADIO ++ RTL ++ ++ -1 ++ dontcare ++ 103.3 ++ ++ ++ ++106854525490359933CE6E34491643A8F2D51D4B3CDF0644A3FC88A9122F9173A0422A77A4 ++ planet radio ++ planet ++ ++ -1 ++ dontcare ++ 103.75 ++ ++ ++ ++1068545254D0CE4F17DAD846DDC36D7DC42608C19C2F18B4885EC251CE790C84C41CB27447 ++ Deutschlandfunk (Koeln) ++ DLF-K ++ ++ -1 ++ dontcare ++ 104.05 ++ ++ ++ ++1068545254AC687063AB78F567A8746D9C8C6B2122EDD6595C51D4BE060F507045CE72F2C3 ++ AFN ++ AFN ++ ++ -1 ++ dontcare ++ 105.15 ++ ++ ++ ++106854525437C470CE8A4CDE8335D5C2F7734E80C021240F03A3CAAEE3012CD289EDC275EC ++ MAIN FM ++ MAIN FM ++ ++ -1 ++ dontcare ++ 106.2 ++ ++ ++ ++10685452541FF3CA5C607D5DE6797DC299B2145287B967056B74590104E2C042A49CDF62B6 ++ KLassik Radio ++ KlassikR ++ ++ -1 ++ dontcare ++ 107.2 ++ ++ ++ ++106854525406B343319F3EC21170A752D910A7C6C26670A13961C9F0CC9652DF5D53695E68 ++ JAM-FM ++ JAM ++ ++ -1 ++ dontcare ++ 107.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/goettingen-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/goettingen-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,367 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Christian Haase ++ 2008-01-23T15:04:13 ++ Germany ++ G�ttingen ++ Cable ++ ++ ++ ++ ++120109774346C3B3C59CC62EE9B80B8D8E08A315081FF6DEECADDE797036DD35DD720313AB ++ NDR 1 Niedersachsen S�dost ++ NDR 1 ++ ++ -1 ++ 87.8 ++ ++ ++ ++12010980262AC02EA7CEE4A9787E1BAB56662E863F8406F1DBD1121C163281EBEC130DF71C ++ NDR 2 ++ NDR 2 ++ ++ -1 ++ 88.2 ++ ++ ++ ++120109780028FA4C97936D91B7AA300175D6246EA08F4B5CD9E4CCB628641F6227FDA707EA ++ NDR Kultur ++ NDR Kultur ++ ++ -1 ++ 88.65 ++ ++ ++ ++1201097927EFEA249C8FC673EBD62E941ED93ED433BCF7E836D1CD7782CDD2CDB152189691 ++ Deutschlandfunk ++ Deutschlandfunk ++ ++ -1 ++ 90.25 ++ ++ ++ ++12010978510EA8D2B980E6C19488BA1E7535640C12518B88F734A91A50DB5ECAB1DCF3E4F5 ++ NDR Info ++ NDR Info ++ ++ -1 ++ 89.25 ++ ++ ++ ++120109837495323238ABA5A082BC5CE9E13FB9BAC2319CB9E8C2FDC5D51E5F7F57CFC3B794 ++ BFBS (engl.) ++ BFBS ++ ++ -1 ++ 90.7 ++ ++ ++ ++1201098447C7921DFDCE0A87585C877A4E4F14469E6E631197D8F61C3D9DB7992C0F6CF94E ++ N-Joy Radio ++ N-Joy ++ ++ -1 ++ 91.05 ++ ++ ++ ++12010985118C339A3D9CF54A26F18143C58DDE078F0C4398FF419B22C8A1112EF54EC9AA72 ++ HR 1 ++ HR 1 ++ ++ -1 ++ 91.7 ++ ++ ++ ++1201098547D3AB57CEE698B1055882DADE29CB3BFCB82BBBF20CBF6F2F2B1976EFF9044708 ++ HR 2 ++ HR 2 ++ ++ -1 ++ 92.4 ++ ++ ++ ++12010985715E0FCC725AC4DF418CB8BE1BBF2401F969B75AAC93F3E12AFF6FE818B7BC4DAB ++ HR 3 ++ HR 3 ++ ++ -1 ++ 92.7 ++ ++ ++ ++12010986083B91D444A320FF64D572F4D06E5EBF7CF9F5E58BD9CEC18429D6B4C179BEDE9F ++ HR 4 Nordhessen-Journal ++ HR 4 ++ ++ -1 ++ 93.15 ++ ++ ++ ++12010986436FC6FB10889A59B3E26CF84319697556F79675891B01D19E087BE589A51BD835 ++ WDR Radio 5 ++ WDR 5 ++ ++ -1 ++ 93.75 ++ ++ ++ ++1201098676DC4A41C8EBF28E3EA290014DDB3AE0BDB33EB4F05ED3FFE781348C803686134B ++ MDR 1 Radio Th�ringen Erfurt ++ MDR 1 Th�ringen ++ ++ -1 ++ 94.25 ++ ++ ++ ++1201098849EE6F5544A5FDEF6F4E671794F7B0D49294B52D96146A015A91EDC48286D85AB9 ++ WDR 2 Bielefeld ++ WDR 2 ++ ++ -1 ++ 95 ++ ++ ++ ++1201097557C000942967970C43A83708468FF26103AC8B0581DEB400BA21BAA8A849874B32 ++ Stadtradio G�ttingen ++ Stadt G� ++ ++ -1 ++ 95.35 ++ ++ ++ ++12010989008BC7BC41095AC902061E5E57722FF5DC4E18AD136EBAC375EB9E5B74B67DB036 ++ WDR 4 ++ WDR 4 ++ ++ -1 ++ 95.8 ++ ++ ++ ++12010989234A3586E929CF194D5AE5061E2B51FDE4CB0DDA02C21811EB73A8CDD679CE3F89 ++ BR 2 Main/Franken ++ BR 2 ++ ++ -1 ++ 96.65 ++ ++ ++ ++1201098961DB6AA80EBEF605DB7726EDE700738740F99E762D3B9673046909F377F5BC81A9 ++ BR 1 Main/Franken ++ BR 1 ++ ++ -1 ++ 96.95 ++ ++ ++ ++1201098991D21FAC6C42CBCA1C30EDAB03AA24F35F6C0EDA5D9EBB6AB9D3575A055E1D1A59 ++ Bayern 3 ++ Bayern 3 ++ ++ -1 ++ 97.65 ++ ++ ++ ++1201099021BADD498B6AEC071B3D17C5FA9DC6491CF07DEE1ABDD5E0D193DC04D0D0C6AB83 ++ Eins Live (WDR) ++ Eins Live ++ ++ -1 ++ 98.3 ++ ++ ++ ++1201099060F137794C0CABE65412572A3A1E133778DB9A56F21E0051DF5AE004DB7EFF1588 ++ Deutschlandradio Kultur ++ Dtl Kultur ++ ++ -1 ++ 98.75 ++ ++ ++ ++1201099105DE85CE952993AC3FEE8B917C0FC45FF302BE4DE3514056800C802CED566AAD3D ++ WDR 3 ++ WDR 3 ++ ++ -1 ++ 99.15 ++ ++ ++ ++120109912693D8EAD66B191CC7A8E74A66CD8F16439634F4E02C27A55B3C05C096A27FEC9A ++ Radio Hochstift ++ Hochstift ++ ++ -1 ++ 99.65 ++ ++ ++ ++120109915408E02695F27D249358DA6D4DF70ADE3FFF4F64426449434DA9C21C0B94012FE7 ++ Antenne Th�ringen ++ Antenne Th�ringen ++ ++ -1 ++ 100.1 ++ ++ ++ ++12010991983A71807FC0FF0365E5400DC2A509123262CEC6B18FCD5AE7D29293D198BCCFCC ++ 89,0 RTL ++ 89,0 RTL ++ ++ -1 ++ 100.75 ++ ++ ++ ++120109923991F554555E1295EB09A9DE9D0B6208EC7E506B35BA3E55B57BEEC55DC439FEAF ++ MDR 1 Radio Sachsen-Anhalt Magdeburg ++ MDR 1 Sachsen-Anhalt ++ ++ -1 ++ 101.1 ++ ++ ++ ++120109931215CD26378E5951B3C42F185A66A67D3D1CF2232BB7A9671BADB30E47F94CE77D ++ Jump ++ Jump ++ ++ -1 ++ 101.55 ++ ++ ++ ++120109934107BECD3DDA9C499E7BF7CF85D856A2FE0303C63771B39618B8D865D1353BEBD6 ++ Radio SAW ++ Radio SAW ++ ++ -1 ++ 101.95 ++ ++ ++ ++1201099371D3D2A916EC4AE1ACDBAE8DB326FC93A0FBAB9D7CA67F0768F02633150F58C77D ++ MDR Figaro ++ MDR Figaro ++ ++ -1 ++ 102.65 ++ ++ ++ ++1201099410375D010A6DC949089AC8548A8767B283E400580491A40EB9FC1F2844FDE748FA ++ Radio 21 ++ Radio 21 ++ ++ -1 ++ 103.25 ++ ++ ++ ++12010994505AA8B9A303C5365BD0377108CAC995D185AA06FE9DC280AB1F3764FD6062079A ++ Radio FFN G�ttingen ++ FFN ++ ++ -1 ++ 104 ++ ++ ++ ++12010995145E068162D8B94A1DC01E3D59898ECCDFE5E2242602AD59D560BD33ED2A37919E ++ Hit-Radio Antenne Niedersachsen G�ttingen ++ Antenne Niedersachsen ++ ++ -1 ++ 104.6 ++ ++ ++ ++1201099558D1923339D9D36028AB475C46AB4C84D6CCE86295FAECA640FA99B2D84D6D8BB3 ++ sunshine live ++ sunshine live ++ ++ -1 ++ 104.95 ++ ++ ++ ++12010995821652BB98253CA9A3F953BDD44D4BE6DA7BF855DBC6290EED9C915D488E716F41 ++ Radio Melodie ++ Radio Melodie ++ ++ -1 ++ 105.35 ++ ++ ++ ++12010996100276949EC86ACCDEB088DB01877A9A0E2B53AF2EC6BB8B042BDA14C6597EDC6C ++ Klassik Radio ++ Klassik Radio ++ ++ -1 ++ 105.8 ++ ++ ++ ++120109963563936CEE1E7D6B93A945FD9607A1EAC60D2FE23A4D222A8571F306FDDB447BCC ++ Hit Radio FFH Nordhessen ++ FFH ++ ++ -1 ++ 106.65 ++ ++ ++ ++1201099700A4AF799AEC5140A08E9CCC709595B2A508AAEF09DC1DAF710F0AC06432D93229 ++ RTL Radio - Die besten Hits mit Gef�hl ++ RTL Radio ++ ++ -1 ++ 107.2 ++ ++ ++ ++1201099740E0E7E0DB340AF8DDE58C6981D09FE7C5B8E6A6278CC15AD387BC40BE7677B96B ++ DEFJAY ++ DEFJAY ++ ++ -1 ++ 107.65 ++ ++ ++ ++1201099768FDAA47CB55582A630F00D1A94BBA7593014DE7B012357FB155BDD4AF8555FF68 ++ Jam FM ++ Jam FM ++ ++ -1 ++ 108 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp kradio-3.5.13.1/kradio3/presets/germany/hilden.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/hilden.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/hilden.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,353 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Uwe Kuhlmann, Uwe_Kuhlmann@web.de ++ 2005-05-03T18:20:35 ++ Germany ++ Hilden ++ cable ++ Gilt fr Hilden / Langenfeld / Leichlingen / Monheim / Leverkusen ++(any comment and thanx welcome!) ++ Enth�lt zusammengef�gte Eintr�ge ++ ++ ++ ++11135013660F9F721EC3DC80603B46C9B67D41EC8F353D462884758182C22E2077C5A6E497 ++ SWR1-Rheinland-Pfalz ++ 8 ++ ++ -1 ++ 87.6 ++ ++ ++ ++11135013665F0A1111D6314DAAF3D15B0190CCD182F24D0C60991DEEB9B94F59C1677AD451 ++ SWR4-Rheinland ++ 26 ++ ++ -1 ++ 87.9 ++ ++ ++ ++11135013665186333B9483BC89B57913499A9E70F6393DCCF34CC89877F80044FCE256AA7D ++ SWR3 ++ 9 ++ ++ -1 ++ 88.35 ++ ++ ++ ++1113501366138A802AD5A22ACBFB1DB303E0D67097FFB8B72914AFE4EADBB906627695F64C ++ WDR2-Wuppertal ++ 11 ++ ++ -1 ++ 88.95 ++ ++ ++ ++1113501366E5A9DE63878AF799B9CAF38BCF370DAA0E5A7B43A8FE9C640FA8668F704EE60C ++ WDR Radio 5 ++ ++ ++ -1 ++ 89.7 ++ ++ ++ ++11135013667E9887B5EEBE22B9DAFF23CFBA9E070109351EFC26A26286F63BDD19EE66E698 ++ JAM-FM ++ 24 ++ ++ -1 ++ 90.05 ++ ++ ++ ++1113501366CF2D50F282F0C22E452E6D7F3130773C446F5906C9305C2A45B53A8480F78890 ++ WDR2-Rhein-Ruhr ++ ++ ++ -1 ++ 90.6 ++ ++ ++ ++11135013662BDEA51AF1ABE96284621DF2E6EF55BB9C075ED63E16914AA95A561F4AB17C5A ++ WDR4 ++ ++ ++ -1 ++ 92.1753 ++ ++ ++ ++111350136699854D3B8C0FB6729070CB2AF25C72E672BE565F8B5742CCD6473CDCCB1CC863 ++ Radio Neandertal ++ 4 ++ ++ -1 ++ 92.5 ++ ++ ++ ++1113501366A7ADDEB8C9A8341BD6ED9BC754AE0E39DF172E9E4B20C7DE27A818F77196DDEA ++ DeutschlandRadio Berlin ++ 13 ++ ++ -1 ++ 93.4004 ++ ++ ++ ++111350136671FD32971DB55D9712623AE318937011D1F42C6F61C9D5E3918403B643C311DB ++ Eins Live (WDR) ++ ++ ++ -1 ++ 94.05 ++ ++ ++ ++111350136682160AC418966730CDA6BFA3264F27BFAA63D8D6481FA8EE12A0181C9C8B7CD7 ++ Deutschlandfunk ++ 14 ++ ++ -1 ++ 94.45 ++ ++ ++ ++1113501366D1D121522B0A5B8AE9527134DBFBE187C97A4DE7183C57F4D200C135F2C07957 ++ RTL RADIO - DIE GR�SSTEN OLDIES ++ 21 ++ ++ -1 ++ 95.3 ++ ++ ++ ++1113501366F8D933B2F83F720B5124C85435F071C19522579E89C89F7647F3ED2490EB223E ++ WDR Radio 5 Funkhaus Europa ++ 15 ++ ++ -1 ++ 96.75 ++ ++ ++ ++1113501366DB8E4FA3F8534872CFF67494232ECA2E0B1AE6E6B4E1E349DC5761EA766453F5 ++ Klassik Radio ++ 23 ++ ++ -1 ++ 97.05 ++ ++ ++ ++1113501366073A8DC7CF7DDE6CFC1A5B4F62B6CD4EB6E2EB932C338787F847B8C5BCC9DC92 ++ Radio Berg ++ ++ ++ -1 ++ 98.8 ++ ++ ++ ++1113501366C53472253704CB7F6B1FDE7D1EDF76DCB586336AD12FC2878F51F418B6516651 ++ Radio 3 (niederl.) ++ ++ ++ -1 ++ 100.951 ++ ++ ++ ++1113501366B41219F825DE19A759CF74E874FECBC14DB39ACECAEF16448257C009AAC7E55F ++ sunshine live ++ 20 ++ ++ -1 ++ 102.051 ++ ++ ++ ++1113501366CFE017DFCC8A99D4656566A73CAFCFE2C40FB8B50D2A30A748AB4A6B327F5AE9 ++ Radio Melodie - Heimatfunk mit Herz M�nchen ++ ++ ++ -1 ++ 102.551 ++ ++ ++ ++1113501366165B0CA74BF612CDEFF38DC3262780DCFFBD76523396DA987B648B5554AC6794 ++ SWR2-Rheinland-Pfalz ++ 10 ++ ++ -1 ++ 103.101 ++ ++ ++ ++1113501366FEB7AB3FBC338FB78E0BBBF284D377EEF809EE6A6835E323805BFC665B251CC9 ++ Radio RPR Eins-Rheinland ++ 7 ++ ++ -1 ++ 103.951 ++ ++ ++ ++1113501366C7761F0E03F265D63062F2FAA29B6547D786974D33512630893942E754E4856A ++ Radio RSG ++ 3 ++ ++ -1 ++ 104.25 ++ ++ ++ ++11135013666976F9AF303FC869DE76FC858BC99A1EA59CE7A085D422455D726D8F95E95109 ++ RPR Zwei ++ ++ ++ -1 ++ 105.4 ++ ++ ++ ++11151372270EC2A4BF0F3036909FAE1CAEB62513B25CD6CC458264FA0EBC0AEC2459AB9DF1 ++ Radio 2 (niederl.) ++ 19 ++ ++ -1 ++ 106.226 ++ ++ ++ ++1113501366A1FB1AB86226CDD00EFCB3EB6682621E1FD1F9F33EDCC22F0F4B532F7E70892F ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 106.501 ++ ++ ++ ++1115137175FDF5091456A1D516BAA383BCCB627DEEA81DD03FF84E9C717612D08113588191 ++ WDR Radio 5 ++ 1 ++ ++ -1 ++ 89.7752 ++ ++ ++ ++1115137180DFA1745F8A7300B22E767E411E1C589B2A4D6FD4EBF7999758BCA9B2636F21C8 ++ WDR 3 ++ 12 ++ ++ -1 ++ 91.3753 ++ ++ ++ ++1115137190DD24C928DD3EBFD3A52AC708916FF2D33FD9177C60BDD96C00FC13F655B0F5F0 ++ Deutschlandfunk ++ 5 ++ ++ -1 ++ 94.5255 ++ ++ ++ ++1115137191E6E3192689593527258FBE309B99ABC975756DA62A654060E611722D93D5395E ++ Antenne D�sseldorf ++ 2 ++ ++ -1 ++ 95.0255 ++ ++ ++ ++1115137197FCFA500F48697544E1D615FE25960E193ED884DFCBD792D151D7B04AAB7FE414 ++ WDR Radio 5 Funkhaus Europa ++ 7 ++ ++ -1 ++ 96.8256 ++ ++ ++ ++11151372038613F752A26302D72D4D81EC08D55D5EDA3399ADB0C44EDA4CC4F2771ACBD5B1 ++ Radio Berg ++ 5 ++ ++ -1 ++ 98.8757 ++ ++ ++ ++1115137205517685CB9E5B1C8C3EC2A3CA5BEACEEDF709791AF99BE3ECCAD34E89FDF56BD7 ++ hr3 ++ 25 ++ ++ -1 ++ 99.5508 ++ ++ ++ ++1115137207FD6AA54223126EE02DA3C2A6D9BCC41D14AF2F509ABE8DC0368769410D153A79 ++ BFBS (engl.) ++ 16 ++ ++ -1 ++ 100.026 ++ ++ ++ ++11151372129C623D6777686C2A80630E4E4D5A4418334033A86B30A1053C2FEA522F91D9B5 ++ ERF (Evangeliums-Rundfunk) ++ 22 ++ ++ -1 ++ 101.651 ++ ++ ++ ++1115137221EB4CC9C6A22DC1204E6087A523333CA4E6B34ECC70DB3D955C03680DDFD70B21 ++ Radio RSG ++ 17 ++ ++ -1 ++ 104.326 ++ ++ ++ ++11151372245CEB4DCA54C0376C7944BCB601E8C5489F66A2ABB6C147AC597D6AAD837F0CCC ++ bigFM ++ 17 ++ ++ -1 ++ 105.476 ++ ++ ++ ++111513723052CCEE3605297250E16967BE66424CD40A53BF4B8C025EA93479D4A446CFE13C ++ Domradio ++ 18 ++ ++ -1 ++ 107.126 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/konstanz-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/konstanz-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,255 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Daniel Stränger (dev at schmaller dot de) ++ 2006-12-18T12:35:21 ++ Germany ++ Konstanz ++ Cable Analog ++ ++ ++ ++ 116644167238F1321A4B015F1A70F1842BBD28B7DBA8363006066739ECFA4F89940729E454 ++ Deutschlandfunk ++ 1 ++ ++ -1 ++ 87.8 ++ ++ ++ 1166441674E3AAF2D536A35F27D5E131E302E18E17917B9494E129F68D1C024DABAE330D0B ++ Radio Seefunk ++ 2 ++ ++ -1 ++ 88.2 ++ ++ ++ 116644167511341F9D7375A102777A285699E9B19B32086C3D07F2C680124431E6BA88D8A1 ++ RSI 1 ++ 3 ++ ++ -1 ++ 88.8 ++ ++ ++ 1166441677044454339E85CB23E0FEA80C97395F0B5F082834621AFF71FA0F6ADCD0F2D3F6 ++ DASDING ++ 4 ++ ++ -1 ++ 89.7 ++ ++ ++ 116644153867318DD8FA616CB002B7FEFF3F116DF68E827BCC769BB7A021010251DDE8ABA9 ++ RTL Radio ++ 1 ++ ++ -1 ++ 90.1 ++ ++ ++ 11664416801E589D311ADF455D4FCB833AEDC04FCC43FB47826334173FBEB9A321E5C0D517 ++ SWR1 ++ 6 ++ ++ -1 ++ 91.1 ++ ++ ++ 1166441681D1C8EE34DA5B5FE2DEC676D3637C77289C1481479BB739B98EB1A72A6C8F095F ++ SWR2 ++ 7 ++ ++ -1 ++ 91.6 ++ ++ ++ 11664416828E205C849B191DF5451F0860CE93EA01C8E99D9FB0035582D32F18A738DFDFF6 ++ SWR3 ++ 8 ++ ++ -1 ++ 92.2 ++ ++ ++ 116644168351AFF8CAE8BC28FD39CE5D8AF01C87AE5FD7846FCD787A992E12A05389D80135 ++ SWR4 ++ 9 ++ ++ -1 ++ 92.6 ++ ++ ++ 1166441686E6B7B6A6F9330000DE77BE3F17D29949832AADED45E4A255C8D3C616A185B1C3 ++ Ö1 ++ 10 ++ ++ -1 ++ 93.7 ++ ++ ++ 1166441687E8198ED84131F832827B2A92B7C83EF390FC501C294FB8A402907055687F11AA ++ Ö2 (Radio Vorarlberg) ++ 11 ++ ++ -1 ++ 94.3 ++ ++ ++ 1166441688C0209D108F8D6916416D33514FCE4E8DF3C40A3A9B12FC57B1DA0B18F0106562 ++ Ö3 ++ 12 ++ ++ -1 ++ 94.7 ++ ++ ++ 1166441690A492F72FDB725DFEA7C727463535B570F301E39118BE6A85A5D6D0FFF73EDACE ++ FM4 ++ 13 ++ ++ -1 ++ 95.5 ++ ++ ++ 1166441691D64CE148BACD840CCFFE639FA2430DBF48793C6091BEB6DFC923237DE8311966 ++ Klassik Radio ++ 14 ++ ++ -1 ++ 96 ++ ++ ++ 11664416923BED343121C02899E757E85FC91F2D66A4FD30008839AA8FCB2B46A986831416 ++ Antenne Bayern ++ 15 ++ ++ -1 ++ 96.4 ++ ++ ++ 11664416935FA995580C00EB03AB99D6B8C3627B2F9AFD00555BABDBFBD8B6C847701951E5 ++ BR2 ++ 16 ++ ++ -1 ++ 96.7 ++ ++ ++ 11664416954251D17FFAB1C19888B3BDAF309017191E8491A11CCA94CAC4AEAFDFC87D98E4 ++ BR1 ++ 17 ++ ++ -1 ++ 97.5 ++ ++ ++ 1166441549E468A60BBEC88E3339CF1A6373AB4396A859CF4D6DD101AC9801A5D48F94A85B ++ BR3 ++ 2 ++ ++ -1 ++ 98 ++ ++ ++ 1166441698F67C9285970AC34FE783A1836A1A3E1803F76F49D7B12A09B29BA04B091FDF88 ++ BR4 ++ 19 ++ ++ -1 ++ 99.1 ++ ++ ++ 1166441700D7B89D336BB7B1F99B077C67043F15466D919E17B16DF11A94AAEE341731B07D ++ BR5 ++ 20 ++ ++ -1 ++ 99.7 ++ ++ ++ 1166441702B157AA712BABF263606A5E443DC45F86D96F95FBB356893A52EAA109DBC29C57 ++ ERF Radio ++ 21 ++ ++ -1 ++ 101.1 ++ ++ ++ 11664417049F25A61DD6C16564B65E024BB73D521960DA92AC806C2CF0E7E721EA611EFC7C ++ radio horeb ++ 22 ++ ++ -1 ++ 101.95 ++ ++ ++ 1166441554347C30787FB9E9EBDE1ACA28B860B5A9B93E591E1D50F99D9A967FE947F7ACC3 ++ DRS1 ++ 4 ++ ++ -1 ++ 102.65 ++ ++ ++ 1166441707031EB9C9E8C4151B05CFEC6A968FBD13B23893F4D94D4222F72A9062D39EBDCF ++ DRS2 ++ 24 ++ ++ -1 ++ 103.1 ++ ++ ++ 11664417087A318E1452B0D1B3F54AA8485AD3F67F74F5D44AD758C104C0B4FDD61F758339 ++ DRS3 ++ 25 ++ ++ -1 ++ 103.7 ++ ++ ++ 11664417100AB0C53D85FAADBF07AD5EB8C02384E12BA33BCFC23C5AF20800B674440827B6 ++ Radio Melodie ++ 26 ++ ++ -1 ++ 104.55 ++ ++ ++ 1166441711D189CA449A9546945255009207B5C9367287BF496B7001A7C938AC6A326901E3 ++ Radio 7 ++ 27 ++ ++ -1 ++ 104.85 ++ ++ ++ 116644171371F70255CFB196BCE5F932B0618CBE35F681F092278A13A69678CA61C6869C6E ++ JAM-FM ++ 28 ++ ++ -1 ++ 105.75 ++ ++ ++ 11664417167F4F1DFCFB7C204E8AB95C8D042E295FFB2EC595E441055F60325A48559F7CF8 ++ Deutschlandradio Kultur ++ 29 ++ ++ -1 ++ 107.25 ++ ++ ++ 1166441717BE71C69ECAF383473836EFB426F77A6155FAA5D9496658C99C2F4E6401FC5E74 ++ sunshine live ++ 30 ++ ++ -1 ++ 107.55 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/lippstadt-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/lippstadt-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,295 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Skutek <grf-chz@gmx.de> ++ 2007-12-18T15:31:54 ++ Germany ++ Erwitte/Lippstadt/Soest/Paderborn/Warstein ++ cable ++ Stand November 2007 ++ ++ ++ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 ++ hr1 ++ ++ ++ -1 ++ 87.9 ++ ++ ++ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 ++ hr2 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 ++ hr3 ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 ++ hr4-Rhein-Main-Journal ++ ++ ++ -1 ++ 88.95 ++ ++ ++ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 ++ 1LIVE (WDR) ++ ++ ++ -1 ++ 89.4 ++ ++ ++ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A ++ Deutschlandfunk ++ ++ ++ -1 ++ 90.1 ++ ++ ++ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 ++ Deutschlandradio Kultur ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 ++ WDR2 - Siegen ++ ++ ++ -1 ++ 90.75 ++ ++ ++ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 ++ NDR1 Radio NDS - Südwest ++ ++ ++ -1 ++ 91.15 ++ ++ ++ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 ++ NDR2 ++ ++ ++ -1 ++ 92.4 ++ ++ ++ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 ++ WDR3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F ++ NDR Kultur ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 ++ JUMP ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F ++ WDR4 ++ ++ ++ -1 ++ 94.25 ++ ++ ++ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF ++ Klassik Radio ++ ++ ++ -1 ++ 94.55 ++ ++ ++ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 ++ BR1 - Main/Franken ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 ++ WDR Radio 5 ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D ++ domradio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 ++ ERF (Evangeliums Rundfunk) ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 ++ Funkhaus Europa (WDR) ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 ++ SWR1 -Rheinland Pfalz ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C ++ SWR2 -Rheinland Pfalz ++ ++ ++ -1 ++ 98.25 ++ ++ ++ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B ++ SWR3 ++ ++ ++ -1 ++ 98.75 ++ ++ ++ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A ++ BFBS (engl.) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB ++ DEFJAY ++ ++ ++ -1 ++ 100.2 ++ ++ ++ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 ++ radio ffn - Osnabrück ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF ++ JAM FM ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E ++ Radio Melodie ++ ++ ++ -1 ++ 101.75 ++ ++ ++ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 ++ RTL Radio - Die besten Hits aller Zeiten ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D ++ sunshine live ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 ++ WDR2 Bielefeld/HIT RADIO FFH ++ ++ ++ -1 ++ 103.9 ++ ++ ++ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 ++ 2255LIVE Ihr Gewinnradio ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 ++ Radio Hochstift/AFN - Frankfurt ++ ++ ++ -1 ++ 106.85 ++ ++ ++ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 ++ Radio Siegen/Hellweg Radio/Radio Sauerland ++ ++ ++ -1 ++ 107.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/magdeburg-mdcc-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/magdeburg-mdcc-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,402 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ H.-J.v.Angern" <h.j.v.angern@mdcc-fun.de> ++ 2010-01-17T18:05:53 ++ Germany ++ Magdeburg ++ Cable ++ ++ ++ ++ 1263742682EFA8D7372495F12DC5035422BAD8D3846427919A16F52EF7FF445AFA377B ++ Hitradio Brocken ++ ++ ++ -1 ++ dontcare ++ 87.6 ++ ++ ++ 12637427327527D1C44D176E9453D15642882AA0A707E44309221E46E7F2880685268B ++ Jump MDR ++ ++ ++ -1 ++ dontcare ++ 87.9 ++ ++ ++ 1263742775EB08A061881C66DCB3F6458E4A460DA7AD2C5DCB1535E063FAE23F188826 ++ MDR 1 Sachsen Anhalt ++ ++ ++ -1 ++ dontcare ++ 88.35 ++ ++ ++ 1263742825D0BB7B10DA6EB23C2FAC12F3C684F04B4E90797356E2BCF667C133218BF6 ++ Sky Radio ++ ++ ++ -1 ++ dontcare ++ 88.8 ++ ++ ++ 1263742827A3842FCF15F38EFD4AE035EBD778E446BE23071188606E1A4D6974361B7F ++ Deutschland Radio ++ ++ ++ -1 ++ dontcare ++ 89.25 ++ ++ ++ 126374282814ADFADBE2EF1CE3D8D76C481B621D30EE27BBCFF14A52676918965C4945 ++ MDR Info ++ ++ ++ -1 ++ dontcare ++ 89.6 ++ ++ ++ 126374282923CF6A6384B154BD196B26FAEC0F46E5D2F75992F1A4CB1E3922E945756F ++ SAW ++ ++ ++ -1 ++ dontcare ++ 90 ++ ++ ++ 1263742830B389853BBD307C73B674DD3080C10A8D7CB8838BDD6057B175CA920FD3AA ++ Oldi Radio ++ ++ ++ -1 ++ dontcare ++ 90.3 ++ ++ ++ 1263742831CC06B9C80311B37D6466924D9AB2D3ADA554FF9DED60340AC9A039E9B3C8 ++ Rock Antenne ++ ++ ++ -1 ++ dontcare ++ 91.25 ++ ++ ++ 12637428322B4118EB5A3211F093974CCCC9927F9558491D774C8AA7E0A33F07700346 ++ Eins Live ++ ++ ++ -1 ++ dontcare ++ 91.65 ++ ++ ++ 1263742833D9A214651D3D206F59094AABE5E3353C48F4020AA8C27C76F836275592E0 ++ NDR 1 Radio Niederschsen ++ ++ ++ -1 ++ dontcare ++ 92.25 ++ ++ ++ 126374283318A69C075A277B3AE8BBC79F4E1E1CFF4D823EABB3E27F2EFC9AA217DDCC ++ NDR 2 ++ ++ ++ -1 ++ dontcare ++ 92.55 ++ ++ ++ 126374283421160FBC90ECB09B18979625B7F274B18546F9C5C97A246495B9AAE1A5E9 ++ FFH ++ ++ ++ -1 ++ dontcare ++ 92.9 ++ ++ ++ 126374283589E02D1E4A540935B08F8687AB04E172BB80B27849A0CDDFFF03174B4C17 ++ NDR Kultur ++ ++ ++ -1 ++ dontcare ++ 93.3 ++ ++ ++ 126374283631ED9E0026122FD10F2825536EC8979B1F01BEB7AD59A182A60DA6AB6337 ++ NDR Info ++ ++ ++ -1 ++ dontcare ++ 93.75 ++ ++ ++ 1263742837C5F29068AF8F6315053367092213F5A91FECB77C79B25DC7123F0F97CE96 ++ Deutsche Welle ++ ++ ++ -1 ++ dontcare ++ 94.35 ++ ++ ++ 126374283890A8F7FA29894A666714B8C172C8AC2B4AB800CFCE4CFAECCE5B89E97343 ++ Klassik Radio ++ ++ ++ -1 ++ dontcare ++ 94.35 ++ ++ ++ 126374283997A76504466255252E1563C2AB7F4C94AF7CB603B93CBF0F04A192200307 ++ HR 3 ++ ++ ++ -1 ++ dontcare ++ 94.8 ++ ++ ++ 1263742840F23D0ECD733FDD8E3731B6056CEB2E209AB55CDF408DC3D77D63C4213280 ++ WDR 2 ++ ++ ++ -1 ++ dontcare ++ 95.1 ++ ++ ++ 126374284156512415BAD6D5DDC43C6D31836973C0907AB8D029DFF6B517E53C2FDDF6 ++ Radio Multikulti ++ ++ ++ -1 ++ dontcare ++ 95.4 ++ ++ ++ 1263742841551253EE75D6424548E0CC1889E159736C4D2ADD3549A113C07F1F061CE2 ++ FFN ++ ++ ++ -1 ++ dontcare ++ 96 ++ ++ ++ 126374284252DC31E7051B8F2C4984B09241B8BB7819148D202E8E524B02774BD15A8A ++ Deutschlandfunk ++ ++ ++ -1 ++ dontcare ++ 96.75 ++ ++ ++ 12637428435D4645161BCED1C50EF09BF6CE85BEA46C166A1E2D64B19B1822D6700EAD ++ Antenne Niedersachsen ++ ++ ++ -1 ++ dontcare ++ 97.15 ++ ++ ++ 126374284413BE6B50358FE9B9ADF0A6EA2D9EDF035B91B1321D75EDF33D749E1CFA20 ++ HR 1 ++ ++ ++ -1 ++ dontcare ++ 97.6 ++ ++ ++ 126374284593B682D61F333A3D754C703C82F42B741DDE18D0C8A2CF8524399A3798F9 ++ JAM-FM ++ ++ ++ -1 ++ dontcare ++ 98.45 ++ ++ ++ 126374284646159C57300999149BF9E29B870F326D53B7AD3585AA98358AE57FB57D76 ++ Radio Kultur ++ ++ ++ -1 ++ dontcare ++ 98.85 ++ ++ ++ 1263742847858C45BB6735345C399F738AFF6F55013D910568D69A6A9A85C313021A5F ++ HR 4 ++ ++ ++ -1 ++ dontcare ++ 99.2 ++ ++ ++ 12637428482EBB68304452FDD74383FB9A44ED38027A32F0806F305E13C5368B14F616 ++ Bayern 4 ++ ++ ++ -1 ++ dontcare ++ 99.8 ++ ++ ++ 1263743544D78D9BED87ED0DF1E8519FB2AF5D2C111B20A29EFF9C93A1DFB9F96254C5 ++ MDR Sputnik ++ ++ ++ -1 ++ dontcare ++ 100.5 ++ ++ ++ 126374354537444BA44CBE30C1D397DA0991B3F9BF542115EEF022AFBC5E5FF290C7A5 ++ MDR Figaro ++ ++ ++ -1 ++ dontcare ++ 101.2 ++ ++ ++ 126374354645C945AE5A4783113FEEB24D935493E61DCD872EE2A134A465E863CD3876 ++ Fritz ! ++ ++ ++ -1 ++ dontcare ++ 101.7 ++ ++ ++ 12637435473D9A588A8A12B43BF3596ED13EFB1180A2A05719E7A8FB40D30A250A0056 ++ BFBS ++ ++ ++ -1 ++ dontcare ++ 102.2 ++ ++ ++ 1263743548B8232CCE6182B4CF3816782E0844B502DDF91E2C28351A0B5877367DE0D3 ++ SR 1 Europawelle ++ ++ ++ -1 ++ dontcare ++ 102.8 ++ ++ ++ 1263743549B9F2A5257233788E6F04310A8F1DD491442CA56AD73B0E5798C729B99EDC ++ YOU FM ++ ++ ++ -1 ++ dontcare ++ 103.1 ++ ++ ++ 1263743550BFDFB8BCD636A097518718168B3D5D61ECD57E40BCC0F277542874A1BA7C ++ Bayern 1 ++ ++ ++ -1 ++ dontcare ++ 103.7 ++ ++ ++ 1263743551B0AEC06DC0F6E54AEE4040B5C41574A6875E90B9911063287E2D6D26F294 ++ RBB 88.8 ++ ++ ++ -1 ++ dontcare ++ 104.15 ++ ++ ++ 126374355201213C9812FD21730D85E96DE0D3A52EF78B5E02A2715518232B56C8A7BD ++ Rockland Sachsen Anhalt ++ ++ ++ -1 ++ dontcare ++ 104.85 ++ ++ ++ 12637435532085DA6DFCF8ACF5D9110E3D8906C6787F5C5959EA24F6556F8B352E32CC ++ Radio Eins ++ ++ ++ -1 ++ dontcare ++ 105.15 ++ ++ ++ 12637435547572CEF30E8B572F74EFE1BD51A7857523DA4C6C72CE5231468DC024D09C ++ Sunshine Live ++ ++ ++ -1 ++ dontcare ++ 105.5 ++ ++ ++ 1263743941C06A86CC4F04B028AA968B5A1D0C649853283C5CC797B064E9291C30B25F ++ ORF 1 ++ ++ ++ -1 ++ dontcare ++ 105.9 ++ ++ ++ 1263743942BC75454A3292124CDCE7FCE62C833AA3C823D7B730489D91694921C82BBE ++ 89.0 RTL ++ ++ ++ -1 ++ dontcare ++ 106.4 ++ ++ ++ 126374394362921148E9ECCE4D0A53BAA6752E8C954750B5716E2DA94072190FB92E46 ++ Antenne Bayern ++ ++ ++ -1 ++ dontcare ++ 106.85 ++ ++ ++ 126374394436B325F6FA9AF7DA917B9D0F9651623DD1D358F20DDBFCAF846F16F20BDC ++ Antenne Brandenburg ++ ++ ++ -1 ++ dontcare ++ 107.6 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am kradio-3.5.13.1/kradio3/presets/germany/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/germany/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/germany/Makefile.am 2012-11-30 23:30:53.000000000 +0100 +@@ -1,244 +1,282 @@ + SUBDIRS = +-EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "worfelden-cable.krp" ++EXTRA_DIST = "aachen-antenna.krp" "aachen-cable-2.krp" "aachen-cable-3.krp" "aachen-cable.krp" "aichach-cable.krp" "amtzell-cable.krp" "aschaffenburg-cable.krp" "augsburg-cable.krp" "bayreuth.krp" "berlin-adlershof-antenna.krp" "berlin-antenna.2.krp" "berlin-antenna.krp" "berlin-cable.2.krp" "berlin-cable.3.krp" "berlin-cable.krp" "bielefeld-cable.krp" "bochum-cable.krp" "bonn-antenna.krp" "bonn-cable.krp" "bottenhorn-antenna.krp" "braunschweig2-cable.krp" "braunschweig-cable.krp" "bremen-cable.krp" "bremerhaven-antenna.krp" "bremerhaven-cable.krp" "bruchkoebel-cable.krp" "chemnitz-cable.krp" "cologne-cable-2.krp" "cologne-cable.krp" "cologne.krp" "coswig.krp" "dortmund-cable-2.krp" "dortmund-cable.krp" "dresden-cable.krp" "duesseldorf-cable.krp" "duesseldorf.krp" "emsdetten-cable.krp" "erfurt-cable.2.krp" "erfurt-cable.krp" "erlangen-cable.krp" "erlensee-cable.krp" "erlensee.krp" "erwitte-cable.krp" "erwitte-lippstadt.krp" "essen-cable.krp" "fischbachau-cable.krp" "frankfurth-am-main-cable.krp" "freiburg-cable.krp" "gelsenkirchen-cable.krp" "gerolsbach-cable.krp" "goettingen-cable.krp" "hamburg-antenna.krp" "hamburg-cable1.krp" "hamburg-cable-2.krp" "hamburg-cable2.krp" "hamburg-cable-3.krp" "hamburg-cable3.krp" "hamburg-cable4.krp" "hamburg-cable5.krp" "hamburg-cable.alternative.krp" "hamburg-cable.krp" "hanau-cable.krp" "hannover-antenna.krp" "hannover-cable.2.krp" "hannover-cable.krp" "heidelberg-cable.krp" "herzogenrath-cable.krp" "hilden-cable.krp" "hilden.krp" "ingolstadt-cable.krp" "juelich-cable.krp" "karlsruhe-cable.krp" "karlsruhe-noerdlicher-landkreis-cable.krp" "kiel-antenna.krp" "kirchzarten-cable.krp" "klingenthal-antenna.krp" "koeln-antenne.krp" "koeln-cable.2.krp" "koeln-cable.krp" "koeln-loevenich-cable.krp" "konstanz-cable.krp" "langenfeld-cable.krp" "langenselbold-cable.krp" "leer-ostfriesland-cable.krp" "leichlingen-cable.krp" "leipzig-cable.2.krp" "leipzig-cable.krp" "lennestadt-cable.krp" "leverkusen-cable.krp" "lippstadt-cable.krp" "ludwigsburg-antenna.krp" "luedenscheid-cable.krp" "magdeburg-mdcc-cable.krp" "maintal-cable.krp" "mainz-cable.krp" "mannheim-cable.krp" "meerbusch-struemp-cable.krp" "moenchengladback-cable.krp" "monheim-cable.krp" "muenchen-2.krp" "muenchen-antenna.krp" "muenchen-cable-2.krp" "muenchen-cable.krp" "muenchen-forstenried-antenna.krp" "muenchen.krp" "muenster-cable.krp" "muenster.krp" "muensterland-antenna.krp" "neuberg-cable.krp" "neuoetting.krp" "norderstedt-cable.krp" "nuernberg-cable-2.krp" "nuernberg-cable.krp" "oer-erkenschwick.krp" "oldenburg-cable.krp" "olpe-antenna.krp" "owen-cable.krp" "paderborn-cable.krp" "pfaffenhofen-ilm-cable.krp" "rheine-mesum-antenna.krp" "rodenbach-cable.krp" "saarbruecken-antenna.krp" "schifferstadt-cable.krp" "schwerte-cable.krp" "soest-cable.krp" "st.georgen-cable.krp" "stuttgart-cable-2.krp" "stuttgart-cable.krp" "tuebingen-cable.krp" "ulm-cable.2.krp" "ulm-cable.krp" "warstein-cable.krp" "weilheim-iOB.krp" "weingarten-cable.krp" "weinstadt-beutelsbach-cable.krp" "wernigerode-antenna.krp" "wilhelmshaven-cable.krp" "worfelden-cable.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/" +- $(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" +- $(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/muenchen-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" +- $(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" ++ $(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" ++ $(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" + $(INSTALL_DATA) "$(srcdir)/aichach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" ++ $(INSTALL_DATA) "$(srcdir)/amtzell-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bayreuth.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-cable.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp" ++ $(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/bonn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bremerhaven-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/bremerhaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" + $(INSTALL_DATA) "$(srcdir)/chemnitz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" ++ $(INSTALL_DATA) "$(srcdir)/coswig.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp" ++ $(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" + $(INSTALL_DATA) "$(srcdir)/duesseldorf.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" +- $(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" +- $(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" + $(INSTALL_DATA) "$(srcdir)/erlangen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" +- $(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bonn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/augsburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/cologne-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" +- $(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/erlensee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp" ++ $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" ++ $(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/frankfurth-am-main-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/goettingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" + $(INSTALL_DATA) "$(srcdir)/hamburg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" +- $(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/dresden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" + $(INSTALL_DATA) "$(srcdir)/hamburg-cable5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" +- $(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" + $(INSTALL_DATA) "$(srcdir)/hamburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/berlin-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" +- $(INSTALL_DATA) "$(srcdir)/aschaffenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/dortmund-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/braunschweig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/berlin-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" +- $(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/duesseldorf-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable1.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" +- $(INSTALL_DATA) "$(srcdir)/bremen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hanau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/herzogenrath-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/hilden.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp" ++ $(INSTALL_DATA) "$(srcdir)/ingolstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" + $(INSTALL_DATA) "$(srcdir)/karlsruhe-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/erfurt-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" +- $(INSTALL_DATA) "$(srcdir)/aachen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/karlsruhe-noerdlicher-landkreis-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/kirchzarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" ++ $(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/koeln-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" + $(INSTALL_DATA) "$(srcdir)/koeln-loevenich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/konstanz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/langenfeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" + $(INSTALL_DATA) "$(srcdir)/langenselbold-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/leer-ostfriesland-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/leipzig-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/leipzig-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/lennestadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/lippstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/luedenscheid-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/magdeburg-mdcc-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/meerbusch-struemp-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/moenchengladback-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/monheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" + $(INSTALL_DATA) "$(srcdir)/muenchen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/muenchen-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" + $(INSTALL_DATA) "$(srcdir)/muenchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/berlin-adlershof-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" +- $(INSTALL_DATA) "$(srcdir)/juelich-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/fischbachau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" +- $(INSTALL_DATA) "$(srcdir)/gelsenkirchen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/leverkusen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/berlin-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/muenchen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" + $(INSTALL_DATA) "$(srcdir)/muenster.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" +- $(INSTALL_DATA) "$(srcdir)/erfurt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/mannheim-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/erlensee-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/heidelberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bielefeld-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bottenhorn-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/erwitte-lippstadt.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" +- $(INSTALL_DATA) "$(srcdir)/cologne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" +- $(INSTALL_DATA) "$(srcdir)/koeln-antenne.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" +- $(INSTALL_DATA) "$(srcdir)/mainz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/muenster-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/muensterland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/neuberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bochum-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/dortmund-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/neuoetting.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" ++ $(INSTALL_DATA) "$(srcdir)/norderstedt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp" + $(INSTALL_DATA) "$(srcdir)/nuernberg-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" +- $(INSTALL_DATA) "$(srcdir)/leichlingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/ludwigsburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/cologne-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/braunschweig2-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/emsdetten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/aachen-cable-3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" +- $(INSTALL_DATA) "$(srcdir)/freiburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/maintal-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hannover-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/hannover-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/nuernberg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/oer-erkenschwick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp" ++ $(INSTALL_DATA) "$(srcdir)/oldenburg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/olpe-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/owen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/paderborn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/pfaffenhofen-ilm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/rodenbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/gerolsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hannover-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/saarbruecken-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/schifferstadt-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/schwerte-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/st.georgen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/soest-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/stuttgart-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" + $(INSTALL_DATA) "$(srcdir)/stuttgart-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable.alternative.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" +- $(INSTALL_DATA) "$(srcdir)/koeln-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" +- $(INSTALL_DATA) "$(srcdir)/klingenthal-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" +- $(INSTALL_DATA) "$(srcdir)/aachen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/bruchkoebel-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/hilden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/aachen-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/hamburg-cable4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" +- $(INSTALL_DATA) "$(srcdir)/kiel-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/berlin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/rheine-mesum-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/muenchen-forstenried-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/essen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" +- +- ++ $(INSTALL_DATA) "$(srcdir)/tuebingen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/ulm-cable.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/ulm-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/warstein-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/weilheim-iOB.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" ++ $(INSTALL_DATA) "$(srcdir)/weingarten-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/weinstadt-beutelsbach-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/wernigerode-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/wilhelmshaven-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/worfelden-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" ++ + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aichach-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/amtzell-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aschaffenburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/augsburg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bayreuth.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-adlershof-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.3.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bielefeld-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bonn-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bottenhorn-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bremerhaven-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/chemnitz-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bochum-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/coswig.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/cologne-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/braunschweig2-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dortmund-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/dresden-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/duesseldorf.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/emsdetten-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable-3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erfurt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlangen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erlensee.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/erwitte-lippstadt.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/fischbachau-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/frankfurth-am-main-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/freiburg-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gelsenkirchen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/goettingen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable1.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable-3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable5.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hanau-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/gerolsbach-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hannover-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable.alternative.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/bruchkoebel-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/heidelberg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/herzogenrath-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/aachen-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hamburg-cable4.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/hilden.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ingolstadt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/juelich-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/karlsruhe-noerdlicher-landkreis-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kiel-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/berlin-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/kirchzarten-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/klingenthal-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-antenne.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/koeln-loevenich-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/konstanz-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenfeld-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/langenselbold-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leer-ostfriesland-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leichlingen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leipzig-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lennestadt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/leverkusen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/lippstadt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ludwigsburg-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/luedenscheid-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/magdeburg-mdcc-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/maintal-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mainz-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/mannheim-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/meerbusch-struemp-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/monheim-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/moenchengladback-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenchen-forstenried-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/essen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muenster.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/muensterland-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuberg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/neuoetting.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/norderstedt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/nuernberg-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oer-erkenschwick.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/oldenburg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/olpe-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/owen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/paderborn-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/pfaffenhofen-ilm-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rheine-mesum-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/rodenbach-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/saarbruecken-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schifferstadt-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/schwerte-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/soest-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/st.georgen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/stuttgart-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/tuebingen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/ulm-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/warstein-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weilheim-iOB.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weingarten-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/weinstadt-beutelsbach-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wernigerode-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/wilhelmshaven-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/germany/worfelden-cable.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/norderstedt-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/norderstedt-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,450 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2009-02-14 ++ Gerhard-Czech@web.de ++ ++ Germany ++ Norderstedt ++ cable ++ wilhelm.tel Senderliste ++ ++ ++ ++1063385350B84E83FC624D588B9BE2C16667AF463CE62AE705548F65C08E293A455B179381 ++ Radio Hamburg ++ Radio HH ++ ++ -1 ++ 88.05 ++ ++ ++ ++106338535026BB6D13F62EB11F9202671BE547076886D906672B3BA433EEA32DEE1D5CFBBC ++ Deutschlandradio Kultur ++ Deutschlandradio Kultur ++ ++ -1 ++ 88.5 ++ ++ ++ ++10633853501AC822C1346D33E13696EEC91ACF26BA372F11213BD45B4EE82A96C15FA32287 ++ WDR 3 ++ WDR 3 ++ ++ -1 ++ 88.8 ++ ++ ++ ++1063385350373BB2F1ABE25FE88366C4630D30676015E09340196CE2D9CA144A574BF9E312 ++ NDR 1 Radio Niedersachsen ++ NDR 1 RN ++ ++ -1 ++ 89.25 ++ ++ ++ ++106338535060116062B40326BB376BFE3AFC499BED2E9977E2FD33EFC4C2EA9A8EC7536CA9 ++ NDR 1 Welle Nord ++ NDR1 WN ++ ++ -1 ++ 89.85 ++ ++ ++ ++1063385350EE3CB6DB0F51E1AA3983153965EA7FA09DCE13F03EF634CB5831F8DB746ADD02 ++ NDR 4 Info Spezial ++ NDR 4 ++ ++ -1 ++ 90.15 ++ ++ ++ ++106338535093FD8B50CD14B4DEDDCAB424AD4A236A3B5132F5A742DD5AE35A1523EA82761E ++ N-Joy Radio ++ N-Joy ++ ++ -1 ++ 90.55 ++ ++ ++ ++106338535044CA129A3069F2F21913EF30FA88A204A17C4F3B771FDB8D37D72B5897D516E6 ++ 1-Live ++ 1-Live ++ ++ -1 ++ 91 ++ ++ ++ ++106338535054196C1A743CDE1D0B11CAA8DE8ACD3A7AFB00ABE2A2803F3E6FBA8EA828014B ++ hr 1 ++ hr 1 ++ ++ -1 ++ 91.5 ++ ++ ++ ++1063385350DE5AD2FDA58E954D66478D9324226E127F9223095557A8D3DFFFEF16FB37C337 ++ Radio Nora ++ Radio Nora ++ ++ -1 ++ 91.85 ++ ++ ++ ++10633853509EAAA7B362EC8BCFC1629FA3834FF7A76B91D6C4BFF4CDC3BB222C79D9568692 ++ hr 2 kultur ++ hr 2 kultur ++ ++ -1 ++ 92.1 ++ ++ ++ ++10633853500A5320B468F00DDB554C8AFD8D8DB4366DDE401B68B8C10D4BF1100A550E3138 ++ hr 3 ++ hr 3 ++ ++ -1 ++ 92.5 ++ ++ ++ ++1063385350508688C1414B72DB224F647C9BBD7A21F19D3F86897B0A82ECB4DBEABAE2C92E ++ SWR 1 ++ SWR 1 ++ ++ -1 ++ 92.8 ++ ++ ++ ++10633853506439B306C57FD4A5340C8F7E7364CBEFE1372C60178FEF29688E0627A218BC52 ++ NDR 90,3 ++ NDR 90,3 ++ ++ -1 ++ 93.2 ++ ++ ++ ++106338535021D5A21FDEDA49C85D63E57004F55638248728F0BFD40F7671CC9BBC5AEA95DB ++ SWR 2 ++ SWR 2 ++ ++ -1 ++ 93.6 ++ ++ ++ ++1063385350D34BD6644543C07C38FA2D661672A512583CC51AD16F6F0DE32CC4697AEB1118 ++ NDR Info ++ NDR Info ++ ++ -1 ++ 94.05 ++ ++ ++ ++1063385350FF40EDBD2E10FDAD51A29E107DCAF7077E29E1736E60CB0BDDFA49A551A6A1C2 ++ NDR 2 ++ NDR 2 ++ ++ -1 ++ 94.65 ++ ++ ++ ++10633853500D6CCAD018C68368688B649B1ACFEE285A557AB5C0FDA660E65718DB691499E1 ++ MDR Sputnik ++ MDR Sputnik ++ ++ -1 ++ 95.1 ++ ++ ++ ++1063385350EBE5C823BACEAE26C7FF138AE71E7711B738C34E75208D92DC51ED5FB9C2FB5E ++ Tide 96,0 + HH Lokalradio ++ Tide + HH Lokal ++ ++ -1 ++ 95.45 ++ ++ ++ ++106338535011B527125E5F38884C3CF693AB2004D3E1C810FD877D2B4213FEFD3836370889 ++ NDR Kultur ++ NDR Kultur ++ ++ -1 ++ 95.75 ++ ++ ++ ++1063385350AB3F8EE6BAC5C355404FD149F70CF608788C42CBCD172722787BFE29CFBAA8BA ++ Bayern 1 ++ Bayern 1 ++ ++ -1 ++ 96.1 ++ ++ ++ ++1063385350601899CA33011371470A528C450992A0D64DD34A718C7BCE4AF47EF312D4B136 ++ Bayern 2 ++ Bayern 2 ++ ++ -1 ++ 96.4 ++ ++ ++ ++106338535068C208A46296C2BE28873616D9C401F53E209937F709EDC3EB6EB7BE49EC4F02 ++ 106!8 rock'n pop ++ 106!8 rock'n pop ++ ++ -1 ++ 96.75 ++ ++ ++ ++10633853502006935D7247875D8AA64C3B2AF8933D5B8D3650A1CAE77A4C6B677833772F0E ++ Oldy 95 ++ Oldy 95 ++ ++ -1 ++ 97.25 ++ ++ ++ ++1063385350169E84364F4F9F4D3C3547FAC7365B9521BEFAB964624811D599177AA4E77E55 ++ radio Paloma ++ radio Paloma ++ ++ -1 ++ 97.5 ++ ++ ++ ++10633853503D5AA8B2230615373C62861989B4AD0EB99F4EAED33ECF1EBF06B5967FCD831A ++ bremen 1 ++ bremen 1 ++ ++ -1 ++ 97.95 ++ ++ ++ ++10633853507248B4D0A7AD9E7DF13B1893C01E6FC349E736D790CD33B3D0696E9063E85E46 ++ RTL Radio ++ RTL Radio ++ ++ -1 ++ 98.2 ++ ++ ++ ++1063385350F6080C0CB178074EB190CA8E77340D8267A33B6C3C3E58B87D1E3255DD0AF5D5 ++ Klassik Radio ++ Klassik Radio ++ ++ -1 ++ 98.6 ++ ++ ++ ++106338535094733F26C046A7795D27ED029389749370E31C7C1C78483134F220F8D8FAD4A7 ++ Antenne Bayern ++ Antenne Bayern ++ ++ -1 ++ 98.9 ++ ++ ++ ++1063385350FAD03C1D4B5A46C859A3A110D862C8523602E39385B8E5E402B94A751731F2EC ++ Radio ffn ++ Radio ffn ++ ++ -1 ++ 99.35 ++ ++ ++ ++10633853500526AA9671790C3BB2211D6DF78CC72D1ABB18733ED5803200B3B1B0ED13C46A ++ Energy 97,1 Hamburg ++ Energy ++ ++ -1 ++ 99.65 ++ ++ ++ ++10633853502CD554F9AD1EB9D0727B9D0621D03342D67D2F526DC6C43040F140D1D8412A88 ++ NDR 1 MV ++ NDR 1 MV ++ ++ -1 ++ 99.9 ++ ++ ++ ++1063385350FCC367BB28B3F06B05EE9436A580DD111C23C69BA950EFFF390F827E9539BB65 ++ Bayern 4 ++ Bayern 4 ++ ++ -1 ++ 100.2 ++ ++ ++ ++106338535048C54A30155C428309B238A6B368938D90074D049CAC4719607EAB5CF7D1CBB3 ++ Das Ding ++ Das Ding ++ ++ -1 ++ 100.5 ++ ++ ++ ++10633853506D9D33CCAD3D2A21934D4332B28A106F4E7B556D2E85E73D1CA9694FE389A9BF ++ WDR 2 ++ WDR 2 ++ ++ -1 ++ 100.8 ++ ++ ++ ++106338535090C69B1F51500F2011BA197DBBF8655430B7EBCE140C874329F8C8C8B0CEA50A ++ you fm ++ you fm ++ ++ -1 ++ 101.3 ++ ++ ++ ++1063385350B7953D6A790A5AB4818383A12C503EC062B044FCA52ABF433AA19E42A49283BF ++ sunshine live ++ sunshine live ++ ++ -1 ++ 101.6 ++ ++ ++ ++1063385350FC80A9732793334A7DAC69EA8F7B486EC7160FC3F7A6E592E08C280C7D06F449 ++ Fritz! ++ Fritz! ++ ++ -1 ++ 102 ++ ++ ++ ++12340016715898BD9CD68481FA7E9268C59FDCF206A92F6C2FC4D81F4BF99B1CD14087279D ++ Deutschlandfunk ++ Deutschlandfunk ++ ++ -1 ++ 102.3 ++ ++ ++ ++1234001676F3C24D22C4CEFAAF59368B1C6175B9A112326DD02540159968DCE362531E47BF ++ Hit-Radio Antenne ++ Hit-Radio ++ ++ -1 ++ 102.75 ++ ++ ++ ++1234004410D728141F410BBB7AE00435D01B95B781EAA667EFA34510D49D1F3B511BF1421B ++ SWR 3 ++ SWR 3 ++ ++ -1 ++ 103 ++ ++ ++ ++1234004410592FCEB5589B5E7B2E730AB5CB789633232C5CAF6D6D19C59D09BBC989CB022F ++ Bayern 3 ++ Bayern 3 ++ ++ -1 ++ 103.4 ++ ++ ++ ++1234004411DFC8AC8BFB2B7B5065F7BE40919DA57485B510CAAA1DA6C66D5B15185BF1FBEF ++ delta radio ++ delta radio ++ ++ -1 ++ 103.75 ++ ++ ++ ++123400445658D18DC5F7E316C14349DAA777FE6EC95255EC80D8E33B208D502CC98C97C9B5 ++ R.SH Radio Schleswig-Holstein ++ R.SH ++ ++ -1 ++ 104.4 ++ ++ ++ ++123400445766065E8E29FA0613993EAF2667A8B3E9D6AF0F4ADACEC66F591C43800662D112 ++ Nordwest Radio ++ Nordwest Radio ++ ++ -1 ++ 104.7 ++ ++ ++ ++12340044573D82674FCA85A381784833081DFDF233C9C032301D07C8CAB368BD735FAAA9CC ++ Freies Sender Kombinat (FSK) ++ Freies Sender Kombinat ++ ++ -1 ++ 105.7 ++ ++ ++ ++1234004409F068FBDBCEF941ACA3B7C82B7DBBCE43BF5287F6A4B96407FA5343837E171138 ++ BFBS ++ BFBS ++ ++ -1 ++ 107 ++ ++ ++ ++1234004458B512B7DC7D8646454A0094CF9F2930306C137063BF00680315D0802EDEDA67B4 ++ Jam FM ++ Jam FM ++ ++ -1 ++ 107.3 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/oer-erkenschwick.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/oer-erkenschwick.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,175 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Uwe Thaler, <Uwe.Thaler@t-online.de> ++ 2003-12-23T22:02:09 ++ Deutschland ++ Essen ++ Kabel ++ Liste Radio Kabelcom Essen ++ ++ ++ 111645544461FE8EC7D53496B0149CC2169AFF2BE5A321887F26EA65C4C52540225748C2DE ++ RTL Radio ++ RTL R ++ ++ -1 ++ 104.8 ++ ++ ++ 1116455444132EC8910552A076B2263EB4FB6DA83828A0EDE6BACD06C3147D3D1D432A0B84 ++ Deutschlandfunk ++ DLF ++ ++ -1 ++ 87.5 ++ ++ ++ 1116455444C33A968EE2BF1BB48608049D2CF4CF12067F88AD3A8399924505353DC2F8C1B1 ++ WDR 4 ++ WDR 4 ++ ++ -1 ++ 91.35 ++ ++ ++ 11164554441C32631CB6263AF15048C040D027B28AFFC9380A2B9027721DAC470EFF0F2B13 ++ WDR Eins Live ++ Eins Live ++ ++ -1 ++ 88.25 ++ ++ ++ 1116455444EC9767FF57C695D2BC57D4E9960583C198339CBC10C280ADC8967430FA73362C ++ Deutschland Radio Berlin ++ DR ++ ++ -1 ++ 90.2 ++ ++ ++ 11164554447E69E7F5DC8891C1EC85A6BABE9DA55BF3F972E92D42A27D94189964F338DAEF ++ WDR III ++ WDR III ++ ++ -1 ++ 90.65 ++ ++ ++ 111645544489F961FBA68B91A2590ED0348782FD901D630C4B10247EE161FF365EDA52A0A4 ++ Funkhaus Europa - WDR 5 ++ WDR 5 FHE ++ ++ -1 ++ 91.25 ++ ++ ++ 11164554447D2214728E8C6A0FE7F397222627101A4A4186A81B2C51C0D9C9E66A4A91DE81 ++ wdr II ++ wdr ii ++ ++ -1 ++ 89.15 ++ ++ ++ 1116455444DCD947F01824F0A55659C25B627F517E6ADDF5B00B3FB2A658F738A482055810 ++ Klassik Radio ++ Klassik ++ ++ -1 ++ 107.5 ++ ++ ++ 11164554446002034B38BC07A94EDA8819EF2177282B18B46232A19A5ECE0901DF6A0D4D85 ++ NDR 2 ++ NDR 2 ++ ++ -1 ++ 98.7 ++ ++ ++ 1116455444B6F7C6375D08F52073F4D132CEC84048966F773C1492E82A05585CCA2C11A891 ++ HR 3 ++ HR 3 ++ ++ -1 ++ 96.15 ++ ++ ++ 111645544479D905B9328F1AC358A01F714EE8C17400018AE87DBED4CE5C7F625F914B5FDB ++ domradio ++ dom ++ ++ -1 ++ 96.25 ++ ++ ++ 111645544480377316E6435D71F5EB8AA0402FB46031174B80C5AC418AE0C0CCDAEDA937A2 ++ bigFM Rheinland-Pfalz ++ bigFM ++ ++ -1 ++ 97.35 ++ ++ ++ 11164554449784A88F4B6C63A7C41D755BE911D687B4C687070880F5B28605E85AECA30754 ++ SWR 4 Rheinland ++ SWR 4 ++ ++ -1 ++ 97.75 ++ ++ ++ 1116455444D5E482E6616E9D6E5D5BDFE5A04193005823CE44E87B48484DF749B8FF8D035B ++ SWR 3 ++ SWR 3 ++ ++ -1 ++ 98.75 ++ ++ ++ 11164554440A3113553BB364D4A20AE066334DE449CA5C17CCA426E8FA1D1EDCCB375D94B6 ++ SWR 1 Rheinland-Pfalz ++ SWR 1 ++ ++ -1 ++ 91.7 ++ ++ ++ 11164554447A369B21CFC99C0BF2B72914C742BE496DFDFCD025658A93E387411759BBFA9D ++ sunshine live ++ Sunshine ++ ++ -1 ++ 102.55 ++ ++ ++ 1116455444C55AFCD21C815FB71F984EABA23B215432E193FCC8D4F77B9722D39CCA020CF2 ++ BFBS ++ BFBS ++ ++ -1 ++ 103.7 ++ ++ ++ 111645544418C2B1594DAF8F9AD98E1A3D4EC894D3A74B163377373AA0D594B4690538B502 ++ WDR 5 ++ WDR 5 ++ ++ -1 ++ 105.5 ++ ++ ++ 11164554446B06F6FC468822B3823EA87329E6F0A6F352A325BC2618FB8037056CC8A53191 ++ Radio Melodie ++ Melodie ++ ++ -1 ++ 105.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/paderborn-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/paderborn-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,295 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Skutek <grf-chz@gmx.de> ++ 2007-12-18T15:31:54 ++ Germany ++ Erwitte/Lippstadt/Soest/Paderborn/Warstein ++ cable ++ Stand November 2007 ++ ++ ++ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 ++ hr1 ++ ++ ++ -1 ++ 87.9 ++ ++ ++ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 ++ hr2 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 ++ hr3 ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 ++ hr4-Rhein-Main-Journal ++ ++ ++ -1 ++ 88.95 ++ ++ ++ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 ++ 1LIVE (WDR) ++ ++ ++ -1 ++ 89.4 ++ ++ ++ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A ++ Deutschlandfunk ++ ++ ++ -1 ++ 90.1 ++ ++ ++ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 ++ Deutschlandradio Kultur ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 ++ WDR2 - Siegen ++ ++ ++ -1 ++ 90.75 ++ ++ ++ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 ++ NDR1 Radio NDS - Südwest ++ ++ ++ -1 ++ 91.15 ++ ++ ++ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 ++ NDR2 ++ ++ ++ -1 ++ 92.4 ++ ++ ++ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 ++ WDR3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F ++ NDR Kultur ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 ++ JUMP ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F ++ WDR4 ++ ++ ++ -1 ++ 94.25 ++ ++ ++ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF ++ Klassik Radio ++ ++ ++ -1 ++ 94.55 ++ ++ ++ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 ++ BR1 - Main/Franken ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 ++ WDR Radio 5 ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D ++ domradio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 ++ ERF (Evangeliums Rundfunk) ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 ++ Funkhaus Europa (WDR) ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 ++ SWR1 -Rheinland Pfalz ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C ++ SWR2 -Rheinland Pfalz ++ ++ ++ -1 ++ 98.25 ++ ++ ++ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B ++ SWR3 ++ ++ ++ -1 ++ 98.75 ++ ++ ++ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A ++ BFBS (engl.) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB ++ DEFJAY ++ ++ ++ -1 ++ 100.2 ++ ++ ++ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 ++ radio ffn - Osnabrück ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF ++ JAM FM ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E ++ Radio Melodie ++ ++ ++ -1 ++ 101.75 ++ ++ ++ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 ++ RTL Radio - Die besten Hits aller Zeiten ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D ++ sunshine live ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 ++ WDR2 Bielefeld/HIT RADIO FFH ++ ++ ++ -1 ++ 103.9 ++ ++ ++ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 ++ 2255LIVE Ihr Gewinnradio ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 ++ Radio Hochstift/AFN - Frankfurt ++ ++ ++ -1 ++ 106.85 ++ ++ ++ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 ++ Radio Siegen/Hellweg Radio/Radio Sauerland ++ ++ ++ -1 ++ 107.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/soest-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/soest-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,295 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Skutek <grf-chz@gmx.de> ++ 2007-12-18T15:31:54 ++ Germany ++ Erwitte/Lippstadt/Soest/Paderborn/Warstein ++ cable ++ Stand November 2007 ++ ++ ++ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 ++ hr1 ++ ++ ++ -1 ++ 87.9 ++ ++ ++ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 ++ hr2 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 ++ hr3 ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 ++ hr4-Rhein-Main-Journal ++ ++ ++ -1 ++ 88.95 ++ ++ ++ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 ++ 1LIVE (WDR) ++ ++ ++ -1 ++ 89.4 ++ ++ ++ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A ++ Deutschlandfunk ++ ++ ++ -1 ++ 90.1 ++ ++ ++ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 ++ Deutschlandradio Kultur ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 ++ WDR2 - Siegen ++ ++ ++ -1 ++ 90.75 ++ ++ ++ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 ++ NDR1 Radio NDS - Südwest ++ ++ ++ -1 ++ 91.15 ++ ++ ++ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 ++ NDR2 ++ ++ ++ -1 ++ 92.4 ++ ++ ++ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 ++ WDR3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F ++ NDR Kultur ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 ++ JUMP ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F ++ WDR4 ++ ++ ++ -1 ++ 94.25 ++ ++ ++ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF ++ Klassik Radio ++ ++ ++ -1 ++ 94.55 ++ ++ ++ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 ++ BR1 - Main/Franken ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 ++ WDR Radio 5 ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D ++ domradio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 ++ ERF (Evangeliums Rundfunk) ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 ++ Funkhaus Europa (WDR) ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 ++ SWR1 -Rheinland Pfalz ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C ++ SWR2 -Rheinland Pfalz ++ ++ ++ -1 ++ 98.25 ++ ++ ++ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B ++ SWR3 ++ ++ ++ -1 ++ 98.75 ++ ++ ++ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A ++ BFBS (engl.) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB ++ DEFJAY ++ ++ ++ -1 ++ 100.2 ++ ++ ++ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 ++ radio ffn - Osnabrück ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF ++ JAM FM ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E ++ Radio Melodie ++ ++ ++ -1 ++ 101.75 ++ ++ ++ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 ++ RTL Radio - Die besten Hits aller Zeiten ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D ++ sunshine live ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 ++ WDR2 Bielefeld/HIT RADIO FFH ++ ++ ++ -1 ++ 103.9 ++ ++ ++ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 ++ 2255LIVE Ihr Gewinnradio ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 ++ Radio Hochstift/AFN - Frankfurt ++ ++ ++ -1 ++ 106.85 ++ ++ ++ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 ++ Radio Siegen/Hellweg Radio/Radio Sauerland ++ ++ ++ -1 ++ 107.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/warstein-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/warstein-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,295 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Skutek <grf-chz@gmx.de> ++ 2007-12-18T15:31:54 ++ Germany ++ Erwitte/Lippstadt/Soest/Paderborn/Warstein ++ cable ++ Stand November 2007 ++ ++ ++ 114450340207C9EC019103333DD933DB3D41B013A5DBCD356C7C0156EC2621FFE73E2E1422 ++ hr1 ++ ++ ++ -1 ++ 87.9 ++ ++ ++ 11979868315767ED87ABDCA3F73B04322F6206B14F773ED7E81FC949B7B917B81EF87984D1 ++ hr2 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 1197986852E0BA8D97BC6BF8B6F04716CCB00AFD5BA6CA8D995F250ADFC88B43614B7E5AE0 ++ hr3 ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 1197986866BE1DADCE0F0E42B595DD4288C996D964AD374F437A3906B45D94BDCCD1BE6608 ++ hr4-Rhein-Main-Journal ++ ++ ++ -1 ++ 88.95 ++ ++ ++ 1197986909AD581EDE997059F3C6CC8819EBBD6B105A638890EDF6EEC1367989592610E114 ++ 1LIVE (WDR) ++ ++ ++ -1 ++ 89.4 ++ ++ ++ 1197986931F17E9C615493539955C1EC0EF343650D8F7DA4B9C6041CD0D69C902133DB213A ++ Deutschlandfunk ++ ++ ++ -1 ++ 90.1 ++ ++ ++ 1197987067CC1D11E88CEB439A2971E3EA37CD91D2198D195200E23B1E513595216718AF49 ++ Deutschlandradio Kultur ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1197987131A4D57985DAB88CE5F5FD087D7AE116E6282CDD7364EC96923A31B27460A17F08 ++ WDR2 - Siegen ++ ++ ++ -1 ++ 90.75 ++ ++ ++ 11979871554A28B730087295ECEDC97D5CC4C045AECF4659EC7707BAFE11A300C6898D3A62 ++ NDR1 Radio NDS - Südwest ++ ++ ++ -1 ++ 91.15 ++ ++ ++ 1197987252499B438A8E799C135278EBD9586CA2CEAF206718CE511DC2E92AACB959B36D61 ++ NDR2 ++ ++ ++ -1 ++ 92.4 ++ ++ ++ 119798730883FC7BC6FC9B8C1B86BB0882EFE3755A9DBBCEAF589591E471394AEB409EB2D3 ++ WDR3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 11979873449E7C8E68A6635830D8AC751D3BD858FBC3960043A771F89A667A91BA65BC508F ++ NDR Kultur ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 119798736890B370856BE148CE631DDCAB6CFA0D79E81E4D9E60F21097B6D38C4FCA789C07 ++ JUMP ++ ++ ++ -1 ++ 93.7 ++ ++ ++ 1197987485166889A954363A8DE0C754A46B40020324C1C968A5FF0C883CDF0E78443C5D0F ++ WDR4 ++ ++ ++ -1 ++ 94.25 ++ ++ ++ 1197987437D8721C8F480ADB9F3869D60A9840E4488D4391C88874539493913EB5190941CF ++ Klassik Radio ++ ++ ++ -1 ++ 94.55 ++ ++ ++ 11979875453FC43ED757D67156ACD3DD7793BD277832FBB9377325918D1566A316D47EC4A9 ++ BR1 - Main/Franken ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1197987582D0E56E3C8B78E7BD25A9319022AA135BDBE0B49CEDCBB2E8F001B29E094C3884 ++ WDR Radio 5 ++ ++ ++ -1 ++ 95.3 ++ ++ ++ 1197987606F3D8F880795A58EC4F1124EEEAE76850E0B2A059ED2A70683DC701F3D2BF245D ++ domradio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ 1197987621D6E3651BC1BF906B63FF8EB270BB6F90D6DB2C02B038DEA665756653B334F897 ++ ERF (Evangeliums Rundfunk) ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 119798765736AEA129913DE99B3426AF4ADC7E340B5A7B7AED1CCDDE8EC76296B09C423D01 ++ Funkhaus Europa (WDR) ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 119798769112502D98951FF11CADB1DC9EB105B9964B1B3A17BDE9C6C7C818698387B43419 ++ SWR1 -Rheinland Pfalz ++ ++ ++ -1 ++ 97.9 ++ ++ ++ 1197987723C79B778DCF02D944361683F670B920D8E7C39BF70929C4EE32FFD87D8440486C ++ SWR2 -Rheinland Pfalz ++ ++ ++ -1 ++ 98.25 ++ ++ ++ 11979877587B06BE4AF2EAB1091AB646BED3259CDFB0C134AC2C81293DDC0DEAC6A4E3308B ++ SWR3 ++ ++ ++ -1 ++ 98.75 ++ ++ ++ 119798780166E3714E22772C455A033A1CFA28C3E77878DCEC6A3B4175B5E61E06CC52410A ++ BFBS (engl.) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ 1197987827AB34BCC724E18AC2C71802F3179B5B6DEE7F336095613F5482AC66678228EFCB ++ DEFJAY ++ ++ ++ -1 ++ 100.2 ++ ++ ++ 1197987878A21E2BB0E25A28C9D6ACA5F558598FFAF9B94C76E39BD0657E48379AD383AD54 ++ radio ffn - Osnabrück ++ ++ ++ -1 ++ 100.6 ++ ++ ++ 1197987901E20AFE673939F11F6DBFBF836B60E4FB392C2FF2671F08EBF3E0EEA6D4C980FF ++ JAM FM ++ ++ ++ -1 ++ 101.4 ++ ++ ++ 1197987940743D0846684D5CB76EEADFD2B4340D4020DDB0567C980A8727A0879350934F2E ++ Radio Melodie ++ ++ ++ -1 ++ 101.75 ++ ++ ++ 11979879652E1C41E69B8ECD89F4B7157AB885D7D3EE1C95B1F5966A1B9AF973A0B9C2C744 ++ Radio 4 (niederl.) ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1197988046251E2597C50D120FB5C8260CE5538E38C4FC76F72ECEEDACFB254764D8228F83 ++ RTL Radio - Die besten Hits aller Zeiten ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 1197988078C3FADE7BAA4134CFB83477C4574EF0CBFB1EA0DFBA8166EA7530D7B1FD88964D ++ sunshine live ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1197988103EF8487A6F7FACD54ADC588E328E8680AC5BD818C581406794A8C006BF43B8AD5 ++ WDR2 Bielefeld/HIT RADIO FFH ++ ++ ++ -1 ++ 103.9 ++ ++ ++ 1197988199F92A5C939879A113E897288CFB17C499006FDD73D8871A5D44E4D79A39CC9DF7 ++ 2255LIVE Ihr Gewinnradio ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1197988237FD341AEE5D2CFC37F068E04935358106E861610FC905AD565B5D58165536BA59 ++ Radio Hochstift/AFN - Frankfurt ++ ++ ++ -1 ++ 106.85 ++ ++ ++ 119798827641AF6BCA28302B2C75D9368C54466A7E0B3C66FD24F76E6BF899C5E33E8A5265 ++ Radio Siegen/Hellweg Radio/Radio Sauerland ++ ++ ++ -1 ++ 107.4 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/germany/wilhelmshaven-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/germany/wilhelmshaven-cable.krp 2012-11-30 23:30:53.000000000 +0100 +@@ -0,0 +1,277 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Michael Herbers, <michael.herbers@gmx.de> ++ 2007-12-11T23:23:26 ++ Germany ++ Wilhelmshaven ++ cable ++ tux fan ++ ++ ++ ++1091290560F19DCAC9442D72D89504676F5CED64569520089652BE8A8A468E3AE29FBDFA1E ++ NDR 1 Niedersachsen ++ 1 ++ ++ -1 ++ 99.55 ++ ++ ++ ++1091290560DCC0EEE1C09CE8C77AF9C4363AB86860E2B729254B6CBB23609E01FB38AB2C11 ++ NDR 2 ++ 2 ++ ++ -1 ++ 96.2 ++ ++ ++ ++10912905603BB0C169D59130A7E4CDB50299B30B4CBAE3140C2E30208DB3BA1D7CA865DDC3 ++ NDR Kultur ++ 3 ++ ++ -1 ++ 95.2 ++ ++ ++ ++10912905609C9242B6154C7E571A4C9E1836EBA6E697BFC7228FDBAC875A7C485BAA697684 ++ NDR Info ++ 4 ++ ++ -1 ++ 107.6 ++ ++ ++ ++109129056091591890E743FC62C0FE220A787BDAFD61AC8C983B8D81A36B97886C7BFCA512 ++ Radio Jade ++ 5 ++ ++ -1 ++ 87.8 ++ ++ ++ ++10912905607D32CC781625CA4804D255AE88896A46524D21EDD358490CD2985F9A7F94BCD6 ++ Radio Ostfriesland ++ 6 ++ ++ -1 ++ 100.15 ++ ++ ++ ++1091290560A2E30DF5AF74EC8699A380BEFF08A942ACF65417DD305FECEA447369716BDB90 ++ RTL Radio ++ 7 ++ ++ -1 ++ 89.1 ++ ++ ++ ++109129056092E86276D7410E5C7CC3D2B9F4463DD63CEE5C9363D732181E089F37D0EB7D7A ++ FFN ++ 8 ++ ++ -1 ++ 105.3 ++ ++ ++ ++109129056009982D289707EE2CCBABFBD81A2074A64E056DFF11E2E9BBD05CDE64A851D141 ++ Hitradio Antenne ++ 9 ++ ++ -1 ++ 102.9 ++ ++ ++ ++1091290560D51AC5807AB56AEC3A4BF76F14C190DA9E6569068F1CF7AF25E3144075EA9E41 ++ N-Joy ++ 10 ++ ++ -1 ++ 100.95 ++ ++ ++ ++1091290560B66E310EC16F9DE501DA13CFCC5040FF0B31D62247C7CEFE5628C4A3F36A85C6 ++ Bremen 1 ++ 11 ++ ++ -1 ++ 102.1 ++ ++ ++ ++10912905602AC2A9C53F9B6E6EFE9E1674878400E7FF5C7F124684CC7F57C9C216A0E01366 ++ Energy Bremen ++ 12 ++ ++ -1 ++ 92.3 ++ ++ ++ ++1091290560E610CC27C3CF08B84731FA4FF3C98EC6CB82AD5443E30049E539A2F3443F4202 ++ Nordwest Radio ++ 13 ++ ++ -1 ++ 98.5 ++ ++ ++ ++10912905600334C7216171F1A43051A8A499453CB86833E4DD3268FC448073E63423DD667C ++ Bremen 4 ++ 14 ++ ++ -1 ++ 104 ++ ++ ++ ++10912905603085269311505B713B67522CA258791BE5E96E28D39638B55DC412A103BFC178 ++ Radio Sunshine ++ 15 ++ ++ -1 ++ 97.85 ++ ++ ++ ++10912905606EC5591E60AB4673DCEB558470C77BCB246DA9FB755D7283719019CC0E270E4E ++ Jam FN ++ 16 ++ ++ -1 ++ 94.9 ++ ++ ++ ++1091290560D30C88E8D43940B11373590F658CC96DDD2658EB06EC3F1581B777F852321E5D ++ FH Europa ++ 17 ++ ++ -1 ++ 100.45 ++ ++ ++ ++1091290560BA5ECFEDAEB193F5B8630C1C38A93A85304BBAB9AAC1D47661E3ED92077A6B02 ++ Deutschlandfunk ++ 18 ++ ++ -1 ++ 88.6 ++ ++ ++ ++1091290560252B8C5FD95DDBE48DAEF86135F2BF2FA4398FD7C7B37FF425BCCFF321514FD6 ++ Deutschlandradio Berlin ++ 19 ++ ++ -1 ++ 107.25 ++ ++ ++ ++10912905602ECB0B3F03E29CEFD2E07F844BF99621F08CE8B99DBDC6519D813891CE76C734 ++ Radio Klassik ++ 20 ++ ++ -1 ++ 98.8 ++ ++ ++ ++1091290560F205062F8746603F2F1CF3C697878D9E82833AA5871AD5F89740068468DC299F ++ Radio Melodie ++ 21 ++ ++ -1 ++ 91.25 ++ ++ ++ ++1091290560645B2E7C0C5F1DD65A0426497CA4618735145E5928DDFA824957C964EE27DCC2 ++ Radio 1 NL ++ 22 ++ ++ -1 ++ 90.6 ++ ++ ++ ++1091290560F63220989D5D33B98DFA024203D01D1D4BC59C3226C715A5C44A28159791C189 ++ Radio 2 NL ++ 23 ++ ++ -1 ++ 90.15 ++ ++ ++ ++109129056099FECBDC47A1044EBE759AB969D64FBF1B2590C8AEBA9179E76649818E61AE4C ++ Skyradio NL ++ 24 ++ ++ -1 ++ 96.85 ++ ++ ++ ++1091290560D5DCC73CD877D51CDFB6975B7A4074A9A26D257267DE6527CBF8C3FBFE793DE4 ++ Radio 4 NL ++ 25 ++ ++ -1 ++ 92.6 ++ ++ ++ ++1091290560E53E10FEF4C1654C3F4D497D8F8EAA4BEAACB473F1C7500D277349F4D7514844 ++ RESERVE ++ 26 ++ ++ -1 ++ 97.3 ++ ++ ++ ++10912905608D35FCB469CB01369E584315BBADAABD9D7B9C8B9D1C1837372BD88FBAC7AB6B ++ RESERVE ++ 27 ++ ++ -1 ++ 99.2 ++ ++ ++ ++1091290560C494E867489FA592C07DE70CF3C1216B4F5E6D1C0C42987E3FC457B4B9E8B5FC ++ RESERVE ++ 28 ++ ++ -1 ++ 101.5 ++ ++ ++ ++109129056054E0EC549A20C823CC67874F7909A856ED54416CDD24B65DE1C12AD39B5B5EFE ++ RESERVE ++ 29 ++ ++ -1 ++ 102.45 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/greece/athens2-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/greece/athens2-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,639 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ George Alexandropoulos <g.alexandropoulos@gmail.com> ++ 2008-12-26T18:43:34 ++ Greece ++ Athens ++ ++ ++ ++ ++ 1230309911B23A391B5B6404E3091E9D9ECF9BE8DE4A6FBC37628F936966CA145F15FEED0F ++ Κρήτη FM (RDS) ++ 1 ++ ++ -1 ++ 87.5 ++ ++ ++ 1230310041C53AF537096A464EA9D7393DB1ED3791370F5775E49BC8858BA82280458F5DAC ++ Εν Λευκό (RDS) ++ 2 ++ ++ -1 ++ 87.7 ++ ++ ++ 12303101575D33579382D14ECCC22E92B1414305016182FB7BA9EFE6CA50A604D850A57CBC ++ Oasis FM (RDS) ++ 3 ++ ++ -1 ++ 88 ++ ++ ++ 1230310220B5C206BC9810A35D1EFC93D70746E857B846B8E310CAA13D3602035490A9913E ++ V FM ++ 4 ++ ++ -1 ++ 88.3 ++ ++ ++ 12303102476E86C70BF2EA5C48D3F805B504267254CE29524B0C63D596BD22B6BCEF20E221 ++ John Greek ++ 5 ++ ++ -1 ++ 88.6 ++ ++ ++ 1230310272DFE71B1E1BF4CB2EE6E6DA9E2F7AF5B19072431F604C8BE6B18D2EAF368FC67A ++ Angel (RDS) ++ 6 ++ ++ -1 ++ 88.9 ++ ++ ++ 12303103371BC455280287C472750952A9492A173E7279696BE7277A3DB9C66CD53149B85A ++ Arren-a Radio (RDS) ++ 7 ++ ++ -1 ++ 89.2 ++ ++ ++ 12303104015CF4557D8ACE18694D6EE8154D07ECA17672AF11C6F5FF0F723EA05D0145705D ++ ΡΣ Εκκλησίαςτης Ελλάδος (RDS) ++ 8 ++ ++ -1 ++ 89.5 ++ ++ ++ 12303104471B8BBD04DF9F47C0EDB773F06B4BACAE82699ACD1A45F0BB75F8D25B3882794E ++ Δρόμος FM (RDS) ++ 9 ++ ++ -1 ++ 89.8 ++ ++ ++ 12303104933673A9EFFDAB1E1AD16F03D4FFE37C1F5CED43B5C75620A80BC2E9C404F67699 ++ 902, Αριστερά στα FM ++ 10 ++ ++ -1 ++ 90.1 ++ ++ ++ 12303105374AE158E5AB0ED3A18C78292DD00315902384EA6109A0AA1172552C1C080BAE77 ++ Κανάλι 1 Πειραία ++ 11 ++ ++ -1 ++ 90.4 ++ ++ ++ 1230310714AE2CA9D371FBCA12154CF555677EF21621890B461BA8FA41F9D9D764DCCDB484 ++ Γλυφάδα FM ++ 12 ++ ++ -1 ++ 90.6 ++ ++ ++ 123031075982EB93F0EF674D9AA441B245BD7FC8D1FEFAA870F9109E184E6DBE4596FDD410 ++ Ράδιο Άστυ ++ 13 ++ ++ -1 ++ 90.7 ++ ++ ++ 123031080527F7E8134485FDE8926E30146332E82E336178DBF4ABD96487E9D52D5AE22C20 ++ Ε.ΡΑ. Τρίτο ++ 14 ++ ++ -1 ++ 90.9 ++ ++ ++ 12303109063B0E3AD5E48ED3A8CF88FE8CC51A90CEF91CA05453F7B360BD86723BB051B413 ++ Πειραεϊκή Εκκλησία (RDS) ++ 15 ++ ++ -1 ++ 91.2 ++ ++ ++ 12303109560CCDEF1DFE6DD06D30184BD88334C27D249404F7C06141D1E15DEED2769A26C3 ++ Κρητική Ραδιοφωνία (RDS) ++ 16 ++ ++ -1 ++ 91.4 ++ ++ ++ 123031099637DA95EC174BC5C9C0C30E5793D31DEC5D1F80C23C56F9791CE86F6ADA4794A1 ++ ΝΕΤ (RDS) ++ 17 ++ ++ -1 ++ 91.6 ++ ++ ++ 12303110246F1535C1B2CC59A3667E77E510E27CC6D0CE1BC195B16C8C1F2E07E98D5EF0C1 ++ Galaxy 92 (RDS) ++ 18 ++ ++ -1 ++ 92 ++ ++ ++ 1230311024FC7B25A31EC1F8FB66C8575BBBC79BB71852C7FFFDBB4C9FD2640605C24E4A0F ++ Λάμψη FM (RDS) ++ 19 ++ ++ -1 ++ 92.3 ++ ++ ++ 123031116244E7BDC268D4A421650CBA260D84346E9DFCA6D2BA54B0DF53EE49CCBF29E034 ++ Best Radio (RDS) ++ 20 ++ ++ -1 ++ 92.6 ++ ++ ++ 12303111928090247F007166010E5D852822A29E1FDAACEDB887EA1261923F19A599386CB3 ++ Kiss Radio (RDS) ++ 21 ++ ++ -1 ++ 92.9 ++ ++ ++ 1230311213A944DC146D6BFAA016A9F26EAD33E758890572A9BCA0E1319327B250F2C5AFEE ++ Orange (RDS) ++ 22 ++ ++ -1 ++ 93.2 ++ ++ ++ 1230311245C89045C8E4A643D71D1924EEAD1B28C67AE522A65071531C2353C8FB57EF22A9 ++ Energy Radio TEI FM ++ 23 ++ ++ -1 ++ 93.4 ++ ++ ++ 12303115166EC20D8697A6C3050C3AA563EFBE770A99C1B0798F2A7A606478B34E367B694E ++ Kosmos (RDS) ++ 24 ++ ++ -1 ++ 93.6 ++ ++ ++ 1230311550F6F0482ED41A99B83F9BB388EF16F0036BEC8D74B18472D3BC37DBB6D93AADD7 ++ Ράδιο Μεσώγεια ++ 25 ++ ++ -1 ++ 93.8 ++ ++ ++ 12303115893C0F6BB62B993A0F13809EB983624554E39A1BA8ACA0A12ED49C38D39D9B3CD5 ++ Επικοινωνία ++ 26 ++ ++ -1 ++ 94 ++ ++ ++ 1230311623B8101A41BD370C4EF460EC27324FF1F5B7DC74C2F24DEF1040131D54EC8FE6CB ++ Ξένιος (RDS) ++ 27 ++ ++ -1 ++ 94.3 ++ ++ ++ 12303116644824056613E423391508C9C281DEE90D20CE8ACA0314F50F466D75BF2AC16DF8 ++ Nova Sport FM (RDS) ++ 28 ++ ++ -1 ++ 94.6 ++ ++ ++ 1230311710D727DBE7F8CA17F95D03CFA6D30792C80E0E040DA8420015272305DBD56EE553 ++ Ρυθμός (RDS) ++ 29 ++ ++ -1 ++ 94.9 ++ ++ ++ 12303117775436213D83FC8FFC561FF16EC0237120E5A5F2BA7B9AB3B50A49C4787E75AC65 ++ Athens Deejay (RDS) ++ 30 ++ ++ -1 ++ 95.2 ++ ++ ++ 123031182099429EF22F12F22F67E2687DE8E7E1135CF17C4A97338CA0D823A7CD06AF585F ++ Ε.ΡΑ. Τρίτο ++ 31 ++ ++ -1 ++ 95.6 ++ ++ ++ 1230311851996923E9C3FE3723FDF97B589375FC6407F26EA25208B8834A403B4711B8D9A7 ++ Φλόγα FM ++ 32 ++ ++ -1 ++ 95.8 ++ ++ ++ 123031189004AE833A162F5018E0CE681665DEE99206E26CD3C7E9936D1591F7719F4C9658 ++ Disco Radio ++ 33 ++ ++ -1 ++ 95.8 ++ ++ ++ 12303120414A9CD78220A67C5AD36C260CE2DF6116A7B81B7D178AF5A8EF31C992EEB232BB ++ Flash (RDS) ++ 34 ++ ++ -1 ++ 96 ++ ++ ++ 12303120671B21410896F7FDC86B9A94492DFBEA717FA148DBB2E42E2B8DD867B678E39528 ++ Red FM (RDS) ++ 35 ++ ++ -1 ++ 96.3 ++ ++ ++ 1230312096E38A0CACC50521610911604EB55EEC77B4A747F608831BF9083EE5512311D3A3 ++ Hijack 96.6 (RDS) ++ 36 ++ ++ -1 ++ 96.6 ++ ++ ++ 12303121260761F5F5BAAB82465FB3A2C3ECBAEE61CAE3A792C46D9548DE5F649648A73270 ++ Rock FM ++ 37 ++ ++ -1 ++ 96.9 ++ ++ ++ 1230312166804069BA50E9D7111832D0EA4852161E89B5731255BF0CAE2CCE50550093AE9B ++ Ant1 (RDS) ++ 38 ++ ++ -1 ++ 97.2 ++ ++ ++ 12303121992EB1FA8C469E8BB788AB71BCC3AAB8F9742987112AFC1F6CE45F2166E9A91FA4 ++ Love Radio (RDS) ++ 39 ++ ++ -1 ++ 97.5 ++ ++ ++ 1230312232366483921B506A2979478D06B02158103F0EB385DBB7B2B856C52168FC595967 ++ Real FM (RDS) ++ 40 ++ ++ -1 ++ 97.8 ++ ++ ++ 1230312306F95ED4F74CEFDE73EF011BA8CF8778AFAA3467DB5FB30144450D3245A192515B ++ 98 FM ++ 41 ++ ++ -1 ++ 98 ++ ++ ++ 1230312327A2288437FE737C29476DC47CB0508582ADF7E9DBADDB8774C04577B33FBEBC19 ++ Αθήνα 9.84 ++ 42 ++ ++ -1 ++ 98.3 ++ ++ ++ 1230312364E2AA2C6881FEE40B2D884943C3E8B64481D60ACCBE9A2432EDE514FE51753308 ++ Derti ++ 43 ++ ++ -1 ++ 98.6 ++ ++ ++ 12303124142D87A4C355F98DDE7CB724DAEE89545FF34A606A36F76ABD84B7B5E4E8CD40D6 ++ Alpha Radio (RDS) ++ 44 ++ ++ -1 ++ 98.9 ++ ++ ++ 123031244511426477E7E610045A66A6D0648BD107284348B0468CDEE0BAAC91FA0DA08C5D ++ Μελωδία ++ 45 ++ ++ -1 ++ 99.2 ++ ++ ++ 1230312493A31F04C250C1D43FD9C594F763BFC1B87A1010A03899E9291D1EA2E79698D695 ++ City 99.5 (RDS) ++ 46 ++ ++ -1 ++ 99.5 ++ ++ ++ 1230312525A4CAAE7137B93A8D20DFFAB81BEA4204385EA6C189A30DE176BB82CB3D4A148B ++ Σκαϊ 100.3 (RDS) ++ 47 ++ ++ -1 ++ 100.3 ++ ++ ++ 1230312591B671B9655862ABA64375F40E746FA963F2A4505F0EDEA78AD33E03A339BBA3AF ++ Ε.ΡΑ. Σπορ (RDS) ++ 48 ++ ++ -1 ++ 100.9 ++ ++ ++ 12303126302C4C368C2349DAD777E3D6F4AD90894D48C29579859906DE59FF20C54BD187D7 ++ Δίεση (RDS) ++ 49 ++ ++ -1 ++ 101.3 ++ ++ ++ 1230312665CBE843B50F7F4895C9461709F956CEFD6ACC0AA75BD380E0D0241AB88670114A ++ FM1 ++ 50 ++ ++ -1 ++ 101.5 ++ ++ ++ 123031268612ED29D140FC9FD11967DCF92C0DC33C82861B4F5089A394BA80AEF15D33ABF0 ++ Ράδιο Κουρσάρος ++ 51 ++ ++ -1 ++ 101.5 ++ ++ ++ 123031274240D069495348EA1D28B8BD54A4A017B286E8444F2CBBEF72582F5438F6C4BEBD ++ Ε.ΡΑ Σπορ (RDS) ++ 52 ++ ++ -1 ++ 101.8 ++ ++ ++ 12303127692012CEFDB538BB251256AAFD024C4DB8BAC224CD6C9B7920211B6850C34A359F ++ Sfera (RDS) ++ ++ ++ -1 ++ 102.2 ++ ++ ++ 1230312809CCCC7D548CEB4151F8190472A6E0459B728B5E74930805AB103319560297EAED ++ Nitro Radio (RDS) ++ 54 ++ ++ -1 ++ 102.5 ++ ++ ++ 1230312850905EE182DBAD8E79EE4386C24413E2154A31CDCEAD3AA12B457A9E2568122523 ++ Ε.ΡΑ Δεύτερο (RDS) ++ 55 ++ ++ -1 ++ 102.9 ++ ++ ++ 1230312886817169D7A15A93410BFE95957996DC91D991585BEC1E45DAF693E26D317804F5 ++ Ράδιο Αναγέννηση (BlackMan) (RDS) ++ 56 ++ ++ -1 ++ 103.1 ++ ++ ++ 12303130012B5ABE270738A8EC062B1E27F5154F2BF3F3672E6352C5DB44C6DE6AE22C5017 ++ Sentra FM (RDS) ++ 57 ++ ++ -1 ++ 103.3 ++ ++ ++ 123031309044B0C6B4FC9EC701C76FF0E7A6768D86DBD12AE00ED80896B645BFBF87461CFE ++ Dream FM ++ 58 ++ ++ -1 ++ 103.5 ++ ++ ++ 12303130998219B153DCF3C8F424A9AA19CEFFE7655171852B4C342C55E8F22078BB431339 ++ Ε.ΡΑ. Δεύτερο (RDS) ++ 59 ++ ++ -1 ++ 103.7 ++ ++ ++ 123031320703190AF84743CFFA4197D7281A023936BFFAA8F9B2C483D77FBE0BF4B608F9DD ++ Παρέα FM (RDS) ++ 60 ++ ++ -1 ++ 104 ++ ++ ++ 1230313237B50AF8C2E59E8BBAB86DC11C0383988DF52F9CCC5925CE44E2A74C5EA3888D86 ++ Athens International Radio ++ 61 ++ ++ -1 ++ 104.4 ++ ++ ++ 1230313281C3A6919D43EB36613751890BA2A52B1A6B2A8468F7A2B234F6BB9256E77EE2BE ++ Athens Shock Radio ++ 62 ++ ++ -1 ++ 104.6 ++ ++ ++ 12303133198504BD0FD62C0E5041BB115CC1500975A0CD88AC5FE350A8BE98382B21CA5148 ++ Radio Paradise (RDS) ++ 63 ++ ++ -1 ++ 104.6 ++ ++ ++ 123031336668A73E93D3A4F9DA8E629E9683521DE0914CD7E344AFC223ECC2A40732CE7427 ++ Στυλ FM (RDS) ++ 64 ++ ++ -1 ++ 104.8 ++ ++ ++ 123031341161834E2B7904C834F82709132303CB4A198EF37D476079A8CD32AC5B283056C2 ++ Ε.ΡΑ Σπορ (RDS) ++ 65 ++ ++ -1 ++ 105 ++ ++ ++ 1230313446E73E13D8B03DAD2777B665D5BE7BA7D81E17FEC6F7E9003F27058BD6B1B59D32 ++ Atlantis ++ 66 ++ ++ -1 ++ 105.2 ++ ++ ++ 123031358462B35AC7AE0E6C9192F6D5D3CAAF62F9239903610EFDAB3DC718B0A68168A021 ++ Παλμός ++ 67 ++ ++ -1 ++ 105.4 ++ ++ ++ 1230313617CC4B3C32327F712A220D7221443447E80E5D99A3C71E80E5A7878C78B5EE04C6 ++ Στο Κόκκινο (RDS) ++ 68 ++ ++ -1 ++ 105.5 ++ ++ ++ 1230313664E878568C085647D08491F498CBAA9369F76F2DCA407587E7C21BDA41BCF55738 ++ ΝΕΤ (RDS) ++ 69 ++ ++ -1 ++ 105.8 ++ ++ ++ 123031368917BFC8A91497C0194CFE9D2D8CB058EE98222B86EF99944E17585F802C19373E ++ Mad Radio (RDS) ++ 70 ++ ++ -1 ++ 106.2 ++ ++ ++ 12303138141D53424848F1188AC3BC6E8F99E7A8437CD2316CCC05803F035198B3CE573573 ++ Ράδιο Αργοσαρωνικός ++ 71 ++ ++ -1 ++ 106.4 ++ ++ ++ 12303138654AE79C55DE444E7393577333E613CBED20C0CA7699F84F99FBF3B36647789BA4 ++ Digital FM ++ 72 ++ ++ -1 ++ 106.7 ++ ++ ++ 123031390634A5D157059B3EC7240BB2FC9E3CB2362A6276261AE13A6BCF96CC52B8B3F8DC ++ Kosmos (RDS) ++ 73 ++ ++ -1 ++ 107 ++ ++ ++ 1230313941D75FBD7052D139CDB27CC53A4284924C335A8604275D3E9F30BFE92CE32CEEF4 ++ Blue Space ++ 74 ++ ++ -1 ++ 107.2 ++ ++ ++ 12303139928D015AE8A07354DD78F3E4696EE19A4C7A28355A6CFAB152F27A74F7B7E63205 ++ Star Radio ++ 75 ++ ++ -1 ++ 107.4 ++ ++ ++ 123031402535BB69B460FE9C4D04663F7E6B8979490B5C134369E42D10967DBA94DF832936 ++ Ακτίνα ++ 76 ++ ++ -1 ++ 107.6 ++ ++ ++ 1230314060D147B66919B197790141847E85744766CE02ABE25521EDBF9ADB038B1D549B5C ++ Super FM ++ 77 ++ ++ -1 ++ 107.8 ++ ++ ++ 12303141163EA61198376BD854C55C07DB1AC4154AEF2F18FD38AD4D3A2882D45BA6BB4711 ++ Ηχόραμα ++ 78 ++ ++ -1 ++ 108 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/greece/athens-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/greece/athens-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,665 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ Michael Tr.<michtri@otenet.gr> ++ 2009-07-02T14:16:43 ++ Greece ++ Athens ++ ++ ++ ++ ++ 1236303555F8C6D2B7D76AB919961DED8B465344600D480097DFA0B9D8FD21EE4407743965 ++ ΚρΞ?τη FM ++ ++ ++ -1 ++ dontcare ++ 87.5 ++ ++ ++ 123630355521C6A97AC143F04E4FFEF9B3296A8D76AAC854EA957FD9E73FE35DBCC613F56E ++ Εν Ξ›Ξ΅Ο…ΞΊΟŽ ++ ++ ++ -1 ++ dontcare ++ 87.7 ++ ++ ++ 1236303555B5D8B70524B3E069215BBD5F346D540F080C118092F4A5C20C46BA4913E9D333 ++ Oasis FM ++ ++ ++ -1 ++ dontcare ++ 88 ++ ++ ++ 123630355592B516BDCAE2D5B5117E8380F5C41A7425C4D3602A9C50DCCDFADDA8772C5140 ++ VFM ++ ++ ++ -1 ++ dontcare ++ 88.3 ++ ++ ++ 12363035551849550D23A9C290AD1089418684403211056223761369428A5442BFB798845C ++ John Greek ++ ++ ++ -1 ++ dontcare ++ 88.6 ++ ++ ++ 12363035552856D73C8625ABB8CE79549854C486E994731F59D4D4E2F682134AC8BF610CEB ++ Angel ++ ++ ++ -1 ++ dontcare ++ 88.9 ++ ++ ++ 12363035559401473C68D712CFB05370CBACC513E3407AD70F06C4AE5EE66B0A6544DD8B87 ++ Arren-a Radio ++ ++ ++ -1 ++ dontcare ++ 89.2 ++ ++ ++ 1236303555DF524877EA983F64260140F197B075D3BD3D535FBB6C6F78F58AD498B70A3180 ++ ΑΣ Εκκλησίας της Ελλάδος ++ ++ ++ -1 ++ dontcare ++ 89.5 ++ ++ ++ 1236303555B950E4E8944932CF5F899D284017823CA7EB448F5464BF512371E1407A515995 ++ Ξ”ΟΟŒΞΌΞΏΟ‚ FM ++ ++ ++ -1 ++ dontcare ++ 89.8 ++ ++ ++ 1236303555FE988948927F6B487000FA9AA7A5633C44653BF74C5DBDA3CE6D27A088350511 ++ 902 ΑριστΡρά στα FM ++ ++ ++ -1 ++ dontcare ++ 90.1 ++ ++ ++ 1236303555BE3B63152696DFA54B3A92B66775A35264BB7281F2C2E2B342BFB3594D65F598 ++ Κανάλι 1 ΠΡιραιά ++ ++ ++ -1 ++ dontcare ++ 90.4 ++ ++ ++ 12363384889A1A75FA05DEE86039BD59FD19D83DB15CA0C9367271F0EA3AD6379241B77D36 ++ Radio Asty ++ ++ ++ -1 ++ dontcare ++ 90.6 ++ ++ ++ 1236303555D034E543C6CBD3A56BDD86E42C3B3786BB9DFB185CB7F2A73670A51769693FAF ++ Ξ•.ΑΑ. ΀ρίτο ++ ++ ++ -1 ++ dontcare ++ 90.9 ++ ++ ++ 12363035557DC51B6683E28C647D0E16B52477B8BF2F7443F6D0F978F0D4123F89A2A53C22 ++ ΠΡιραϊκΞ? Εκκλησία ++ ++ ++ -1 ++ dontcare ++ 91.2 ++ ++ ++ 123630355579A9ED56F6354B0F53FEF9102BCB7342FC6A8CCD369AAFE206C1DF7E83A6494A ++ ΞšΟΞ·Ο„ΞΉΞΊΞ? Ααδιοφωνία ++ ++ ++ -1 ++ dontcare ++ 91.4 ++ ++ ++ 123633865886ABEF0BD85FA264A328E2D52FC8C3E4893BF1FAADB1E04AE447B10495E4F403 ++ NET ++ ++ ++ -1 ++ dontcare ++ 91.6 ++ ++ ++ 1236303555025BCA17F8EF9A0B5B48AF56C02D07CFF8EAE7BECD66DEAE04FA39CC018DA682 ++ Galaxy 92 ++ ++ ++ -1 ++ dontcare ++ 92 ++ ++ ++ 123630355578828CC76A23BCDFCAAB11465BA737D79C719BB35FBE232B352442AD3C81563A ++ Ξ›Ξ¬ΞΌΟˆΞ· FM ++ ++ ++ -1 ++ dontcare ++ 92.3 ++ ++ ++ 12363035557B2403325DD733982F42829F4CA43FE9626BF7A1A5A68FD482AA36EBC6E6BBDE ++ Best Radio ++ ++ ++ -1 ++ dontcare ++ 92.6 ++ ++ ++ 1236303555E15EE72ABEC2D16F003455AC70685892F731AA36E818356AAFD6868297144CE3 ++ Kiss FM ++ ++ ++ -1 ++ dontcare ++ 92.9 ++ ++ ++ 12363035554FA4D7BE8217DCC400C11D50231BDCC560E8D4467F3CFF12F91964CEBDC23A35 ++ Orange ++ ++ ++ -1 ++ dontcare ++ 93.2 ++ ++ ++ 1236303555CC91671E5F32D0EA8F6C7A47DE9DF968000FFEC1F096B74E65F35EDC31320775 ++ Kosmos ++ ++ ++ -1 ++ dontcare ++ 93.6 ++ ++ ++ 1236303555EE0F168A293A39F6B7715EB7015BBC5AE1B84F98B6894B60375913F89F3E3837 ++ Epikoinonia FM 94 ++ ++ ++ -1 ++ dontcare ++ 94 ++ ++ ++ 1236303555D807F6B64385AFAFF35CA0C71E48D6402D8F6DD1317FD8985368202683E76F99 ++ XFM ++ ++ ++ -1 ++ dontcare ++ 94.3 ++ ++ ++ 123630355582F11794FA491D9AE942B99CCE9CFA385D60A76ADCA8272398798F66FF5023D0 ++ Nova Sport FM ++ ++ ++ -1 ++ dontcare ++ 94.6 ++ ++ ++ 1236303555DE36BA648307E877F5C340E34F10E7ED563BE03BD991A7450B73ADFE87611457 ++ Ξ‘Ο…ΞΈΞΌΟŒΟ‚ ++ ++ ++ -1 ++ dontcare ++ 94.9 ++ ++ ++ 1236303555F619039E0DB51B3B3F55754A159449F4987CCC442060D32AE6E356090B8ACE70 ++ Athens DeeJay ++ ++ ++ -1 ++ dontcare ++ 95.2 ++ ++ ++ 123633888677CEFB92E1F3A3633D56C3179ACF1EEC1C060BC7F7B1355614ECDC8F6D817F72 ++ Ξ•.ΑΑ. ΀ρίτο ++ ++ ++ -1 ++ dontcare ++ 95.6 ++ ++ ++ 1236303555F019432F2B2A97E6A9289B3FA6E172E58C306F31E7D14BFEE8B6651DF6FFE4AD ++ Floga ++ ++ ++ -1 ++ dontcare ++ 95.8 ++ ++ ++ 1236303555002B7464B001BD05C6D36F0DF95839816750FA47A4C4BB620522BE3313234FB6 ++ Flash ++ ++ ++ -1 ++ dontcare ++ 96 ++ ++ ++ 1236303555CE211857EA50B8116A8C780BFB75B354F0F24471E8A250D465E95B476C4C32D0 ++ Red FM ++ ++ ++ -1 ++ dontcare ++ 96.3 ++ ++ ++ 12363035552BD28A667EDE6729B103EB0113819281D4FD8C9FB6ECCE791510744AEDE96470 ++ Hijack 96.6 ++ ++ ++ -1 ++ dontcare ++ 96.6 ++ ++ ++ 1236303555B6DE03DB507ED282725F38D2126C7E2B53C99A15CB9C1D9E5D2FAAAA71B2C54C ++ Rock FM ++ ++ ++ -1 ++ dontcare ++ 96.9 ++ ++ ++ 12363035550F41ABC97DBFA000B3049E6BE2C8CC094565BA9CFA86419367AF83DA286A377E ++ Ant1 ++ ++ ++ -1 ++ dontcare ++ 97.2 ++ ++ ++ 1236303555228F598B5C8AEBB9E7DEB479DBB324EFC609073E2A505C1DA9C65F024AF0A273 ++ Love Radio ++ ++ ++ -1 ++ dontcare ++ 97.5 ++ ++ ++ 1236303555AF8701B92ED1DFAC5F94AA6D76D64ACC4045FFE126AE5B9D65890FB28F8001C0 ++ Radio Veronica ++ ++ ++ -1 ++ dontcare ++ 97.7 ++ ++ ++ 1236303555BB78B6473DCA5D19CD162E660D97C3DCC20C1B168BAD04BAEB393743DD4DE192 ++ Real FM ++ ++ ++ -1 ++ dontcare ++ 97.8 ++ ++ ++ 123630355584EFCCA46C288369540AEA2E9177C6FEC32931B3A41BAAADC772302EC6B70C30 ++ Free FM 98 ++ ++ ++ -1 ++ dontcare ++ 98 ++ ++ ++ 12363035556772D03B3375CA4CBB4C77526F4C68665A982472337D7E6FB57A70C6AD08CB7D ++ ΑθΞ?Ξ½Ξ± 9.84 ++ ++ ++ -1 ++ dontcare ++ 98.3 ++ ++ ++ 1236303555D05113FEDCD174B864DFE6C363D64D8F0FEDDB93A0895D5951444A6FFC271DE0 ++ Derti ++ ++ ++ -1 ++ dontcare ++ 98.6 ++ ++ ++ 1236303555E3B5FBA84598C50E5D5AA5DEC44020AEF46F05CEA27B5962AF71A36302EB05DA ++ Alpha Radio ++ ++ ++ -1 ++ dontcare ++ 98.9 ++ ++ ++ 123630355502E85E6E11163EC9CE92D641E96E23C2AB647D8F10E3C636572712FA388CFC59 ++ ΞœΞ΅Ξ»Ο‰Ξ΄Ξ―Ξ± ++ ++ ++ -1 ++ dontcare ++ 99.2 ++ ++ ++ 12363035556B4FBBE8D6D94307A23452C23B7F1EF17470DEC6A261B1945480300877040849 ++ City 99.5 ++ ++ ++ -1 ++ dontcare ++ 99.5 ++ ++ ++ 12363391269EBCA96147929CD6EA80429E231A1F13C2AA9C45F1DDA930C0494BBF6F3ECC49 ++ Ξ•.ΑΑ. ΔΡύτΡρο ++ ++ ++ -1 ++ dontcare ++ 99.9 ++ ++ ++ 12363035556B5F9C8F7B4D768DCA637C204F25F1E298E6A404C7A97091261CDE9D4052451A ++ Σκάι ++ ++ ++ -1 ++ dontcare ++ 100.3 ++ ++ ++ 12363035553183FA84CE18D387CB46EBF5CC16505D39F9FF616AFAB34D809FBA59005473F8 ++ Αάδιο ΞˆΞ½Ο„Ξ±ΟƒΞ· (ΞšΞ±Ο„Ξ¬Ξ»Ξ·ΟˆΞ· ΝομικΞ?Ο‚) ++ ++ ++ -1 ++ dontcare ++ 100.6 ++ ++ ++ 12363392215C1075EAAAAF5F8B68DC241DC64B73E74F8CA31C80B8CC5CDAA5A6FFA831CCE6 ++ Ξ•.ΑΑ. Σπορ ++ ++ ++ -1 ++ dontcare ++ 100.9 ++ ++ ++ 123630355546A9DBD579719C3F103D9BCD58C4A4A93E7EE0081B3878770CA4FBAAC69104B8 ++ ΔίΡση ++ ++ ++ -1 ++ dontcare ++ 101.3 ++ ++ ++ 123633930939349E99E1583D905411E3A26A9F7A0F3B1854E36D8DD0ABD9D7ECF27C92A79C ++ FM1 ++ ++ ++ -1 ++ dontcare ++ 101.55 ++ ++ ++ 12363035550FB3D1826ADA343C62F12E359EC478299C150CAF5EB77600601A693C9AFEEA7F ++ Ξ•.ΑΑ. Σπορ ++ ++ ++ -1 ++ dontcare ++ 101.8 ++ ++ ++ 12363035559F6943BECB480619307FB7846D0D6049CE6B63871E531C04D89126A9A0BCBEE9 ++ Sfera ++ ++ ++ -1 ++ dontcare ++ 102.2 ++ ++ ++ 12363035553E482A95AA9987C3A13DD33143C23B73E7FFB25AA030805EFA54EA35F608B45A ++ Nitro Radio ++ ++ ++ -1 ++ dontcare ++ 102.5 ++ ++ ++ 123633941752D1852572742677A43F7BBC58123BADEAC534375869AB801E5AEA35D3E27A54 ++ Ξ•.ΑΑ. ΔΡύτΡρο ++ ++ ++ -1 ++ dontcare ++ 102.9 ++ ++ ++ 1236303555F437335446AED229C9B7173F51FE17C07E4E0BB2B9FFEAF9184B419391B80F27 ++ Αάδιο Αναγέννηση (Blackman) ++ ++ ++ -1 ++ dontcare ++ 103.1 ++ ++ ++ 12363035551465037E37D37C8643099BA790C9517BF50876E67333AE6F6013D7748AEA8299 ++ Sentra FM ++ ++ ++ -1 ++ dontcare ++ 103.3 ++ ++ ++ 1236303555BC9F9CFAF5E21430C6527BEAF2FB64E7C057ED24F1B6BAEFC4ECCD1FFBD55BF8 ++ Ξ•.ΑΑ. ΔΡύτΡρο ++ ++ ++ -1 ++ dontcare ++ 103.7 ++ ++ ++ 12363035555742A6CD0D32F6B7442B4F64A76D0F640673125BCC3D244B89C279B57C8020A3 ++ Παρέα FM ++ ++ ++ -1 ++ dontcare ++ 104 ++ ++ ++ 1236339576168E8F86D1EFEB569EC1BE7E8B9076FFE2DBEA320C1E10E46035FECF489C55F4 ++ Radio Laikos ++ ++ ++ -1 ++ dontcare ++ 104.2 ++ ++ ++ 12363035552826561E0029161F6A503930BA1F6C47201A6E3C68D154371F54D64DC93204CD ++ Athens International Radio ++ ++ ++ -1 ++ dontcare ++ 104.4 ++ ++ ++ 123630355532218320A3836943AEE9715736B1A30E09E8D04FCFF0E41E3325B8E57681C32E ++ Shock Radio/Paradise Radio ++ ++ ++ -1 ++ dontcare ++ 104.6 ++ ++ ++ 1236339857FD45FB7C8BF3CD34E2A81D8DDC0A4C533F9312A346A9E948CB848A1636C2AC2B ++ Styl FM ++ ++ ++ -1 ++ dontcare ++ 104.8 ++ ++ ++ 1236303555B3AC4C4846304D7D5CB88AD564C7B9291D4119031D5D5B8B085251AF8E3EE4A7 ++ Atlantis ++ ++ ++ -1 ++ dontcare ++ 105.2 ++ ++ ++ 123630355529017C5A217A450030806F0667B6AAE22A3D609C5A643A0E7AAAEC4CEC2C0938 ++ Στο κόκκινο ++ ++ ++ -1 ++ dontcare ++ 105.5 ++ ++ ++ 1236303555C56B7569D58DAFEEEBC35636A57418EA19C6C6487DDEF05D6E7FE9AB48222330 ++ NET ++ ++ ++ -1 ++ dontcare ++ 105.8 ++ ++ ++ 123630355564CE6CC7B5934E7C847A55C2E13AE83F870C4DE984DAB56C100FE7D3F31C7D0E ++ Mad Radio ++ ++ ++ -1 ++ dontcare ++ 106.2 ++ ++ ++ 1236303555EA609BC93A37A5207464F74D75118039B2D584CE6452D6698CEBA61AE028C294 ++ Αάδιο Ξ‘ΟΞ³ΞΏΟƒΞ±ΟΟ‰Ξ½ΞΉΞΊΟŒΟ‚ ++ ++ ++ -1 ++ dontcare ++ 106.4 ++ ++ ++ 12363404362D264AEDDC91C1E2A212597D78ECAE4C633315101C2D1C96789CD265CC45C9E9 ++ Digital FM ++ ++ ++ -1 ++ dontcare ++ 106.7 ++ ++ ++ 12363035553FC9D2C8AAF40C2FFDBE37510033B111AD1B323C66ADC3F0019DDB838EDCA999 ++ Kosmos ++ ++ ++ -1 ++ dontcare ++ 107 ++ ++ ++ 123634057618FA5E35E2D3FD8BD5242DC258A594E14B15F717CB25EA5F2890892747DE622F ++ Blue Space FM ++ ++ ++ -1 ++ dontcare ++ 107.2 ++ ++ ++ 12363035556CEBBE420E1068460097F219C8A46A51A6ED734B28FA9644F3F85F64A1D8D923 ++ Ακτίνα ++ ++ ++ -1 ++ dontcare ++ 107.6 ++ ++ ++ 123630355527CE70F600EEEF1844A053FD3A3E2635FB28AA296D8D8B180AB413D3158329B7 ++ Ξ—Ο‡ΟŒΟΞ±ΞΌΞ± ++ ++ ++ -1 ++ dontcare ++ 108 ++ ++ ++ 1246530641771960F6E09566E2D1FC981BA989DB7371D1C962E23D5B859B78ABB9E60A ++ NME ++ NME ++ ++ -1 ++ dontcare ++ http://shout.astream.com:80 ++ mp3 ++ auto ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/greece/kastoria-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/greece/kastoria-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,243 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Kotorkis Constantinos <kkie68@gmail.com> ++ 2007-04-26T19:30:02 ++ Greece ++ Kastoria ++ antenna ++ ++ ++ ++ ++1063385407E05886942B080C70E9095C4F9EF8862C65C78A24F00C860909A8F2DF1D8E4276 ++ NET ++ 1 ++ ++ 0.7 ++ 88.6 ++ ++ ++ ++10633854072B0E0DC480808BDB1B13DE7C9EAD8922118AA2308E8EAE5734F497B27D0E5CA4 ++ Kastoria FM ++ 2 ++ ++ 0.7 ++ 89.3 ++ ++ ++ ++1063385407BAC77165139F07C89AC054801FFCC28D35D934283F02B9BCED437CEE6AC0714E ++ Star FM ++ 3 ++ ++ 0.7 ++ 90.1 ++ ++ ++ ++106338540734A200C587C92B80A77C200463AB2E267EC19752C4A9437DEB5F536717B94D20 ++ Second Program ++ 4 ++ ++ 0.7 ++ 90.6 ++ ++ ++ ++106338540752061A546AA001A586665BCB54004C1C1347298E7283572C82D64949DBE9C957 ++ Radio 1 ++ 5 ++ ++ 0.7 ++ 91.1 ++ ++ ++ ++10633854076453138F76391F38AB129A608316C5D09E32485167705CA7955F77678A2940A0 ++ Kastoria FM ++ 6 ++ ++ 0.7 ++ 91.5 ++ ++ ++ ++1063385407C1E6152C11A5C05EC1A9B26344BC96855CB5499B0FE9A34778570B790E42D350 ++ Love Radio ++ 7 ++ ++ 0.7 ++ 92 ++ ++ ++ ++10633854074684F1C732220572385076AA324545DAA6F665760E56C87A810D7993A286798F ++ Radio Galatini ++ 8 ++ ++ 0.7 ++ 92.6 ++ ++ ++ ++1063385407C2FDA891449DE0C03E5E7932F799722FAA4FF13B03CBE4C99A0917B6C7ADD6DB ++ Radio Kastoria ++ 9 ++ ++ 0.7 ++ 93 ++ ++ ++ ++10633854075A7010C56169D354DA3EF48A44A96CD0A0D0E37B3901BE8D3BB0A8C463EFC47B ++ ANT ++ 10 ++ ++ 0.7 ++ 93.6 ++ ++ ++ ++1063385407DE46F8206EF76187D23429152202A1B933189E4B1058E32A2F9B4CA7633CAC14 ++ Church FM ++ 11 ++ ++ 0.7 ++ 94.2 ++ ++ ++ ++1063385407B76A1FDD10FBFF5530744D064D6BAA8B830B25EF0A574F0392AA52CC9B12C6E8 ++ ALPHA - Kastoria ++ 12 ++ ++ 0.7 ++ 94.7 ++ ++ ++ ++1063385407B364D20C095E208175C40582AF362B2AFF3BA446358B43A75D885C7089181318 ++ Radio Top ++ 13 ++ ++ 0.7 ++ 95 ++ ++ ++ ++1063385407925B3F89E35DCA26D0FDD23B201FB3B5D913150A0B2ED13406D4550A8F225EE7 ++ FM 95.7 ++ 14 ++ ++ 0.7 ++ 95.7 ++ ++ ++ ++106338540763F9B74ECB3A3738307E1F8CAC58922C79D914D1A19D9DE507FB9F0AF73D481F ++ ERA Florina ++ 15 ++ ++ 0.7 ++ 96.6 ++ ++ ++ ++1063385407BBFCDA7EEB359F7449A9AB09788E3B61611A75A52A0132D62A97345D4AE5120E ++ Radio Argos ++ 16 ++ ++ 0.7 ++ 97.4 ++ ++ ++ ++1063385407EC895CE1ED4BA554256C9675503A14AE0A16204C31C96D1EF8DA5F5EAE1CDCE4 ++ 98 - 0 FM ++ 17 ++ ++ 0.7 ++ 98 ++ ++ ++ ++10633854073984D438913EB6D843C930D9E3C759F66D5D6844F62CD0B9BC13DE9D088D0E06 ++ ALPHA ++ 18 ++ ++ 0.7 ++ 98.4 ++ ++ ++ ++1063385407B773C66DE987BF3F6C54397272705D41947595F1627E186C69EC4869070517B5 ++ Astra ++ 19 ++ ++ 0.7 ++ 99.2 ++ ++ ++ ++1097440937C315B67747A306C466CCCF55B8F055176DFD6A2061AADC235FD95FE5259545E3 ++ ERA Kozani ++ 20 ++ ++ 0.7 ++ 100.6 ++ ++ ++ ++106338540776AB993148427CF32961DF65E082B3746EE579B7F51228015D2C0AFEE5FE3B18 ++ Energy FM ++ 21 ++ ++ 0.7 ++ 101 ++ ++ ++ ++10633854072EF5E4D39CD2686DC398799C6BC06B33C6CF5AF8F49EF08AB2DDE87A1DF28CB5 ++ Melodia ++ 22 ++ ++ 0.7 ++ 102.4 ++ ++ ++ ++10633854070216B895699C7066D736450D9AB7CE21915CEDEE4160943B05558B7DCA595F8B ++ Radio Contact ++ 23 ++ ++ 0.7 ++ 103.3 ++ ++ ++ ++1177228968EE49047C34766F31EBA3CBC70B260C51795FF804520F3673FA4D31D60C29C5E5 ++ Siera FM ++ 24 ++ ++ 0.7 ++ 105.3 ++ ++ ++ ++1177228975E0F618803191F64E0F240EA42E64C2FE3CAF4220B5381EBF53F5C2DA7BF44774 ++ xristianity.gr ++ 25 ++ ++ 0.7 ++ 107.3 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am kradio-3.5.13.1/kradio3/presets/greece/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/greece/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/greece/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,13 @@ ++SUBDIRS = ++EXTRA_DIST = "athens2-antenna.krp" "athens-antenna.krp" "kastoria-antenna.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/" ++ $(INSTALL_DATA) "$(srcdir)/athens2-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/athens-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/kastoria-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens2-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/athens-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/greece/kastoria-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp +--- kradio-3.5.13.1/kradio3/presets.old/hungary/bodajk.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/hungary/bodajk.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,144 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Zoltán Kukk <kukkzoli at freemail.hu> ++ 2007-01-03T21:00:00 ++ Hungary ++ Bodajk ++ ++ ++ ++ ++ ++1167850373C82402EA2D65E2EF47C5AD84039FCA74B2C9606BDA3149E6D6BDF7FBE95D063E ++ Juventus rádió ++ Juventus ++ ++ -1 ++ 89.5 ++ ++ ++ ++1167850406B8127A80BD8BD2C586FD1631292311B0CED2324E69418EC01B0557B9968CACAC ++ Ezerjó rádió ++ Ezerjó ++ ++ -1 ++ 89 ++ ++ ++ ++1167850435CFAC2599DDD436BF567F4271775919A5B073D86F44E1F4060A7C28B8F0F6A2F2 ++ Danubius rádió ++ Danubius ++ ++ -1 ++ 103.3 ++ ++ ++ ++1167850498CCFA6F317518BF91DF109749ECB2DFDB6E9EC8166C0A969B744DAEEF6ACF8242 ++ Sláger rádió (Budapest) ++ Sláger ++ ++ -1 ++ 100.8 ++ ++ ++ ++1167850855354EC11F0524A66B56EBF339D03E94CFEACCF7CCD5321509F1FA04047EC4AA7D ++ Sláger rádió (Kabhegy) ++ Sláger ++ ++ -1 ++ 107.2 ++ ++ ++ ++11678510534FA202C2D87C91BABE55195F61FCF266513D3FDDD4FD825E1531ABA688DA9176 ++ Kossuth rádió (Budapest) ++ Kossuth ++ ++ -1 ++ 107.8 ++ ++ ++ ++1167851116A73EED2A8825C4D7FDB0CF782E800B989D0AE371B5B0DCD7DE29C0B9A3E729ED ++ Kossuth rádió (Székesfehérvár) ++ kossuth ++ ++ -1 ++ 92.3 ++ ++ ++ ++116785116398AF0022838BE746A818A591D40E0724E64E12194140D15BBD54A164999C2128 ++ Petőfi rádió (Budapest) ++ Petőfi ++ ++ -1 ++ 94.8 ++ ++ ++ ++11678512258B63DE67579D3C8A129EDBCC01F899B13BBBE330F0A9639354957A85A7EFA3E0 ++ Petőfi rádió (Kabhegy) ++ Petőfi ++ ++ -1 ++ 93.9 ++ ++ ++ ++116785126176BD6278000E1B61D6456B665421F90C2399723E2FF720C6A422748F6B10086F ++ Bartók rádió (Budapest) ++ Bartók ++ ++ -1 ++ 105.3 ++ ++ ++ ++11678513005B487EEA72C73F5C6C68C219F140943028F878063E44F6DB114EFF24F51C60A0 ++ Bartók rádió (Kabhegy) ++ Bartók ++ ++ -1 ++ 105 ++ ++ ++ ++1167851614C4E8169C6CBA010DE341C04C2945D0F372DBCE50FDF23A6EAFA8BFE50ED1AF72 ++ Fehérvár rádió (Székesfehérvár) ++ Fehérvár ++ ++ -1 ++ 94.5 ++ ++ ++ ++11678516557A409DB4975E5AFCF59176FAF534BAEFC5AB5AE0828EA0F3EAB932A502D26F02 ++ Vörösmarty rádió (Székesfehérvár) ++ Vörösmarty ++ ++ -1 ++ 99.2 ++ ++ ++ ++1167851693B85F04BD653789133040263C907C468621EA5E96E1546A763B543243B3BADA55 ++ Rádió 1 (Székesfehérvár) ++ Rádió 1 ++ ++ -1 ++ 101.8 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/hungary/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/hungary/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,14 +1,16 @@ + SUBDIRS = +-EXTRA_DIST = "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp" ++EXTRA_DIST = "bodajk.krp" "budapest-antenna.2.krp" "budapest-antenna.krp" "budapest.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/" +- $(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" ++ $(INSTALL_DATA) "$(srcdir)/bodajk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp" + $(INSTALL_DATA) "$(srcdir)/budapest-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp" + $(INSTALL_DATA) "$(srcdir)/budapest-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/budapest.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/bodajk.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/hungary/budapest.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/iceland/akureyri-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/iceland/akureyri-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,66 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Sveinn í Felli, ++<sveinki@nett.is> ++ 2007-09-19T16:06:04 ++ Iceland ++ Akureyri ++ Antenna ++ Skýrustu stöðvarnar í Þorpinu, beint á móti ++Hallandssendunum og í sjónlínu við ++Vaðlaheiðarmöstrin. ++ ++ ++ ++1116455444C0A53C88CF0B0CDA23B95FF522492EDC8D85A8A49E1FFDEC642F996299EBB966 ++ 12spor AEY ++ ++ ++ -1 ++ 89.5 ++ ++ ++ ++111645544483CB529B5F78FB43D62D676F8E160605DDB4EF2740153A1C170D9E77B153CEB7 ++ Talstöðin AEY ++ ++ ++ -1 ++ 90.9 ++ ++ ++ ++1116455444EF6B983A00E17071CFDECD828F1BDC0B8D79AAEA6B7070982F29B978DAAAA2E0 ++ Gamla Gufan ++ RUV ++ /home/sveinki/Documents/mnt/myndir/Skype ++Pictures/ruv0.jpg ++ -1 ++ 91.6 ++ ++ ++ ++1190205101A69868A03E013E9129D67A1A2C905B0269D0F028844017DE11058713DB990936 ++ Bylgjan AEY ++ 1 ++ ++ -1 ++ 92.7504 ++ ++ ++ ++11902051081962E6F35CE1BCF2BC88F69F37181A8D9D354ACC18945492247F99F3C75D886B ++ Raus 2 AEY ++ R2 ++ ++ -1 ++ 96.5256 ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/iceland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/iceland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,10 +1,11 @@ + SUBDIRS = +-EXTRA_DIST = "reykjavik-antenna.krp" ++EXTRA_DIST = "akureyri-antenna.krp" "reykjavik-antenna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/" ++ $(INSTALL_DATA) "$(srcdir)/akureyri-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/reykjavik-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp" + +- + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/akureyri-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/iceland/reykjavik-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/india/chennai-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/india/chennai-antenna.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,90 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ R Deepak ++ 2007-03-31T18:43:18 ++ India ++ Chennai ++ FM Channels ++ All the FM channels in Chennai. ++ ++ ++ 11753445936E9E0E3CB2F8B796DA65739E538B78054D02FC4FF552D5AD5322BF9096662427 ++ Suryan FM! 93.5 ++ Suryan ++ ++ -1 ++ 93.5 ++ ++ ++ 117534478397469F0EE509B25EC447D0FB792BAD25C215AC5030FCE0A5526753581D51EE8A ++ AIR Chennai! 106.4 ++ AIR ++ ++ -1 ++ 106.4 ++ ++ ++ 11753448532F6C07DB566ADC38950FBEFE3BA1B7A17C67588FCFE42ECF91EBC93060C5484E ++ Radio Mirchi! 98.3 ++ Mirchi! ++ ++ -1 ++ 98.3 ++ ++ ++ 1175344609AEBF26E4585D6BB9451B35A6B79D28D60BB45191557CEABE2B70DE9B73286723 ++ Hello FM! 106.4 ++ Hello ++ ++ -1 ++ 106.4 ++ ++ ++ 1175345266393FFD660E04396BD99D66EF2B285E20CFEE6F34EC7C1D76D6CE7CD5678A5A99 ++ Radio City! 91.1 ++ City! ++ ++ -1 ++ 91.1 ++ ++ ++ 11753453722D6047CF4D052685FF27306A5E4EB1D199E8F73B96D8F6FF98D2ECD83377B214 ++ Aha! 91.9 ++ Aha! ++ ++ -1 ++ 91.9 ++ ++ ++ 1175345415AB9DF01C90B137E3F59A6D461167A3DCA48358E634B8018ACB4302D67004B137 ++ 92.7 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ 1175345458D724DBB612353F3FEE62EF46FDF1262938FB884B7DB68746D40ADB11E4B44824 ++ Radio One! 94.3 ++ One! ++ ++ -1 ++ 94.3 ++ ++ ++ 1175345587560034B04EDFB7D495329917971B0D575ABA42943DE907244C2712EAFDC58C7D ++ All India Radio 105 ++ AIR 105 ++ ++ -1 ++ 105 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am kradio-3.5.13.1/kradio3/presets/india/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/india/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/india/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,9 @@ ++SUBDIRS = ++EXTRA_DIST = "chennai-antenna.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/india/" ++ $(INSTALL_DATA) "$(srcdir)/chennai-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/india/chennai-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp +--- kradio-3.5.13.1/kradio3/presets.old/italy/bologna.2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/italy/bologna.2.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,239 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Gabriele Armao - <armao@cs.unibo.it> ++ 2006-10-04T19:27:15 ++ Italy ++ Bologna ++ ++ ++ ++ ++ 1159867796E4871EB13C28A4A30D192702AE16A05157116050944CD6793E90BF9431658294 ++ Puntoradio ++ Puntoradio ++ ++ -0.01 ++ 88 ++ ++ ++ 1159867800ACD74C759A92F0A0145B76486A9BA709640E3C8F5E09F4AA2349729389715EEB ++ Radio 1 ++ Radio 1 ++ ++ -1 ++ 89.5252 ++ ++ ++ 11598678056B10C8341D5C385A6E8083B51B686CF65A96E423BB96146AB0EBB15F12EBAEAA ++ Radio 2 ++ Radio 2 ++ ++ -1 ++ 91.6753 ++ ++ ++ 1159867815F32674A7E6FCF9D777C56835DE55FD2EF382991E57FA34D17B6084D8AE6A96DA ++ Radio Gamma ++ Radio Gamma ++ ++ -1 ++ 95.05 ++ ++ ++ 115986781556CB6407ED08D4399F2B64B0D712DF67904FE87E846290502F5E7D29F74273D7 ++ Radio Company ++ Radio Company ++ ++ -1 ++ 95.3755 ++ ++ ++ 115998100090243491D552054F89D8AE7CC4C1BBB8E5A75979E8623EDCE4B4FA88E66F5259 ++ Radio Città del Capo ++ Radio Città del Capo ++ ++ -1 ++ 96.3 ++ ++ ++ 1159867821D06CE1DEFACAE89FA611D6C23F51494EF2AA0E9644A204A103574E4246A500F4 ++ Radio Nettuno ++ Radio Nettuno ++ ++ -1 ++ 97 ++ ++ ++ 1159867823CDAAED89B09854AE271D642C9CA742EEAD75D17800B0139C21BA29E8C3A48F45 ++ Radio International ++ Radio International ++ ++ -1 ++ 97.5756 ++ ++ ++ 1159867824DFE7DA44AA821CEF20013FB9698274C644DA33DCFCDB594271F69B9B7B21782A ++ Paneburro ++ Paneburro ++ ++ -1 ++ 98.25 ++ ++ ++ 11598678290325C9320F5DE2D693129FAD419939421E812A1C96B5A41EF5DCFC3951EC0B15 ++ Playstudio ++ Playstudio ++ ++ -1 ++ 99.4 ++ ++ ++ 1159981753D8BD52A46D7EAFD830788FE999D83B1A3CBF25070AED7694DA606FFFC5359D60 ++ Radio Deejay ++ Radio Deejay ++ ++ -1 ++ 99.7 ++ ++ ++ 1159981844BCA202D2B3664A3DF04F9A5B0CC018D76C0BF6D378608CD6A7CD5198C44896DA ++ Radio Fashion ++ Radio Fashion ++ ++ -1 ++ 100.2 ++ ++ ++ 1159867834C67A4C4EFF36BBBA44B89F4EEFA5A0FDA68318BE7C332940741BE05CC9FC4E02 ++ Radio Maria ++ Radio Maria ++ ++ -1 ++ 101 ++ ++ ++ 1159867835AA567DCB00F1CDA9CEC1D422F70EBDA6D4F7DA7013A2BCC645F4B8AEEEC9BFAE ++ Radio Monte Carlo 2 ++ RMC2 ++ ++ -1 ++ 101.3 ++ ++ ++ 115998202597FB17CD324D30D4365EBFAAB74C28DB868BB8D425D1D730113AB84587524351 ++ RTL 102.5 ++ RTL 102.5 ++ ++ -1 ++ 101.6 ++ ++ ++ 1159982065046E122F7603346855EF8A55392F69BAFD8A73FA43B2C1A7CD10325A2E7F75DF ++ Kiss Kiss ++ Kiss Kiss ++ ++ -1 ++ 101.8 ++ ++ ++ 115986783739E74C73DCAE72789AB048FB7551DCB819C63A7F1870A746B08AB62F3BE80B2C ++ Radio Anni 60 ++ Radio Anni 60 ++ ++ -1 ++ 102.351 ++ ++ ++ 115986783967AD82D48D91060A6D094CC266C7B84667EE0219D268835AD5B65A9E7B835DC0 ++ Radio Bruno ++ Radio Bruno ++ ++ -1 ++ 102.8 ++ ++ ++ 11599822368F30FEE3569AD480E8E9EDDC59E3ADB3F077542FD82BED3B147C62ACF47268AF ++ Radio Città Fujiko ++ Radio Città Fujiko ++ ++ -1 ++ 103.05 ++ ++ ++ 1159867840EC49187AF76B4CC4862BD711948CF56DB9FBCDB0040409329E5918F1C4FB9E8C ++ Radio 103.3 ++ Radio 103.3 ++ ++ -1 ++ 103.251 ++ ++ ++ 11599823610B03AD0A2BA306E94007E0E548C1FDF3F7A2960FA9E2F745A08C80CF286FEF31 ++ Radio105 ++ Radio105 ++ ++ -1 ++ 103.55 ++ ++ ++ 1159867842CC2EB15567BD3B2BB8167B7D0A467877326888C087BE7FE78FE8826CDB70FBB7 ++ Radio Sabbia ++ Radio Sabbia ++ ++ -1 ++ 103.976 ++ ++ ++ 11598678446057BC4116C3FD33AF7BAF73951B6DAEE334DC8A35311D6952232AC131AB86D2 ++ Radio DImensione Suono ++ RDS ++ ++ 0 ++ 104.501 ++ ++ ++ 115986784537E07F9C327005C0DB00C6D1BB6749175482EB87FE5C7DEE67AEDEC6EAB06921 ++ Lattemiele ++ Lattemiele ++ ++ -1 ++ 105.026 ++ ++ ++ 11598678482059D4D5764000004CF5FD49E8796D8E1E1B5DA24CBAFB3670FCBC1F9D644FFF ++ Playradio ++ Playradio ++ ++ -1 ++ 106.076 ++ ++ ++ 1159867850B8776E8E5D779CC8EC9CD4FBEF53C3A6CBDBAB1049FBC64455B0BA3222B9B964 ++ Radio 24 ++ Radio 24 ++ ++ -1 ++ 107.001 ++ ++ ++ 1159867852D619DE2433296B2FD51950E7A1F34D750801F1D90BBEEC2750851A9166F65C0C ++ Lattemiele ++ Lattemiele ++ ++ -1 ++ 107.526 ++ ++ ++ 1159867853CCFF791DEAD366D390AB80F332149BE5523826D5927A027319AABD4A118FFCF2 ++ Radio 101 ++ Radio 101 ++ ++ -1 ++ 107.951 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am kradio-3.5.13.1/kradio3/presets/italy/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/italy/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/italy/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,14 +1,17 @@ + SUBDIRS = +-EXTRA_DIST = "bologna.krp" "rovato.krp" "torino-antenna.krp" ++EXTRA_DIST = "bologna.2.krp" "bologna.krp" "rovato.krp" "torino-antenna.krp" "trento.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/" ++ $(INSTALL_DATA) "$(srcdir)/bologna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp" + $(INSTALL_DATA) "$(srcdir)/bologna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp" + $(INSTALL_DATA) "$(srcdir)/rovato.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp" + $(INSTALL_DATA) "$(srcdir)/torino-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/trento.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp" + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/bologna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/rovato.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/torino-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/italy/trento.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp kradio-3.5.13.1/kradio3/presets/italy/trento.krp +--- kradio-3.5.13.1/kradio3/presets.old/italy/trento.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/italy/trento.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,367 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ ClaudioFior ++ 2008-02-23T12:21:33 ++ Italy ++ Trento ++ Generical commercial radio ++ The first private radio for audience ++ ++ ++ ++12037788327C5000A1E1C3107F31D06EE254802E7FE64344B8508BD16B33321349F935F092 ++ RTT ++ ++ ++ -1 ++ 87.8 ++ ++ ++ ++12037784512E058DF3EB180F961037205703CFA3E43AD176232529B6F7A694C83C90133064 ++ Radio 1 ++ ++ ++ -1 ++ 88.05 ++ ++ ++ ++12037783990F5404D815267E1CEFBEBD2AF561F18B4AA33DE9DBC766067B0BE8A04398B6EA ++ RTT ++ ++ ++ -1 ++ 88.2 ++ ++ ++ ++1203778152A526CCA7DA26245392806D9EEBC290A91EEC1D318C9D80F87BE2F00C41B8B27C ++ Radio 1 ++ ++ ++ -1 ++ 88.7 ++ ++ ++ ++1203766148E30AA19F10875C0E4491222EF1665EFFC0D39FD585D8A7867309FD8AE02D2E13 ++ Radio Italia ++ ++ ++ -1 ++ 89 ++ ++ ++ ++1203765566F4E2677160964DE0F02C40E19C974AF24CA370A5497DC8684CDA0971F1565234 ++ Radio Italia Anni 60 ++ ++ ++ -1 ++ 89.6 ++ ++ ++ ++120376511549E6B71A3CE890F8B8676EEFD32C390819740918C2141BA47DD3150368D636E3 ++ Latte e miele ++ ++ ++ -1 ++ 90.05 ++ ++ ++ ++120376467696B11D09DBAE0D31FC25BC86C345975673125B1C3E0DE0962A9CDB822548D482 ++ Radio Maria ++ ++ ++ -1 ++ 90.4 ++ ++ ++ ++1195497782E78C6F58B61A33B081034F832CAF523A81F48BB5DD73D145CAE67C6D658F8E91 ++ Radio1 ++ ++ ++ -1 ++ 91 ++ ++ ++ ++1195498225CD235FD6E77F1BB29DF7303459C6ED8F08603A713F988646EBE11998E54D4122 ++ Radio2 ++ ++ ++ -1 ++ 90.7 ++ ++ ++ ++11981031163FC9FCF9F8557F554E7B70F10ABD1D8709C53C0AB9932DC9352467EEC8C00603 ++ Radio3 ++ ++ ++ -1 ++ 92.7 ++ ++ ++ ++119810398361E8DC092D02E9643CA66BDCCC5EB080057E8BB1BF8534EC6FFE3277DB186A7F ++ Radio Montecarlo ++ ++ ++ -1 ++ 95.45 ++ ++ ++ ++1203150062CB034C1991734F1DC16A7F45C94824B25183111A6C807DE86FED49C10EB41DE9 ++ Radio Margherita ++ ++ ++ -1 ++ 91.4 ++ ++ ++ ++1203150356B2B3BF5088BF9B9224B6E44A13843E8D5FCCC9C9E6CD722DFBDEF67DB7B3D571 ++ Radio Cuore2 ++ ++ ++ -1 ++ 91.95 ++ ++ ++ ++1203150494711D017990E1A8C63D001A814F39BF5CD86E7FA27B31EA5B7832962E769FC1F2 ++ Radio Studio pi� ++ ++ ++ -1 ++ 92.4 ++ ++ ++ ++120315071062B241694CA1A60BAE348E8EF398A0E787A9DCC3C217A146CC5BB5D063EADD92 ++ Radio Italia ++ ++ ++ -1 ++ 92.95 ++ ++ ++ ++1203153606B8A32AD018D71B5804D33FC84739B120ED1E04180E44E0234D5A200516DC3EE1 ++ 105 in alta quota ++ ++ ++ -1 ++ 93.4 ++ ++ ++ ++120315396131FC29130C20B77297DF7D1F37C78079FC106952987C864AE6D5F492AC1D6E06 ++ Radio cuore ++ ++ ++ -1 ++ 94.35 ++ ++ ++ ++1203154501D15FD503F381C2FEF7661D720D5F52963461D72CFA9FA21127CFA667CADF9A33 ++ Radio cuore 3 ++ ++ ++ -1 ++ 95 ++ ++ ++ ++12031568517DD2548E0946F0065974D5A21507A3E08350C7AA97AE0957D887E276AD99C019 ++ NBC ++ ++ ++ -1 ++ 96.3 ++ ++ ++ ++1203200613E74CEFC21DA7C4B61BC16A599C136A70D129B325476B181C2C1CAECF6556E90E ++ In blue ++ ++ ++ -1 ++ 96.65 ++ ++ ++ ++12037568765ECB0C523B1E78437E39371DC85BC474862827FA874A2B15D66D1B352B10AB26 ++ Radio Dimensione Suono ++ RDS ++ ++ -1 ++ 97.95 ++ ++ ++ ++1203757011E882BF401D989C42961F043F263E18467AECBB0A10E00652EDC1D82337D405D1 ++ Vergin Radio ++ ++ ++ -1 ++ 98.25 ++ ++ ++ ++12037570988FB0B1EBE148AC82B42FB155E3429D704D950EE22ADDA71D55DB145A65CB1ABA ++ Radio Dimensione Suono ++ RDS ++ ++ -1 ++ 98.6 ++ ++ ++ ++1203757250F1C78881D6FF295D020E80C91C4AC8E56329C223B3F87837CE44E4C78D08CF0D ++ Radio Latte e Miele ++ ++ ++ -1 ++ 98.85 ++ ++ ++ ++1203757675DF3EB701C74C7CF82B8B9173CEC28CB21C70F61A87CC91025EA6C021E3898B5F ++ Radio Dolomiti ++ ++ ++ -1 ++ 99.2 ++ ++ ++ ++120375786255B98C202F837DD293EEF55471EACA537B331E228B2EE835E494F4866C4E9A2F ++ Radio Genius ++ ++ ++ -1 ++ 100.75 ++ ++ ++ ++12037583500BB86685BFC434BE7675EC38DD2E7604E0220C0DE8D1D65695A0E7B06378AD6A ++ Radio Dolomiti ++ ++ ++ -1 ++ 101.1 ++ ++ ++ ++12037584063E07EC045C029EDBFE8499AC6E21E4342C33B8CF7C4824DD2DDA12A21C852D03 ++ Radio Genius ++ ++ ++ -1 ++ 101.65 ++ ++ ++ ++12037584836A28EE00AF9C12F3FAD88367F1DB27C939CE4DA444200AE57017191D0813614E ++ Radio Capital ++ ++ ++ -1 ++ 101.95 ++ ++ ++ ++1203758731A214755DC7D0A2FEC3927765269DCE92958E7D5C3D83B8C884D9212621CE9644 ++ Radio Gamma ++ ++ ++ -1 ++ 102.25 ++ ++ ++ ++1203758996A5D1C5CF5289364B936E933C047EFA878B2663A679F56B0A8DE1DEEF029E5526 ++ RTL 102.5 ++ ++ ++ -1 ++ 102.45 ++ ++ ++ ++120375929353FA1323BD876CCF878483DDE94B4A6AC5CDB97FC16B4C4CFE460C901B60CCCD ++ Radio 24 ++ ++ ++ -1 ++ 102.7 ++ ++ ++ ++120375997547B7A1EDB73B248BB273EB8CD513AC1D2B3C0DC882208B4DCEDE1CFB244DACE3 ++ Rete 101 ++ ++ ++ -1 ++ 102.95 ++ ++ ++ ++1203761052A4C36EDEEE1E12F8452070F64678AD816B2E449E2C1B9D761A9644F7DB1FE18A ++ Radio Radicale ++ ++ ++ -1 ++ 103.35 ++ ++ ++ ++1203761721500B262A77C5F20170FCE50704F412CB4C55AA7B7CAF552F636CD4E307A3FF4A ++ Radio DJ1 ++ ++ ++ -1 ++ 103.65 ++ ++ ++ ++1203764354DE34015364D5C788E9EE6BB21CF1286AF4BBD7CCA54E4836D6536E5B8D68C3A3 ++ Radio Maria ++ ++ ++ -1 ++ 104 ++ ++ ++ ++1203764542A23343C3040B36F14B8B65AE6D8298113863B25247836B094DDC21E962A0279A ++ Radio DJ ++ ++ ++ -1 ++ 104.25 ++ ++ ++ ++1203764641F20C7E2AC6EBD257052162471AE4DEFD3773757B400E480176B471F07CEE6612 ++ Radio 105 ++ ++ ++ -1 ++ 105 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/lithuania/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/lithuania/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,12 +1,13 @@ + SUBDIRS = +-EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp" ++EXTRA_DIST = "kaunas-antenna.krp" "panevezys.krp" "vilnius.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/" + $(INSTALL_DATA) "$(srcdir)/kaunas-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/panevezys.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/vilnius.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp" + + uninstall-local: + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/kaunas-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/panevezys.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/lithuania/vilnius.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp +--- kradio-3.5.13.1/kradio3/presets.old/lithuania/vilnius.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/lithuania/vilnius.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,88 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Andrzej Valchik ++ 2008-08-27T23:00:25 ++ Lithuania ++ Vilnius ++ ++ Contains merged Data ++ ++ ++ ++12198672179D04D8F6F96417B40484863BE066FC65D89EB7336B216618B7319056873D6999 ++ Zip FM ++ 1 ++ ++ -1 ++ 100.1 ++ ++ ++ ++1219867219728EC984D598E6FC962752395F584B659E6D7C2DCF837FCE3C20951C5DD66969 ++ Russian Radio ++ 2 ++ ++ -1 ++ 105.6 ++ ++ ++ ++1219867220014EF13080BDD4E133C40C717013A6D0E184DED3CE7D49C820379D0F4ED69288 ++ Radiocentras ++ 3 ++ ++ -1 ++ 101.5 ++ ++ ++ ++1219867222255675B2B22E8A9936E9BCE61691DD75DCE674AE5CD3A0D1B83C717CB64D7FCA ++ M1 ++ 4 ++ ++ -1 ++ 106.801 ++ ++ ++ ++121986753461099673260F43AC1048500BA8CD6A48CE88E7C3655AC55029A0533699DEEE5C ++ Power Hit Radio ++ ++ ++ -1 ++ 95.9 ++ ++ ++ ++121986760885465B9D5A74B4022D81F51C0478BAA1BF2E57D4C4A983FFB26616F66E28491A ++ European Hit Radio ++ ++ ++ -1 ++ 99.7 ++ ++ ++ ++12198670760B330000E51F0F3617E1C73F67120DF45ACE16AB33D101129A0F65BEF43D2847 ++ Opus 3 ++ ++ ++ -1 ++ 98.3 ++ ++ ++ ++12198677026740FED9FAD2BC544E5FFDF0F11F5B9FCF3C84AE76210C237B238794FE3E35B0 ++ M1+ ++ ++ ++ -1 ++ 106.2 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp +--- kradio-3.5.13.1/kradio3/presets.old/luxemburg/alzette.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/luxemburg/alzette.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,324 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Loes Alex >alex@linux.lu> ++ 2006-11-12T12:25:01 ++ Luxembourg ++ Esch/Alzette ++ ++ Contains merged Data ++ ++ ++ ++1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0 ++ S�dwestrundfunk 1 ++ SWR1 ++ ++ -1 ++ 99.2 ++ ++ ++ ++1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359 ++ S�dwestrundfunk 1 ++ SWR1 ++ ++ -1 ++ 97.7 ++ ++ ++ ++1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262 ++ S�dwestrundfunk 2 ++ SWR2 ++ ++ -1 ++ 93 ++ ++ ++ ++1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E ++ S�dwestrundfunk 3 ++ SWR3 ++ ++ -1 ++ 90 ++ ++ ++ ++1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808 ++ S�dwestrundfunk 3 ++ SWR3 ++ ++ -1 ++ 90.6 ++ ++ ++ ++1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08 ++ Classic21 ++ Classic21 ++ ++ -1 ++ 87.6 ++ ++ ++ ++106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343 ++ Premiere ++ Premiere ++ ++ -1 ++ 96.4 ++ ++ ++ ++11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7 ++ Vivacit� ++ Vivacit� ++ ++ -1 ++ 91.5 ++ ++ ++ ++1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6 ++ RTL L�tzebuerg ++ RTL L�tzebuerg ++ ++ -1 ++ 88.9001 ++ ++ ++ ++11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42 ++ RTL L�tzebuerg ++ RTL L�tzebuerg ++ ++ -1 ++ 92.5 ++ ++ ++ ++116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E ++ RTL Radio ++ RTL Oldie ++ ++ -1 ++ 93.3 ++ ++ ++ ++1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71 ++ RTL Radio ++ RTL Oldie ++ ++ -1 ++ 97 ++ ++ ++ ++116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F ++ BEL RTL ++ Bel RTL ++ ++ -1 ++ 90.4 ++ ++ ++ ++116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B ++ Musique ++ Musique ++ ++ -1 ++ 90.8 ++ ++ ++ ++10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85 ++ Musique 3 ++ Musique 3 ++ ++ -1 ++ 94.1 ++ ++ ++ ++10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6 ++ DNR ++ DNR ++ ++ -1 ++ 102.9 ++ ++ ++ ++11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36 ++ DNR ++ DNR ++ ++ -1 ++ 104.2 ++ ++ ++ ++1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561 ++ 100komma7 ++ 3 ++ ++ -1 ++ 100.701 ++ ++ ++ ++10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0 ++ Radioara ++ ARA ++ ++ -1 ++ 103.3 ++ ++ ++ ++1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639 ++ Eldoradio ++ ELDO ++ ++ -1 ++ 105.002 ++ ++ ++ ++1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C ++ City FM Esch ++ City FM ++ ++ -1 ++ 101.2 ++ ++ ++ ++1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606 ++ Inter ++ Inter ++ ++ -1 ++ 98.1 ++ ++ ++ ++11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F ++ Radio Festival ++ Festival ++ ++ -1 ++ 101.7 ++ ++ ++ ++116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9 ++ new station 9 ++ 9 ++ ++ -1 ++ 105.9 ++ ++ ++ ++116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45 ++ Radio Latina ++ Latina ++ ++ -1 ++ 101.2 ++ ++ ++ ++1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A ++ Lokalradio Betebuerg ++ LRB ++ ++ -1 ++ 103.9 ++ ++ ++ ++11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D ++ Radio Contact 2 ++ Contact 2 ++ ++ -1 ++ 105.7 ++ ++ ++ ++1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39 ++ RGL ++ RGL ++ ++ -1 ++ 106 ++ ++ ++ ++1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E ++ Radio Belle Vallee ++ Belle vallee ++ ++ -1 ++ 107 ++ ++ ++ ++1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF ++ Radio Contact ++ Contact ++ ++ -1 ++ 107.5 ++ ++ ++ ++1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA ++ Radio Challenger ++ Challenger ++ ++ -1 ++ 102.2 ++ ++ ++ ++1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890 ++ 95,5 FM ++ 95,5 ++ ++ -1 ++ 95.5 ++ ++ ++ ++1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6 ++ 95,9 FM ++ 95,9 FM ++ ++ -1 ++ 95.9 ++ ++ ++ ++11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7 ++ 106,5 FM ++ 106,5 FM ++ ++ -1 ++ 106.5 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp +--- kradio-3.5.13.1/kradio3/presets.old/luxemburg/esch.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/luxemburg/esch.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,324 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Loes Alex >alex@linux.lu> ++ 2006-11-12T12:25:01 ++ Luxembourg ++ Esch/Alzette ++ ++ Contains merged Data ++ ++ ++ ++1163326933EB744DBB9C1EDD1D8E16F31C269ADD45F914715B65BABABC04EDAD9B1333F0C0 ++ S�dwestrundfunk 1 ++ SWR1 ++ ++ -1 ++ 99.2 ++ ++ ++ ++1163329364799814657B8D3E7D22528643D3E4BAB028C46DE92DC3F89F7C0F1B119B985359 ++ S�dwestrundfunk 1 ++ SWR1 ++ ++ -1 ++ 97.7 ++ ++ ++ ++1163329214DB6B30879AB4302A94C98A2ACFB6B2149FC6510CB58E6AA1F7B4EF51843D2262 ++ S�dwestrundfunk 2 ++ SWR2 ++ ++ -1 ++ 93 ++ ++ ++ ++1163328832D863DD1C695DA1403F48C349657FDF2677DF343F3F0882DF390BE7212716720E ++ S�dwestrundfunk 3 ++ SWR3 ++ ++ -1 ++ 90 ++ ++ ++ ++1163325201376872BE5AB201ACBE6B7916BC9FEAE1F778FAE36EDF09D1D8576C2FABE8B808 ++ S�dwestrundfunk 3 ++ SWR3 ++ ++ -1 ++ 90.6 ++ ++ ++ ++1163330034075C9ECB9718957096823D12613AD16CB915A26D10BE65CF5407CCD56A43DF08 ++ Classic21 ++ Classic21 ++ ++ -1 ++ 87.6 ++ ++ ++ ++106338540798C0D12726F1661419AB34C2642A94AC5C6E261E91C693826FE8AAB710612343 ++ Premiere ++ Premiere ++ ++ -1 ++ 96.4 ++ ++ ++ ++11633290654CF0230A48506DC3DD90CD2D762F486571C0F789F7EBB5AC0C21A9FA780427D7 ++ Vivacit� ++ Vivacit� ++ ++ -1 ++ 91.5 ++ ++ ++ ++1063385407AFBFB6A017C8C7A5F8F16BC30B85D0C0E87B84799C65FCE80394C9D2202CE4B6 ++ RTL L�tzebuerg ++ RTL L�tzebuerg ++ ++ -1 ++ 88.9001 ++ ++ ++ ++11633291411FAD229D1CAAADED0CE059FE98C637C0D4990AE9576CB360DB47DB434B1E7E42 ++ RTL L�tzebuerg ++ RTL L�tzebuerg ++ ++ -1 ++ 92.5 ++ ++ ++ ++116332520866D4C8867B32DE1801A83417CAD34D4D385052BA2C9A2CF6300AFD972A5FF38E ++ RTL Radio ++ RTL Oldie ++ ++ -1 ++ 93.3 ++ ++ ++ ++1063385407EA222E19244D3040A4F1B8AC8AF03F4EB304ED09F9D0C946A9B557590C5D2B71 ++ RTL Radio ++ RTL Oldie ++ ++ -1 ++ 97 ++ ++ ++ ++116332892335934EA1B377096CBBCD683C87556466B34F9A3720458EE6BC15AECCF3F0D07F ++ BEL RTL ++ Bel RTL ++ ++ -1 ++ 90.4 ++ ++ ++ ++116332520577808CE062019CAEA5A0EA201C8F5FB635FCAD2B27184857ADA60F1546BCD77B ++ Musique ++ Musique ++ ++ -1 ++ 90.8 ++ ++ ++ ++10633854070D0624F5D0DE76E44CBFCA7425618F58AB75BEF835973FBF447FDA5B50117B85 ++ Musique 3 ++ Musique 3 ++ ++ -1 ++ 94.1 ++ ++ ++ ++10633854076161020BD41D27F67E226E563E890312F73FB3301F832FD42F97F2C7FC6764C6 ++ DNR ++ DNR ++ ++ -1 ++ 102.9 ++ ++ ++ ++11633252222E92DD5C3EC58F99CD07722FDA5639008D903059DFFC75EDCFF658B4D6D89C36 ++ DNR ++ DNR ++ ++ -1 ++ 104.2 ++ ++ ++ ++1063385407C0E4A025D422F911694EA657E38FD8B85C87FD88DD984A01C9E0CB5F3DAC0561 ++ 100komma7 ++ 3 ++ ++ -1 ++ 100.701 ++ ++ ++ ++10633854079297D695D8BC75127B779ACDACAB080F4F03335C9B916941C159377D64678AF0 ++ Radioara ++ ARA ++ ++ -1 ++ 103.3 ++ ++ ++ ++1063385407BB520D98D14CECDCD0AAD64B8FF750BA848C03845757BDFB9F0B955D39843639 ++ Eldoradio ++ ELDO ++ ++ -1 ++ 105.002 ++ ++ ++ ++1163329418E8576AD40D75C543EE9A093DCE03B4051FAECBDF73D37CC48B96F40BEC79E22C ++ City FM Esch ++ City FM ++ ++ -1 ++ 101.2 ++ ++ ++ ++1063385407917331FDBE436B09CF00637FC7F12D4E277AF861322A256EC884DD7E86CEF606 ++ Inter ++ Inter ++ ++ -1 ++ 98.1 ++ ++ ++ ++11633252192E0BA2ED6CD18FDFE748A79C5125781907807F97341E8822B1B404B5FACD486F ++ Radio Festival ++ Festival ++ ++ -1 ++ 101.7 ++ ++ ++ ++116332522516BC3F1CF778CF47ABBFE182FD7AFA0865B7F87E9089E5FBC8A4D1BAA32DABA9 ++ new station 9 ++ 9 ++ ++ -1 ++ 105.9 ++ ++ ++ ++116332954945F54F898EC8F2BB6AA85DDC110F72F64AB4D8E3451E55345F4E1FEDF5634E45 ++ Radio Latina ++ Latina ++ ++ -1 ++ 101.2 ++ ++ ++ ++1163329706DED977EB4B2A58B696F64B718E96BC68CAD6DB1DA034BE75BDC5320FECEBF85A ++ Lokalradio Betebuerg ++ LRB ++ ++ -1 ++ 103.9 ++ ++ ++ ++11633297674FEF7DD1C2FBF43ACA3CA7EB2C936F59620DD5374ACB0609F9B1CF4FABA7849D ++ Radio Contact 2 ++ Contact 2 ++ ++ -1 ++ 105.7 ++ ++ ++ ++1163329812F12CE288BAF733BD9199B53EDA01804DE48CC577A08FBBFAD6C4F7ACA1848C39 ++ RGL ++ RGL ++ ++ -1 ++ 106 ++ ++ ++ ++1163329847C0213ACA35041D97ADD05C5DB1B7C1CCD2F6E8C5BFED71C2E19FDDC24B93254E ++ Radio Belle Vallee ++ Belle vallee ++ ++ -1 ++ 107 ++ ++ ++ ++1163329897A1FDDD433DD21199DED68FF9F0E540F1E4CD6C55B33BBAF99241B902091C2AAF ++ Radio Contact ++ Contact ++ ++ -1 ++ 107.5 ++ ++ ++ ++1163329591D429F2459980ACBC417A2048FADD9D273F527EE86515629C14E91F417FE039FA ++ Radio Challenger ++ Challenger ++ ++ -1 ++ 102.2 ++ ++ ++ ++1163330188CC0367F029D5A66062615F6BCE2FAF0728695533704EF79C712BF0B06BA56890 ++ 95,5 FM ++ 95,5 ++ ++ -1 ++ 95.5 ++ ++ ++ ++1163330246FF5200963B1566F233EE7AB74AE953AD9E77ABBBD4EE5251EC63DA2647CCCCF6 ++ 95,9 FM ++ 95,9 FM ++ ++ -1 ++ 95.9 ++ ++ ++ ++11633303204AFAE7D4A526CF4AE040C00CB72415289FB237237EF96227CBC73E1939F3B9E7 ++ 106,5 FM ++ 106,5 FM ++ ++ -1 ++ 106.5 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/luxemburg/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/luxemburg/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,10 +1,13 @@ + SUBDIRS = +-EXTRA_DIST = "walferdange.krp" ++EXTRA_DIST = "alzette.krp" "esch.krp" "walferdange.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/" ++ $(INSTALL_DATA) "$(srcdir)/alzette.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp" ++ $(INSTALL_DATA) "$(srcdir)/esch.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp" + $(INSTALL_DATA) "$(srcdir)/walferdange.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp" + +- + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/alzette.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/esch.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/luxemburg/walferdange.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/Makefile.am kradio-3.5.13.1/kradio3/presets/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/Makefile.am 2012-11-30 23:52:48.000000000 +0100 +@@ -1 +1 @@ +-SUBDIRS = switzerland norway bulgaria new-zealand ireland sweden iceland italy portugal brazil germany russia catalonia usa australia finland lithuania england slovakia canada spain luxemburg turkey belgium argentina romania netherlands south-africa austria uruguay hungary poland czechia france ++SUBDIRS = argentina australia austria belarus belgium brazil bulgaria canada catalonia colombia croatia czechia england finland france germany greece hungary iceland india ireland italy lithuania luxemburg netherlands new-zealand norway poland portugal romania russia slovakia south-africa spain sweden switzerland turkey ukraine uruguay usa vietnam +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp +--- kradio-3.5.13.1/kradio3/presets.old/netherlands/ede.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/netherlands/ede.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,360 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Wilfred van den Assem ++ 2004-08-14T13:45:29 ++ Netherlands ++ Ede ++ cable ++ got data from http://www.upc.nl/ ++ ++ ++ ++1061768916D6D60211155A9867579BD00D8BAAB1B161379528845A471C2473820166ACE223 ++ Radio 1 ++ Radio 1 ++ ++ -1 ++ 87.6 ++ ++ ++ ++1061768916674F270FB0E48154D32C1348A18098757C8FBB5B2E6DD4DBE531C44F80E55850 ++ Radio 2 ++ Radio 2 ++ ++ -1 ++ 88.2 ++ ++ ++ ++1061768916521DF9F0D8CC313B63094A26C58A3EF43281F65F7405DC7ED9F250F50877E6A8 ++ Radio 3 ++ Radio 3 ++ ++ -1 ++ 88.7 ++ ++ ++ ++1061768916875497BD80A8B3EB56FDD97D8BCD15143EF3A7FB072C8B3AF77BFC9B8B077F41 ++ Radio 4 ++ Radio 4 ++ ++ -1 ++ 89.1 ++ ++ ++ ++106176891671E2CAEA45B3503F03EC1C51826002CBD7B24604CA6379650E39A727905D27A9 ++ Radio 747 AM ++ Radio 747 AM ++ ++ -1 ++ 89.6 ++ ++ ++ ++106176891660FD79DFF18BF25EE5732FDAE5A7F4DE53C34511719A9D9A192A52FCDAB424FB ++ VRT Radio 1 ++ VRT Radio 1 ++ ++ -1 ++ 91.6 ++ ++ ++ ++1161153582384EAC06B0BE166AB53A183932FF5B20B5E78210FDACD304E3E73F651DCD3C03 ++ VRT Radio 2 ++ VRT Radio 2 ++ ++ -1 ++ 92 ++ ++ ++ ++10617689169CF30DDBE712348BEF827B9C3992B2E4761C7BE090E611BA3F3639F4C1B9ED68 ++ VRT Radio Klara ++ VRT Radio Klara ++ ++ -1 ++ 92.4 ++ ++ ++ ++116115361665D32BD758259F77358067404F00097689E170441AE61F4A31352285D328250E ++ Radio Oost ++ Radio Oost ++ ++ -1 ++ 107.9 ++ ++ ++ ++1161153652CCFDA5E3632D597D89537123A32442359230A708945E6893FC34A713DAF3CFB7 ++ Omroep Fryslan ++ Omroep Fryslan ++ ++ -1 ++ 100.9 ++ ++ ++ ++1061768916CCBEFA171CFA37C0C9504D15C9E5D25D4307FAB210169CE31D93B3EC2639EFC1 ++ Omroep Gelderland ++ Omroep Gelderland ++ ++ -1 ++ 103.3 ++ ++ ++ ++1061768916DAD184A2F4074D993CBB883601E987A73B79E77DF27EC7B59BBE06D9E3F1C25A ++ Lokale Omroep ++ Lokale Omroep ++ ++ -1 ++ 93.1 ++ ++ ++ ++10617689169DB2EDD8EC100A91AEE995A3803046E75F4C2E9FD96C4A9F4F4E572ACFD76E60 ++ BBC Radio 3 ++ BBC Radio 3 ++ ++ -1 ++ 102.2 ++ ++ ++ ++1161153719E945B75BBAE2BE88E1D6708CA899C38812377F524084DC17799B28EF95A7449F ++ WDR 1 ++ WDR 1 ++ ++ -1 ++ 99.1 ++ ++ ++ ++11611537345314B57844DCB83ED1854B2DD0AF2C0F35DE85056B2C31076E0C233C546ED8FA ++ WDR 2 ++ WDR 2 ++ ++ -1 ++ 99.5 ++ ++ ++ ++1161153750FEF87459094374CCA4D2C2D3184881B0E0490493088F22BF3F9EBA30857E4256 ++ WDR 3 ++ WDR 3 ++ ++ -1 ++ 99.9 ++ ++ ++ ++116115377178116A777931577FF53165625081CB5D288FD6584D5FDA80359B75305E9CE512 ++ WDR 4 ++ WDR 4 ++ ++ -1 ++ 100.5 ++ ++ ++ ++1061768916B8192E1A210DEA36E235662832013CA5A99264A14A07BA0933F5079FA526A1CE ++ Arrow Rock Radio ++ Arrow Classic Rock Radio ++ ++ -1 ++ 97.6 ++ ++ ++ ++116115335888BB7FB1792AB5778FA5020D15B6D27B83D36DA1707E3135AED4395FA4DC6DEA ++ Arrow 90,7 FM ++ Arrow 90,7 FM ++ ++ -1 ++ 101.3 ++ ++ ++ ++11611538298006F042F5BA4800CCB6E984D134258D0ED47B33E519D2D3E29AA1D3A138D734 ++ Het Gelders Geluid ++ Het Gelders Geluid ++ ++ -1 ++ 102.8 ++ ++ ++ ++11611538849F64970DCE09509546044C9CA3819FF67DD1EC1EF0ECCE744D74D2E4F1C64E6E ++ BBC World Service ++ BBC World Service ++ ++ -1 ++ 104.5 ++ ++ ++ ++1161153903EFD4B3ED578A480A62461EEBA0EABBE5603346C9DF183154881E81A7080A6F83 ++ BNR Nieuwsradio ++ BNR Nieuwsradio ++ ++ -1 ++ 106.7 ++ ++ ++ ++10617689169DB024ABAAA652F2C5476890B717855DBD52903DA0E0F5255A8E98AC2BB3E732 ++ Classic FM ++ Classic FM ++ ++ -1 ++ 104.9 ++ ++ ++ ++10617689164394C7A3D38B4FEDE5625C2E7534ED6AD44B8EE956712A802388A26DB075E098 ++ Concertzender ++ Concertzender ++ ++ -1 ++ 103.8 ++ ++ ++ ++1061768916FC58F6080AA9D2E99E4EF096A27242230717633F27CEAD62834C228FEE869BCC ++ RTL FM ++ RTL FM ++ ++ -1 ++ 98.1 ++ ++ ++ ++11611539802AD1AF72DE7F31516F32690C20DF5CDFCBD9FFF73B11B5B7066A3F17EDEF95F6 ++ Hot Radio ++ Hot Radio ++ ++ -1 ++ 101.8 ++ ++ ++ ++1161154009DFC37030D6C2614E5E925F3B92CA4F8987B0C6079BF0A79CA6C69D0810CE5DCA ++ Slam FM ++ Slam FM ++ ++ -1 ++ 97.1 ++ ++ ++ ++116115403704F8DC30EF1E672D16616263E4423BECE77A6247368F1003E605F23E3CADAB70 ++ Keizerstad FM ++ Keizerstad FM ++ ++ -1 ++ 105.4 ++ ++ ++ ++106176891684678CE4B308A8A6F724F5C73506E16E27268EB819FC720AE7AD5B483473E4B6 ++ Kink FM ++ Kink FM ++ ++ -1 ++ 94.1 ++ ++ ++ ++1061768916248E70F2866B0754758FA4F16D395369F9B3550559E24A77C1B48B5C1EEB0684 ++ Q-Music ++ Q-Music ++ ++ -1 ++ 95.4 ++ ++ ++ ++10617689161657EC736540B26C223EC40019E316770DD54F30EDD58351F305A7CCF58CF42E ++ Radio 10 Gold ++ Radio 10 Gold ++ ++ -1 ++ 94.6 ++ ++ ++ ++1061768916495B2FFD8C70DEA15BCE8BCD882F1ECB21F05F8713D6610A04BE9690F59CD956 ++ Radio 538 ++ Radio 538 ++ ++ -1 ++ 90.6 ++ ++ ++ ++1161154174EE98D5510463A0C07109A56AD2303F0B1E6EC5A22EF3B9918775924D8921C7B5 ++ Radio Donna ++ Radio Donna ++ ++ -1 ++ 98.6 ++ ++ ++ ++1061768916C3BBEBD88D7BE50E0D66854AAFC41402F07BCC2B609B8D70D7B1BE9E0551D162 ++ Radio Veronica ++ Radio Veronica ++ ++ -1 ++ 95.9 ++ ++ ++ ++1161154202F08ECD8CB447AAD23BB63C38C144E82BCC2C6258E4E774BEB0AC1E958B9945BF ++ Rebecca ++ Rebecca ++ ++ -1 ++ 107.1 ++ ++ ++ ++10617689165763D6C843F7F6EC887BCB341263385A26A6AF2E11CB926DE91932882C30DCF7 ++ Sky Radio ++ Sky Radio ++ ++ -1 ++ 90 ++ ++ ++ ++10617689166BA97C6B690CD30B8E86DA28E1B815A478FD6B58504AF435C114B2CFD4177318 ++ Yorin FM ++ Yorin FM ++ ++ -1 ++ 93.6 ++ ++ ++ ++11611542299B25F62676B0D3F897FE54E785DFE3A527F5EBD866C1F49207CADEBF1A1EDB6A ++ 2e Kamerlijn ++ 2e Kamerlijn ++ ++ -1 ++ 107.6 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/netherlands/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/netherlands/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,30 +1,31 @@ + SUBDIRS = +-EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp" ++EXTRA_DIST = "alphen-aan-den-rijn-cable.krp" "amersfoort-cable.krp" "amsterdam-cable-2.krp" "amsterdam-cable.krp" "arnhem-cable.krp" "ede.krp" "enschede-cable.krp" "groningen.krp" "ijhorst.krp" "rotterdam-cable.krp" "tegelen-cable.krp" "the-hague-antenna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/" +- $(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" +- $(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" + $(INSTALL_DATA) "$(srcdir)/alphen-aan-den-rijn-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" + $(INSTALL_DATA) "$(srcdir)/amersfoort-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" ++ $(INSTALL_DATA) "$(srcdir)/amsterdam-cable-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" + $(INSTALL_DATA) "$(srcdir)/amsterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/arnhem-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/ede.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp" ++ $(INSTALL_DATA) "$(srcdir)/enschede-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" + $(INSTALL_DATA) "$(srcdir)/groningen.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/ijhorst.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" ++ $(INSTALL_DATA) "$(srcdir)/rotterdam-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/tegelen-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/the-hague-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/alphen-aan-den-rijn-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amersfoort-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable-2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/amsterdam-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/arnhem-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ede.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/enschede-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/groningen.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/ijhorst.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/rotterdam-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/tegelen-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/netherlands/the-hague-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/czestochowa.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/czestochowa.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,104 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ rado-1.0beta3b ++ Mario, <mariuszwr@o2.pl> ++ 2008-03-30T14:19:27 ++ poland ++ czestochowa ++ ++ antenna ++ ++ ++ 109569822506C857816E13E27DEC856024B05151EB43DE1B656728CCA49EB2B9427D135846 ++ Polskie Radio Bis ++ Bis ++ ++ -1 ++ 98.95 ++ ++ ++ 1094719793C323351FB798EF728B232148DC066B49C9E7C8CF11D7F9AC32CBFF70F79F25B0 ++ Trójka ++ Trójka ++ ++ -1 ++ 91.7 ++ ++ ++ 1095697872BBA803C49A13E8248BEA59AEE7B241A7AC35BDAC2A07159E8935A7768571ED15 ++ Radio C ++ C ++ ++ -0.01 ++ 96.6 ++ ++ ++ 1095697962016FBF883B757A23FDD3AD28778C46353A6FF8D656EA6AE8A7377F44AF09B63D ++ Radio Katowice ++ Katowice ++ ++ -1 ++ 98.45 ++ ++ ++ 10956981207850CC6E93BB5799DE6342A15BCBBC2F6EA512A458D1624CFF503292FB19F94A ++ Jedynka ++ Jedynka ++ ++ -1 ++ 87.55 ++ ++ ++ 109569817873B0C0A37E18F984E4D9CF9E9A9F2C7B3A48D230ADDEABD4DF0CFB7D4F220B79 ++ RMFMAXX ++ RMFMAXX ++ ++ -1 ++ 102.55 ++ ++ ++ 1095697990DB89F838E5B480B6023336F88A88670804126D366D2D42B241FB499AE0EDC18F ++ Radio Zet ++ Zet ++ ++ -1 ++ 103.45 ++ ++ ++ 1094719872EA2412A37C582F0EE766611FB36914F824B944B872DDD8D42DF884F1682F485B ++ RMF FM ++ RMF FM ++ ++ -0.01 ++ 105.9 ++ ++ ++ 1094720563210A2A1BCA82A429BECEC40E1CC444660EE2B573EA7E032282B2B66E89A8B8A5 ++ Dwójka ++ Dwójka ++ ++ -1 ++ 90.6 ++ ++ ++ 109569825516562B261D7E9C26E0DCA51E196A1F79A8B0AA5978B7D2AD4003D354DA8FB186 ++ Radio Fiat ++ Fiat ++ ++ -1 ++ 94.7 ++ ++ ++ 1095698040CF98DFCCAFF2E5690ED9E44F33E5F9DA2A96FF5FE1D6B81D5BFAA6A578E3791B ++ Radio Jasna Góra ++ Jasna Góra ++ ++ -1 ++ 100.55 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/gdansk.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/gdansk.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,151 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Marcin Dabek ++ 2005-05-02T12:01:20 ++ Poland ++ Gdansk ++ ++ ++ ++ ++ 12215568287C61A88AEC8635FC5CCFF7171F303401B1DCFD2CA5CE3D81AA7F3224E90BC742 ++ RMF Classic ++ ++ ++ -1 ++ 88.4 ++ ++ ++ 122155684736B50D0EAE6D579A11236D29B3B4469F8F9C1CDBEA36913DBD03F5FFFE7B1204 ++ Radio Maryja ++ ++ ++ -1 ++ 88.9 ++ ++ ++ 12215568727DFE9D88CDC83160CCC15526A6CF26D8701917D5244503A3B7E285F14E141377 ++ Polskie Radio Program 2 ++ ++ ++ -1 ++ 89.5 ++ ++ ++ 1229710262F4878A7B00BE2D7F76D54B3BA03B9A47463EC5FD828B08F5D0BFA7EE0B966028 ++ Chilli ZET ++ ++ ++ -1 ++ 92 ++ ++ ++ 1221556917BE7AC365D5DDF2C108946E1D0152AD5A703D3C68DA2DDBB40B911CBB6A6E693B ++ Radio Kaszebe ++ ++ ++ -1 ++ 92.3 ++ ++ ++ 1221556932BF6B314ECB047845EF8614D8B46B954ECD37DD45B8DF865F9743E15AF2D64CA8 ++ Polskie Radio Euro ++ ++ ++ -1 ++ 93.4 ++ ++ ++ 12215569572CE92640C495542FFB927F221407B75D9BF2555272C335DBA68110863E696996 ++ Radio Eska Trójmiasto ++ ++ ++ -1 ++ 94.6 ++ ++ ++ 1221556988D9342A99AFC0B1A9E59692FC1FB6E06F164791963D1F5D88F9065195F35C37C6 ++ Polskie Radio Program 1 ++ ++ ++ -1 ++ 95.7 ++ ++ ++ 1221557013882E0532BD346FFFD9A5EA1CD212D9C8E152E98DAB619AC6E927E7DDD1233BAB ++ RMF Maxxx Trójmiasto ++ ++ ++ -1 ++ 96.4 ++ ++ ++ 1221557038E31C4C464C57757EB85F937BA47741C3B136900BD84054C1CE3452114747163A ++ Radio TOK FM ++ ++ ++ -1 ++ 97.8 ++ ++ ++ 1219857722931B3EEF9145FBCFF13C6034AB67BA25D1207ADCA53F82364AA593224F7109CF ++ RMF FM ++ ++ ++ -1 ++ 98.4 ++ ++ ++ 1221557083CE00FD4802E76A9C8E7FBF6379D9AC6BC454404BDCDD1E517F5BA60209B1D3DD ++ Polskie Radio Program 3 ++ ++ ++ -1 ++ 99.9 ++ ++ ++ 1221557119075B6D8D3C90DFC53DBEE7AD2FDA2B6B9D025437E41D40C49DB45EDE918430DC ++ Radio Plus Gdańsk ++ ++ ++ -1 ++ 101.7 ++ ++ ++ 1221557141040C86265FA2B11B772DB78368F5D3FFCD9A20DAEB3BA239B0D04864925CAACB ++ Radio Złote Przeboje ++ ++ ++ -1 ++ 103 ++ ++ ++ 1221557171CAB3A2B6E4E3CAD3F6E293D318C15489374FF7EE504CB68DFAA2E08B704C14B7 ++ Polskie Radio Gdańsk ++ ++ ++ -1 ++ 103.7 ++ ++ ++ 122155719504D8B63D209DF87C9FAB419641D87FFED865596883C203FDDE6E86F663BEDC81 ++ Radio Eska Rock ++ ++ ++ -1 ++ 104.4 ++ ++ ++ 1219857671CD41C2FF7BAB36A8B4E4FCD5B5675ABC24E423D3DFE2705995D5719CFDDC022D ++ Radio Zet ++ ++ ++ -1 ++ 105 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/lodz-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/lodz-cable.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,197 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ ++ 2007-06-20T00:25:42 ++ Poland ++ Lodz ++ Multimedia_cable ++ Contains merged Data ++ ++ ++ ++11822951592B62AD0B29DA188FC37D5BC6DF251E8831E9B25E1B08D8217AC8C820314A5E87 ++ Tok FM ++ Tok ++ ++ -1 ++ 98.8 ++ ++ ++ ++11822954375392ACECD74C5E8F829F49E89C6538C88A683A95FCB11D5E442DDD7B5EDD3841 ++ Polskie Radio BIS ++ BIS ++ ++ -1 ++ 98.3 ++ ++ ++ ++1182295070AD54E88C72A2EA8AE4C3EFBDFEA8522D6E560D5FE3C8EC0371C49CA6E65BF29A ++ RMF FM ++ RMF ++ ++ -1 ++ 97 ++ ++ ++ ++11872808081B25C94B7555C7F8A4B9888E9AF25C6358CDF7F9B27C951BB0E9A7E7230BCFA8 ++ Sunshine Live ++ Sunshine ++ ++ -1 ++ 95 ++ ++ ++ ++11872803804CA47D3949558F9F50EDC13DB1BE5D6067FE476C4C3A52378A7C2608AB8D9FDD ++ Klassik Radio ++ Klassik ++ ++ -1 ++ 94.4 ++ ++ ++ ++11872804261AA8FF934BC24FA59871DC47CCED08ECDDB0A9B5B16EB8E4208775A98DBA10F4 ++ RTL Radio ++ RTL ++ ++ -1 ++ 93 ++ ++ ++ ++11822950461598E1CEBE4AD1116E623E7F82824779228D49FCADF3F6967F2D3A7C5A5E9DA2 ++ Radio Zet ++ Zet ++ ++ -1 ++ 90.4 ++ ++ ++ ++118229530168E7CC202D9FCE6928BE23CD43DDEA8EBDED271636F820F3396FD86454CC3C5B ++ Radio Z�ote Przeboje ++ Z�ote Przeboje ++ ++ -1 ++ 89.2 ++ ++ ++ ++1182294924AA0C337B114539C8878F2697138156C0DBD5AF8CB4E6BEDDEF2C6AB020BFC334 ++ Radio Pogoda ++ Pogoda ++ ++ -1 ++ 104.1 ++ ++ ++ ++118229190344092EF2F0D2AA89D78EF8CFE8A2BEFE42FAFAB2F4D9C2C57C6D54D384A366BD ++ Radio Maryja ++ Maryja ++ ++ -1 ++ 87.5 ++ ++ ++ ++11822950051DEE65FC7A6D1FD85B2A696A21081EFAC6A3492731946B1B99E99C2F31FEF73A ++ Polskie Radio Program 2 ++ PR2 ++ ++ -1 ++ 105.5 ++ ++ ++ ++118728050865D611D8D6A580F01787B91B3C88FE6ED168D744FE6597A6A3832AC1C506CDA1 ++ Jam FM ++ Jam ++ ++ -1 ++ 105.1 ++ ++ ++ ++1182295497B82166CE2968E66B97BA2BD60C955F6076B475B0713DA5CFD1F3A855347991FD ++ Polskie Radio Program 1 ++ PR1 ++ ++ -1 ++ 106 ++ ++ ++ ++1182295121FE742DD14B3861BE7C0767ACD3C14BD1CEF344EC37AFCC8E69DB26C706202EB4 ++ Radio Parada ++ Parada ++ ++ -1 ++ 104.1 ++ ++ ++ ++118229519080D140BF6665ED6B0E319197C0796B202C344D457245805ADCA1A324BD6DB024 ++ Radio Eska Rock ++ Eska Rock ++ ++ -1 ++ 103.1 ++ ++ ++ ++1182295224A5CFF0376073A55D56260F2D0BDF72CC0D9E0CD0444C96E5B053B12352276040 ++ Polskie Radio ��d� ++ Radio ��d� ++ ++ -1 ++ 102.5 ++ ++ ++ ++11872802306FD47B3725D04E5C840EA16346C835BE25A43B27AE9EA709ECCC5A60E400AC12 ++ Polskie Radio Program 3 ++ PR3 ++ ++ -1 ++ 101.9 ++ ++ ++ ++11822952706BCBA8B1F212D43FF9CD77304D15248CCBB36D99CBFE1717E6FC70B5328FB9AA ++ Radio Vox FM ��d� ++ Vox ++ ++ -1 ++ 101.3 ++ ++ ++ ++1182291526776BF1C96CE85AC3882781A6821B58BDA25507033F693A442094A1E6CF7B40CE ++ Radiostacja ++ ++ ++ -1 ++ 106.5 ++ ++ ++ ++11872807143C41BCDB4450D8F024BB289D4434AB639B2C9BB430A5F37BE3CF44F40BACAEFF ++ Eska ��d� ++ ++ ++ -1 ++ 100.8 ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am kradio-3.5.13.1/kradio3/presets/poland/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/poland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/poland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,30 +1,47 @@ + SUBDIRS = +-EXTRA_DIST = "bialystock-antenna.krp" "elblang-antenna-fm.krp" "katowice.krp" "krakow-antenna.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp" ++EXTRA_DIST = "bialystock-antenna.krp" "czestochowa.krp" "elblang-antenna-fm.krp" "gdansk.krp" "katowice.krp" "krakow-antenna.krp" "lodz-cable.krp" "nowy-sacz-antenna.krp" "opole-antenna.krp" "poznan-antenna.krp" "tarnow.krp" "torun-cable.krp" "warsaw-antenna.2.krp" "warsaw-antenna.krp" "warsaw-cable2.krp" "warsaw.krp" "warsaw-upc_cable.krp" "warsaw-ursynow.krp" "warszawa-cable.krp" "warszawa-ursynow.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/" +- $(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" +- $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/bialystock-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/czestochowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp" + $(INSTALL_DATA) "$(srcdir)/elblang-antenna-fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp" +- $(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" +- $(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/gdansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp" + $(INSTALL_DATA) "$(srcdir)/katowice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp" +- $(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" ++ $(INSTALL_DATA) "$(srcdir)/krakow-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/lodz-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/nowy-sacz-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/opole-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/poznan-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/tarnow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp" ++ $(INSTALL_DATA) "$(srcdir)/torun-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" + $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/warsaw-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/warsaw-cable2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" + $(INSTALL_DATA) "$(srcdir)/warsaw.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/warsaw-upc_cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/warsaw-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" ++ $(INSTALL_DATA) "$(srcdir)/warszawa-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/warszawa-ursynow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/bialystock-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/czestochowa.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/elblang-antenna-fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/gdansk.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/katowice.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/krakow-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/lodz-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/nowy-sacz-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/opole-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/poznan-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/tarnow.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/torun-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-cable2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-upc_cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warsaw-ursynow.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/poland/warszawa-ursynow.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/nowy-sacz-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/nowy-sacz-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,70 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta2 ++ Marcin"WASYL"Basiaga, ++WasylNS@interia.pl ++ 2005-11-30T14:36:51 ++ Poland ++ Nowy Sącz ++ antenna ++ Contains merged Data ++ ++ ++ ++1104422521ECAFDA4C92BFABDCA1C6CE092CD4E64C696A81194D6FE9F26DEF7D9999466F8E ++ RMF FM ++ RMF FM ++ ++ -0.01 ++ 103.196 ++ ++ ++ ++1104426638C6D4851AD1CE10470FBE94C2FFF50A6011843F618E3E5453686AFA1C1EB1AE23 ++ Radio Zet ++ Zetka ++ ++ -0.01 ++ 97.796 ++ ++ ++ ++1104429437CB3574C52E0E9C7C5D92D4C557A2B457B005AE4DF83176CC2CD5F9E9DE65FD04 ++ Polskie Radio PR 3 ++ Trójka ++ ++ -1 ++ 94.796 ++ ++ ++ ++1104429442C8D842CAF84FE1C33EA30EC6CA2E7653E11E1C384D4EF4946409D66EB2334273 ++ Polskie Radio PR 1 ++ Jedynka ++ ++ -0.01 ++ 99.2007 ++ ++ ++ ++110449736641CF389791C851CE7ACA60328CECD88E3722CC969EB7C3DF4ABA7DDEF7D86FA3 ++ Złote Przeboje ECHO ++ ECHO ++ ++ -1 ++ 93.7999 ++ ++ ++ ++1104849921CBBF6A08B9FF1C1FAE90125D357C387AB173C28038A02076EF970BB49C181077 ++ Radio Kraków ++ Radio Kraków ++ ++ -0.01 ++ 90.05 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/opole-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/opole-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,100 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Krzysztof Kusiak, ++<szyszart@poczta.onet.pl> ++ 2007-01-24T16:57:09 ++ Poland ++ Opole ++ Antenna ++ ++ ++ ++ 1 ++ Polskie Radio Program 2 ++ 1 ++ ++ -1 ++ 88.3 ++ ++ ++ 2 ++ Tr�jka ++ 2 ++ ++ -1 ++ 90.3 ++ ++ ++ 3 ++ Radio Eska ++ 3 ++ ++ -1 ++ 90.8 ++ ++ ++ 4 ++ Radio Zet ++ 4 ++ ++ -1 ++ 92.2 ++ ++ ++ 5 ++ Radio Z�ote Przeboje ++ 5 ++ ++ -1 ++ 92.8 ++ ++ ++ 6 ++ RMF FM ++ 6 ++ ++ -1 ++ 95.3 ++ ++ ++ 7 ++ Radio Maryja ++ 7 ++ ++ -1 ++ 98.2 ++ ++ ++ 8 ++ Radio Opole ++ 8 ++ ++ -1 ++ 101.2 ++ ++ ++ 9 ++ Radio Planeta ++ 9 ++ ++ -1 ++ 106.2 ++ ++ ++ 10 ++ Radio Plus Opole ++ 10 ++ ++ -1 ++ 107.9 ++ ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/poznan-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/poznan-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,213 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0-rc4 ++ artur.zaprzala@gmail.com ++ 2009-05-23T11:21:38 ++ Poland ++ Poznań ++ antenna ++ Na podstawie http://nadaje.com/miasta/Poznan.html ++ ++ ++ 1243073856B7CB5AE3A8DD7F64D99162701127E8EB17921157D47B4F1CD2C1B35300AC ++ Radio Merkury ++ Merkury ++ ++ -1 ++ stereo ++ 100.9 ++ ++ ++ 1181345500C8D8A94219DBBC463934BEFA6CB0DAB24F33C6ABA71DFB08DF33AB483E441B55 ++ PR Program III ++ Trójka ++ ++ -1 ++ stereo ++ 96.4 ++ ++ ++ 1243091725823AD6BA86EF676F69423FC8246C52646B4D3AC6A598D678C8FC8DECBA06 ++ PR Program II ++ Program II ++ ++ -1 ++ stereo ++ 89.1 ++ ++ ++ 11813450874FEFBFE9D9664744CED00CC429A41AF491A0F341950699E506F2833995048115 ++ PR Program I ++ Program I ++ ++ -1 ++ stereo ++ 92.3 ++ ++ ++ 124307402214A45EF45919BAFF02EA193FD2BFD73C6A1489C197787A21C309564028FC ++ Polskie Radio Euro ++ Euro ++ ++ -1 ++ stereo ++ 100.2 ++ ++ ++ 1181310720D76397D1E0CE3FA017DE0FF960A280D3994F75AB6512563E93B6BCC932D2C33E ++ Radio Złote Przeboje ++ Złote Przeboje ++ ++ -1 ++ stereo ++ 88.4 ++ ++ ++ 1243092477BD500CBB54A00F1BBDEF4DD16A2F7E2EC9B6F8E2047E22A40611BCB7476D ++ Chilli ZET ++ Chilli ZET ++ ++ -1 ++ stereo ++ 101.6 ++ ++ ++ 12430741057023A3CC5976ADC55C0E886946A60A4205CBF98A166CFC41C4CFEB8C198D ++ Radio Eska Rock ++ Eska Rock ++ ++ -1 ++ stereo ++ 107.4 ++ ++ ++ 1243073700ECE65C3E99B2CE8049C7498B1732137742C789DFC70A2113D921DBE69A02 ++ MC Radio ++ MC Radio ++ ++ -1 ++ stereo ++ 102.7 ++ ++ ++ 1181345133A04BF742C340E1FC6BDA16A09CF9612919DA70DDEA02798BD190B0F0762FB7C9 ++ RMF FM ++ RMF FM ++ ++ -1 ++ stereo ++ 94.6 ++ ++ ++ 11813451171B80122E5B2FC18587A666F545EBCA4E45F41A816A2C9FD381DA957E0188263B ++ Radio Z ++ Z ++ ++ -1 ++ stereo ++ 97 ++ ++ ++ 1243074060EBA788F812C95004302AB34F8D515473E912E93F3E6DC9006E712955F619 ++ Radio Z ++ Z ++ ++ -1 ++ stereo ++ 104.7 ++ ++ ++ 11813107167D3CC8996BCF9B44DDADB08B9AAE804FA337940B03AA28F18B2AB02E28CDDD51 ++ Radio Blue FM ++ Blue FM ++ ++ -1 ++ stereo ++ 103.4 ++ ++ ++ 1181345115714F0A6908202C3FE5BC5ED7D62A8B0A0DF97CFFCE612011CD1EDAF67CFC4AC2 ++ RMF MAXXX ++ RMF MAXXX ++ ++ -1 ++ stereo ++ 93.5 ++ ++ ++ 1181345101A37EB521C0D4DA7736962278AD3B3961D3DB8853572FD1AAF554A20C2D68B89D ++ Radio Eska ++ Eska ++ ++ -1 ++ stereo ++ 93 ++ ++ ++ 11813451194A150D2B5165FA1DB1E53F35E32978BDBE46BAB7D4445AD3333CE5D7EC48095F ++ Radio Afera ++ Afera ++ ++ -1 ++ stereo ++ 98.6 ++ ++ ++ 1243092539C04A6CD4C5B25CD713CCD794592A56DE0274843B85D9FADA0064A9DE8456 ++ Radio Roxy FM ++ Roxy FM ++ ++ -1 ++ stereo ++ 105.4 ++ ++ ++ 1243073918646EC6C3D2F64E7C33C1B2C375E6130AB50FFFB0CC15BCE2DF66E82F219A ++ Radio Planeta ++ Planeta ++ ++ -1 ++ stereo ++ 90.6 ++ ++ ++ 12430739360FD65A37249E783AE38ED70BB151627FBE6B6CADDAF83EC4A4445EEACAFF ++ Radio Planeta ++ Planeta ++ ++ -1 ++ stereo ++ 99.4 ++ ++ ++ 118131069508E2B7F26DF1C5B1CE1A577EC08E051873B7C21C86B13ADBE50257B825F6C941 ++ Radio TOK FM ++ TOK FM ++ ++ -1 ++ stereo ++ 97.7 ++ ++ ++ 11813450899FC57789CC3A44DDAE5C22E6BB61251A7438BC16C1566D9ABA9C2A9EA5B27698 ++ Radio Emaus ++ Emaus ++ ++ -1 ++ stereo ++ 89.8 ++ ++ ++ 1243074085F655034EB7C8D95088C8A951706DA80D4DB373C89ED8DFA968CF396FDA4C ++ Radio Maryja ++ Maryja ++ ++ -1 ++ stereo ++ 106.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/tarnow.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/tarnow.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,167 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Jacek Drobiecki, j.drobiecki@mwi.pl ++ 2006-08-13T13:05:16 ++ Poland ++ Tarnow ++ antenna ++ ++ ++ ++ 11554744911E6260E25520A4AF03462D1BF650D3A46C33D2DF18E13B711A0B093BD9B0C97D ++ Polskie Radio Program 2 ++ PR 2 ++ ++ -1 ++ 88 ++ ++ ++ 1155474531FC82F3BA0DEC16DE3BD16B08971EDE5158F6ADE06830918279C8ECB6418ADEA9 ++ RMF FM ++ RMF ++ ++ -1 ++ 88.2 ++ ++ ++ 115547460387D53144D776A4650C37E47E15D549DB99E130D7FF101CEABAE3B24887F22DE3 ++ Polskie Radio Program 2 ++ PR 2 ++ ++ -1 ++ 88.6 ++ ++ ++ 1155474640001219B3008B89483DB18A6FF42AAD83D6707D0C985063B4E848D5731369B58F ++ Polskie Radio Program 2 (Bochnia) ++ PR 2 ++ ++ -1 ++ 89.4 ++ ++ ++ 115547434749EC4CD78DAF20EF8E4B6E5333C45F003ACFBD12AE2C32298739B8B7DE02AF6F ++ Radio Krakow ++ Krakow ++ ++ -1 ++ 90 ++ ++ ++ 1155474669C49CEC64EE4291EA8A8CEE82E09F00DEE28C746C3D111AABDF776A0168D0F773 ++ Polskie Radio BIS ++ PR BIS ++ ++ -1 ++ 91.1 ++ ++ ++ 1155474725CCD85AFA6208AD4153E9335229304383B405A12BE66C7898150B48B976FC2EDC ++ RMF FM ++ RMF ++ ++ -1 ++ 95.4 ++ ++ ++ 11554747499B0D4864A56811C0894BD0900CCAA7FD2505CEA0C5110492C072EE7A93A4947D ++ RMF FM ++ RMF ++ ++ -1 ++ 96 ++ ++ ++ 1155474784D6818BED1604A6E700CF77A5403ADE565C559553F56FFAE046586F7BEF76B2D8 ++ Radio MAKS ++ MAKS ++ ++ -1 ++ 98.1 ++ ++ ++ 115547481284433E6F0785342958176E418F731D56E1BDB9A28A6CBFAE1278B26BAA3BBC8B ++ Polskie Radio Program 3 ++ PR 3 ++ ++ -1 ++ 99.4 ++ ++ ++ 1155474827CDDBE861AEF4E59966935D8DE6DD1534825BF9877CFF5467F78F2A2161669997 ++ Polskie Radio Program 1 ++ PR 1 ++ ++ -1 ++ 99.9 ++ ++ ++ 115547485978A3B6D7231EB91CB3E4FBD591C21233389FD21B0F23CD69DDD81063B7FA920F ++ Radio Krakow ++ Krakow ++ ++ -1 ++ 101 ++ ++ ++ 1155474884CD983E4A9E47EA99CD475E1287382B5B43A8B9971F26AA5725D15601D075ABF9 ++ RDN Malopolska (Nowy Sacz) ++ RDN ++ ++ -1 ++ 101.2 ++ ++ ++ 115547489596B110A4C03019FF4EE2856C2E1110DDD10E37BFEBD32D8AB2F2EBE2472E76D1 ++ Radio Krakow ++ Krakow ++ ++ -1 ++ 101.6 ++ ++ ++ 11554749149AE9DBE9A8C74D5237F782051EEDB4417F3D784F19323506F3DDCF2FB48609DD ++ Radio Maryja ++ Maryja ++ ++ -1 ++ 102.6 ++ ++ ++ 1155474928C7C7EE5700DCEC117911DD5E0424E053B50A99FDD440B9825AE78B530A824B07 ++ RMF FM ++ RMF ++ ++ -1 ++ 103.2 ++ ++ ++ 1155474940ED3934C9676750AB9D3BA445FDF5E129BA3663825AA3C85476F8C9878ABBAB9D ++ RDN Malopolska ++ RDN ++ ++ -1 ++ 103.6 ++ ++ ++ 1155474965831D096128378DE1965F5323CF342B7058B96847CA59CF9905AD7760B68CAD35 ++ Radio ZET (Krakow) ++ ZET ++ ++ -1 ++ 104.1 ++ ++ ++ 1155475014BBDCB24424B44D1097D4B2D69580AAD5AE0A045EFC0FD28813BCF95113EAD5CE ++ Radio ZET ++ ZET ++ ++ -1 ++ 107.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-cable.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,97 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ andrzejk@aster.net.pl ++ 2008-12-08T09:11:31 ++ Poland ++ Warszawa ++ astercity cable ++ pakiet basic ++ ++ ++ ++10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E ++ PR Program 1 ++ 1 ++ ++ 1 ++ 89.5 ++ ++ ++ ++108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9 ++ PR Program 2 ++ 2 ++ ++ -1 ++ 104 ++ ++ ++ ++1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244 ++ PR Program 3 ++ 3 ++ ++ -1 ++ 102.7 ++ ++ ++ ++1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11 ++ Radio Dla Ciebie ++ 5 ++ ++ -1 ++ 98 ++ ++ ++ ++122872309592995F81CBC12BF16FFDDA976EF54E3ACEEEDAF287D916DA723E1CFA3BD173FC ++ Radio Wawa ++ 4 ++ ++ -1 ++ 105.2 ++ ++ ++ ++1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8 ++ Radio Zet ++ 7 ++ ++ -1 ++ 99.1 ++ ++ ++ ++108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471 ++ RMF-FM ++ 9 ++ ++ -1 ++ 107.1 ++ ++ ++ ++1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667 ++ Radio Bis ++ 6 ++ ++ -1 ++ 94.3 ++ ++ ++ ++1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F ++ Radio Maryja ++ 8 ++ ++ -1 ++ 101.7 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp +--- kradio-3.5.13.1/kradio3/presets.old/poland/warszawa-ursynow.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/poland/warszawa-ursynow.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,88 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Andrzej Koz�owski, <andrzejk@astercity.net> ++ 2007-10-10T18:21:22 ++ Poland ++ Warszawa-Ursynow ++ astercity cable ++ pakiet basic ++ ++ ++ ++10882367971EBA4B1B9F1F17EEFC1C249AF259256AC8CE59D9F47558CAD65E64E3FD3B070E ++ PR Program 1 ++ 4 ++ ++ -1 ++ 89.5 ++ ++ ++ ++108823682322199A3A26A0CC4935DF81456C046D5473FA11B89A799AB92536C1524B7FE4D9 ++ PR Program 2 ++ 23 ++ ++ -1 ++ 104 ++ ++ ++ ++1088236820C1AB035EEB576C5E772194080D9EC1936C2A7CDE21E088FF0AEC7812D3FCE244 ++ PR Program 3 ++ 21 ++ ++ -1 ++ 102.7 ++ ++ ++ ++108823682553AF90DFFFF097021348B489A54CDB9D1F7BB805D3AD198548C191CAA2887471 ++ Radio Wawa ++ 24 ++ ++ -1 ++ 105.2 ++ ++ ++ ++1088236812CCED5AB431EBC6CB0950BB44398F71408BA41B76161F5224F462F85FBB3EBC11 ++ Radio Dla Ciebie ++ 14 ++ ++ -1 ++ 98 ++ ++ ++ ++1088236805DD37389D670DADEFFB7240BC4A69F7C84A6C2588580B6E3AB31FF649E769A667 ++ Radio Bis ++ 10 ++ ++ -1 ++ 94.3 ++ ++ ++ ++1088236814091D61464F50B5EBB55C6E93212666024A0108312DECFA0523C7503752293BB8 ++ Radio Zet ++ 16 ++ ++ -1 ++ 99.1 ++ ++ ++ ++1088236818F98AEF0C8A67C0A142086FAE09B7ADFEEA10DEA2F70BF9BD85C281DFDF43A65F ++ Radio Maryja ++ 20 ++ ++ -1 ++ 101.7 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/portugal/aveiro-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/portugal/aveiro-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,71 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta2 ++ Hélio Guilherme <helio.guilherme@bluebottle.com> ++ 2006-11-18T22:54:01 ++ Portugal ++ Aveiro ++ ++ Sintonizados a 10km a Sul da cidade. ++ ++ ++ 1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5 ++ Antena 2 ++ ANTENA2 ++ ++ 0.5 ++ 87.34 ++ ++ ++ 11164554449DE41CDB4FBD7A49098CC696567AD524945B94899CC3498B6C5752A8B04D06B8 ++ Rádio Renascença ++ RR ++ ++ -0.01 ++ 88.17 ++ ++ ++ 1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878 ++ Aveiro FM ++ AvFM ++ ++ -0.01 ++ 88.57 ++ ++ ++ 111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8 ++ Antena3 ++ ANT3NA ++ ++ -0.01 ++ 93.06 ++ ++ ++ 1116455444150CB66C475C9CB684A9CCAB396CEB9A29EEE7E5536B3E7E272032275E24187A ++ AveiroFM ++ AvFM ++ ++ -1 ++ 98.81 ++ ++ ++ 11172936389B2769CBDCDC246EE4A75B8E6727EE985F3A839B55A40DBA9B558400165B803F ++ Rádio Clube de Aveiro ++ RCA/RCP ++ ++ -0.01 ++ 107 ++ ++ ++ 115075507171272DFC8631DB6A60AE46717B8FF41F7927414A02E38E3E9A0B1C732A6B584C ++ Antena 2 ++ 3 ++ ++ -0.01 ++ 101.245 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/portugal/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/portugal/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,10 +1,11 @@ + SUBDIRS = +-EXTRA_DIST = "lisboa-antenna.krp" ++EXTRA_DIST = "aveiro-antenna.krp" "lisboa-antenna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/" ++ $(INSTALL_DATA) "$(srcdir)/aveiro-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/lisboa-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp" + +- + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/aveiro-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/portugal/lisboa-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/khabarovsk.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/khabarovsk.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,159 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.2 ++ Andrey Tomilenko (aka Thom) thom82@mail.ru ++ 2012-06-22T20:57:29 ++ Russia ++ Khabarovsk ++ Antenna ++ ++ ++ ++ 1305638939C1FD865E64BAC19C5F57AA772A41E3154D83B787C6A8BBE41BA59C2D4F50 ++ Радио Юность ++ 1 ++ ++ -1 ++ dontcare ++ 71.24 ++ ++ ++ 1305638967B8157796236B9C31EA6815AB3C48379EF65E79F49A3C79C36703B1F4D915 ++ Радио Маяк ++ 2 ++ ++ -1 ++ dontcare ++ 72.02 ++ ++ ++ 13056389922F1F70C837614DE48AE22EF0FEFBFCBF25660BC1196A68629EE08CB0F3C1 ++ Радио России ++ 3 ++ ++ -1 ++ dontcare ++ 72.8 ++ ++ ++ 130563904442B5A2DDA4F2CE53202F339A5EDE755CEE833D693FC05B308A26E05303B5 ++ Ретро FM ++ 4 ++ ++ -1 ++ dontcare ++ 87.9 ++ ++ ++ 13056390981FCC9EC91AA3DC33CE07779742EDC01DFAD322F810AA5C641578B689A25B ++ Авторадио ++ 5 ++ ++ -1 ++ dontcare ++ 88.7 ++ ++ ++ 13056391188DDE01EF727CF401895206DAA0BB3FF7E907AC8105D76121359DEA67894A ++ Русское Радио ++ 6 ++ ++ -1 ++ dontcare ++ 89.6 ++ ++ ++ 13403587309CACBC90948F03CBCD705121A11FCB3C08F1015195B38A61E19CA9FF1B7C ++ Юмор FM ++ 7 ++ ++ -1 ++ dontcare ++ 91 ++ ++ ++ 13056391680029FBFC1E1A539CD8847454B89ACC8B316221B4FE23591283568D29EB74 ++ Милицейская волна ++ 8 ++ ++ -1 ++ dontcare ++ 101.4 ++ ++ ++ 13056392023511D5D2255D527F78A9F3A2773304264B21F4431550D50A0C7935A891B0 ++ Радио 101.8 FM ++ 9 ++ ++ -1 ++ dontcare ++ 101.8 ++ ++ ++ 1340358776C1D2B150D77B86BB2AC6634B476162CAE427444FC5FD63B7F5428393489A ++ Серебряный дождь ++ 10 ++ ++ -1 ++ dontcare ++ 102.7 ++ ++ ++ 130563925202974C20BE1F41D064DF0F58F50BF73A3FD4C3DFD97D4CF50362D7ADC943 ++ Радио Дача ++ 11 ++ ++ -1 ++ dontcare ++ 103.1 ++ ++ ++ 1305639289B512A628A955D08E53324832FB8CDCEBDA010C75CD50714594D7633004AC ++ Восток России ++ 12 ++ ++ -1 ++ dontcare ++ 103.7 ++ ++ ++ 130563932489FDF6E2BD0FE5CE07D11879AB3EC67D4504F7245EBE90EC3372BF8E9401 ++ Дорожное радио ++ 13 ++ ++ -1 ++ dontcare ++ 104.3 ++ ++ ++ 1305639357C85ADEAA9CE0A129200D98B6FC5343251C2F74FBE88C22E5A5808BE77F0C ++ Вести FM ++ 14 ++ ++ -1 ++ dontcare ++ 104.8 ++ ++ ++ 1305639381A545F9CA03ED0BFEAAE4186B78418905B20AF41ADF875DFF7E13F9282768 ++ Европа Плюс Хабаровск ++ 15 ++ ++ -1 ++ dontcare ++ 105.6 ++ ++ ++ 1305639414A15F8313B28FA6B1F1DD6DB5C43F107C068A2E9F0B46D5C3C024F5CA8562 ++ Маяк FM ++ 16 ++ ++ -1 ++ dontcare ++ 106.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am kradio-3.5.13.1/kradio3/presets/russia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/russia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/russia/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,12 +1,27 @@ + SUBDIRS = +-EXTRA_DIST = "moscow.krp" "saint-petersburg-antenna.krp" ++EXTRA_DIST = "khabarovsk.krp" "moscow.2.krp" "moscow.3.krp" "moscow.4.krp" "moscow.5.krp" "moscow.krp" "saint-petersburg-antenna2.krp" "saint-petersburg-antenna.krp" "samara.krp" "vladivostok-antenna.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/" +- $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/khabarovsk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp" ++ $(INSTALL_DATA) "$(srcdir)/moscow.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/moscow.3.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp" ++ $(INSTALL_DATA) "$(srcdir)/moscow.4.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp" ++ $(INSTALL_DATA) "$(srcdir)/moscow.5.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp" + $(INSTALL_DATA) "$(srcdir)/moscow.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp" ++ $(INSTALL_DATA) "$(srcdir)/saint-petersburg-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/samara.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp" ++ $(INSTALL_DATA) "$(srcdir)/vladivostok-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/khabarovsk.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.3.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.4.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.5.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/moscow.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/saint-petersburg-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/samara.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/russia/vladivostok-antenna.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/moscow.2.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,142 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Wasiliy Cheremisinov <wasiliy.ch@gmaill.com> ++ 2007-12-08T10:59:46 ++ Russia ++ Moscow ++ ++ ++ ++ ++ ++1064330466317A41A714F7A3C70B72A8F4F88EFF1AD5870570230FAC49A74C6528C4359C32 ++ Busines FM ++ 1 ++ ++ -1 ++ 87.5 ++ ++ ++ ++1064330466947F92FD80D121BD0DF4EDFEE9874FC5EB83A080586606778F480426C7442561 ++ Humor ++ 2 ++ ++ -1 ++ 88.7 ++ ++ ++ ++10643304662D3779EBD6858C0583607EBF2788213464832A85F4205B19D671A503DF4BAB30 ++ Jazz ++ 3 ++ ++ -1 ++ 89.1014 ++ ++ ++ ++106433046664F3991076F0870D839F4065A92B11B3059FAAF1F7AF006AFE06F56FDEC49E93 ++ Auto ++ 3 ++ ++ -1 ++ 90.3 ++ ++ ++ ++106433046619C3366A5F5A7EC91799AAEF32A445F3424E9E10E41C636539CF59CC24C082AB ++ Nashe ++ 6 ++ ++ -1 ++ 101.7 ++ ++ ++ ++1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED ++ MonteKarlo ++ 7 ++ ++ -1 ++ 102.102 ++ ++ ++ ++1064330466CA4EED0736CAAB36E71A839D40008B0C5AC9AA2C82C643A9AFED34C2B1B13AED ++ Maximum ++ 4 ++ ++ -1 ++ 103.727 ++ ++ ++ ++1064330466979D59DE67FAA40E5E5408F6F709FC01B7A01AAA3434B64A6270A375091BD753 ++ Europe Plus ++ Europe Plus ++ ++ -1 ++ 106.203 ++ ++ ++ ++106433046610DCFA997911331B73CDB8ECD23DE325DD1105AF6768E6E071D4CD51DAF72FF5 ++ Love radio ++ 7 ++ ++ -1 ++ 106.603 ++ ++ ++ ++10643304660D5013C5720489386C78C7990FEB7F6A8AC21D623CB23A6B02B123D892B08E02 ++ Seven Hills ++ Seven Hills ++ ++ -1 ++ 104.7 ++ ++ ++ ++1064330466E85A0C0833E61EED4D7180C6B2186A20ED80D94859E7B7764ED980E964796459 ++ BestFM ++ ++ ++ -1 ++ 100.5 ++ ++ ++ ++10643304668EE856A49266E70C96D6371545017E454330FFC78F72BDA85BE1B1A7D8BEF6E7 ++ Silver Rain ++ ++ ++ -1 ++ 100.1 ++ ++ ++ ++1064330466EE8DA6A56D9A920D2BF0E7C52A7B72423B0552B652EE24CD3859998B5702B762 ++ Classic ++ 5 ++ ++ -1 ++ 100.902 ++ ++ ++ ++1194197244ED4A8A191D1807FCF73D636896F020AFDFB2DF7A765FFAD1F322D06AA154B896 ++ Relax ++ 5 ++ ++ -1 ++ 90.8 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.3.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/moscow.3.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,466 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Ser Moro ++ 2008-11-09T07:40:00 ++ Russia ++ Moscow ++ ++ На 09 ноября 2008 г. (09 nov 2008) ++ ++ ++ ++12122828023F212F976473C4E93995D4891E8C777646EC34AA187F3448C0EC7E543609CBC2 ++ Бизнес FM ++ Buziness ++ ++ -1 ++ 87.5 ++ ++ ++ ++12122827990F65AFCF6B3859E87971677CE6871AA71F6DA2E00B58C3BCFDF04A57035AE67F ++ Сити FM ++ City ++ ++ -1 ++ 87.9 ++ ++ ++ ++121228279796B23241487AFED5155A28232E67B9EA7CE628A67F0AC2F6BCC433C01A4369D8 ++ Ретро FM ++ Retro ++ ++ -1 ++ 88.3 ++ ++ ++ ++1212282794C55B646493A81EF00526173AAD59794E0A8C92E10D5E87C4A47973F2379A26F2 ++ Юмор FM ++ Юмор ++ ++ -1 ++ 88.7 ++ ++ ++ ++1212282794B5DE3840CC9B45A581943EF925529837BEC12B66C3D85E90F3996B65BA0DCA58 ++ Радио Джаз ++ Джаз ++ ++ -1 ++ 89.1 ++ ++ ++ ++12122596825C81908E711F49D34E2488F9E0CBC975C4B3DCA073F6DE213A8A01920BC096E0 ++ Megapolis FM ++ Megapolis ++ ++ -1 ++ 89.5002 ++ ++ ++ ++12122597039752418C5847057F3705AC380BE3BA5FD830328E221B3D353EED65850266ACE7 ++ Кекс FM ++ Kex ++ ++ -1 ++ 89.9 ++ ++ ++ ++121225968579A6748F6F0976C2DE6D1CB4A53B97CE0F1C3ABBB08FCBB45106E48DC5BFDD98 ++ Авто Радио ++ АвтоРадио ++ ++ -1 ++ 90.3 ++ ++ ++ ++1212259688DA536296403BFE6C53E376FEBC230247FF0A589D0483AB91AD8F08557DEB6A41 ++ Relax ++ Relax ++ ++ -1 ++ 90.8 ++ ++ ++ ++121225968939C1C287EFC31157B5BACC22FD61CB81A7A785C097349863FC892E23DBF888AA ++ Эхо Москвы ++ Эхо ++ ++ -1 ++ 91.2 ++ ++ ++ ++1212259691C099D02DD657FDC1D535FFCC843C096BAA4D230DF1D0EF937282F477A9CB1AD3 ++ Культура ++ Культура ++ ++ -1 ++ 91.6 ++ ++ ++ ++1212259692167C08E0C5F1453D16DE8A855A0938E10641E9C7FE41B77FD5948D32F68F74D2 ++ Говорит Москва ++ 92 ++ ++ -1 ++ 92 ++ ++ ++ ++12122596961F2F8798C4AF031DC06C680A36A17247A632141493DA9C57B21540155AF20194 ++ Радио Дача ++ Дача ++ ++ -1 ++ 92.4 ++ ++ ++ ++12122596993B33CE7223A502CDE834AC553FD5B1ACBE52DA72FDF905583CCC03252456B392 ++ Радио Карнавал ++ Карнавал ++ ++ -1 ++ 92.8 ++ ++ ++ ++1225098463FAF803940A48CC5DD762C9533BDC42913313BC62C9A3E7C2459348A3E851558B ++ Спорт ++ Спорт ++ ++ -1 ++ 93.2 ++ ++ ++ ++12138945622084AC7C25C48D647BBC4E3E0CE9AD45BA5AEFA5B9B4E5458B9EC833ECCC0A9F ++ Radio Newton ++ Newton ++ ++ -1 ++ 93.6 ++ ++ ++ ++12250982552FF63D58F730C6F74FE8EE55569A165B6AEAF01CE9F319C8E21A8556B9436B82 ++ Radio Unost ++ U ++ ++ -1 ++ 94 ++ ++ ++ ++123196465419618E775ADB30B8FBA7BC0AC4ED246FCC72C7933EEC9D8A313395649F4C76E2 ++ Radio Lornet ++ Lornet ++ ++ -1 ++ 94.4 ++ ++ ++ ++12122827767F54AF294458E31567320F8D23209CDEE586C3DA2FCA907480AD37C291805057 ++ Радио Моя семья ++ Семья ++ ++ -1 ++ 94.8 ++ ++ ++ ++121228278574DD0761AB27D245495CE6B980B40D7E886D1AB6B1C42091B893E48A46783853 ++ Rock Radio ++ Rock ++ ++ -1 ++ 95.2 ++ ++ ++ ++12123390445BBF6A3ED8F754C4156A0BB2B470DA04733F19754E36F1ED6FC19AC85F1D64C2 ++ Радио Звезда ++ Звезда ++ ++ -1 ++ 95.6 ++ ++ ++ ++12348480920036E7BC9624E105EFE480CF03DC713FF687375B2041F2E26BA12F0BF95A6540 ++ 96 ++ 96 ++ ++ -1 ++ 96 ++ ++ ++ ++1212339046DDCBDF85F15BE3CAB54C1C0F0A8334B83255E9131C72C5F1E831B2E0F7CD2984 ++ X-FM ++ X-FM ++ ++ -1 ++ 96.4 ++ ++ ++ ++12123390461714F20182DBDDF585EC9929A50864AE86074C3C8E1E02F5AED483D5B462D980 ++ Детское Радио ++ Детям ++ ++ -1 ++ 96.8 ++ ++ ++ ++1219914057D2886AC3FAF181A0F36D2A9D76A1C252631C40E6E39BDF5ED016BE8242F100B9 ++ Radio Комсомольская правда ++ Radio КП ++ ++ -1 ++ 97.2 ++ ++ ++ ++1212339047DFFBBFF46ADF915EDF6CA7D1FE79038F088FFF2291DBD34D9EEC0DA84893D70F ++ Радио России ++ Вести ++ ++ -1 ++ 97.6 ++ ++ ++ ++1212339054BC3DCB9C2D81802E0E77E6E82336E2D17F87C6ED63F400C263BBE6DB3C2E14E2 ++ 98 ++ 98 ++ ++ -1 ++ 98 ++ ++ ++ ++12155099273AA79DF72C4062FA8C04E9D964815CB91829824065AFE9A8D2BAB1F4AA94463D ++ Свежее радио ++ Fresh ++ ++ -1 ++ 98.4 ++ ++ ++ ++1212339385229EBB7819AC5442AC0E1F41E58F10C72CA249BEF2BE9E3A659006684E6A8944 ++ Радио Алла ++ Алла ++ ++ -1 ++ 98.8 ++ ++ ++ ++1226205404FBE117B1B15AECDF62B6FF796F9658061C68CCBD7A57E8CE1DF50CE7E1A4AA14 ++ Radio Orpheus Classic ++ Orphey ++ ++ -1 ++ 99.2 ++ ++ ++ ++1212339386F7157F3BFC0DD589711E42FEE85071B689BEE4534AFFF55523ED54A7528BA870 ++ Финам ++ Финам ++ ++ -1 ++ 99.6 ++ ++ ++ ++12123393868B5B553B02B25F4DAD23C73657402F8383C1B9FC1E8620894774526C4AF6C1E1 ++ Радио Серебряный дождь ++ Silver ++ ++ -1 ++ 100.1 ++ ++ ++ ++12123393873AB899D7246EB39485864B2F04EAFDD1765682408BA8192975DA61DB7A83B3F1 ++ Радио Best FM ++ Best ++ ++ -1 ++ 100.5 ++ ++ ++ ++1212339387F11C65FEA6E51B7B8E93C7CA337F5DFDFCA2F8ADAD249503D3C9D0E84EA26351 ++ Classic ++ Classic ++ ++ -1 ++ 100.9 ++ ++ ++ ++1212339388EEE39E0BC4D3DA35192A71CE62993C32CEF36856FF682F80DDD3EF6B98C536D6 ++ D FM ++ DFM ++ ++ -1 ++ 101.2 ++ ++ ++ ++1212339659E2E4B8321BABF68F83B40DBB5178D9982E286066E756532578AE9312F77EA3E2 ++ Наше Радио ++ Наше ++ ++ -1 ++ 101.7 ++ ++ ++ ++1212339658E751B53B44FE1F1A6CB6D173CFDE7BFD900D63319CAC8AD2BD17B5E130AADB83 ++ Radio Monte-Carlo ++ Monte-Carlo ++ ++ -1 ++ 102.1 ++ ++ ++ ++12123396589CF758161886D9EBCB3F9935FD928E7B62EAF419F10636D9E74CE75F03ADEC0B ++ Радио Попса ++ Попса ++ ++ -1 ++ 102.5 ++ ++ ++ ++121233979036412BB8D5C8E91549545A821460D7CD25921A5823B83D48072EB378C6CFE6D5 ++ Радио Шансон ++ Шансон ++ ++ -1 ++ 103 ++ ++ ++ ++12123397914DC4E206CE83692E6403D4A60E2B618F648D59DE5B1B86E0F1CC5BA7346A4E55 ++ Маяк ++ Маяк ++ ++ -1 ++ 103.4 ++ ++ ++ ++1212339791D7BD41F55ACAC72BB37828705B336858ED3872404B84D4B756CA3BC1C043B2A3 ++ Radio Maximum ++ Maximum ++ ++ -1 ++ 103.7 ++ ++ ++ ++121233979674E163A4CB1750E1B5695178A3E6B6D2633C72DDB810B1E769975DB3B0A3301A ++ Radio Energy ++ Energy ++ ++ -1 ++ 104.2 ++ ++ ++ ++121234007486004F788B3D4D98C280330FFA2D9B472961C33C1604CFDAE47B0662F4864611 ++ Radio 7 ++ Radio7 ++ ++ -1 ++ 104.7 ++ ++ ++ ++1212340074EE1D11E026C89F078E0829E75A80904A3503AE203E09F1620F350B680B74E472 ++ Radio Next FM ++ Next ++ ++ -1 ++ 105.2 ++ ++ ++ ++1212340075589879A76AA393BAFDF5DF4555B287B418A2225B182A0851A599A46B31FC6990 ++ Русское Радио ++ РусРадио ++ ++ -1 ++ 105.7 ++ ++ ++ ++12123400752D0B01A4845E3747674600730689641EF7D2A58F5A6F9E475F590C2B17B3FB31 ++ Europe + ++ Europe+ ++ ++ -1 ++ 106.2 ++ ++ ++ ++121234007591A90762201E3A7A025C8089D71E7D010F1BD6C1DC67621A5445559100BABE20 ++ Love Radio ++ Love ++ ++ -1 ++ 106.6 ++ ++ ++ ++12123400761B5688D434BA35EFEA9E23F61FE0C066EF18F45E751B61F700466DA357388236 ++ Русская Служба Новостей ++ РСН ++ ++ -1 ++ 107 ++ ++ ++ ++1212340077A657F5A456F3AC7A05F638034484ED6CB2C508B5B7CE45CA49E4943B7AD3CB16 ++ Hit FM ++ HitFM ++ ++ -1 ++ 107.4 ++ ++ ++ ++1212340373F23364BD99C0FD26A8FE62CCC1FC2326409F5E1952746C8D45D693B34297DC61 ++ Радио Милицейская волна ++ Милиция ++ ++ -1 ++ 107.8 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.4.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/moscow.4.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,486 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ Basil <614@mail.ru> ++ 2006-12-24T14:00:31 ++ Russia ++ Moscow ++ Aver media studio 307 ++ http://www.radioo.ru/ ++ ++ ++ ++1166957632E1E6B773B16FAB3C9BBE8D8781249B51B85183FB4644F8B5BD4AFFC80B99918C ++ Love Radio ++ ++ ++ -1 ++ 66.02 ++ ++ ++ ++1166957579D0832BBA97ACA268BF14E56BD550D114E1FDDE0BD8951CBFE0A2163E4069E3F9 ++ Radio of Russia ++ ++ ++ -1 ++ 66.44 ++ ++ ++ ++1166957557AD5CF65A33753EB4783380B2D909A75959EA7DB49335DBCDA806DF576F9E88D1 ++ Maximum ++ ++ ++ -1 ++ 66.86 ++ ++ ++ ++1166957531EE4C210521F42A6074AF09772AF1A72431482C98A0574EDBCB64D424B7939184 ++ Mayak ++ ++ ++ -1 ++ 67.22 ++ ++ ++ ++116695750623A2EE2D00B86A33412D256B8498339EBB7B57DE4BA1463879A1DCA077792B41 ++ Avtoradio ++ ++ ++ -1 ++ 68 ++ ++ ++ ++11669574847289DE68C47E37F6D780471358D18F59C685C0038723C9DDFBFF6BB204CAD87D ++ Radio-1 ++ ++ ++ -1 ++ 68.3 ++ ++ ++ ++11669574457A4DC4E624827B2B132AE6A093289F54D91510995EA005AD458EBE226D3276C5 ++ Yunost' ++ ++ ++ -1 ++ 68.84 ++ ++ ++ ++11669574079F9EC2AEF3ADB2D01D5FB77DA8E5101C2B1F33A47E7CB7A48C01E46DB5733E6B ++ Russian radio-2 ++ ++ ++ -1 ++ 69.26 ++ ++ ++ ++1166957372D0EFB9DD0E58F11A669F20C7636C4C7359BC74B57859603CABD6EA3E383F73E8 ++ Europe plus ++ ++ ++ -1 ++ 69.8 ++ ++ ++ ++1166957329444CE214B5282ACBCCC9D0CFBB923D38FBD5881C2D85B762A6030FBD68B8790F ++ Ultra ++ ++ ++ -1 ++ 70.19 ++ ++ ++ ++11669572935247BDFDED87C62DE211E85F85958BB19922B8A5CF4368B61D78548CA9A940D1 ++ Russian radio ++ ++ ++ -1 ++ 71.3 ++ ++ ++ ++1166957221E055943148E8F9463BE8D5818BEA3BA30A08203786FB4ED16D913CDF79B0780A ++ Orfey ++ ++ ++ -1 ++ 72.14 ++ ++ ++ ++116695719350C9F89CDA632EE1E5E8228C51FFB348E380A567776482D28A61E1FDAF919BCC ++ Radio-Retro ++ ++ ++ -1 ++ 72.92 ++ ++ ++ ++1166957083101FD14C6FB1C54314BE3FB7D301DE25AEBB388FA5E519560BF675C254B5D85B ++ Radio 7 na 7 holmah ++ ++ ++ -1 ++ 73.4 ++ ++ ++ ++11669570483021426130F14BA799C4532A1E94CA33C15510D0808D726993F2D5CD12BF1A4B ++ Echo of Moscow ++ ++ ++ -1 ++ 73.82 ++ ++ ++ ++1166956990CD8B8893868F6156B295FE27607F49EEC77AFB3FB72CAAF4D565FD83074C5F42 ++ Radio-Arsenal ++ ++ ++ -1 ++ 87.5 ++ ++ ++ ++1166956756A12CD220E711648DAEB58CB7ED10154187C2C0E24785EA12DDFA4BD25252DC69 ++ City-FM ++ ++ ++ -1 ++ 87.9 ++ ++ ++ ++11669569236286CCBF2A0E5EA3DED4BC8C67FBE7FC72D3B80B331BC8C961A71BB176355171 ++ Retro-FM ++ ++ ++ -1 ++ 88.3 ++ ++ ++ ++11669560101DEA7A9DD968F07112FDC44DD324224A38FBA5D5B865FB6D2955B682FC37D8BB ++ Humor FM ++ 7 ++ ++ -1 ++ 88.7 ++ ++ ++ ++1064330466E07BE61B89FE49C799EFEB5F0ABA72E6CCFC08267015CFDD367F702D64E79AED ++ Radio Jazz ++ 7 ++ ++ -1 ++ 89.1 ++ ++ ++ ++1166955883D8A04151E06D760E4DF7842990744F8A91720F94CF971EC619F0740C4B6B3AE4 ++ Megapolis-FM ++ ++ ++ -0.01 ++ 89.5 ++ ++ ++ ++11669558359E63EA7B5B2DEB6FE1FB2FEE89F013636EFD33BC5A9A9F45C2AD71A498C515F7 ++ Melodiya ++ ++ ++ -0.01 ++ 89.9 ++ ++ ++ ++11669557934A98B4E710AD5AF9869B1B2D144B8DC5561089B2955338935CBE122A135EA4BF ++ Avtoradio ++ ++ ++ -0.01 ++ 90.3 ++ ++ ++ ++116695559236C1ED99206B33F508E21FEE76AC7FE98FD022956184B0589A0F6676F99EAF4C ++ Relax FM ++ ++ ++ -0.01 ++ 90.8 ++ ++ ++ ++116695562015B618A6F9D0548252841B7979C5E390A1B4F83B3FF1EE8E2D5D6405D5A00041 ++ Echo of Moscow ++ ++ ++ -0.01 ++ 91.2 ++ ++ ++ ++11669556985A865C27C521C9C97FACBEDCF297A972C453C4EC9044639AA5CDD4FE360B3393 ++ Culture ++ ++ ++ -0.01 ++ 91.6 ++ ++ ++ ++1166955387C3ABE1CF31ADA0BFAD068F592100A89A0BA5C06332ED7ECA15D66D9D7897FC42 ++ Govorit Moskva ++ ++ ++ -0.01 ++ 92 ++ ++ ++ ++1166955534C99366F4574B49157C6E49B1BE8C521C8D7C4369DFB4E11E1964C3939D654FC1 ++ Radio Udacha ++ ++ ++ -0.01 ++ 92.4 ++ ++ ++ ++11669554443AC0849DBF480743A2A75F80D1A5A0961437C1ABC792FE3B493E3B99B98FE438 ++ Radio Sport ++ ++ ++ -0.01 ++ 93.2 ++ ++ ++ ++1166955327A5A60A1BA10F9E45AB03057448A48CCC6BB6E2B869CF0347F5DEC4E5892865AB ++ Zvezda ++ ++ ++ -0.01 ++ 95.6 ++ ++ ++ ++11669552470238A75168E4067074193A8BE904A83C4B142DF39BCAEB354B07C4B6505325E2 ++ M-Radio ++ ++ ++ -0.01 ++ 96.4 ++ ++ ++ ++116695519894B4CA3641876C66F34BDB9784EC7FFDB8888F16901B26407D7D67389CCB8601 ++ Radio Rossiya ++ ++ ++ -0.01 ++ 97.602 ++ ++ ++ ++1166955120CE8553D7E2FA57F6C9CCDD1260A217C10EAA121E6193B630764EA91F2AB47692 ++ Russian Songs ++ ++ ++ -0.01 ++ 98.802 ++ ++ ++ ++116695501694031750D1F39D2B677CC9174F963EE0200C0F375F176DE5F2C1206D3BD73F34 ++ Silver rain ++ ++ ++ -0.01 ++ 100.102 ++ ++ ++ ++1166956114A7783981473BE9C2773D90392F9C647F1ACC07B4A630F92202E4921619FF571C ++ Best FM ++ 7 ++ ++ -1 ++ 100.5 ++ ++ ++ ++1166956189FC9213CF6C51999DE90A5029DD8717E31A6C0C32C67C9B2704A6D23823E0F8F2 ++ Radio Classic ++ 7 ++ ++ -1 ++ 100.9 ++ ++ ++ ++1166956224013A6F091F5FACC187C80B7799774F17A454E988CDEDF05D3571BCA00A3CD0DA ++ Dinamit-FM ++ 7 ++ ++ -1 ++ 101.2 ++ ++ ++ ++11669562690A11198557EE507FFB7954DA34C38B676DEDA1509A6D66786C56203A28F9F94F ++ Nashe radio ++ 7 ++ ++ -1 ++ 101.7 ++ ++ ++ ++11669563019B8DB055ADA960C32A8AFC23AAE3940B38EE3C8F8766B91C8245D87E7932C8E4 ++ Radio Monte-Carlo ++ 7 ++ ++ -1 ++ 102.1 ++ ++ ++ ++116695636884CCD5D7C5900B5796DFA6C9667EBBEB7B38A426B4D759A17C2BD91336829EAA ++ Radio Popsa ++ 7 ++ ++ -1 ++ 102.5 ++ ++ ++ ++1166956399B5023480C7B42DA089AA87F6EDE92EC88AA4A3075D0D5B4FC80C9FEA397C2CE2 ++ Shanson ++ ++ ++ -1 ++ 103 ++ ++ ++ ++1166956417F021C66B643D13FD46C17672F93228108D2E40A921E65C18643DB8A52F239201 ++ Mayak-FM ++ ++ ++ -1 ++ 103.4 ++ ++ ++ ++116695644332BD22B7C117952C90E15739DA0F472D7E709C986DD3BB722CC9686304300B31 ++ Maximum ++ ++ ++ -1 ++ 103.7 ++ ++ ++ ++1166956467C3FE528365A3FE4F02A089BDA4538722A94D5750B9B9F9B92E5C65E96C35C20A ++ Energy ++ ++ ++ -1 ++ 104.2 ++ ++ ++ ++1166956491E7F82945D14B1E17BDDFA8CE2DCF38607B2825A5D5384BC86C52724284AB0DCB ++ Radio 7 na 7 holmah ++ ++ ++ -1 ++ 104.7 ++ ++ ++ ++1166956520D811ADD05B13F61CEF11C3BC6077C25A641C2EED304AD183722B29C5E4B2EB44 ++ Radio Next ++ ++ ++ -1 ++ 105.2 ++ ++ ++ ++116695655702F1446544A6D8FDDF1F18783C2E1250224F31BD4F1E52973D1762B1DE305B26 ++ Russian radio ++ ++ ++ -1 ++ 105.7 ++ ++ ++ ++1166956582FCEEECE6B71538020E0FEE80F48B730A887DD24272958D8A3B833E67FA1A9CE8 ++ Europe plus ++ ++ ++ -1 ++ 106.2 ++ ++ ++ ++1166956665BBE158E4AB6982810081D0CC0A8DB510A065244FC65E7E7DCDEC5375AC84CA46 ++ Love radio ++ ++ ++ -1 ++ 106.6 ++ ++ ++ ++11669566898A71C985BD4F702BD8E37FDD0FEFB4C061B8C1C0A173E3F78A2B3A78710C4531 ++ Russian news service ++ ++ ++ -1 ++ 107 ++ ++ ++ ++11669567303B9760EE6E437AE2AB08E9A17A2863B75CA17AAA838C2EFB8BE4C68940A036C0 ++ Hit-FM ++ ++ ++ -1 ++ 107.4 ++ ++ ++ ++1166956816C5E7650467CD2ED1AA3DEA8FDB61220C5B53C6DC983094B1EE9A0F78F875B255 ++ Milicejskaya volna ++ ++ ++ -1 ++ 107.8 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/moscow.5.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/moscow.5.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,456 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Дмитрий Смелков <das@sidero.ru> ++ 2009-09-29T12:52:24 ++ Russia ++ Moscow ++ FM tuner ++ from http://www.radivo.ru/ ++ ++ ++1254113419B3C18A92D0E731CE42E8D1B5422801904B133FA665DD97FAE73E96A00FBE8DB2 ++ 87.5 Business FM ++ business ++ ++ -1 ++ 87.5 ++ ++ ++ ++1254113603879D10C2B96E3183D52959B8856D666C01DD7A0D3E2241083206A2DB0960B2D3 ++ 87.9 City FM ++ city ++ ++ -1 ++ 87.9 ++ ++ ++ ++1254115232366C9DEA47B3A7116316F1EBE11D09C33A82D9CE30A7476990E14F8C8757ED0E ++ 88.2 Retro FM ++ retro ++ ++ -1 ++ 88.2 ++ ++ ++ ++12541150826343FCCBF4C9FE2C48DC3AFF72223EC870B294904B965C7786164418D1ECEB61 ++ 89.1 Radio Hour ++ radiohour ++ ++ -1 ++ 89.1 ++ ++ ++ ++1254115595A961F47B9FA95B97E461DB06938647202A847D49C0C24C59CFDBDEDEFE840190 ++ 89.5 Megapolis FM ++ megapolis ++ ++ -1 ++ 89.5 ++ ++ ++ ++1254115803EE8AEC14BE9ED5C558908548FF16F6218299D22BBCC1EA13F357B4B2CB8C3D55 ++ 89.8 Kex FM ++ kex ++ ++ -1 ++ 89.8 ++ ++ ++ ++125411663098D26141ECE7630E94EC91620E2B11B29F55D97E66353E635912278CD06408EC ++ 90.3 Auto Radio ++ auto ++ ++ -1 ++ 90.3 ++ ++ ++ ++12541167464545487460A4DFFC5CE6F8B50604319D36561246F36B8339961D7A05BFC02642 ++ 90.8 Relax FM ++ relax ++ ++ -1 ++ 90.8 ++ ++ ++ ++1254116837998FD1B2F1CB9E369CC14D023BFD0E3F28C30E5670D2B3F90F3ADC7A329895B9 ++ 91.2 Echo Moscow ++ echo ++ ++ -1 ++ 91.2 ++ ++ ++ ++125411883682FF181084BEB9506C2BD92D573167086EA5E6A970BA7BF89C2F31C10F141BE7 ++ 91.6 Cultura Radio ++ cult ++ ++ -1 ++ 91.6 ++ ++ ++ ++1254118931AEDBCC2332E787FB1BD109EF5339D3ADD39EC0D9BEF4D1647FC2E424B4D3DA80 ++ 92.0 Speak Moscow ++ speakmoscow ++ ++ -1 ++ 92 ++ ++ ++ ++125411900574B23E44E4A814887A6254349FF7EA6A63CF785968BDC2D4EB96235EC27FC613 ++ 92.4 Radio Dacha ++ dacha ++ ++ -1 ++ 92.4 ++ ++ ++ ++1254119087D1C80EEDD9D50AE4C7EF5CE7AC1AC1924A2A151B0D06EABFACF49505FD189A22 ++ 92.8 Karnaval ++ karnaval ++ ++ -1 ++ 92.8 ++ ++ ++ ++1254208038DC6388DAD27AEEC081627D18A85ECD56B732DFEDEFBD0EDFD3269B423E1FB0E1 ++ 93.2 Radio Sport ++ sport ++ ++ -1 ++ 93.2 ++ ++ ++ ++12542080899D30F2FBBC0E46D5E7C438DB8250612B1BB1B295383A2B1F02B67523F2B26E0C ++ 93.6 NewTONE FM ++ newtone ++ ++ -1 ++ 93.6 ++ ++ ++ ++1254209832885D8EACB4781D6A59A016B0342F474B31C89E12FF6CD69C257924A82C368E8D ++ 94.0 Youth FM ++ youth ++ ++ -1 ++ 94 ++ ++ ++ ++12542099761A361B34C331CA5822DBF2A247297A1D420D89742BF3107DBA8E8C10AEEB7B81 ++ 94.4 Lornet ++ lornet ++ ++ -1 ++ 94.4 ++ ++ ++ ++1254210228ED1569120CACBF54781E22BA8E1F327B44FE51705A8E9ACDECB3E416B1C97439 ++ 94.8 My family ++ family ++ ++ -1 ++ 94.8 ++ ++ ++ ++12542103277D90DA1B11C2382160EF2748D4CCFFFAC5C27EF5231C933C41132EE1A00B3132 ++ 92.5 FM ++ 92_5_fm ++ ++ -1 ++ 95.2 ++ ++ ++ ++125421040801C66994144AE1BF4130B6E61B509D327F18D375A7DB7E0295834139FB18F2FB ++ 95.6 Star FM ++ star ++ ++ -1 ++ 95.6 ++ ++ ++ ++1254210555DC625D856752C6B8F5AD7E20419BB318E01A1895DBC9FA38BA755A9433240257 ++ 96.0 Tour ++ tour ++ ++ -1 ++ 96 ++ ++ ++ ++1254210690E4B1BBA290BBC0633D3C5428B80A238A1EE76F8A8B78DE207ABE627BFA4EAE47 ++ 96.4 X FM ++ x ++ ++ -1 ++ 96.4 ++ ++ ++ ++12542107788E5E6BBB75B20D94E632DEC2F2271010DCEDEB30464F9A9A9E6C1D1989B49D6C ++ 96.8 Kids FM ++ kids ++ ++ -1 ++ 96.8 ++ ++ ++ ++12542109468DF4D861CC4352DD73492D57049D752D0B7699AC2A8E21FFBD9AAA3E0ECA2BBD ++ 97.2 Kommi FM ++ kommy ++ ++ -1 ++ 97.2 ++ ++ ++ ++1254211077FFBB611A4952B42E012F454F9A6856ACDD141621E0B1FD46EE1063A64B7732EC ++ 97.6 Vesty FM ++ vesty ++ ++ -1 ++ 97.6 ++ ++ ++ ++12542111368120FA07696D76E9051198BF7DD2A2203D1207D98DF67B154C158D950006022E ++ 98.0 98-Hits FM ++ hits ++ ++ -1 ++ 98 ++ ++ ++ ++12542111955D1C8602DD46E46EB51F985EB9B7D18B321EAE5AA52A367CC0DCD615F4E70DAE ++ 98.4 Fresh FM ++ fresh ++ ++ -1 ++ 98.4 ++ ++ ++ ++12542112900E007DE37B5945C000F14A7BDF6FE9353595FFDD5B7F10F70777B4A70769D98C ++ 98.8 Alla ++ alla ++ ++ -1 ++ 98.8 ++ ++ ++ ++125421137786885E1A519D06FC665D843621D57F354569E748BAED5BCC4ED24A45AA3BACDF ++ 99.2 Orpheus ++ orpheus ++ ++ -1 ++ 99.2 ++ ++ ++ ++1254211405D36EF5FFB3C3F976726AC733CF85E6C8D6010FDA058D7D4853FE4EA22DEB7AAA ++ 99.6 FinAm FM ++ finam ++ ++ -1 ++ 99.6 ++ ++ ++ ++1254211511B2F2B33598DF20767D683FEDBF14BCF48B8E421FB06B5CA7DC7FA48225B347F2 ++ 100.1 Silver Rain ++ rain ++ ++ -1 ++ 100.1 ++ ++ ++ ++1254211695A7414A14CD8B6C8AEEA25BE7255BF911A2F49A43015857C206A89AD8A8F23FD3 ++ 100.5 Best FM ++ best ++ ++ -1 ++ 100.5 ++ ++ ++ ++12542118336B9184DC2526A04E26068352F769930C2C179E0A0C1B4C97F13479AD80F92AE2 ++ 100.9 Radio Classic ++ classic ++ ++ -1 ++ 100.9 ++ ++ ++ ++1254211957B53A0D5717BBFE765D179B97462295F20170616066BE0EBEFE3AB432F207ECA1 ++ 101.2 D-FM ++ dfm ++ ++ -1 ++ 101.2 ++ ++ ++ ++1254212095CABACDDF1849CDE516C3721C546F839B688C25583C6B76BDE71F5A37365CDD4F ++ 101.7 Our Radio ++ our ++ ++ -1 ++ 101.7 ++ ++ ++ ++125421218101C4242DE07C4952D972476E047C29905300CD40E2C956ABAAB93F1343FF0703 ++ 102.1 Monte Carlo ++ montecarlo ++ ++ -1 ++ 102.1 ++ ++ ++ ++12542122574A490326E90BA2143ED3CBA9ECE84D51ACE9888179A851E019D49C1BFD902E9E ++ 102.5 POP-SA ++ popsa ++ ++ -1 ++ 102.5 ++ ++ ++ ++1254212409B14B1DDD97729A43EFF2196C938431A6DFFFDDDEB708F71BFE3BA5FCD9481CD0 ++ 103.0 Shanson ++ shanson ++ ++ -1 ++ 103 ++ ++ ++ ++1254212449AF5CCA7CCD0A0A429F6A0B1A280D071FF498AFFA110761B26A01FFBD3AE9AB54 ++ 103.4 Lighthouse ++ lighthouse ++ ++ -1 ++ 103.4 ++ ++ ++ ++125421248712D3B6413968F909481424D8D32E99BDF14FD58DA9DA2FA8B624DCB6007035E4 ++ 103.7 Maximum ++ maximum ++ ++ -1 ++ 103.7 ++ ++ ++ ++12542127050D97BAA80BDCE7504703E2A9C6F161999453E46AD3CC6D99F6767C6CF76C3743 ++ 104.2 Energy ++ energy ++ ++ -1 ++ 104.2 ++ ++ ++ ++125421278240CFAB908AE144C301C4A01EB0C7D48A5CECE281E1B8C6E815B17B6496499C3A ++ 104.7 Radio 7 ++ radio7 ++ ++ -1 ++ 104.7 ++ ++ ++ ++1254213566627DCF077D632A14DD76250EC1060682EE482A4AAC10315DA36711C347E50874 ++ 105.2 Next ++ next ++ ++ -1 ++ 105.2 ++ ++ ++ ++125421372931ED002928F13BD48B38C77F57176B136C93C8A595624BEC8BD6A6B707AE695F ++ 105.7 Russian Radio ++ russian ++ ++ -1 ++ 105.7 ++ ++ ++ ++1254213794A88ECDB89C81F42B2CDDA09B66B4FCA62E33624331AA1BDE4031DB6169377C36 ++ 106.2 Europe+ ++ europe ++ ++ -1 ++ 106.2 ++ ++ ++ ++1254213892F9F02154427DE2C906EC61A784CF7ED2438EE6559BDE0A88AC1E42BE44A39AAE ++ 106.6 Love Radio ++ love ++ ++ -1 ++ 106.6 ++ ++ ++ ++12542141315B35477A88C0C075181F1C74FFE56A2FA2087A6D8D06EB8BD7DA827B8EAB252C ++ 107.0 RSN ++ rsn ++ ++ -1 ++ 107 ++ ++ ++ ++1254214188565B3064EC814AA6F693342B771BF65AE9F77CAF3656E059FAECAEE6980134F9 ++ 107.4 Hits FM ++ hitsfm ++ ++ -1 ++ 107.4 ++ ++ ++ ++1254214270622D673398308291D95016FA8228F590BC02522A14F14D3018F9303B44B72CC8 ++ 107.8 Police wave ++ police ++ ++ -1 ++ 107.8 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/saint-petersburg-antenna2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/saint-petersburg-antenna2.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,177 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ Hanataro (Александр Николаевич <hanataro25@gmail.com>) ++ 2011-03-04T16:29:42 ++ Russia ++ Saint-Petersburg ++ ++ ++ ++ ++ 12992427093FBA5E1570243458E2D5F851F3BBFC99DF2268059177356E9A652BFD2E3F ++ Дорожное радио ++ Дорожное радио ++ ++ -1 ++ dontcare ++ 87 ++ ++ ++ 12992267583B237AB8A0CA36A5978FDB4D934789809AA63B645C0D7EFB86FF3B224776 ++ Ретро ++ Ретро ++ ++ -1 ++ dontcare ++ 87.9996 ++ ++ ++ 12992267615D79138BF78E489668066A5F161E95CB0C2E1F0D2D2C7E8B3AED74947879 ++ Авто Радио ++ Авто Радио ++ ++ -1 ++ dontcare ++ 88.3496 ++ ++ ++ 1299245224DFDE600C4E78F81A578FBA1F2A45006C1A483D5738B2BF48ED284BC2C9FC ++ Для Двоих ++ Для Двоих ++ ++ -1 ++ dontcare ++ 90.5 ++ ++ ++ 1299226770ED601040E43EE3B93E2438C4AC6AFC01DDEACC98B1EE08302A04F82068E7 ++ Кекс FM ++ Кекс FM ++ ++ -1 ++ dontcare ++ 91.0996 ++ ++ ++ 1299226773D02C541B6C989B46A7BE9E07EF3C544185FC9341F54F2EDBE86E17D89BC7 ++ Эхо Москвы ++ Эхо Москвы ++ ++ -1 ++ dontcare ++ 91.4996 ++ ++ ++ 12992450064E4AAA3432B8FCA126079FA296A86E336905CE3ABF2EFED8C373D58C3798 ++ Радио Рокс ++ Радио Рокс ++ ++ -1 ++ dontcare ++ 102 ++ ++ ++ 12992268058FEAF0C94EF06273EB673743E6258F75242AB4295D51C5B66F4EC057F2AF ++ Студио ++ Студио ++ ++ -1 ++ dontcare ++ 102.349 ++ ++ ++ 12992435281FDB16BE9B711DE92E41FCEA928DDD2FC1ABA6AFCD5B07A578393BD0EC54 ++ Динамит FM ++ Динамит FM ++ ++ -1 ++ dontcare ++ 103.4 ++ ++ ++ 12992268107030A254DC106BD62B943CE1313E4BADD282E927475E0B571AA5F3694D92 ++ Наше Радио ++ Наше ++ ++ -1 ++ dontcare ++ 103.9 ++ ++ ++ 1299226813353F96B553C09BB1CC06CB806CA6EE34705D76534B42A70C5E8C2BB99596 ++ Русский Шансон ++ Русский Шансон ++ ++ -1 ++ dontcare ++ 104.399 ++ ++ ++ 1299226815509A209761FCE70F2AA153A6D6118E92DD70A6516B2E44535A25AC5A117C ++ Балтика ++ Балтика ++ ++ -1 ++ dontcare ++ 104.849 ++ ++ ++ 12992439342FE6A60DC705889C54E4E43102EE5BD7A70338627821A114AEA10A547484 ++ Love ++ Love ++ ++ -1 ++ dontcare ++ 105.3 ++ ++ ++ 129922681953A87D8654349F7F46E20C2482A6BE6EA8C59008AE1DD6F9650CFD33F414 ++ Спутник ++ Спутник ++ ++ -1 ++ dontcare ++ 105.899 ++ ++ ++ 1299226822C937A9D0C21E95F9AB1D7A36CACD1AAD8751DF1E0868B8499D496E10F3E1 ++ record ++ record ++ ++ -1 ++ dontcare ++ 106.299 ++ ++ ++ 1299226825ADD93E9496FBE70152AEF5833A1B98A1B2EEC51A47DE80A35C432EE4A6D7 ++ Маяк ++ Маяк ++ ++ -1 ++ dontcare ++ 106.949 ++ ++ ++ 12992448213D3022DC21C96DB5D1AED00A71539ABED1EB113698432D0D45C6B9CA1540 ++ Бизнес FM ++ Бизнес FM ++ ++ -1 ++ dontcare ++ 107.35 ++ ++ ++ 12992448794E7CF4A66A7FAFC810B559EFE948480288CC3288AB469C6F84B28CC51F89 ++ Русское радио ++ Русское радио ++ ++ -1 ++ dontcare ++ 107.8 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp kradio-3.5.13.1/kradio3/presets/russia/samara.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/samara.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/samara.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,239 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ slider ++ 2010-11-25T11:06:47 ++ Russia ++ Samara ++ ++ ver 0.01 ++ ++ ++ 12906697574C22D12352F932FBC406C8E4D27AA805ACCE94C1128DA618D2781B04FCB5 ++ Добрые песни ++ Добрые песни ++ -1 ++ stereo ++ 68.51 ++ ++ ++ 12906699108A5C3D49F59F5AA489785116892F2745E5025BFDAB5E583F3BF2926C83BE ++ Радио России ++ Радио России ++ -1 ++ mono ++ 70.31 ++ ++ ++ 1290670109AC03A5A7B274C46EF2F54FB75D0E973F01E5E2CF14968E6D60D838D8DD69 ++ Радио Маяк ++ Радио Маяк ++ -1 ++ mono ++ 72.05 ++ ++ ++ 1290669458F93F12F39C5CF1E698F318744E109C1D43985D0DFDDABCFCEDCB0D74F184 ++ Русское радио ++ Русское радио ++ -1 ++ mono ++ 72.83 ++ ++ ++ 129066946284D16DEFE6A632919C49CC7B59DE24C76FF17D6659DE4F709941C1923CBF ++ Самара-Максимум ++ Самара-Максимум ++ -1 ++ mono ++ 73.61 ++ ++ ++ 1290669966CAFF3D2FE0BCA9C4ABE31755A703071613797EDBAE8220DFF911F71223C3 ++ Экспресс FM ++ Экспресс FM ++ -1 ++ stereo ++ 90.1 ++ ++ ++ 1290669496B23BBAB0F7EA2F53447A2D2B5062D6F95A5634B03B8C642B2B6AB0DA857F ++ Милицейская волна ++ Милицейская волна ++ -1 ++ stereo ++ 90.6 ++ ++ ++ 129066949955CCCD9BDF1541E3CBF2BD80CCD9D2169927CB1B7783CBD7EB7C84AB4E52 ++ Радио 7 ++ Радио 7 ++ -1 ++ stereo ++ 91 ++ ++ ++ 12906695025E8878640F18551035279789653DC1847C3ED7FCE3C17DA0DE00814C1277 ++ Ток FM / Серебряный дождь ++ Ток FM / Серебряный дождь ++ -1 ++ stereo ++ 91.5 ++ ++ ++ 12906701432579FB12F26EC4143B4075C5CA32161561C67469F2674F1D000639924769 ++ Радио Маяк ++ Радио Маяк ++ -1 ++ mono ++ 92.1 ++ ++ ++ 1290669512AA728A2909B5DA1766DCBA8FEE7319FB691CC904D364B5FD63F0E091086C ++ Юмор FM ++ Юмор FM ++ -1 ++ stereo ++ 95.7 ++ ++ ++ 1290670209D53A20DBE72609B8DD5D1C949AD9C717D957B7EA737EE0AF4555783A9568 ++ Kot FM ++ Kot FM ++ -1 ++ stereo ++ 96.3 ++ ++ ++ 1290669520AFD73B2A79481561F353ADAAA8019C899B98EBD5BBC7C8C523D8B5E1F4AC ++ Ретро FM ++ Ретро FM ++ -1 ++ stereo ++ 98.6 ++ ++ ++ 1290669523EB55855C02E8D1466C0DD69923D0AECA8D1EA4638A4324CF005F1B9396B4 ++ Эхо Москвы ++ Эхо Москвы ++ -1 ++ stereo ++ 99.1 ++ ++ ++ 1290669526015A03960BBB8AFEAE8434E5774A10912CE23D3F30E715BC3F6AF63E2B01 ++ Европа плюс ++ Европа плюс ++ -1 ++ stereo ++ 99.9 ++ ++ ++ 1290669529F2C34EF9C4054325268B74145214ED93301E756EEF49D0B6B369F0472357 ++ Русское радио ++ Русское радио ++ -1 ++ stereo ++ 100.3 ++ ++ ++ 129066953365186F4B19E0FFA6970EA7CF9BBE4CB8B4C8B29585CBEDCCADE3E0438A6B ++ Радио Шансон ++ Радио Шансон ++ -1 ++ stereo ++ 101 ++ ++ ++ 12906695360BE1FF43000028BE7DFFAC09A6D1C3D8D82F4230ADAFB8A97EA67063A617 ++ Радио Рекорд ++ Радио Рекорд ++ -1 ++ stereo ++ 101.5 ++ ++ ++ 1290670428DB6665C4DA8315E1F9C1C3AEE22FE5F400B378BF01D0C2091AD1D6351815 ++ Радио Дача ++ Радио Дача ++ -1 ++ stereo ++ 102.1 ++ ++ ++ 1290669541A995A471FD47505C9A854FA3283E543CFCF2CF49D755684FA403A8B707AE ++ NRJ ++ NRJ ++ -1 ++ stereo ++ 102.5 ++ ++ ++ 1290669543FBF9E4CC1B1852F655B37CAB7142F34981CBEE8CED47387B2B1D416A3818 ++ DFM ++ DFM ++ -1 ++ stereo ++ 102.9 ++ ++ ++ 1290669547A5146B3B559C4AF1D19A78B25BCBC6C96FC3FB2CE096DBBC08E1121BED6C ++ Радио Мегаполис ++ Радио Мегаполис ++ -1 ++ stereo ++ 103.6 ++ ++ ++ 1290669551EF9AAACB0ED236913B13084702FB32333DA1D6057709066AE87252E866F0 ++ Самара-Максимум ++ Самара-Максимум ++ -1 ++ stereo ++ 104.3 ++ ++ ++ 1290670579C8F92CAD2D08031E938BAAC59BBE4DE2F00B83A172121D8E030078F04F1B ++ Авторадио ++ Авторадио ++ -1 ++ stereo ++ 104.8 ++ ++ ++ 12906695578486108D25E6524980F6692BAAD184350B1AD0404E9FF46D5E553E800991 ++ Радио Алла ++ Радио Алла ++ -1 ++ stereo ++ 105.4 ++ ++ ++ 12906695610B4001861F6297000F9E0163510F013380B0230CB87871A69A947A5603F6 ++ Дорожное радио ++ Дорожное радио ++ -1 ++ stereo ++ 106.1 ++ ++ ++ 1290670650697A6A61F958CCF9DA5BBC65D36276B78CF50F7837A6B0102BDF4E3D51D0 ++ Love радио ++ Love радио ++ -1 ++ stereo ++ 106.6 ++ ++ ++ 1290669568AF4C3FA28BC38A7BFB9FB288E3CD453E4E732F49B3C509F3FDECA89B4E16 ++ Детское радио ++ Детское радио ++ -1 ++ stereo ++ 107.2 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/russia/vladivostok-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/russia/vladivostok-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,141 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.2 ++ Andrey Tomilenko (aka Thom) thom82@mail.ru ++ 2012-06-22T20:47:29 ++ Russia ++ Vladivostok ++ Antenna ++ ++ ++ ++ 1305629847E4E1C8DFAE28601AA9FF6FED89E658E93D0FB8E6CD6E38CAE5F9FD312294 ++ Радио Маяк ++ 1 ++ ++ -1 ++ dontcare ++ 69.68 ++ ++ ++ 13056302742651484CC5912F72A23F69F67301C3D59DE23FEE9DDBB143FD366F972D12 ++ Радио России ++ 2 ++ ++ -1 ++ dontcare ++ 71.84 ++ ++ ++ 1305630309F71DD598694A4024E35B0E728919D3C07279C5A8517CCD3CAF6665D50FDE ++ Авторадио ++ 3 ++ ++ -1 ++ dontcare ++ 88.3 ++ ++ ++ 1305630337CE26C7EFFA5A35679CA6A2014859F842B5784AE6CD400457AAB500DA93CA ++ Радио 7 ++ 4 ++ ++ -1 ++ dontcare ++ 91.3 ++ ++ ++ 1305630407C3530D192583FA82B955F4DC456E7280CA9FAAF485DCDB1017EF8AFDBCAD ++ Радио VBC ++ 5 ++ ++ -1 ++ dontcare ++ 101.7 ++ ++ ++ 130563042542AAA24D5F407A403C4A7197B4CFA710A0DC193EBD8830AAC41C95A4ADF1 ++ Радио Лемма ++ 6 ++ ++ -1 ++ dontcare ++ 102.7 ++ ++ ++ 1305630440AAD7287143E964761B40147B5B4300A6F0E875FD2F16CB7CF19636145C52 ++ Радио Шансон ++ 7 ++ ++ -1 ++ dontcare ++ 103.2 ++ ++ ++ 13056304542589A59330FDFD3BC5C59CF6F361BD834A851576B85BC0B2DD0882E7A094 ++ Ретро FM ++ 8 ++ ++ -1 ++ dontcare ++ 103.7 ++ ++ ++ 13056304729BC63FBCDAEACF9BF8E31BB50C14D2A3BA718D7CC67516720549D43308ED ++ Европа Плюс Владивосток ++ 9 ++ ++ -1 ++ dontcare ++ 104.2 ++ ++ ++ 130563049042596A28FF0B0A75A1EEE2646A0F66383E7ADACD04F3CCFEF9CD2D291A32 ++ Радио Дача ++ 10 ++ ++ -1 ++ dontcare ++ 104.7 ++ ++ ++ 1305630506C7D70286FAD616EDC0D58CE0E911282596E00793C5A5D9E1D402700207F7 ++ DFM ++ 11 ++ ++ -1 ++ dontcare ++ 105.3 ++ ++ ++ 1305630522CCF6CD3D24E933D486C62C00D4279BC46C85AA7B71F9170ECB4900CF7899 ++ Хит FM ++ 12 ++ ++ -1 ++ dontcare ++ 105.7 ++ ++ ++ 1305630536EF153D9BA1638772799D7C1D066D0C8E431B98476DD073FC4B05AA07C4A9 ++ Владивосток FM ++ 13 ++ ++ -1 ++ dontcare ++ 106.4 ++ ++ ++ 1305630551DEB55372DD2D6225FD2472EB4B5926B50BD2F6D652E4E9DBB8F8E8E590B8 ++ Русское Радио ++ 14 ++ ++ -1 ++ dontcare ++ 107 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp +--- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava2.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava2.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,114 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Karol Slanina ++ 2007-01-30T23:57:25 ++ Slovakia ++ Bratislava ++ ++ ++ ++ ++ 11701979358557D176BE181F7A4D73F6B3E363053727BB4B2865AEBDF6522AA23B496A4BC6 ++ R�dio FM ++ R�dio FM ++ ++ -1 ++ 89.3 ++ ++ ++ 1170197995A51B2D6F23369B1E32CD8732D47EF18E7DF3DE59A10F1E552EF0D5192E082F2F ++ Lumen ++ Lumen ++ ++ -1 ++ 93.8 ++ ++ ++ 1170197864908C92A275FF4EB11D627A70C50F184AC5025AD1EA23B1F2C2E5545DF4604377 ++ Fun Radio ++ Fun ++ ++ -1 ++ 94.3 ++ ++ ++ 1170198029A2525F10FCA4A80FC4C9920DE5317291C7E3FA88F7439AF8554FABEF2C505A7B ++ R�dio Slovensko ++ R�dio Slovensko ++ ++ -1 ++ 96.6 ++ ++ ++ 1170198058FF77AB835BD24D973DBD19FEE90CD52C897DBD56454EAC40FF6EE6299530E2BA ++ Lumen ++ Lumen ++ ++ -1 ++ 97.2 ++ ++ ++ 1170197883FEF499284D6512B6D124C6AEE06954813B19D0677B9FAE1E25841F047E506DAB ++ Regina ++ Regina ++ ++ -1 ++ 99.3 ++ ++ ++ 11701981540C8BA3C5FEE26BFEBC1C21757EAECF0F8812D60536CF462229E28D88D79D3614 ++ Hey! ++ Hey! ++ ++ -1 ++ 100.3 ++ ++ ++ 117019818318BF1A3FB6743C67752E82D4040BEE751A2DFA097586C0745590238E429B140D ++ Viva ++ Viva ++ ++ -1 ++ 101.8 ++ ++ ++ 117019823636B4E4B502BC79238346E03946C14B71DBF94119255C2C80249382E9E9596E76 ++ Dev�n ++ Dev�n ++ ++ -1 ++ 104.4 ++ ++ ++ 1170198249A7B52138DFC2490C760F9B63E3089848E5530558F197A85AF75E491DE3752EF8 ++ Okey ++ Okey ++ ++ -1 ++ 104.8 ++ ++ ++ 1170198200C27DA842FC3E41A94178717FD57CDA4B3637AEE94EE432559A51406C152BE867 ++ Jemn� mel�die ++ Jemn� mel�die ++ ++ -1 ++ 106.6 ++ ++ ++ 1170198173C7877B76C83C5A1D305D71333F95BF44E85E4981BFC901138A6D8B4161CB9DDE ++ Expres ++ Expres ++ ++ -1 ++ 107.6 ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp +--- kradio-3.5.13.1/kradio3/presets.old/slovakia/bratislava.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/slovakia/bratislava.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,95 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ ++ 2007-01-03T17:10:50 ++ ++ ++ ++ ++ ++ ++ 1167837266A46C6BD80A9B05DB8191BBA2DF07FBD9C06260FFCD10A5C14F99B37A4A1264E1 ++ Radio FM ++ radiofm ++ ++ 0 ++ 89.3 ++ ++ ++ 1167837523A6FCDE20D4D66BFB2D2DEC1BE1027C01007A26E6BBB1E674B7E9B1B5F2B69282 ++ Radio Wien ++ ++ ++ -0.01 ++ 89.95 ++ ++ ++ 1167906947508A1DFDFB2DCC3217FE7DE77F0896F34EFCE5C1F01A3481D8B13DEA5AAE0D03 ++ BBC World ++ ++ ++ -1 ++ 93.8 ++ ++ ++ 11678375991034A86E0C2F24E0262CECC9917EEADEAAAC6738B5CE2DB74B4210B84E60E6DC ++ Fun Radio ++ ++ ++ -1 ++ 94.3 ++ ++ ++ 1167837739B15816FFEC00FA6F46359F18C7E4B88DEDD1D1EDF4E2E25A5DA0117CB3CF1E73 ++ SR1 ++ ++ ++ -0.01 ++ 96.6 ++ ++ ++ 1167840523320901F854CBA0C6099B0F680738AB4EF8B7375882DD6C1C9BC639C14A0075DB ++ Radio FM4 ++ ++ ++ -1 ++ 103.8 ++ ++ ++ 11679064372E55132CD63194C6DF57BED568063822F8DB897F58D7F1F2AEAE396B1E0BF242 ++ Radio Okey ++ ++ ++ -1 ++ 104.8 ++ ++ ++ 1167906269AA3003C8F5BAE787A4B93AC008C8DF8FCE0F184E50FBA8C7EAB68F194DD47442 ++ Krone Hit ++ ++ ++ -1 ++ 105.8 ++ ++ ++ 11679069873DD5DB69565B0F08A2A6C7D0922333B8E956C9B23DC2066513ED88F091BDF922 ++ Jemné Melódie ++ ++ ++ -1 ++ 106.6 ++ ++ ++ 1167906370C374296A0729322F2FE591A959E9927D815F5AC53FEC71DF3EEF3A2B6868B6E1 ++ Radio Expres ++ ++ ++ -1 ++ 107.6 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/slovakia/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/slovakia/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,10 +1,13 @@ + SUBDIRS = +-EXTRA_DIST = "kosice.krp" ++EXTRA_DIST = "bratislava2.krp" "bratislava.krp" "kosice.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/" ++ $(INSTALL_DATA) "$(srcdir)/bratislava2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" ++ $(INSTALL_DATA) "$(srcdir)/bratislava.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" + $(INSTALL_DATA) "$(srcdir)/kosice.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp" + +- + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/bratislava.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/slovakia/kosice.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp kradio-3.5.13.1/kradio3/presets/spain/leon.krp +--- kradio-3.5.13.1/kradio3/presets.old/spain/leon.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/spain/leon.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,114 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ Roberto Garrido <garrido251@terra.es> ++ 2006-10-16T18:47:38 ++ Spain ++ Leon ++ ++ Emisoras de Leon capital ++ ++ ++ 1116455444F91ED21F1D7BA697D3CCCA4F80412D98E84AC5EEE8E9FD8802E8239245117BE5 ++ RNE 1 ++ RNE 1 ++ ++ 87.60 ++ -1 ++ ++ ++ ++1116455444F58348060F6B3951D032CE2AE3962570045A854578FE3718D634442C77547493 ++ 40 Principales ++ 40 Prin. ++ ++ 88.2 ++ -1 ++ ++ ++ 111645544469DB377E2239117F981CCE57F05666F7D20638D4B79949FCF6B9046A5504FBF8 ++ Radio Clasica ++ R. Clas. ++ ++ 91.10 ++ -1 ++ ++ ++ ++1116455444E3C16AFC5033065A79EA2ACB983CD130F211DD90B5191135A7A0406A415E9E32 ++ Radio 3 ++ Radio 3 ++ ++ 89.30 ++ -1 ++ ++ ++ 11164554446CAC6C1662A7B7CED73A73B393EDB080B0BDF83DB7FF69DADA2B1CE6EEB5227C ++ Cadena Ser ++ C. Ser ++ ++ 92.60 ++ -1 ++ ++ ++ 11164554447A9C68C227A551F40419A4A90C43709DE94082A0EE08024CCC55365C051D497B ++ Cadena 100 ++ C. 100 ++ ++ 93.3 ++ -1 ++ ++ ++ 1116455444DCD642C7A6C7E5EB8768969BA1504A0B12AF82D9B3B42EF1A943AD01C56B1878 ++ Cadena Dial ++ C. Dial ++ ++ 94.3 ++ -1 ++ ++ ++ ++1116455444509F0036299C12C83B7ABEA8000845DC5D38E34AAEA04346433F6ACC64860751 ++ M80 Radio ++ M80 ++ ++ 95.3 ++ -1 ++ ++ ++ 1116455444787E3904290A56E16C4808EE0C7117893EE19A27D621326FA4FEA44334A6AAB4 ++ Kiss FM ++ Kiss FM ++ ++ 96.5 ++ -1 ++ ++ ++ 1116455444C8F7100921C174D17234BB109181FB1D1891D59C31A09771D0400BA46015D36F ++ Onda Cero ++ O. Cero ++ ++ 98.3 ++ -1 ++ ++ ++ 1116455444524D3835E4E98FA48D0822236F7A2C4881D4D3314D9740CDE086B1DCF400850C ++ Radio Maria ++ R. Maria ++ ++ 101.3 ++ -1 ++ ++ ++ 111645544434E00A4B79D5AF6F50BCA073B4F0075DB98363F2965208360ADB384FC9C9261F ++ Radio 5 ++ Radio 5 ++ ++ 102.2 ++ -1 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am kradio-3.5.13.1/kradio3/presets/spain/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/spain/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/spain/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,26 +1,27 @@ + SUBDIRS = +-EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp" ++EXTRA_DIST = "barcelona2.krp" "barcelona.krp" "bilbao.krp" "leon.krp" "lugo.krp" "madrid-2.krp" "madrid.krp" "malaga.krp" "mieres-del-camino.krp" "sevilla.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/" +- $(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" +- $(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" + $(INSTALL_DATA) "$(srcdir)/barcelona2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp" +- $(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" + $(INSTALL_DATA) "$(srcdir)/barcelona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp" + $(INSTALL_DATA) "$(srcdir)/bilbao.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp" +- $(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" +- $(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/leon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp" + $(INSTALL_DATA) "$(srcdir)/lugo.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/madrid-2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" ++ $(INSTALL_DATA) "$(srcdir)/madrid.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" ++ $(INSTALL_DATA) "$(srcdir)/malaga.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" ++ $(INSTALL_DATA) "$(srcdir)/mieres-del-camino.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" ++ $(INSTALL_DATA) "$(srcdir)/sevilla.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/barcelona.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/bilbao.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/leon.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/lugo.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid-2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/madrid.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/malaga.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/mieres-del-camino.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/spain/sevilla.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp +--- kradio-3.5.13.1/kradio3/presets.old/sweden/linkoeping.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/sweden/linkoeping.krp 2012-11-25 00:48:01.000000000 +0100 +@@ -0,0 +1,87 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_11_27 ++ Magnus Holmgren <magnus@kibibyte.se> ++ 2006-10-19T16:57:24 ++ Sweden ++ Link�ping ++ ++ ++ ++ ++ ++11612679722C3AE9D70B2B3DD46C4065608BA1CAACE6896B3D6F823A492BBC2530D8F59698 ++ Sveriges Radio P1 ++ P1 ++ ++ -1 ++ 88.6 ++ ++ ++ ++1161268014C8DA05F96C556DF58C27DCA0B7EB4D76C21088188AB8FD914878185BD0F9D949 ++ Sveriges Radio P2 ++ P2 ++ ++ -1 ++ 93.1 ++ ++ ++ ++1161267649469715870FF0D03695CA6A24454360C86BFBE9C63852DBE7C345B2F78588CDCA ++ Sveriges Radio P3 ++ P3 ++ ++ -1 ++ 98.2 ++ ++ ++ ++1161266725517FE1ECC390A4AD8164724F361C1BBC9663B69AE58DA4D18E922C95E7B94877 ++ Sveriges Radio P4 �sterg�tland ++ P4 ++ ++ -1 ++ 99.8 ++ ++ ++ ++1161267804D5E933F12EFCD66F8EEF4B28C4345A2D2986DE5A121E68825E481A4197D46171 ++ Link�pings n�rradio ++ N�r ++ ++ -1 ++ 95.5 ++ ++ ++ ++11612659565F0D48B7FB6AE89FFFA0F61FFC2C342AFF99E6AFC86F0E8FFAE65DE6AEAE3BCA ++ Rix FM ++ Rix ++ ++ -1 ++ 104.376 ++ ++ ++ ++11612667154BB764EE3775FEA4FC6159E50300742ADD5E58B519E357ACAE84BA532BCDD8E8 ++ Lugna favoriter ++ LF ++ ++ -1 ++ 94.5 ++ ++ ++ ++116126856640E5698A4438B690C4BFE5601F11D852BAC3164C921A42AAB231681183E40603 ++ East FM ++ East ++ ++ -1 ++ 103.2 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/sweden/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/sweden/Makefile.am 2012-11-25 00:48:01.000000000 +0100 +@@ -1,18 +1,19 @@ + SUBDIRS = +-EXTRA_DIST = "gothenburg.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp" ++EXTRA_DIST = "gothenburg.krp" "linkoeping.krp" "oestersunds-kommun.krp" "stockholm.2.krp" "stockholm.krp" "vaxholm.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/" +- $(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" +- $(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" + $(INSTALL_DATA) "$(srcdir)/gothenburg.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp" ++ $(INSTALL_DATA) "$(srcdir)/linkoeping.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping.krp" ++ $(INSTALL_DATA) "$(srcdir)/oestersunds-kommun.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" + $(INSTALL_DATA) "$(srcdir)/stockholm.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp" + $(INSTALL_DATA) "$(srcdir)/stockholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/vaxholm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/gothenburg.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/linkoeping" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/oestersunds-kommun.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.2.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/stockholm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/sweden/vaxholm.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/switzerland/baar-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/switzerland/baar-cable.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,421 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ ++ 2008-10-29T08:32:41 ++ Schweiz ++ Baar (ZG) ++ Cable ++ ++ ++ ++ ++12252731615C37190398400074872507711380CC9F801C63990D7D1216B681209CEA7786A9 ++ Deutsche Schweiz 1� ++ DRS 1 ++ ++ -1 ++ 87.5 ++ ++ ++ ++12252731615F3EC8840F1D28547F96E5F851757FD7E43F14DAC1D84B35BBD2E4B3CBACA8EC ++ Deutsche Schweiz 2 ++ DRS 2 ++ ++ -1 ++ 87.8 ++ ++ ++ ++1225273161571CAE333F51B6DF76B9FC350D3B8241CB010CC415F45A11DDF89938B7E48F20 ++ Deutsche Schweiz 3 ++ DRS 3 ++ ++ -1 ++ 88.4 ++ ++ ++ ++122527316101F7DBAA4FC8D120BA86942BB54C774119B175AEFDBF07313E9BC380645E5979 ++ Deutsche Schweiz 4 ++ DRS 4 ++ ++ -1 ++ 94.3 ++ ++ ++ ++12252731610FD0B97EA983008980BC88F6C246C1B0DCA90B2298759E39A2485A68FBD08284 ++ Radio Eviva ++ EVIVA ++ ++ -1 ++ 89.6 ++ ++ ++ ++1225273161DD5A7B47F06219EE6B287410846E68A2F9645FBE56CDA64055EBE9FD50F400CA ++ DRS Musikwelle ++ DRS M ++ ++ -1 ++ 107 ++ ++ ++ ++122527316150F8094927669160C81E11488EE683D7D51643444F74930B441A71E741AA8D1E ++ Radio Swiss Jazz ++ CH-Jazz ++ ++ -1 ++ 93.2 ++ ++ ++ ++122527316144A1588DA40CC54E54E8FD1955699F6E590FF05128F551C188B50781BFA2E429 ++ Swiss Clasic ++ CH-Class ++ ++ -1 ++ 100.1 ++ ++ ++ ++1225273161E93DBEAB0A4B385E7F8638081FF4FE77F082AE85AFD05E79A86074C450274ED4 ++ Swiss POP ++ CH-POP ++ ++ -1 ++ 100.4 ++ ++ ++ ++1225273161A8049CE900367D1B4609C408D051B68E68CC148E1E4AFAE7C6210EB569563F5F ++ Tropica ++ TROP ++ ++ -1 ++ 91.8 ++ ++ ++ ++12252731615AE584B8080DBA4FA802E756A6CA14DC0B1999843A435E10D0C016073AC04964 ++ Rock Nation ++ SM ++ ++ -1 ++ 89.9 ++ ++ ++ ++1225273161F381A9211F4AD4D44F7DF22218F520FD15E20AEC8F90520E8EF44FDBA9D8BE49 ++ Radio Virus ++ VIRUS ++ ++ -1 ++ 102.5 ++ ++ ++ ++12252731616CA06E1C2AE30BB75D0A55BEBCDBB0430F29D75E9065E394C07C91234513F35D ++ Radio Sunshine ++ RSH ++ ++ -1 ++ 98 ++ ++ ++ ++1225273161425F93755AFA25B35C884916F0ADC90D5AD7C7FBB55A6FD8CBDC5F9FEF5DCB9F ++ Radio Pilatus ++ PIL ++ ++ -1 ++ 98.9 ++ ++ ++ ++1225273161AB5F78DEF5E32376FDFD550AEFEBC2B8D3870C2F241C3B2A799343A4B8E181C2 ++ Radio Central ++ RAS ++ ++ -1 ++ 101.9 ++ ++ ++ ++1225273161422E70DA14D5688197F0463779CDB698D20B05A5EF117F0EA81F427FF665E65D ++ Radio 105 ++ R105 ++ ++ -1 ++ 105.5 ++ ++ ++ ++12252731613B91C4CE87B38152A108B17DFF853A5EF3E30A85E31709BF2A86FF4E6FAE1EB7 ++ Radio 24 ++ R24 ++ ++ -1 ++ 107.3 ++ ++ ++ ++1225273161DEE2378679617AC0F38BFBE73B34344C5DAAB629FD54F6CA96BDE14AAE8307F8 ++ Radio LORA ++ LORA ++ ++ -1 ++ 107.9 ++ ++ ++ ++1225273161B50423C2C6D3A258BAE99CC96F1C2A7DBFA5632C321CE714DB38AAE38C346710 ++ Radio Energy ++ NRJ ++ ++ -1 ++ 107.6 ++ ++ ++ ++12252731614A07E5A4D217F410E3D11188E49B4FB392835BB6B33BB5667D39EEF9C77DFFDD ++ Suisse Romande 1 ++ RSR 1 ++ ++ -1 ++ 100.7 ++ ++ ++ ++1225273161EE7A4CB25EA346F4C855D21D92C8DA38A3FFAFDE9BFBD109E3FA6791FD9ED0C5 ++ Suisse Romande 2 ++ RSR 2 ++ ++ -1 ++ 101.3 ++ ++ ++ ++12252731617BF310CCF020C3ECB8AF3A1F9FC7ECCF63C53B2D2CDF1E8E6314EBDBB84A48FB ++ Suisse Romande 3 ++ Couleur 3 ++ ++ -1 ++ 101.6 ++ ++ ++ ++12252731612E058C045EB2E699CE7A457AD516992A350A702579000BA6C5A17EF171454EBF ++ Svizzera Italiana 1 ++ Rete uno ++ ++ -1 ++ 102.2 ++ ++ ++ ++1225273161774BDACFA3A2D1010ACDA1358A21BDEE9D11EB4BD544ACAABA25E9C81D3D9877 ++ Raetoromanisch ++ RAT ++ ++ -1 ++ 90.2 ++ ++ ++ ++1225273161DA24AD3329D2F6A2F676CD4A618F3E9B00F3398DBA3248F87B18C1062C566065 ++ Suedwestrundfunk 1 ++ SWR 1 ++ ++ -1 ++ 88.7 ++ ++ ++ ++12252731612C2E8DB69C060D2B9F6D99B76A0C6915CA9C1F570DAD0BA21633CCDCA6968999 ++ Suedwestrundfunk 2 ++ SWR 2 ++ ++ -1 ++ 89 ++ ++ ++ ++1225273161D5A748788A860FA1780DD3A85D63C4B7A24338B84D949FE74913F310D1281550 ++ Suedwestrundfunk 3 ++ SWR 3 ++ ++ -1 ++ 89.3 ++ ++ ++ ++1225273161017919BC747D3C3050F193AB1FDD0F0B82062E2AFE4A9A04A9164264186C2298 ++ Suedwestrundfunk 4 ++ SWR 4 ++ ++ -1 ++ 93.5 ++ ++ ++ ++1225273161310AC50726DB4819FF3E73563B2121FC09B2624B0AAD25AC1C639DB73EED8DD7 ++ Bayern 1 ++ BR 1 ++ ++ -1 ++ 91.4 ++ ++ ++ ++1225273161BCF2994106AAD995088C4AEDD8F0901CE0864622EA856A5E4BD8B09C8C0A481F ++ Bayern 2 ++ BR 2 ++ ++ -1 ++ 106.4 ++ ++ ++ ++1225273161F93BA8D4C7D85846202BC721054391B03E0FE53A0A25A5CFB27E56D49F5A84ED ++ Bayern 3 ++ BR 3 ++ ++ -1 ++ 92.3 ++ ++ ++ ++1225273161C5E00C7CED1D20457FD741161A38C3D2E89849DA70700FD9B4053AA554FF31D4 ++ Bayern 4 ++ BR 4 ++ ++ -1 ++ 92.9 ++ ++ ++ ++1225273161E936AD3F2AA5E9AE3C541FF6AE99ABB898C3D8FB485F46E811C7FC68DD14D70B ++ Deutschlandfunk ++ DLF ++ ++ -1 ++ 93.8 ++ ++ ++ ++122527316144EFE270366507B0E1DC5B5D9CA2650577187AC960D27D0B063152EBCF43A076 ++ RTL Radio ++ OLDI ++ ++ -1 ++ 102.8 ++ ++ ++ ++12252731615F50D3ADC6C7CADAEED6BE118E60ACE86C254FF12BE25AFC2A578EEA92F7A1A3 ++ Oesterreich 1 ++ Oe 1 ++ ++ -1 ++ 95.9 ++ ++ ++ ++1225273161EB926A11E10642DFF9732D249A77006949B6141F7E541DC09149F03447AA1B5C ++ Oesterreich 3 ++ Oe 3 ++ ++ -1 ++ 97.7 ++ ++ ++ ++122527316111AD7DEF5739C998C08D84F388A1E7AC8B6A3B44BFC614A83E2894F818E015C4 ++ Radio Vorarlberg ++ Oe 2 ++ ++ -1 ++ 103.7 ++ ++ ++ ++122527316181DDE5688DAC8A726278689857F789B201D9BFECA62AACFAD6039B1FF103AEDF ++ Klassik Radio ++ KLAS ++ ++ -1 ++ 103.4 ++ ++ ++ ++12252731619C8109156AB1A348BF532BBCF4DAF1B77311C8B00BBC1AE4259A2BF82F1A2C99 ++ Sky Radio ++ SKY ++ ++ -1 ++ 98.3 ++ ++ ++ ++12252731613FD044AB1BEE2C8AF97A15DC1A1558AEDA9FAB84399E834459AAA8E73BD6F6E6 ++ Deutsche Welle ++ DW ++ ++ -1 ++ 104.9 ++ ++ ++ ++1225273161B078B9CCFB310C45D6DF651133CF77D5E9CD6C4162A1292BF5FF9DCE6CEA6A58 ++ France musique ++ FM ++ ++ -1 ++ 105.2 ++ ++ ++ ++1225273161247F897CFB0D11FF8DDCF3BF74EEF92D78187BF0FC3BF6A48B726DE551B65D44 ++ France culture ++ FC ++ ++ -1 ++ 105.8 ++ ++ ++ ++1225273161089D4E01B7FCDE677247DBBE8112EC1B6D59860843F08720DEB6C0F314150928 ++ France inter ++ FI ++ ++ -1 ++ 106.1 ++ ++ ++ ++1225273161FB03759B05089B0E9B49DD4C1BAFBA08AF0F697E11D37F931A337DB02710F30A ++ BBC World Service ++ BBCW ++ ++ -1 ++ 95.6 ++ ++ ++ ++12252731612C2CF11CF81CAB1D6BF82A4CDFC854050815CDEFF9FC3F4EC54A3B5B9DFF71B1 ++ World Radio Switzerland ++ WRS ++ ++ -1 ++ 94.6 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/switzerland/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/switzerland/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,14 +1,19 @@ + SUBDIRS = +-EXTRA_DIST = "diepoldsau-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp" ++EXTRA_DIST = "baar-cable.krp" "diepoldsau-cable.krp" "egg-cable.krp" "spiez-cable.krp" "stansstad-cable.krp" "wrenlos-cable.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/" ++ $(INSTALL_DATA) "$(srcdir)/baar-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp" + $(INSTALL_DATA) "$(srcdir)/diepoldsau-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp" +- $(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/egg-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp" ++ $(INSTALL_DATA) "$(srcdir)/spiez-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp" + $(INSTALL_DATA) "$(srcdir)/stansstad-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/wrenlos-cable.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" + + uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/baar-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/diepoldsau-cable.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/egg-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/spiez-cable.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/stansstad-cable.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/switzerland/wrenlos-cable.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp +--- kradio-3.5.13.1/kradio3/presets.old/switzerland/spiez-cable.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/switzerland/spiez-cable.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,361 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-09-20 ++ ++ 2006-11-25T18:25:59 ++ ++ ++ ++ ++ ++ ++ ++ 1164475721C836B02D3F9FB5323F9B91DCC801F18604275400966F77F8438EE0DFD21004A3 ++ Musigw�lle 531 ++ ++ ++ -1 ++ 87.8 ++ ++ ++ ++ 1164476030DBDA7CE1895880614BD880D190BFF85874123D1EA380A59325BA85DAD0E36B75 ++ Radio BEO ++ ++ ++ -1 ++ 88.4 ++ ++ ++ ++ 116447645722BEEB11FBAE650D5B6E528AA5BE6550F03E5A316B7D12360F42AD9ABBE71A49 ++ Virus ++ ++ ++ -1 ++ 89.1 ++ ++ ++ ++ 1164476485623C22102A116C99B38AFFB8899E4C63E7CED92DF119968181A3D45E6B1E082D ++ Radio Regenbogen ++ ++ ++ -1 ++ 89.6 ++ ++ ++ ++ 1164476522F136F4B1AB6D4A0F9B8640C7C52001600D8812FC2AC614AF11B13117F9100683 ++ DRS 2 ++ ++ ++ -1 ++ 89.9 ++ ++ ++ ++ 11644766088531147C8EBFB983BD17E35EFAEFAB6AA2910217FB62BF2CC43087B928E20052 ++ DRS 3 ++ ++ ++ -1 ++ 90.8 ++ ++ ++ ++ 1164476645F8334668B73282FC0CDDE1E642E1A4B1F4068638961E8E73BFCEEEEB21E08A08 ++ Oesterreich 3 ++ ++ ++ -1 ++ 92.3 ++ ++ ++ ++ 11644767132F795AABE1F145F8EC35E7EA1D9FDD1125452F31152EF022E3D77DDE4002C436 ++ SW-Rundfunk 3 ++ ++ ++ -1 ++ 94.29 ++ ++ ++ ++ 11644768047E4A9DAFF301C6C6B33D8CC33F9BA07E6000AB137E484161BD939A14063DFCA4 ++ Bayern 4 ++ ++ ++ -1 ++ 96.5 ++ ++ ++ ++ 116447709817EED4BED4A4579737F308C6D1510E8578017F10D3D3DB349B32AAB44A1ED9CC ++ Radio Melodie ++ ++ ++ -1 ++ 102.1 ++ ++ ++ ++ 1164476632F724A008F02E6D3AD51D39DC085CE1B82F9FA9EFB1608AC16C5F26D9020A9C82 ++ Oesterreich 1 ++ ++ ++ -1 ++ 91.7 ++ ++ ++ ++ 116447711474A26EC5B9D08F4F13D196CEBA8A340ACE82EBD0B8E9FC61BAC8125C82C013D0 ++ RTL-Radio ++ ++ ++ -1 ++ 102.7 ++ ++ ++ ++ 1164476846FC95432884DBDC07B8FF2792A20AA3D097403536C233BD1BAF0BBF08C2C58F13 ++ Radio Svizzera Italiana ++ ++ ++ -1 ++ 97.8 ++ ++ ++ ++ 11644771468AA776EFE5705F034B7D8C34A8825AA572D8C8EABC803DE94A4F540E4018EF89 ++ Radio Rumantsch ++ ++ ++ -1 ++ 104.2 ++ ++ ++ ++ 116447673275A830CAE620C2602AC63CF04DC44B22EF74C7B9C0B7D34F9559968C3FA5DDC7 ++ SW-Rundfunk 2 ++ ++ ++ -1 ++ 94.6 ++ ++ ++ ++ 1164476871DC16BE6BE1FC8EBF76E8C1D96294EB0AFDFDBB681D07C6E629295715E93760EB ++ Radio Suisse Romand 1 ++ ++ ++ -1 ++ 98.7 ++ ++ ++ ++ 116447719145CA243A149CFC3CC5B277C8C952C68CC4AFE241170805028B9D8F4C6F8EFC6D ++ Sky Radio ++ ++ ++ -1 ++ 104.6 ++ ++ ++ ++ 1164476689247ADCA226D16E3A1A47B3F109347DC3A07082682F51A09946D8CDEF76FADBF0 ++ SW-Rundfunk 1 ++ ++ ++ -1 ++ 93.1 ++ ++ ++ ++ 11644772145A80A226FE3438AEB2CD7C67CC50D04D9A6963445C389F8544829335827FB68B ++ Swiss Pop ++ ++ ++ -1 ++ 105.6 ++ ++ ++ ++ 11644768870A3FC50ED9BB1F3FDEFFBBECC9510AA8113A440A46895F6467573AFFB1DF7D82 ++ Swiss Culture + Jazz ++ ++ ++ -1 ++ 99 ++ ++ ++ ++ 1164477240CF1F4C25E2A3F009578B936EE6802812D0351938C0B0A38F7E268D4F5D010653 ++ Radio Eviva ++ ++ ++ -1 ++ 106.1 ++ ++ ++ ++ 11644767613828AAB12B9DA61869FF71B91D28FA83ADEF88D7FA446D0927C3DB626A0FB90C ++ Bayern 1 ++ ++ ++ -1 ++ 95.2 ++ ++ ++ ++ 11644772595D1023FE4609DB5BC01A162A2A370269F79F81AFB6F8C6B575C778A3CD11B4BE ++ Swiss Music Radio ++ ++ ++ -1 ++ 106.8 ++ ++ ++ ++ 116447700658B7827F2F1C3EEC396586A5694F03645A8C0BC343E030D1B49F58CBE66B3E03 ++ France Inter ++ ++ ++ -1 ++ 100.15 ++ ++ ++ ++ 116447727511838E69F94FB51A15470F7EFA96E9AE099AA1836A7562ED95671C0F1E0E0C31 ++ Radio BE 1 ++ ++ ++ -1 ++ 107.3 ++ ++ ++ ++ 1164476665D42950581695565798A8D7D864F8ABCE5D945CF141430F2D7EF9245F54829B88 ++ Swiss Classic ++ ++ ++ -1 ++ 92.8 ++ ++ ++ ++ 1164477303B8282E6DA0AA48A55E59F852CA2935F99E6E4ADE05329EDC2F39F90064B8E914 ++ MDR Sputnik ++ ++ ++ -1 ++ 107.7 ++ ++ ++ ++ 116447703272325203D3A39FF25A9013A17926FC95911E8A2B3E0508C8A1911F65B54316E9 ++ France Musique ++ ++ ++ -1 ++ 100.8 ++ ++ ++ ++ 1164477369E78B9920982741ACE5BF2403152CBF4EBE4E51E9AFDDE6481FD84B61DCB539AA ++ DRS 1 Regional ++ ++ ++ -1 ++ 88.4 ++ ++ ++ ++ 11644767869F8A1A9D954FDA85F658D53C4C4F463ABF512D00DD6ACE2A7E183AE736C3E2E7 ++ Radio Network 105 ++ ++ ++ -1 ++ 95.7 ++ ++ ++ ++ 11644770561E9A7C4F01D692E947D4EB715F243D6340CAEB5FDA1AFF9BB6C38ABBC75427F0 ++ Klassik Radio ++ ++ ++ -1 ++ 101.2 ++ ++ ++ ++ 11644777782CECEA00CDCCCA218FADB5451F25842A2AB8C8D397694C6A7235EF1A892EDC9A ++ Couleur 3 ++ ++ ++ -1 ++ 97.5 ++ ++ ++ ++ 1164477077DF2B858361FA4F6EF082A705A96D694DCA0E7665C753CBC1EFD9117753616E08 ++ Capital FM ++ ++ ++ -1 ++ 101.7 ++ ++ ++ ++ 1164477882C2E4BE3D45186DC9A9DAB61CCDD0FA342DD5865C8154713B73638D36E76FC1CF ++ France Culture ++ ++ ++ -1 ++ 99.5 ++ ++ ++ ++ 1164478027D46AFC7CD8F5F0F27BC708272780F0447F1FC0E532845417F4900ED08038267C ++ BBC W-Service ++ ++ ++ -1 ++ 103.4 ++ ++ ++ ++ 1164478081D5D6FD1F78B4466274D593B544F3484C1CADE593A1668D108C4C451E287E2ED6 ++ Bayern 3 ++ ++ ++ -1 ++ 105.2 ++ ++ ++ ++ 1164477159F2E7FEB9CAF1D312DC9D665718F264E2B23BEFEF956E0F53F4D48DB4E9829CB1 ++ Sky Radio ++ ++ ++ -1 ++ 88.8 ++ ++ ++ ++ 1164478115A1CBD0F9B921FF6D38E14579A8AA498D2A05DCB3A7020A5C059EE4A507B6CAAD ++ Radio BE 1 ++ ++ ++ -1 ++ 107.3 ++ ++ ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/turkey/istanbul-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/turkey/istanbul-antenna.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,239 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Tolga Kaprol <tolga@kaprol.net> ++ 2009-03-22T16:56:00 ++ Turkiye ++ Istanbul ++ antenna ++ Based for Besiktas District ++ ++ ++ 1133103256F976C1C9EE76F2A0358FF48D0C8CA359A63AB04AE6170E6E6DD15E535DEDCE6F ++ TRT FM 1 ++ ++ ++ -1 ++ 95.6 ++ ++ ++ 113310325667257411AA7CDAA02CF2BF8682CFAE0730F602AE53D1E377B6AAEA8D73644F41 ++ CNN Türk Radyo ++ ++ ++ -1 ++ 92.5 ++ ++ ++ 11331032568361DC126F4320BB3A88CB142BAA17B6381608ED1FE62C0C23E09BC8385E7A40 ++ NTV Radyo ++ ++ ++ -1 ++ 102.8 ++ ++ ++ 11331032560BC71AF1443D07D68F7AA660D6ED3CB72F51561D0868328E48112C379A2ECEFF ++ Haberturk Radyo ++ ++ ++ -1 ++ 90.4 ++ ++ ++ 1133103256027AE7ACDDA8B25B6DD21B02DA5E86924D65EAC985866CA95C42D97D285CA211 ++ Radio N101 ++ ++ ++ -1 ++ 101 ++ ++ ++ 11331032564E7A550EEE6211419FBC18C3E9B0AB9BC2A5E73A99F889A811893A0BCE956F81 ++ Lig Radyo ++ ++ ++ -1 ++ 92.3 ++ ++ ++ 1133103256B7EB1EBEEFA0A2990C6F6E6CA8BBF4EDB07B47E815062EBD5D39B497610F843B ++ Radio Dinamo ++ ++ ++ -1 ++ 103.8 ++ ++ ++ 11331032560F7121DBCB34D537AD1A03F44CA586717903F6A5A280127C508F5CBFCD924991 ++ Metro FM ++ ++ ++ -1 ++ 97.2 ++ ++ ++ 11331032566E340315A3C3FFD132FE6A71D036623CD6A6D3437FF98BD12681CA47B71A784C ++ Number One ++ ++ ++ -1 ++ 102.4 ++ ++ ++ 1133103256F9BF82DF0814AD9897CB0CEDFBEBA9911945B367CA3271986F54C6F7A31D9A07 ++ Radio Mynodose ++ ++ ++ -1 ++ 106.2 ++ ++ ++ 1133103256AAC27E61C4EBB1104FBA47A7912A2D1FE2741E5C2A770041D85BE6EDC05B1BDA ++ Radyo D ++ ++ ++ -1 ++ 104 ++ ++ ++ 11331032560DAF105BA4EF17AEB45103D9129DFEA293409989B56A7C8952D1818DBB25042C ++ İstanbul FM ++ ++ ++ -1 ++ 88.6 ++ ++ ++ 123773385189517947A19528E9A57CAC0894995D3247B4AD8B5C2448FF8A873901995B2C54 ++ Joy Türk ++ ++ ++ -1 ++ 89 ++ ++ ++ 11331032563063855FA8319AA8C9683B9329810FCD7AFC25153815CFF082FB5235EA02B146 ++ Alem FM ++ ++ ++ -1 ++ 89.2 ++ ++ ++ 1133103256DA5A6933830D45EE5115C15AEBC121DA36ADCD16308642B9FE159234C4FDA992 ++ TGRT FM ++ ++ ++ -1 ++ 93.1 ++ ++ ++ 11331032564A1086A845369C8F051B1FBC9F021A505A4BD4A812D2A5049418CB3EE677E07E ++ TRT FM 3 ++ ++ ++ -1 ++ 88.2 ++ ++ ++ 11331032563CCD20721596677CE8F9F5590205147CA1F6D2E9F2F0C638C3C2A9138AB733B4 ++ TRT FM 2 ++ ++ ++ -1 ++ 91.4 ++ ++ ++ 1133103256993932C327E1E6728B2991C26A117AA31507B69F280FC07885EDD4B6C94444F9 ++ TRT FM 4 ++ ++ ++ -1 ++ 103.4 ++ ++ ++ 11331032564133D26A4C9D715126DA6A05821C2C8547ADB0B6E292ED2AC5D886CD695A9AA3 ++ Pal Station ++ ++ ++ -1 ++ 106 ++ ++ ++ 113310325652A761312F07237C7671866B97CBE6B48547F34456FCEE48957F9607C6569023 ++ Akra FM ++ ++ ++ -1 ++ 107.6 ++ ++ ++ 11331032560A559D71BE292F346B96164129EB47905681168232A8129E3FFDCD626BB1F9B3 ++ Power FM ++ ++ ++ -1 ++ 100 ++ ++ ++ 12377345702367CB1D14908BAF372C84879F6014A9EB3C2D84388EE34A0786123B38D10913 ++ Radyo 5 ++ ++ ++ -1 ++ 94.7 ++ ++ ++ 12377345953C28151FC597DC78EAE3322BD8C12AEAD7337873397BE9C3A350BE4A90D67C5C ++ K-Rock FM ++ ++ ++ -1 ++ 94.5 ++ ++ ++ 1237734609DFBDCB3B4121E1080EB6F6791918B96C2EC8453558FC2131B60AE9CB393C9FF0 ++ Açık Radyo ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1237734626985324B699C0AC2C37DDE0AF723CB325AEF1AFCA5C66DC4E9DBD1DB35570F599 ++ Radio Oxigen ++ ++ ++ -1 ++ 96 ++ ++ ++ 123773464032B65D46D84318ABFEB1E880E6B9B9691E282445A5DDB69E68E8375FA73ED14B ++ Radyo Eksen ++ ++ ++ -1 ++ 96.2 ++ ++ ++ 12377346804EA0ABAE9A3C8BA69FABB4F07B268E771F7F0BD5DE98389DF80D9F800F28E128 ++ Capital Radio ++ ++ ++ -1 ++ 99.4 ++ ++ ++ 12377346942C7A5A6FDE6C5A6E1FDFF7D6F040C823E9D0DBB9923884C7AFB5200AA05F9047 ++ Joy FM ++ ++ ++ -1 ++ 100.6 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp +--- kradio-3.5.13.1/kradio3/presets.old/turkey/izmir.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/turkey/izmir.krp 2012-11-25 00:48:00.000000000 +0100 +@@ -0,0 +1,501 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot_2005_12_04 ++ leopartux, <leopartux@yahoo.com.tr> ++ 2006-09-24T16:19:46 ++ Turkiye ++ İzmir ++ antenna ++ ++ ++ ++ ++1159105607FA7E2E4A53A41AE958DB98159D59BEEBD842C5DF5F6322151D6BBB2A029A07D9 ++ RADYO KARADENİZ ++ ++ ++ -0.01 ++ 87.7 ++ ++ ++ ++1159105607B40A26E67591AE45B92DC144480D83B900716DBCD0608DC88818AD7C74264ADA ++ TRT-3 ++ ++ ++ -1 ++ 88 ++ ++ ++ ++1159105607DC9FC312AF54A5820F54F6D69F13B6DA7834E3EB8449B1001039ABD906FFAB6F ++ MORAL FM ++ ++ ++ -1 ++ 88.3 ++ ++ ++ ++1159105607EFF83345BFCEFBAEFAF1881B9FEB912ED88EBB5F9C4C28450B4A1C3430EDDCBF ++ RADYO 35 ++ ++ ++ -1 ++ 89 ++ ++ ++ ++115910560775C8F2F2262D92720199F1766DC82E20C507D29B926D7F027CBF7F7040CEEC62 ++ ALEM - FM ++ ++ ++ -1 ++ 89.3 ++ ++ ++ ++11591056078312289400695553F47805AC33DDE809782DE802697526527568315202F9FAED ++ SHOW RADYO ++ ++ ++ -1 ++ 89.6 ++ ++ ++ ++1159105607B5E20EC323A8E43E9553520088A61D9B0BFB32B8E61EB1A089FEF16654F633A9 ++ İMBAT FM ++ ++ ++ -1 ++ 90 ++ ++ ++ ++1159105607EC1A0C9EF7B06E83D93436764017E649C1B4F90CDE9C09E1CD414EBBCD4CCCCC ++ NUMBER ONE FM ++ ++ ++ -1 ++ 90.5 ++ ++ ++ ++1159105607FAE384F5B5F1E3B604B5612D64BCD9450BF8385755621A2DEAEEA0B1DE1AE04D ++ SÜPER FM ++ ++ ++ -1 ++ 90.8 ++ ++ ++ ++1159105607E505526A4CAF0C67C9579B9DE0ADAF67664515CA85DC1780BC78EAA24A23075C ++ TRT-FM ++ ++ ++ -1 ++ 91.2 ++ ++ ++ ++115910560756282CAC18B01D0EC3397BF5B75167B3A0B249DB684EAE9336C14A4FB71BAEE5 ++ TATLISES ++ ++ ++ -1 ++ 91.5 ++ ++ ++ ++115910560734851591640F1FB0B7CC04962AD8C2EF2CF8097700FCB7B1567A3630B9031AD0 ++ TGRT FM ++ ++ ++ -1 ++ 92 ++ ++ ++ ++1159105607B8C8EE6D45D70363E9D5FDEEA005097D8CFE64BCFB17C55CF4997EA999CF5DF6 ++ RADYO EGE ++ ++ ++ -1 ++ 92.7 ++ ++ ++ ++115910560798C8FD6E5B3CFFCDAE6FF62B05835EBA661CDAD465511335D4CE222E5EDA796C ++ S SBS TÜRK ++ ++ ++ -1 ++ 93 ++ ++ ++ ++11591056070F3750DB792C0D8E7A82C170894000493F167FC34457EA674E4C5E918F36A3C7 ++ CAN RADYO ++ ++ ++ -1 ++ 93.3 ++ ++ ++ ++115910560752926AA64A6B4EB4BF08023558E67F3934CA10086150EED0E6D724AB2D0D7F61 ++ BATI RADYO ++ ++ ++ -1 ++ 93.6 ++ ++ ++ ++1159105607C2B3A02FE39ED42C6C500CC73BC8F3348B3B0384180C28440220F9BCFBC95EB0 ++ RADYO HERKÜL ++ ++ ++ -1 ++ 94.1 ++ ++ ++ ++11591056073C37C0249646B9579684894FCBF257164C13EC62E959F45959314281D8292F84 ++ DİNİ ++ ++ ++ -1 ++ 94.4 ++ ++ ++ ++115910560748518A040B4D49C702A8234BA8B2F7F7535D057275B82E35B774E7448977B1A8 ++ TRT ++ ++ ++ -1 ++ 94.7 ++ ++ ++ ++1159105607E4D0917B5CC0C5C73B223F6F22D7027E88EC628B76F5714628215FDA0DC0B455 ++ ROMANTİK RADYO ++ ++ ++ -1 ++ 95.2 ++ ++ ++ ++11591056071310D735CBD17F34FC9E0796AD7224AA70652439B4373BCA9FCCDC28C5C8F02A ++ NTV RADYO ++ ++ ++ -1 ++ 95.7 ++ ++ ++ ++1159105607C63D293FFC07F5D40C466CBC59E902DF12D5053986DF725ECA46E9C1E6A2B5B9 ++ RADYO KLAS ++ ++ ++ -1 ++ 96 ++ ++ ++ ++1159105607E2AA531318CED2328BEFD30BE86DD8AB6C938D99A12E140D9DAFBF5FFFB5CA16 ++ KRAL FM ++ ++ ++ -1 ++ 96.2 ++ ++ ++ ++1159105607F7EAB9637AC2DEC25EF87FC9C4BA3E6053E105E3267439970F74E23271C9A94F ++ KORDON FM ++ ++ ++ -1 ++ 96.5 ++ ++ ++ ++11591056075AE767CC1742EE410890A3434BF841DE4CCF8E04384C668F48FCF7A295EBB241 ++ AKRA ++ ++ ++ -1 ++ 96.9 ++ ++ ++ ++1159105607E23C551FF00DA5D3B6900CFC96A53967A5A3D06B321E20F272B10D52B66D3A9D ++ METRO FM ++ ++ ++ -1 ++ 97.2 ++ ++ ++ ++1159105607C29AEC7E64F2BD94D8F90B69DDD92AEF6F8219916B6A4C1D6370AC3986BFE78A ++ RADYO ÖZMEN ++ ++ ++ -1 ++ 97.7 ++ ++ ++ ++11591056070AE78D419999974A013C8B1DE244AE6F8AB229050B4BFC3EF2A3C8E1818AECDD ++ RADYO ÇAĞ ++ ++ ++ -1 ++ 98 ++ ++ ++ ++1159105607A0554A722F050281FB640527CD582CD086A783D05314DF7DA99868FB51027C6E ++ BEST FM ++ ++ ++ -1 ++ 98.4 ++ ++ ++ ++1159105607261BF429647FEC9AF5F182BECE1ABFDE5E6841AB4751779F19AA4E44A48C2064 ++ TRT RADYO 3 ++ ++ ++ -1 ++ 99.1 ++ ++ ++ ++1159105607DC02FAA3C60B19BF7D463FE4E57FF6D1754E336F2EB5C09269A0C4CC9FADED7F ++ KAPİTAL RADYO ++ ++ ++ -1 ++ 99.5 ++ ++ ++ ++115910560718F41B55DA2C22C8CAFC7E646FB818DD5F3FA899E4B716D0B081E9783EF2EB1E ++ POWER FM ++ ++ ++ -1 ++ 99.8 ++ ++ ++ ++1159105607AC13C9B2E73B51979ADC9E07FE4E975B0EB34CEACEEDCE31338BD8CEAFC1565E ++ POWER FM ++ ++ ++ -1 ++ 100 ++ ++ ++ ++11591056070DE8C2C54FC76A0CE7A5804E004F6843E0993FF66783850FD14B5A27B9B06B00 ++ TRT ++ ++ ++ -1 ++ 100.5 ++ ++ ++ ++1159105607B5377E3FDAE59A8798658C4F60F97AF71D8B83DCF21BB780E63EB31AAB6A9F6A ++ FM İZMİR 101 ++ ++ ++ -1 ++ 101 ++ ++ ++ ++1159105607A2D18FDB42A8746E13B11517D5399E0C3E97810CA2137BE97264E6174A1C5F2A ++ RADYO 7 ++ ++ ++ -1 ++ 101.3 ++ ++ ++ ++11591056070AE74CCF17E01A748B57E7FB9B90E1CBD7832D22D52808F73DB4B74FF73A1B90 ++ BUCA FM ++ ++ ++ -1 ++ 101.8 ++ ++ ++ ++11591056078A9AA84174307D34A82FB4934AF5AA9FE8D127E21ED075EEDC81D3B10EF660C3 ++ YAYIN ++ ++ ++ -1 ++ 102 ++ ++ ++ ++1159105607866A5463E5CDE0B629E0448E2019F9DF6BF9FF6CAB3E5CC01371F184743D6161 ++ YAYIN ++ ++ ++ -1 ++ 102.5 ++ ++ ++ ++1159105607F161CDA7E8B7716584D06C42DCBC31ADEA54E41A89E5533C7C755FBD01457233 ++ ÇAĞRI FM ++ ++ ++ -1 ++ 102.8 ++ ++ ++ ++1159105607E3DB104F21C6D584C2470DA6757609FCB5F041BC8DF37995D178CD501CD6E3E7 ++ RADYO KLAS ++ ++ ++ -1 ++ 103.1 ++ ++ ++ ++11591056074FBE7B317764E18E47444F0C5605B7A4AA0E6E8C48E995846ED16A9D447F5DF4 ++ KISS FM ++ ++ ++ -1 ++ 104.3 ++ ++ ++ ++1159105607813B68DE1187BC92E8443057F779259412E0F5C5A19B6F48234809F58ED80E74 ++ RADYO SAHİL GÜVENLİK ++ ++ ++ -1 ++ 104.7 ++ ++ ++ ++1159105607FDD595CBC65F79B5308FA63D07B3492AF46849A8892EECF9D50907E5A49F75C3 ++ RADYO MEGA ++ ++ ++ -1 ++ 105 ++ ++ ++ ++1159105607FD0B95759823566EF1414449C2B4A747605E9C9994A559E3DD3AE72B603ED397 ++ YILDIZ - FM ++ ++ ++ -1 ++ 105.3 ++ ++ ++ ++11591056072E1066F35321AE34E12FEEF7B0EDBBB65CB33830D9026DFC936049285A0F7F90 ++ RADYO İZMİR 1 ++ ++ ++ -1 ++ 105.5 ++ ++ ++ ++1159105607F87CE144CC085AE076248CE7689A592571F142D16E26261229BE68BD99E69C0F ++ POWER TÜRK ++ ++ ++ -1 ++ 105.7 ++ ++ ++ ++1159105607957DCEA71BC3720EC830BA271A93149816AF306870516E1B4E5F62EFD22DC213 ++ RADYO MAYDANOZ ++ ++ ++ -1 ++ 106 ++ ++ ++ ++115910560765128416B0A5B64C0F1ACD2416FA82F09BC57C729FA982D1333C43016761F906 ++ RADYO 5 ++ ++ ++ -1 ++ 106.3 ++ ++ ++ ++1159105607ABADBA5D050666CD5490144F32CC52C8DFCB1697610B885FA4B3E4ACA0489C5D ++ MARMARA FM ++ ++ ++ -1 ++ 106.7 ++ ++ ++ ++1159105607B430DF02D6E1DF350808F9BB1259A2DA0C0610EF236A642DC8EB6015DE926E2B ++ RADİO SPORT ++ ++ ++ -1 ++ 107 ++ ++ ++ ++1159105607DEFBE0652474F7C9279D33917322527B9B49AB91D0F5BA571B38BCFCEC5746D4 ++ DEMOKRAT RADYO ++ ++ ++ -1 ++ 107.3 ++ ++ ++ ++1159105607D69CD982A9991158EF55CF55931CE256E36CB987D47EE8F96BAB7599DF323996 ++ RADYO GÖKKUŞAĞI ++ ++ ++ -1 ++ 107.6 ++ ++ ++ ++1159105607C5C1733FC47A4D8400C1FE885FFF45C80A378DC50971AB47AA459209E7B188B9 ++ RADYO DOKUZ EYLÜL ++ ++ ++ -1 ++ 108 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/turkey/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/turkey/Makefile.am 2012-11-25 00:48:00.000000000 +0100 +@@ -1,10 +1,14 @@ + SUBDIRS = +-EXTRA_DIST = "adapazari-antenna.krp" ++EXTRA_DIST = "adapazari-antenna.krp" "istanbul-antenna.krp" "izmir.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/" + $(INSTALL_DATA) "$(srcdir)/adapazari-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/istanbul-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/izmir.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp" + + uninstall-local: + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/adapazari-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/istanbul-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/turkey/izmir.krp" ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,285 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Igor Shavrin shih@i.ua ++ 2007-09-24T01:34:37 ++ Ukraine ++ Kyiv ++ antenna ++ Generated from http://www.proradio.org.ua ++ ++ ++ ++1190568285E2B7D4E87359DE08E1C16FF2A41E2CC4B4079B9D587F66F9DAE1943C32413C48 ++ 1+1 TV ++ ++ ++ -1 ++ 91.75 ++ ++ ++ ++1190568345ADD24685A544861E9BB16C04C9E3D475CC7A53B57AB349052F68D130F313C4B1 ++ Retro FM ++ ++ ++ -1 ++ 92.4 ++ ++ ++ ++1190585238FF5CDED1F6E49D979E1C6E8586464ABC5963D3821EE8A2700E280242DBEAD939 ++ Europa Plus Ukraina ++ Europa+ ++ ++ -1 ++ 92.8 ++ ++ ++ ++1190568386558A019551B727BAA9B7E6597371BE9B786A7FA4D579B90CE762BB193AA7B441 ++ Radio Kontinent ++ Kontinent ++ ++ -1 ++ 94.2 ++ ++ ++ ++11905684061104A7FFAF246E4D84AA2387207120AA39C33D45E589BB89055F4F7FDEFB82DD ++ Love Radio ++ ++ ++ -1 ++ 95.2 ++ ++ ++ ++11905684242BF5811F0423AFCB4073E9C8A3CFFBF24665B4F909CA9A4F99CBD5BBC036BE3B ++ Jam FM ++ ++ ++ -1 ++ 95.6 ++ ++ ++ ++119056843858C509C9C78DF4C47EA8A8DAC2C52B0A337905BA53708A22DD133B01C0B1B824 ++ ERA FM ++ ++ ++ -1 ++ 96 ++ ++ ++ ++1190568357D10207D487D67CF384A86594ECAFE68E392EFCA113BFF7E46CEB0D8B931DAFB8 ++ HIT FM Ukraina ++ ++ ++ -1 ++ 96.4 ++ ++ ++ ++119056848271CC0E7F7A1FBFBCF9199138ED8A9A0C523EA5108ABA25E1307C126E7BD74401 ++ Renesans ++ ++ ++ -1 ++ 96.8 ++ ++ ++ ++11905684983370750F90BD5C902D66EBDFE5296BD5651766EFD709E4704B22548DBDAF7308 ++ Radio Kyiv ++ ++ ++ -1 ++ 98 ++ ++ ++ ++1190568511F84481912290B9578CF4B8E7919E6638815FCD4570430CD1B0DEB4C711F64BF0 ++ Russkoe Radio ++ ++ ++ -1 ++ 98.5 ++ ++ ++ ++1190585757834E40A75A390555FDAF2FD8F879BE84C1A4200B48576DE998BCEA2FC5E62DF8 ++ Nostalgie ++ ++ ++ -1 ++ 99 ++ ++ ++ ++1190568560F0EE4F93BBB53A68B0281C926A5BD23C335B5D1D329947E2C0A52DAE396749C7 ++ Radio One ++ ++ ++ -1 ++ 99.4 ++ ++ ++ ++11905679324E90F6002986D3368F12F1CFEE67E990F11A9C6DEE84CB5AF68299405FD665D2 ++ Gala Radio ++ ++ ++ -1 ++ 100 ++ ++ ++ ++1190568578411C4F3F6FA8981F3F2BFD5CCA61C19A25F35BEE712D3C71E030FACD22E99B0B ++ Narodne Radio ++ ++ ++ -1 ++ 100.5 ++ ++ ++ ++11905686031692090120A5CCB19D0C832CE9CBAF0F82401488F5D50998B59251BE3ABED287 ++ Melodiya ++ ++ ++ -1 ++ 101.1 ++ ++ ++ ++119056861728940CAC20705F67C7F2C856BBA6848E21899374B76A38EBDB313B8591A9686B ++ Music Radio ++ ++ ++ -1 ++ 101.5 ++ ++ ++ ++119056862470D26DB3B12FED7B8ED2DC4508E163BD9BAABA42D048F56B213F13C597D69025 ++ Garne Radio "Shanson" ++ ++ ++ -1 ++ 101.9 ++ ++ ++ ++11905686391B87595BB9BEC38746C9C3E947AA6D55A0A4C552772A10E0F80CE500953927FC ++ Prosto Radi.O ++ ++ ++ -1 ++ 102.5 ++ ++ ++ ++1190568655B5EB86D24DD802856EC39BBEBC51BF22050169329E05C2F860A484FBD6313DFB ++ Lux FM ++ ++ ++ -1 ++ 103.1 ++ ++ ++ ++11905686799F70922A7C9F9FD1EB52C97F2151C5AB4821C2C3BAEAB8A665CC01994442666C ++ Radio Rox ++ ++ ++ -1 ++ 103.6 ++ ++ ++ ++1190568692FD2A3434E88AE180B7DDD0B4F56A5E5AE51759D6F3F56DF9CC27718AFA269676 ++ Radio Sharmanka ++ ++ ++ -1 ++ 104 ++ ++ ++ ++1190568717454DE097A03235C880EACCC7C40BDDBFC2EB270C88B8734B91595DF4BA8D5249 ++ NRJ Hit Music Only ++ ++ ++ -1 ++ 104.6 ++ ++ ++ ++119056872687EECA44E2309197D198412A1887DE7F0B2449EF314EA607FF35B5F170FC7A37 ++ Ukrainske Radio 1, Promin 2, Kultura 3 ++ ++ ++ -1 ++ 105 ++ ++ ++ ++1190568745E5015664A7B31B09C9613B79F8EC8962BF2CB26175427DAF927F844A0287C479 ++ Perets FM ++ ++ ++ -1 ++ 105.5 ++ ++ ++ ++119056875609A0A52CFBE42B09E02389F481B47B3A0F4788D7FA244C0348D39A55E58022B0 ++ Dorosle Radio ++ ++ ++ -1 ++ 106 ++ ++ ++ ++119056876964244E846B8E8C747093DD99C135F11B0CD12BCD83B3425453F00E76FE83686E ++ Dance radio "Kiss FM" ++ Kiss FM ++ ++ -1 ++ 106.5 ++ ++ ++ ++1190568784E96F88515B6C5A632D94FD3DDA890DF833807614BA2B3B48B73E6FA2A47D2CA1 ++ Europa FM Kiev ++ ++ ++ -0.01 ++ 107 ++ ++ ++ ++11905687949FDD940404BDB04A08D1D424537F3BA1B276ADDC688AC7B08BA7F8509C9DF904 ++ Auto-Radio Ukraina ++ ++ ++ -1 ++ 107.4 ++ ++ ++ ++1190568804C04E9CCFBED42FE3B715B52A019A58DDA156C4E489D2F782F2E63C96D1DEF49C ++ Nashe radio ++ ++ ++ -1 ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/kyiv.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/kyiv.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,274 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ ++ ++ ++ ++ ++ ++ ++ ++ 119273391379030B77DD389261E2FBA0A991B6701AF3A5862288308F40C544DA814C20062B ++ Перший Національний ++ ТБ1 ++ -0.01 ++ 65.75 ++ ++ ++ 1193316494B73351D34EF40803093A58359F67A37F7E8ED38E149F13D094A7905E06E42474 ++ Українське Радіо 1 ++ Радіо1 ++ -1 ++ 68.5 ++ ++ ++ 11933165321752787BF1002D79ACE570EE9B87CCBBCF246E72E419A7BE774439E089F5D44A ++ GALA Радіо ++ ++ -1 ++ 69 ++ ++ ++ 1193316570E34F57BD024F9CB7EF6C51C4F87FBF1411D36A02B804C5087321F7D3DD0ECA90 ++ Радіо "Промінь" ++ ++ -1 ++ 71.3 ++ ++ ++ 11933167682F7B1489DDF8BA166B64AEAC020BD9AB32BC286C12CCABDBEA80A35B5E43BD6E ++ Студія Майдан ++ ++ 1 ++ 72.1 ++ ++ ++ 11934927917C3A29AD199B030CBC096B56CF0305BA7D65E112F492AB599F562F27493D6107 ++ Радіо "Культура" ++ ++ -0.01 ++ 72.86 ++ ++ ++ 11934928943D70A4E7FE3DAF3F5BF2705C3969F3B99BB6C0553CA824E1F68E5EA9F1A8C884 ++ Радіо "Ренесанс" ++ ++ -1 ++ 73.6 ++ ++ ++ 1193316628EC33AA5B9929BF4C2631419F0D92BD2F7383D5D729D88DBAC41A26E508A85A7A ++ 1+1 ++ ТБ2 ++ -0.01 ++ 91.75 ++ ++ ++ 1193316720AA067FCA76F0C1D40116F62296E77CA12F35FD747922056E9A187C9EB78BB8B4 ++ Радіо 5 - Ретро FM ++ ++ -1 ++ 92.4 ++ ++ ++ 1193316785C490D8F8B28F9162A65D003FFEF4671633A4A077142D6B289FB47C3FE3EC79CA ++ Радіо "Europa Plus Україна" ++ ++ -1 ++ 92.8 ++ ++ ++ 119331681445D8A1D12737761FAC73F3EBEDE3D113C96F8D7A3072F6BA50107BEC2E20C561 ++ Радіо "Континент" ++ ++ -1 ++ 94.2 ++ ++ ++ 1193316826104C89BB1C8D151978F203860D8365D823887E838A590C5647A7888B4EA98EC9 ++ Love Radio ++ ++ -1 ++ 95.2 ++ ++ ++ 11933168995119FD101E5D954F34B599ABB081A108B810AF992A1373662764B3D225A1BCB6 ++ Радіо "Джем FM" ++ ++ -1 ++ 95.6 ++ ++ ++ 11927339390C925CC6F4D2FFC1A39CB31E29BD522BCE8D9ABA40F583629678876816CE2A98 ++ Радіо "ЕРА FM" ++ ++ -1 ++ 96 ++ ++ ++ 11933169254CD9D9791B9F273C4813420DC8FC90514E836161B3CDC2F991AC54E6BC3A28A5 ++ ХIT FM Україна ++ ++ -1 ++ 96.4 ++ ++ ++ 11933169780A493D079BFF56533C5053CEA8FE02353BD90310F14495816E68CF86A74DF015 ++ Радіо "Ренесанс" ++ ++ -1 ++ 96.8 ++ ++ ++ 119331699790CF2CEFAC144AC8DE31A870920A047FC7C6032AA36CE108C2F8650447949673 ++ Радіо Київ ++ ++ -1 ++ 98 ++ ++ ++ 1193317011853A0311E4EC1F465CECA08BAB32174E31A836E55DF7CBA4888BC6F5F5A0C127 ++ Русское радио Україна ++ ++ -1 ++ 98.5 ++ ++ ++ 1193317033B598FBEDC8EABE2B9D942948474DE8A883AA4C7F8A67D09A3E95A76EE9173005 ++ Радіо "Nostalgie" ++ ++ -1 ++ 99 ++ ++ ++ 1193317086C9C8D6C58704A210A165F228AEC16247F8B762407EA5310529D31452E916770D ++ Radio One ++ ++ -1 ++ 99.4 ++ ++ ++ 1193317113A97FA7ECBFA63810E2A2057D466C163AFA77A84ED004D6B68D24C64D5B58F260 ++ GALA Радіо ++ ++ -1 ++ 100 ++ ++ ++ 11933171496457288D14D60DC35B0881F57DDF96C69A4A11E1DB04F13586FAF5E6D864C2DE ++ Народне радіо ++ ++ -1 ++ 100.45 ++ ++ ++ 1193317177C554C7CF311160E3FD986FC8CAA7BDA7710B3CB1558E3BF482BCBBABE7F5653C ++ Радіо Мелодія ++ ++ -1 ++ 101.1 ++ ++ ++ 119331719696B32B0FC85E58AA2DBE73FABAE6E48F944E6DDF47149319834D58BF72709178 ++ MusicРадіо 101.5FM ++ ++ -1 ++ 101.5 ++ ++ ++ 11934929310E6587D3850F1271122E6F0EDB876906C8322E0AC9D7420EBFE33412288DB24B ++ Гарне радіо "Шансон" ++ ++ -1 ++ 101.9 ++ ++ ++ 1193317221249DCB1C7B41AD3B55410BE79B37A6A0255EFE17FCD590BF2555F1EBBA79696B ++ Просто Раді.О ++ ++ -1 ++ 102.5 ++ ++ ++ 1193317243B36E1F3F4F27D1638AD01331ABB4A2CF35E3614E64E54BB245A8BF4646FD9098 ++ Люкс FM ++ Люкс FM ++ -1 ++ 103.1 ++ ++ ++ 1193317469ABB39852E8DC69F360F2D9D920193307D7333BE3DC2B6A661F796B316709FEA1 ++ Радіо РОКС Україна ++ ++ -1 ++ 103.6 ++ ++ ++ 1193317255835DCE993DBAD5D6179A124D84301373F933B474A95849C1B29CA26B416D6271 ++ Радіо Шарманка ++ ++ -1 ++ 104 ++ ++ ++ 11933172801EACE4A7FE3F78FCAE40F4C93C5C3C4E44F57967CD206D7567429A11898B05F7 ++ NRJ Hit Music Only ++ ++ -1 ++ 104.6 ++ ++ ++ 11933172951418D970E5224A322D5D3CDE884E17FF9A77AFEE45038A700C283BCDF4546971 ++ Промінь ++ ++ -1 ++ 105 ++ ++ ++ 1193493005253C16A430195E9F18969767B0A2C3F2ED37DF1A2C9307977481F7848345F23B ++ Радіо "Перець FM" ++ ++ -1 ++ 105.5 ++ ++ ++ 11933173102BF63585CC18E76ECAE440C6EF690DDD1F564FC7F98B900A640DA0F9FAA97FEB ++ Доросле радіо ++ ++ -1 ++ 106 ++ ++ ++ 11933173320EB03AC65D7E9302C66AC44B173E19A37F5075E812B5C13413B3E38E6AED2244 ++ Dance radio "Kiss FM" ++ Kiss FM ++ -1 ++ 106.5 ++ ++ ++ 1193317353991E196D4840CAA699A52C9560081AC37D77CC34073594673069F8B347017151 ++ Радіо "Europa FM" ++ Europa FM ++ -1 ++ 107 ++ ++ ++ 11933173660CA24F98EDC6DE77443FE71898A479B6BACAC5FE7B85C6A08CC96714689CE881 ++ Авторадіо-Україна ++ ++ -1 ++ 107.4 ++ ++ ++ 1193462232F3BBCE734B7DE4DE9B2158DC76B0AB5A88910A99720CFEC43C02F16E87E22E23 ++ Наше Радіо ++ ++ -1 ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/lugansk.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/lugansk.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,143 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Igor Lobov <ivl@front.ru> ++ 2009-03-09T15:03:15 ++ Ukraine ++ Lugansk ++ ++ ++ ++ ++ 1064330466317A41A714F7A3C70B22A8F4F88EFF1AD5870570230FAC49A74C6528C435FC32 ++ Люкс FM ++ Люкс FM ++ ++ -1 ++ 90.8 ++ ++ ++ 1236531204D675F1E3913FCD945685B736986EB65B4576DBEF430FA337D3355E6655114EC7 ++ Шансон ++ Шансон ++ ++ -1 ++ 91.3 ++ ++ ++ 1236532766B6BB266A8C8AF15F1FA2F7A1F4461D5DE0E36260BD220F78729380ACA3406C9B ++ Ретро FM ++ Ретро FM ++ ++ -1 ++ 91.9 ++ ++ ++ 123652999119E06577B29B9481F49463944679117D38DE47AB2BEE399E28B27C513527092D ++ Шарманка ++ Шарманка ++ ++ -1 ++ 100.4 ++ ++ ++ 123653079854CDC1FA489FD9BC0C9018688138439EF1748E7BAE978D1CF37CEE1DC221B809 ++ Мелодия ++ Мелодия ++ ++ -1 ++ 101.1 ++ ++ ++ 1236530818BA5A7BD0D0F5C8054A78EE43566C46EAABF99A316503E0B994C39788CCE173DC ++ Авторадио ++ Авторадио ++ ++ -1 ++ 101.8 ++ ++ ++ 1236532798123231CCB6DC001884D40CE507985DC23093DE1B72397A6D81CD9D2DC6BA286E ++ М-FM ++ М-FM ++ ++ -1 ++ 102.3 ++ ++ ++ 1236532812AB511522487A6B437E83DB867BD18E756C18FE228864BCE14210651F5FAC9F80 ++ Русское радио ++ Русское радио ++ ++ -1 ++ 102.9 ++ ++ ++ 1236530838F517539CE7C5DFC59F97A7B561EA5F01A545D5142C6F3D85CBA980B86B55AE19 ++ Пульс ++ Пульс ++ ++ -1 ++ 103.6 ++ ++ ++ 123653086143C3C71D4F8FCF61645F0655E43058A049124EB95D09189797463C0A6DA402F1 ++ Хит FM ++ Хит FM ++ ++ -1 ++ 104 ++ ++ ++ 1236530899DE7E038C4D62B940D7BEF4D05B90384E131BE490EEA2AEEF870D8160EDCB96B1 ++ Европа + ++ Европа + ++ ++ -1 ++ 104.8 ++ ++ ++ 123653093974B772F5351BF4CE172C68E24EF386EB62BEDE1A1180BB09765AB49F261B2A1C ++ Эхо ++ Эхо ++ ++ -1 ++ 105.5 ++ ++ ++ 123653099504B71EFC17B5F7F3EBDE2EA0617249C65BB59B7741BF1F3D849E26650E9F2C3C ++ Наше радио ++ Наше радио ++ ++ -1 ++ 106.1 ++ ++ ++ 1236531097D21AAB0774E01FCA1CFF26D1EF66074A64E316210A998AD806A60DBB741F0E18 ++ Гала радио ++ Гала радио ++ ++ -1 ++ 106.5 ++ ++ ++ 123653114112A4E959FB3005DF5381500039A1F9FC4AC640902606A73982B3F0532CDBEFB8 ++ Скайвэй (KISS FM) ++ Скайвэй (KISS FM) ++ ++ -1 ++ 106.9 ++ ++ ++ 123653282541358FF62E3196D45E6B221CB959E72B914B0D929AA066ADC7D49F90F6B1F7F6 ++ Радио ЭРА ++ Радио ЭРА ++ ++ -1 ++ 107.3 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/lviv.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/lviv.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,160 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Volodymyr Petlovy ++ 2008-11-30T16:59:00 ++ Ukraine ++ Lviv ++ Radio ++ All stations in my city ++ ++ ++ ++122799021780C192F2D1A07BFE06D065A65E515F0C739CDFCD1AA6BCDF826A4F302ED9C252 ++ Національне Радіо ++ Національне Радіо ++ ++ -1 ++ 67 ++ ++ ++ ++122799022189C2C08CBAB32132F909F1D32133FAA5D8B64531FB163C2274EC9D739AC3F934 ++ Радіо Промінь ++ Радіо Промінь ++ ++ -1 ++ 68.9 ++ ++ ++ ++12279902652D4188864C39EFFC4FF5477D13D243F6B8F3C8EAAF74C37941251E9D7739B29F ++ Ера ФМ ++ Ера ФМ ++ ++ -1 ++ 88.6 ++ ++ ++ ++1227990268237C351DE729E01F7FE8A905B3C6D2C9AB20955F906700DA9DB36C079BCC623D ++ Еко ФМ ++ Еко ФМ ++ ++ -1 ++ 89.6515 ++ ++ ++ ++1227990272C61931B94C013586810D19FA1F67FC13C5BD6CCB00B09353D41AE2C9FC113D30 ++ Радіо Ман ++ Радіо Ман ++ ++ -1 ++ 91.1 ++ ++ ++ ++122799027388059A3A027955641E923A4867BC6C48355F7D08781AF8BE81AD0F9C220A1815 ++ Love Радіо ++ Love Радіо ++ ++ -1 ++ 91.5 ++ ++ ++ ++12279902969752ED3FD1DEC7E32F6B113D4E98DFD955287B2AE274B75B0E87235E66367D43 ++ Львівська Хвиля ++ Львівська Хвиля ++ ++ -1 ++ 100.8 ++ ++ ++ ++1227990297623905720B162E2F976651CAB458673C653A82D4A4C6DA8909E9B38A9B3B867B ++ Гала Радіо ++ Гала ++ ++ -1 ++ 101.3 ++ ++ ++ ++1227990300A33527E201DA266374163FB150CF5CA19161D3980488E92D3BDD8086BA9F7970 ++ Ретро ФМ ++ Ретро ФМ ++ ++ -1 ++ 102.5 ++ ++ ++ ++12279903043A16C0F1AABD2687E1E3BE3FD9E65EC3F3194117FAB45A4F9B4C3374658E6720 ++ Радіо One ++ Радіо One ++ ++ -1 ++ 103.902 ++ ++ ++ ++1227990305979E314884161454A31F33EC95684D57F542C0C3E78721F4995C4BE15AE0FFE4 ++ М ФМ ++ М ФМ ++ ++ -1 ++ 104.3 ++ ++ ++ ++122799030605312B35769EDF40268CFB4824B5C1B88C9A9DC0A5AFCB729A3A8E0E78693D04 ++ Радіо Люкс ++ Люкс ++ ++ -1 ++ 104.7 ++ ++ ++ ++1227990308187904A3FD5401A07636FA3D523DF6D59A2C25B950519986D576180F9AA897CB ++ Авторадіо ++ Авторадіо ++ ++ -1 ++ 105.4 ++ ++ ++ ++12279903109883D98CC3DF88D59F8574CCD0E71A9B9A23180889A31A979703D600022E47A9 ++ Наше Радіо ++ Наше ++ ++ -1 ++ 106 ++ ++ ++ ++12279903121852B0BB31EFCC3B65D74FBC51A71F89C8D83D65FE6C7BEFD78DBD8B0215A47E ++ Радіо Незалежність ++ Незалежність ++ ++ -1 ++ 106.7 ++ ++ ++ ++122799031353196770DF4ED04D9D1C1CE3BB21C661B7E58D45F0A9675601C99746619519F6 ++ Радіо Мелодія ++ Мелодія ++ ++ -1 ++ 107.103 ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,17 @@ ++SUBDIRS = ++EXTRA_DIST = "kyiv-antenna.krp" "kyiv.krp" "lugansk.krp" "lviv.krp" "nikolayev.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/" ++ $(INSTALL_DATA) "$(srcdir)/kyiv-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/kyiv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp" ++ $(INSTALL_DATA) "$(srcdir)/lugansk.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp" ++ $(INSTALL_DATA) "$(srcdir)/lviv.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp" ++ $(INSTALL_DATA) "$(srcdir)/nikolayev.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/kyiv.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lugansk.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/lviv.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/ukraine/nikolayev.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp +--- kradio-3.5.13.1/kradio3/presets.old/ukraine/nikolayev.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/ukraine/nikolayev.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,150 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ Vadim Bu <panoptus@gmail.com> ++ 2000-01-01T00:00:00 ++ Ukraine ++ Nikolayev ++ ++ ++ ++ ++ 1281291324881640300A9656B36F2C8FB7C0CBF62F9876BF91EF206ADCD406E3854756 ++ ТВ ++ ++ ++ -1 ++ dontcare ++ 65.8 ++ ++ ++ 128129138506DF5A35A7530F941618DD6AFE504718D2EC8394947C3E26F33BCAD769D4 ++ Первый канал укр. радио ++ ++ ++ -1 ++ dontcare ++ 69.85 ++ ++ ++ 12812013750E66C763E47D9FD3AA8F5A5C0833B02B80757ABC86852CFB2538D8EE1769 ++ ХитФМ ++ ХитФМ ++ ++ -1 ++ dontcare ++ 91.5 ++ ++ ++ 1281201553DF8B2D6C7D312C77A4B85AC6D831ACA3FD386E2ACE23ECD292C52CAD4BF8 ++ Радио Алла ++ Радио Алла ++ ++ -1 ++ dontcare ++ 100.1 ++ ++ ++ 1281201897F0FEDF0D65FA7843847268C92807EC96BDFE3A601F49B2C40CC3D8256369 ++ ОкФМ ++ ОкФМ ++ ++ -1 ++ dontcare ++ 100.8 ++ ++ ++ 12812014665AC9DD7F71ABF382654AA324D618DD173C0CD43166B35167FFA6D5977CEE ++ Русское радио ++ Русское радио ++ ++ -1 ++ dontcare ++ 101.6 ++ ++ ++ 12812015256E6C171F895496A945901A91FF91C92E2F37800C256AB29AB1C5AAE8D9BF ++ Кисс ФМ ++ Кисс ФМ ++ ++ -1 ++ dontcare ++ 102.1 ++ ++ ++ 12812015381A12F5CEB14337821BD569BFB00F016CF21617F60B718F9C8E70E9563AAC ++ Наше радио ++ Наше радио ++ ++ -1 ++ dontcare ++ 102.75 ++ ++ ++ 12812909149BEFA3A4DD95C41B19CE8110C3BE638D33F712C45D21272C119512A1D552 ++ Авторадио ++ Авторадио ++ ++ -1 ++ dontcare ++ 103.35 ++ ++ ++ 12812898487D26BFE955AF336F67A743540DBB78557C3DC79C18FB7281BE35CB6ED8A2 ++ Взрослое ++ Взрослое ++ ++ -1 ++ dontcare ++ 104.1 ++ ++ ++ 128120125873F1C0A0B9F8F7844149BB02E340FB8B117B27EB34E755BF77D67BAD5A08 ++ Просто ++ Просто ++ ++ -1 ++ dontcare ++ 104.6 ++ ++ ++ 128120159508376D674AB7C609B1B38CFE0592A3F53AA7C2F2E5D369514888DF9BC255 ++ Мелодия ++ Мелодия ++ ++ -1 ++ dontcare ++ 105.1 ++ ++ ++ 128120161385DDA12FD03D03056C8707135DDC5D04AF9D8E0B91E5E1AE68BC8F8A0163 ++ Ретро ++ Ретро ++ ++ -1 ++ dontcare ++ 106.4 ++ ++ ++ 1281201626F402B08396B731E230EA16EFE90C3889ACF99F4E2E4DC4AB445D980141FD ++ Люкс ФМ ++ Люкс ФМ ++ ++ -1 ++ dontcare ++ 107.1 ++ ++ ++ 1281201639D78071860C8AB2ED93CB078E4EEDDD2B02620617AE124B5F9AB0F0D66A7E ++ Эра ++ Эра ++ ++ -1 ++ dontcare ++ 107.7 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp +--- kradio-3.5.13.1/kradio3/presets.old/usa/Indiana-newburgh.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/usa/Indiana-newburgh.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,193 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-1.0beta3b ++ Lester Hinton ++ 2007-08-19T22:25:00 ++ USA ++ Newburgh, IN ++ FM Radio ++ Evansville,IN area Stations ++ ++ ++ 11875741170887A5CACEB53D24EC0C7E6446F3A2C6BEBFD9D2EC483839162385C9C7C4EB96 ++ WABX Classic Rock ++ ++ ++ -1 ++ 107.5 ++ ++ ++ 118757413136CB812379364A402F733E1BEDC25E60D77645F00831F07BE96FF30888324EBD ++ Jack Fm ++ ++ ++ -1 ++ 107.15 ++ ++ ++ 1187574832B2142319AC87045E95B530F52CA9F24B6E980A33BD87DFD04A6360A7B9768BC9 ++ Kiss FM ++ ++ ++ -1 ++ 106.1 ++ ++ ++ 11875754000F53E03278CB5C0450067CFDBE79C3BD498890A966610D9A621D2E872821D056 ++ CJ Classic Hits ++ ++ ++ -1 ++ 105.7 ++ ++ ++ 1187575470E6F0B059EEB24BCA55192507774F5AD1F0ECB78742AA260B767B22064D067140 ++ WJLT Super Hits ++ ++ ++ -1 ++ 105.3 ++ ++ ++ 11875757671EBA54F567804703E6B930BF68D50673086F33AFCEB24287086044932E622792 ++ ++ ++ ++ -1 ++ 104.7 ++ ++ ++ 11875758930AB9977E06DC0FA833EF912E98B3B9E37B31D6DA9CC5A69E229955C315BF70A6 ++ WIKY Evansville,IN ++ ++ ++ -1 ++ 104.1 ++ ++ ++ 118757661829503869856F302C684C9C601EB4CD0CE53178A44C81955A7C7807C43E92A7A9 ++ WGBF River City Rocker ++ ++ ++ -1 ++ 103.1 ++ ++ ++ 1187576723EC47FF2944185BF9C69026961B2CB67841231B5BA5E097BEA9A066318DDD386C ++ WLME Lewisport, Kentucky ++ ++ ++ -1 ++ 102.7 ++ ++ ++ 1187576885BAF94B352929D819FFDA48B3E2CC49FA4810DB9479760A951E1877585E64B8C9 ++ WQXQ 101.9 FM ++ ++ ++ -1 ++ 101.9 ++ ++ ++ 1187577250796D54BAB65FF0838225F239224D8F4C101895811597D16E8B5779F88F0AE4D4 ++ WBGW Religious Fort Branch ++ ++ ++ -1 ++ 101.5 ++ ++ ++ 11875778905CB94237C96056BEF23AC744D8C26E97ADC80A26800757CC4AE54965AF744463 ++ 97X Classic Rock Owensboro, Kentucky ++ ++ ++ -1 ++ 97.1 ++ ++ ++ 1187578481AF82158EBA23A77E7F9BC8FB829E837A56979F8466923C39C8D6A35819F8B94F ++ Hot 96 WSTO Owensboro, Kentucky ++ ++ ++ -1 ++ 96.1 ++ ++ ++ 11875787904D7AE91F09E8FE5B81045E192A2899C1650FDE2FE93ED0FC3FAE6F1249075FFA ++ Classic Rock ++ ++ ++ -1 ++ 94.9 ++ ++ ++ 1187578936195A8EE8BC81E698E18BA81AC866D658B940BC852EFB48F6AE04067439D24866 ++ WKTG Power Rock Owensboro, Kentucky ++ ++ ++ -1 ++ 93.9 ++ ++ ++ 1187579126CAB93F22412297E9BECBD5D4B65207F2223EDE413AE49F6B210CCFF9DB58BA58 ++ WUEV College Evansville, IN ++ ++ ++ -1 ++ 91.5 ++ ++ ++ 1187579275AFEB205731B134D9C4ABB89CAAFE5EEBD97C251C883F31DDB87A5558BACA39D4 ++ WVUB Vincennes ++ ++ ++ -1 ++ 91.1 ++ ++ ++ 1187579552DAB2CFE1FF6469FF4E9862013915EBF64AC189171BD06C156F12474A0C7C248B ++ WPSR Evansville, IN ++ ++ ++ -1 ++ 90.7 ++ ++ ++ 1187579681CFB4798BD9824971407C55F42514477C425A8D365844185D328C1A31F79CB744 ++ ++ ++ ++ -1 ++ 89.9 ++ ++ ++ 118757983754300B648DF30B8BCCE734305204B4F33FC53CA4C30AE14FF6A750C22896CD00 ++ Western, Kentucky Public Radio ++ ++ ++ -1 ++ 89.5 ++ ++ ++ 1187579929C4932368D87672C2DDE6B8E396BC108893903533E0567703B2F4F8E88D3DD9FC ++ The Bash Wabash Valley College ++ ++ ++ -1 ++ 89.1 ++ ++ ++ 11875800416C2FDE228F9D079430B49B1B156D28B464F36A0281D09DD1DEB2A1A62F4D8021 ++ WNIN Public Radio Evansville,IN ++ ++ ++ -1 ++ 88.3 ++ ++ ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am kradio-3.5.13.1/kradio3/presets/usa/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/usa/Makefile.am 2012-06-26 02:49:50.000000000 +0200 ++++ kradio-3.5.13.1/kradio3/presets/usa/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -1,390 +1,395 @@ + SUBDIRS = +-EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp" ++EXTRA_DIST = "Alabama_am.krp" "Alabama_fm.krp" "Alabama.krp" "Alaska_am.krp" "Alaska_fm.krp" "Alaska.krp" "Alberta_am.krp" "Alberta_fm.krp" "Alberta.krp" "Ann Arbor (Michigan).krp" "Arizona_am.krp" "Arizona_fm.krp" "Arizona.krp" "Arkansas_am.krp" "Arkansas_fm.krp" "Arkansas.krp" "Austin.krp" "British Columbia_am.krp" "British Columbia_fm.krp" "British Columbia.krp" "California_am.krp" "California_fm.krp" "California.krp" "Chicago-antenna.krp" "college-park,GA.krp" "Colorado_am.krp" "Colorado_fm.krp" "Colorado.krp" "Connecticut_am.krp" "Connecticut_fm.krp" "Connecticut.krp" "Dallas.krp" "Delaware_am.krp" "Delaware_fm.krp" "Delaware.krp" "District of Columbia_am.krp" "District of Columbia_fm.krp" "District of Columbia.krp" "Florida_am.krp" "Florida_fm.krp" "Florida.krp" "Guam_am.krp" "Guam_fm.krp" "Guam.krp" "Hawaii_am.krp" "Hawaii_fm.krp" "Hawaii.krp" "houston.krp" "Idaho_am.krp" "Idaho_fm.krp" "Idaho.krp" "Illinois_am.krp" "Illinois_fm.krp" "Illinois.krp" "Indiana_am.krp" "Indiana_fm.krp" "Indiana.krp" "Indiana-newburgh.krp" "Iowa_am.krp" "Iowa_fm.krp" "Iowa.krp" "Kansas_am.krp" "Kansas_fm.krp" "Kansas.krp" "Kentucky_am.krp" "Kentucky_fm.krp" "Kentucky.krp" "los-angeles-antenna.krp" "Louisiana_am.krp" "Louisiana_fm.krp" "Louisiana.krp" "Maine_am.krp" "Maine_fm.krp" "Maine.krp" "Manitoba_am.krp" "Manitoba_fm.krp" "Manitoba.krp" "Maryland_am.krp" "Maryland_fm.krp" "Maryland.krp" "Massachusetts_am.krp" "Massachusetts_fm.krp" "Massachusetts.krp" "Michigan_am.krp" "Michigan_fm.krp" "Michigan.krp" "Minnesota_am.krp" "Minnesota_fm.krp" "Minnesota.krp" "Mississippi_am.krp" "Mississippi_fm.krp" "Mississippi.krp" "Missouri_am.krp" "Missouri_fm.krp" "missouri-joplin-antenna.krp" "Missouri.krp" "Montana_am.krp" "Montana_fm.krp" "Montana.krp" "Nebraska_am.krp" "Nebraska_fm.krp" "Nebraska.krp" "Nevada_am.krp" "Nevada_fm.krp" "Nevada.krp" "New Brunswick_am.krp" "New Brunswick_fm.krp" "New Brunswick.krp" "Newfoundland_am.krp" "Newfoundland_fm.krp" "Newfoundland.krp" "New Hampshire_am.krp" "New Hampshire_fm.krp" "New Hampshire.krp" "New Jersey_am.krp" "New Jersey_fm.krp" "New Jersey.krp" "New Mexico_am.krp" "New Mexico_fm.krp" "New Mexico.krp" "New York_am.krp" "New York_fm.krp" "New York.krp" "North Carolina_am.krp" "North Carolina_fm.krp" "North Carolina.krp" "North Dakota_am.krp" "North Dakota_fm.krp" "North Dakota.krp" "Nova Scotia_am.krp" "Nova Scotia_fm.krp" "Nova Scotia.krp" "Ohio_am.krp" "Ohio_fm.krp" "Ohio.krp" "Oklahoma_am.krp" "Oklahoma_fm.krp" "Oklahoma.krp" "Ontario_am.krp" "Ontario_fm.krp" "Ontario.krp" "Oregon_am.krp" "Oregon_fm.krp" "Oregon.krp" "oregon-portland-antenna.2.krp" "oregon-portland-antenna.krp" "Pennsylvania_am.krp" "Pennsylvania_fm.krp" "Pennsylvania.krp" "Quebec_am.krp" "Quebec_fm.krp" "Quebec.krp" "Rhode Island_am.krp" "Rhode Island_fm.krp" "Rhode Island.krp" "Saint Paul (Minneapolis).krp" "Salina (Kansas)_fm.krp" "Saskatchewan_am.krp" "Saskatchewan_fm.krp" "Saskatchewan.krp" "South Carolina_am.krp" "South Carolina_fm.krp" "South Carolina.krp" "South Dakota_am.krp" "South Dakota_fm.krp" "South Dakota.krp" "Tennessee_am.krp" "Tennessee_fm.krp" "Tennessee.krp" "Texas_am.krp" "Texas_fm.krp" "Texas.krp" "texas-odessa.krp" "Utah_am.krp" "Utah_fm.krp" "Utah.krp" "Vermont_am.krp" "Vermont_fm.krp" "Vermont.krp" "Virginia_am.krp" "Virginia_fm.krp" "Virginia.krp" "Washington_am.krp" "Washington_fm.krp" "Washington.krp" "West Virginia_am.krp" "West Virginia_fm.krp" "West Virginia.krp" "Wisconsin_am.krp" "Wisconsin_fm.krp" "Wisconsin.krp" "Wyoming_am.krp" "Wyoming_fm.krp" "Wyoming.krp" + + install-data-local: + $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/" +- $(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" +- $(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" +- $(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" +- $(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" +- $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" +- $(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" +- $(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" +- $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" +- $(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" +- $(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" +- $(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" +- $(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" +- $(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" +- $(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" +- $(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" +- $(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" +- $(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" +- $(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" +- $(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" + $(INSTALL_DATA) "$(srcdir)/Alaska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" +- $(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" +- $(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alaska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alberta_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" ++ $(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" ++ $(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" ++ $(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" ++ $(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" + $(INSTALL_DATA) "$(srcdir)/California_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" +- $(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" ++ $(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" + $(INSTALL_DATA) "$(srcdir)/college-park,GA.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" +- $(INSTALL_DATA) "$(srcdir)/Alaska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" +- $(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" +- $(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" +- $(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" +- $(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" +- $(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" +- $(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Colorado_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" + $(INSTALL_DATA) "$(srcdir)/Colorado.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" +- $(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" +- $(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" +- $(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" +- $(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" +- $(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arizona_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" +- $(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" +- $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" ++ $(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" ++ $(INSTALL_DATA) "$(srcdir)/Dallas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" ++ $(INSTALL_DATA) "$(srcdir)/Delaware_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" + $(INSTALL_DATA) "$(srcdir)/Delaware_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arkansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" +- $(INSTALL_DATA) "$(srcdir)/Alberta_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" +- $(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" ++ $(INSTALL_DATA) "$(srcdir)/Delaware.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" + $(INSTALL_DATA) "$(srcdir)/District of Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" +- $(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" +- $(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" +- $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" +- $(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Austin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" +- $(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" ++ $(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/District of Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" + $(INSTALL_DATA) "$(srcdir)/Florida_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arizona_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" +- $(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" +- $(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Florida.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" ++ $(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Guam_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" + $(INSTALL_DATA) "$(srcdir)/Guam.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" ++ $(INSTALL_DATA) "$(srcdir)/Hawaii_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" ++ $(INSTALL_DATA) "$(srcdir)/houston.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" ++ $(INSTALL_DATA) "$(srcdir)/Idaho_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Idaho_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Idaho.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" ++ $(INSTALL_DATA) "$(srcdir)/Illinois_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Illinois_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Illinois.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" ++ $(INSTALL_DATA) "$(srcdir)/Indiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" ++ $(INSTALL_DATA) "$(srcdir)/Indiana-newburgh.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp" ++ $(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Iowa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" ++ $(INSTALL_DATA) "$(srcdir)/Kansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Kansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" ++ $(INSTALL_DATA) "$(srcdir)/Kentucky_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" + $(INSTALL_DATA) "$(srcdir)/Kentucky_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arizona.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" +- $(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" +- $(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Kentucky.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" ++ $(INSTALL_DATA) "$(srcdir)/los-angeles-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/Louisiana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Louisiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" + $(INSTALL_DATA) "$(srcdir)/Maine_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Kansas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" +- $(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" +- $(INSTALL_DATA) "$(srcdir)/Connecticut_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Maine_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" ++ $(INSTALL_DATA) "$(srcdir)/Manitoba_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" + $(INSTALL_DATA) "$(srcdir)/Manitoba_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Guam_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Iowa_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" +- $(INSTALL_DATA) "$(srcdir)/Colorado_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" ++ $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" ++ $(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Maryland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Maryland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" ++ $(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Massachusetts_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Massachusetts.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" ++ $(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Michigan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" ++ $(INSTALL_DATA) "$(srcdir)/Minnesota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Minnesota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" ++ $(INSTALL_DATA) "$(srcdir)/Mississippi_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Mississippi_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" ++ $(INSTALL_DATA) "$(srcdir)/Missouri_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Missouri_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/missouri-joplin-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/Missouri.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" ++ $(INSTALL_DATA) "$(srcdir)/Montana_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nebraska_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nebraska.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nevada_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nevada_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Brunswick.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" ++ $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" + $(INSTALL_DATA) "$(srcdir)/Newfoundland_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" ++ $(INSTALL_DATA) "$(srcdir)/Newfoundland.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Hampshire_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Hampshire.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" + $(INSTALL_DATA) "$(srcdir)/New Jersey_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arkansas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Ann Arbor (Michigan).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" +- $(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Minnesota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Hawaii_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Jersey.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Mexico_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Mexico_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/New Mexico.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" ++ $(INSTALL_DATA) "$(srcdir)/New York_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/New York_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" + $(INSTALL_DATA) "$(srcdir)/New York.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/North Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ohio_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ohio_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ohio.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oklahoma_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oklahoma_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oklahoma.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Ontario.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oregon_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oregon_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Oregon.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" ++ $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.2.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" ++ $(INSTALL_DATA) "$(srcdir)/oregon-portland-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" ++ $(INSTALL_DATA) "$(srcdir)/Pennsylvania_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" + $(INSTALL_DATA) "$(srcdir)/Pennsylvania_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Iowa_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Louisiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" +- $(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Montana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" +- $(INSTALL_DATA) "$(srcdir)/Alabama.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" +- $(INSTALL_DATA) "$(srcdir)/Maryland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Alberta.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" ++ $(INSTALL_DATA) "$(srcdir)/Pennsylvania.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Quebec.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" ++ $(INSTALL_DATA) "$(srcdir)/Rhode Island_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Rhode Island_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Rhode Island.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saint Paul (Minneapolis).krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" ++ $(INSTALL_DATA) "$(srcdir)/Salina (Kansas)_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Saskatchewan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Carolina.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Dakota_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/South Dakota.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" ++ $(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" + $(INSTALL_DATA) "$(srcdir)/Tennessee_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Tennessee.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" ++ $(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Texas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Texas.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" ++ $(INSTALL_DATA) "$(srcdir)/texas-odessa.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp" ++ $(INSTALL_DATA) "$(srcdir)/Utah_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Utah_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Utah.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" + $(INSTALL_DATA) "$(srcdir)/Vermont_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp" +- $(INSTALL_DATA) "$(srcdir)/North Carolina_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Massachusetts_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" +- $(INSTALL_DATA) "$(srcdir)/California_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" + $(INSTALL_DATA) "$(srcdir)/Vermont_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Alabama_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Michigan_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Vermont.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" ++ $(INSTALL_DATA) "$(srcdir)/Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" ++ $(INSTALL_DATA) "$(srcdir)/Washington_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Washington_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Washington.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" ++ $(INSTALL_DATA) "$(srcdir)/West Virginia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/West Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" + $(INSTALL_DATA) "$(srcdir)/West Virginia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp" +- $(INSTALL_DATA) "$(srcdir)/Manitoba.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" +- $(INSTALL_DATA) "$(srcdir)/Texas_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Tennessee_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nevada.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" +- $(INSTALL_DATA) "$(srcdir)/Connecticut_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" +- $(INSTALL_DATA) "$(srcdir)/New Hampshire_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Connecticut.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" +- $(INSTALL_DATA) "$(srcdir)/Michigan.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" + $(INSTALL_DATA) "$(srcdir)/Wisconsin_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Montana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Arkansas_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/British Columbia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" +- $(INSTALL_DATA) "$(srcdir)/Mississippi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" +- $(INSTALL_DATA) "$(srcdir)/Indiana.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" +- $(INSTALL_DATA) "$(srcdir)/Nova Scotia.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" +- $(INSTALL_DATA) "$(srcdir)/South Carolina_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" ++ $(INSTALL_DATA) "$(srcdir)/Wisconsin_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" ++ $(INSTALL_DATA) "$(srcdir)/Wisconsin.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" ++ $(INSTALL_DATA) "$(srcdir)/Wyoming_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" + $(INSTALL_DATA) "$(srcdir)/Wyoming_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Alabama_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/British Columbia_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Indiana_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Florida_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nebraska_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Virginia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Hawaii.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" +- $(INSTALL_DATA) "$(srcdir)/Ontario_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Chicago-antenna.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" +- $(INSTALL_DATA) "$(srcdir)/District of Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/South Dakota_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" +- $(INSTALL_DATA) "$(srcdir)/British Columbia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/New Jersey_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" +- $(INSTALL_DATA) "$(srcdir)/Nova Scotia_fm.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" +- $(INSTALL_DATA) "$(srcdir)/Newfoundland_am.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" +- $(INSTALL_DATA) "$(srcdir)/California.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" +- $(INSTALL_DATA) "$(srcdir)/Maine.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" +- ++ $(INSTALL_DATA) "$(srcdir)/Wyoming.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" + + uninstall-local: +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana-newburgh.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Dallas.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/college-park,GA.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alaska_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/missouri-joplin-antenna.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Missouri.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/houston.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Idaho_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Brunswick.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Delaware_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Austin.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Illinois.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Dakota.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oklahoma.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.2.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/oregon-portland-antenna.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Quebec.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/los-angeles-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kentucky_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arizona.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Oregon_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Kansas.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Mexico.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Guam_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Rhode Island.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saint Paul (Minneapolis).krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Salina (Kansas)_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan_fm.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Saskatchewan.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Colorado_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_fm.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ann Arbor (Michigan).krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ohio_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Minnesota_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New York.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Pennsylvania_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Iowa_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Louisiana.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maryland_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alberta.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/texas-odessa.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Utah.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/North Carolina_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Massachusetts_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Vermont.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Washington.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia_fm.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/West Virginia.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Manitoba.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Texas_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Tennessee_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nevada.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Hampshire_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Connecticut.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Michigan.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Montana_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Arkansas_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Mississippi.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Carolina_am.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin_fm.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wisconsin.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_am.krp" + -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Alabama_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Indiana_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Florida_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nebraska_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Virginia_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Hawaii.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Ontario_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Chicago-antenna.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/District of Columbia_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/South Dakota_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/British Columbia_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/New Jersey_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Nova Scotia_fm.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Newfoundland_am.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/California.krp" +- -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Maine.krp" ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/usa/Wyoming.krp" +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp +--- kradio-3.5.13.1/kradio3/presets.old/usa/missouri-joplin-antenna.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/usa/missouri-joplin-antenna.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,96 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ Vanessa Ezekowitz ++ 2008-03-06T03:27:22 ++ USA ++ Joplin, Missouri ++ Antenna ++ ++ ++ ++ ++1204795416D327B29628F9A516E5FB37E10FE87051EC4814A5DB9310CE50567FB8CDAD8C0E ++ KXMS (Fine Arts Radio Int'l) ++ ++ ++ -1 ++ 88.7 ++ ++ ++ ++1204795416E12EDA0A2654A5BE583984CAAFC558B39A76BB7A1CD8CE2FB94A27F204F1934C ++ KSYN (Kissin') ++ ++ ++ -1 ++ 92.5 ++ ++ ++ ++120479541625C6582240A6ACB64070E43AEDF4652A7FD0B3D8F48BDD8ABAA3DA2794C6D4D8 ++ KJMK (Lite Rock) ++ ++ ++ -1 ++ 93.9 ++ ++ ++ ++1204795417914AAC2F66691FA07212B02F77AA7F5A3FCACC1F6217E9907D15444CC75D91CB ++ KXDG (Big Dog) ++ ++ ++ -1 ++ 97.9 ++ ++ ++ ++12047954174FB5470F53D45D70CA84226BC5F64B0566C0EAE6DDF701E0D6F7BC7791EE1471 ++ KBIN (Classic Country) ++ ++ ++ -1 ++ 99.7 ++ ++ ++ ++12047954170ABC15063AD62CEEECF710F339727F3F073C66C12713BBCBB2FA44C46254D61E ++ KIXQ (Kix) ++ ++ ++ -1 ++ 102.5 ++ ++ ++ ++1204795417E9D264C67939C2CA96378EE4BE54256EAF1C9DB6C5C75BA91D38AC4BFC966237 ++ KCAR (Cool 104) ++ ++ ++ -1 ++ 104.3 ++ ++ ++ ++1204795417E494F0F8E67F42AE4CFB364E20AC2E3B832C1724C5912E85C8DE2B06C467A4E1 ++ KMOQ (Q105) ++ ++ ++ -1 ++ 105.3 ++ ++ ++ ++1204795417E91429BBC4986C1F9B9BDCA2CF6FC0FFD829A66480FE077C75B70650B9FF5B36 ++ KJML (Rock 107) ++ ++ ++ -1 ++ 107.1 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp +--- kradio-3.5.13.1/kradio3/presets.old/usa/texas-odessa.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/usa/texas-odessa.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,151 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-snapshot-2006-11-12-r497 ++ ++ ++ USA ++ Odessa,Texas ++ ++ ++ ++ ++ 116846129002F1F8194388299FC3139319A930591722CECB86569BAC9725A06B36B2FD8CC4 ++ KLVW ++ ++ ++ -1 ++ 96.9 ++ ++ ++ 11684613150AE00B186451ABD6D71B8367D23F52446D5F025EE36FED385E460193E70491A3 ++ KAWZ ++ ++ ++ -1 ++ 89.1 ++ ++ ++ 1168461334AF8D607D7EF147FF8B65CDD5C023A41ED5B062E5BC222D146F60020275063078 ++ KBMM ++ ++ ++ -1 ++ 96.9 ++ ++ ++ 11684613599F7116FBE9A5114CA9B4A2CE8D56B90F4E8C910A185DBDE551323127B9B3A568 ++ KFLB ++ ++ ++ -1 ++ 90.5 ++ ++ ++ 1168460870B8292553C2CF19E2E5FD3CA914DFC0C547A173C7B35562C20761A9BB0AE8E4D9 ++ KOCV ++ ++ ++ -1 ++ 91.3 ++ ++ ++ 1168460975331463C5B45FAB68AAFDA87E7459F3988B480B10A375BD6C1ECF8A23DE73A288 ++ KNFM ++ ++ ++ -1 ++ 92.3 ++ ++ ++ 1168461002342CFC649119A91BF7D0F4D53702C5EE4E74996C5995805A4C889B2714926578 ++ KZVT ++ ++ ++ -1 ++ 93.3 ++ ++ ++ 1168461019B99600290F3A77F620C3F956088E3543B5DB1490495E36E5BAA7240A80A95132 ++ KQRX ++ ++ ++ -1 ++ 95.1 ++ ++ ++ 1168461042CF2067ED36AAB605B6DD61F3DB4ABA0A2B62BBC7ECA3723193B29FFB6CA3CA68 ++ KMRK ++ ++ ++ -1 ++ 96.1 ++ ++ ++ 1168461068C54AB8B0F3EB77D0B55914ACC9C2C3C91A17EA3AB0BB7B62479B06962539B095 ++ KMCM ++ ++ ++ -1 ++ 96.9 ++ ++ ++ 116846108171A02F30F18036E75C6BFAC283F7F68B87AEEAB39D03C07A3D0590A4B4578F79 ++ KODM ++ ++ ++ -1 ++ 96.9 ++ ++ ++ 11684610993661B95209C8CC24B3A153BD2AB1D538BB28BF41AAC4E940E24130725F8B82AF ++ KHKX ++ ++ ++ -1 ++ 99.1 ++ ++ ++ 1168461120A076395C093FB1BA6315362B58A11EFADE461C5ACAD61AA51F7E66FB0FBEAA69 ++ KBAT ++ ++ ++ -1 ++ 99.9 ++ ++ ++ 11684611436094D7F632AB1EB4FAD57028DB098DB6E0D2055F0A96FD55525137EBD5C47A5B ++ KFZX ++ ++ ++ -1 ++ 102.1 ++ ++ ++ 1168461195282D1688F40C7FC5AA003DDC700EC5DD797FC632097B5E56176E024E04B4AF84 ++ KCRS ++ ++ ++ -1 ++ 103.3 ++ ++ ++ 1168461220137A9E713D061D38E11FB474360C007F1866EBA09325F489B29B345A15AF28F5 ++ KCHX ++ ++ ++ -1 ++ 106.7 ++ ++ ++ 1168461240BCBE9B8FD990C788128803DF787B796306066505548D89F71F3505D3BC837A6E ++ KQLM ++ ++ ++ -1 ++ 107.9 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp +--- kradio-3.5.13.1/kradio3/presets.old/vietnam/hanoi.krp 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/vietnam/hanoi.krp 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,60 @@ ++ ++ ++ ++ kradio-1.0 ++ ++ kradio-4.0.0 ++ Pham Thanh Nam <phamthanhnam.ptn@gmail.com> ++ 2009-11-08T13:14:16 ++ Vietnam ++ Hanoi ++ FM ++ ++ ++ ++ 12576571600E343C50AE64ABBB128131D2438689F9BEA2D9C2BACE297416E68B309EA2 ++ Hanoi ++ ++ ++ -1 ++ stereo ++ 90 ++ ++ ++ 12576573057937209E795F1B379958B917FFDDD421456F10C75CC5AE901FFC55BC47DC ++ VOV2 ++ ++ ++ -1 ++ dontcare ++ 96.5 ++ ++ ++ 1257657101D508873DA1965BB87A96601283B0F78920CAD7DA951DD6DF74F1C98553F5 ++ VOV1 ++ ++ ++ -1 ++ dontcare ++ 100 ++ ++ ++ 12571038920FB7D70277EEDB473F783FF9C4BE09036A58A570581103530069FD2F7B7B ++ VOV3 ++ ++ ++ -1 ++ stereo ++ 102.7 ++ ++ ++ 1257657210A2BBEDF17CAE4283E948AAFFE9A8CF59ED4705780CB6C91189A1488DA04D ++ VOV5 ++ ++ ++ -1 ++ dontcare ++ 105.5 ++ ++ ++ +diff -Nuar kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am +--- kradio-3.5.13.1/kradio3/presets.old/vietnam/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kradio-3.5.13.1/kradio3/presets/vietnam/Makefile.am 2012-11-25 00:48:02.000000000 +0100 +@@ -0,0 +1,9 @@ ++SUBDIRS = ++EXTRA_DIST = "hanoi.krp" ++ ++install-data-local: ++ $(mkinstalldirs) "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/" ++ $(INSTALL_DATA) "$(srcdir)/hanoi.krp" "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp" ++ ++uninstall-local: ++ -rm -f "$(DESTDIR)$(kde_datadir)/kradio/presets/vietnam/hanoi.krp" diff --git a/redhat/applications/tderadio/trinity-kradio-3.5.13.1.spec b/redhat/applications/tderadio/trinity-kradio-3.5.13.1.spec new file mode 100644 index 000000000..cc5903e88 --- /dev/null +++ b/redhat/applications/tderadio/trinity-kradio-3.5.13.1.spec @@ -0,0 +1,182 @@ +# Default version for this component +%define kdecomp kradio + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: Comfortable Radio Application for KDE [Trinity] +Version: 0.1.1.1 +Release: 5%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +Patch1: kradio-3.5.13.1-updated_preset.patch + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: libsndfile-devel +BuildRequires: lirc-devel + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}twolame-devel +%endif +%if 0%{?suse_version} +BuildRequires: libtwolame-devel +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: lame-devel +%endif + +%description +KRadio is a comfortable radio application for Trinity with support for +V4L and V4L2 radio cards drivers. + +KRadio currently provides + + * V4L/V4L2 radio support + * Remote control support (LIRC) + * Alarms, sleep Countdown + * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) + * Recording capabilities, including MP3 and Ogg/Vorbis encoding + * Timeshifter functionality + * Extendable plugin architecture + +This package also includes a growing collection of station preset +files for many cities around the world contributed by KRadio users. + +As KRadio is based on an extendable plugin architecture, contributions +of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 +%patch1 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-lirc \ + --enable-v4l2 \ + --enable-lame \ + --enable-ogg \ + --enable-alsa \ + --enable-oss + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +for f in hicolor locolor ; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done +update-desktop-database %{tde_appdir} -q &> /dev/null ||: + +%postun +for f in hicolor locolor ; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done +update-desktop-database %{tde_appdir} -q &> /dev/null ||: + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{tde_bindir}/convert-presets +%{tde_bindir}/kradio +%{tde_libdir}/kradio/plugins/*.la +%{tde_libdir}/kradio/plugins/*.so +%{tde_tdeappdir}/kradio.desktop +%{tde_datadir}/apps/kradio/ +%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo + +%changelog +* Sat Dec 01 2012 Francois Andriot - 0.1.1.1-5 +- Updates presets + +* Wed Oct 03 2012 Francois Andriot - 0.1.1.1-4 +- Initial build for TDE 3.5.13.1 + +* Sun Jul 08 2012 Francois Andriot - 0.1.1.1-3 +- Rebuild for RHEL 5 +- Fix postinstall + +* Wed May 02 2012 Francois Andriot - 0.1.1.1-2 +- Rebuild for Fedora 17 +- Fix HTML directory location + +* Sat Nov 19 2011 Francois Andriot - 0.1.1.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tderadio/trinity-kradio-3.5.13.spec b/redhat/applications/tderadio/trinity-kradio-3.5.13.spec new file mode 100644 index 000000000..dfaedd47d --- /dev/null +++ b/redhat/applications/tderadio/trinity-kradio-3.5.13.spec @@ -0,0 +1,164 @@ +# Default version for this component +%define kdecomp kradio + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: Comfortable Radio Application for KDE [Trinity] +Version: 0.1.1.1 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: libsndfile-devel +BuildRequires: lirc-devel + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}twolame-devel +%else +BuildRequires: lame-devel +%endif + +%description +KRadio is a comfortable radio application for Trinity with support for +V4L and V4L2 radio cards drivers. + +KRadio currently provides + + * V4L/V4L2 radio support + * Remote control support (LIRC) + * Alarms, sleep Countdown + * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) + * Recording capabilities, including MP3 and Ogg/Vorbis encoding + * Timeshifter functionality + * Extendable plugin architecture + +This package also includes a growing collection of station preset +files for many cities around the world contributed by KRadio users. + +As KRadio is based on an extendable plugin architecture, contributions +of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-lirc \ + --enable-v4l2 \ + --enable-lame \ + --enable-ogg \ + --enable-alsa \ + --enable-oss + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +for f in hicolor locolor ; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done +update-desktop-database %{tde_appdir} -q &> /dev/null ||: + +%postun +for f in hicolor locolor ; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done +update-desktop-database %{tde_appdir} -q &> /dev/null ||: + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{tde_bindir}/convert-presets +%{tde_bindir}/kradio +%{tde_libdir}/kradio/plugins/*.la +%{tde_libdir}/kradio/plugins/*.so +%{tde_tdeappdir}/kradio.desktop +%{tde_datadir}/apps/kradio/ +%{tde_datadir}/locale/*/LC_MESSAGES/kradio-*.mo + +%Changelog +* Sun Jul 08 2012 Francois Andriot - 0.1.1.1-3 +- Rebuild for RHEL 5 +- Fix postinstall + +* Wed May 02 2012 Francois Andriot - 0.1.1.1-2 +- Rebuild for Fedora 17 +- Fix HTML directory location + +* Sat Nov 19 2011 Francois Andriot - 0.1.1.1-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.1.spec b/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.1.spec new file mode 100644 index 000000000..41d24ea5c --- /dev/null +++ b/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.1.spec @@ -0,0 +1,139 @@ +# Default version for this component +%define kdecomp kdesudo + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: sudo frontend for Trinity + +Version: 2.5.1 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-arts-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils + + +%description +KdeSudo is a graphical frontend for the sudo utility. +It allows you to run programs as another user by entering your password. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; source /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --includedir=%{tde_tdeincludedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{tde_bindir}/kdesudo +%{tde_tdedocdir}/HTML/en/kdesudo/ + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 2.5.1-3 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 2.5.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + +* Wed Nov 02 2011 Francois Andriot - 2.5.1-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.spec new file mode 100644 index 000000000..da04bb7ef --- /dev/null +++ b/redhat/applications/tdesudo/trinity-kdesudo-3.5.13.spec @@ -0,0 +1,130 @@ +# Default version for this component +%define kdecomp kdesudo + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: sudo frontend for Trinity + +Version: 2.5.1 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + + +%description +KdeSudo is a graphical frontend for the sudo utility. +It allows you to run programs as another user by entering your password. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## File lists +# HTML (1.0) +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common + done + popd + fi +done +fi + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{tde_bindir}/kdesudo +%{tde_tdedocdir}/HTML/en/kdesudo/ + + +%Changelog +* Tue May 01 2012 Francois Andriot - 2.5.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + +* Wed Nov 02 2011 Francois Andriot - 2.5.1-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/tdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..850d5c7c0 --- /dev/null +++ b/redhat/applications/tdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,11 @@ +--- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200 ++++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200 +@@ -23,7 +23,7 @@ + + SET_TARGET_PROPERTIES(kded_kdesvnd + PROPERTIES +- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module") ++ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}") + + INSTALL(TARGETS kded_kdesvnd + RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/redhat/applications/tdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/tdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch new file mode 100644 index 000000000..c912db32b --- /dev/null +++ b/redhat/applications/tdesvn/kdesvn-3.5.13-fix_not_a_string_literal_error.patch @@ -0,0 +1,127 @@ +--- kdesvn/src/svnqt/cache/LogCache.cpp.stringliteral 2011-08-17 23:41:23.000000000 +0200 ++++ kdesvn/src/svnqt/cache/LogCache.cpp 2012-08-05 12:44:59.038119225 +0200 +@@ -187,7 +187,7 @@ + TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key); + db->setDatabaseName(m_BasePath+"/maindb.db"); + if (!db->open()) { +- qWarning("Failed to open main database: " + db->lastError().text()); ++ qWarning("%s", (TQString("Failed to open main database: " + db->lastError().text())).ascii()); + } else { + m_mainDB.setLocalData(new ThreadDBStore); + m_mainDB.localData()->key = _key; +@@ -269,12 +269,12 @@ + #endif + TQDataBase mainDB = m_CacheData->getMainDB(); + if (!mainDB || !mainDB->open()) { +- qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")); ++ qWarning("%s", ("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii()); + } else { + TQSqlQuery q(TQString(), mainDB); + mainDB->transaction(); + if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) { +- qWarning("Failed create main database: " + mainDB->lastError().text()); ++ qWarning("%s", ("Failed create main database: " + mainDB->lastError().text()).ascii()); + } + mainDB->commit(); + } +@@ -321,7 +321,7 @@ + TQSqlQuery cur(TQString(),mainDB); + cur.prepare(s_q); + if (!cur.exec()) { +- qDebug(cur.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text()); + return _res; + } +--- kdesvn/src/svnqt/cache/ReposLog.cpp.ORI 2012-08-05 12:50:50.352685697 +0200 ++++ kdesvn/src/svnqt/cache/ReposLog.cpp 2012-08-05 12:55:39.515888432 +0200 +@@ -68,7 +68,7 @@ + TQString q("select revision from 'logentries' order by revision DESC limit 1"); + TQSqlQuery _q(TQString(), m_Database); + if (!_q.exec(q)) { +- qDebug(_q.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii()); + return svn::Revision::UNDEFINED; + } + int _r; +@@ -76,7 +76,7 @@ + //qDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data()); + _r = _q.value(0).toInt(); + } else { +- qDebug(_q.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(_q.lastError().text().TOUTF8().data())).ascii()); + return svn::Revision::UNDEFINED; + } + return _r; +@@ -197,7 +197,7 @@ + bcount.bindValue(0,TQ_LLONG(end.revnum())); + bcount.bindValue(1,TQ_LLONG(start.revnum())); + if (!bcount.exec()) { +- qDebug(bcount.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(bcount.lastError().text().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not retrieve count: ")+bcount.lastError().text()); + return false; + } +@@ -211,7 +211,7 @@ + bcur.bindValue(1,TQ_LLONG(start.revnum())); + + if (!bcur.exec()) { +- qDebug(bcur.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(bcur.lastError().text().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+bcur.lastError().text()); + return false; + } +@@ -220,7 +220,7 @@ + revision = bcur.value(0).toLongLong(); + cur.bindValue(0,revision); + if (!cur.exec()) { +- qDebug(cur.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(cur.lastError().text().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text() + ,cur.lastError().number()); + return false; +@@ -264,7 +264,7 @@ + TQSqlQuery query("select revision,date from logentries order by revision desc limit 1",m_Database); + + if (query.lastError().type()!=TQSqlError::None) { +- qDebug(query.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii()); + } + bool must_remote=!noNetwork; + if (query.next()) { +@@ -283,7 +283,7 @@ + query.bindValue(0,TQ_LLONG(aRev.date())); + query.exec(); + if (query.lastError().type()!=TQSqlError::None) { +- qDebug(query.lastError().text().TOUTF8().data()); ++ qDebug("%s", (TQString(query.lastError().text().TOUTF8().data())).ascii()); + } + if (query.next()) { + return query.value(0).toInt(); +@@ -320,7 +320,7 @@ + if (!_q.exec()) { + m_Database->rollback(); + qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); +- qDebug(_q.lastQuery().TOUTF8().data()); ++ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); + } + _q.prepare(qPathes); +@@ -334,7 +334,7 @@ + if (!_q.exec()) { + m_Database->rollback(); + qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); +- qDebug(_q.lastQuery().TOUTF8().data()); ++ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); + } + } +@@ -375,7 +375,7 @@ + _q.prepare(query_string); + if (!_q.exec()) { + qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); +- qDebug(_q.lastQuery().TOUTF8().data()); ++ qDebug("%s", (TQString(_q.lastQuery().TOUTF8().data())).ascii()); + throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number()); + } + while(_q.next()) { diff --git a/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.1.spec b/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.1.spec new file mode 100644 index 000000000..c4b49483f --- /dev/null +++ b/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.1.spec @@ -0,0 +1,287 @@ +# Default version for this component +%define kdecomp kdesvn + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: subversion client with tight KDE integration [Trinity] +Version: 1.0.4 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.elliptique.net/~ken/kima/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +# [kdesvn] Fix "not a string literal" error +Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: subversion-devel +Requires: trinity-kdesvn-kio-plugins = %{version}-%{release} + + +%description +KDESvn is a graphical client for the subversion revision control +system (svn). + +Besides offering common and advanced svn operations, it features +a tight integration into KDE and can be embedded into other KDE +applications like konqueror via the KDE component technology KParts. + + +%package -n trinity-libsvnqt +Group: Development/Libraries +Summary: Qt wrapper library for subversion [Trinity] + +%description -n trinity-libsvnqt +This package provides svnqt, a Qt wrapper library around the +subversion library. + +It is based on the RapidSvn SvnCpp library, a subversion client API +written in C++. + +%package -n trinity-libsvnqt-devel +Group: Development/Libraries +Requires: trinity-libsvnqt = %{version}-%{release} +Requires: qt-devel +Requires: subversion-devel +Summary: Qt wrapper library for subversion (development files) [Trinity] + +%description -n trinity-libsvnqt-devel +This package contains the header files and symbolic links that developers +using svnqt will need. + + +%package kio-plugins +Group: Development/Libraries +Conflicts: trinity-kdesdk-kio-plugins +Summary: subversion I/O slaves for Trinity + +%description kio-plugins +This packages includes KIO slaves for svn, svn+file, svn+http, +svn+https, svn+ssh. This allows you to access subversion repositories +inside any KIO enabled KDE application. + +This package is part of tdesvn-trinity. + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 +%patch2 -p1 -b .stringliteral + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +find . -name CMakeLists.txt -exec %__sed -i {} \ + -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ + -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ + -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ + \; + +# More ugly hack to add TQT include directory in CMakeLists.txt +%__sed -i CMakeLists.txt \ + -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt," + +# Moves HTML files to the correect location +find . -name "*.cmake" -exec %__sed -i {} \ + -e "s,/doc/HTML,/doc/kde/HTML,g" \ + \; + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ + -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%find_lang %{kdecomp} || touch %{kdecomp}.lang + +# Installs SVN protocols as alternatives +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn +%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol +%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol +%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol +%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol +%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post -n trinity-libsvnqt +/sbin/ldconfig || : + +%post kio-plugins +for proto in svn+file svn+http svn+https svn+ssh svn; do +%if 0%{?suse_version} + update-alternatives --install \ +%else + alternatives --install \ +%endif + %{tde_datadir}/services/${proto}.protocol \ + ${proto}.protocol \ + %{tde_datadir}/services/${proto}.protocol_tdesvn \ + 20 +done + +%preun kio-plugins +if [ $1 -eq 0 ]; then + for proto in svn+file svn+http svn+https svn+ssh svn; do +%if 0%{?suse_version} + update-alternatives --remove \ +%else + alternatives --remove \ +%endif + ${proto}.protocol \ + %{tde_datadir}/services/${proto}.protocol_tdesvn + done +fi + + + +%postun -n trinity-libsvnqt +/sbin/ldconfig || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kdesvn +%{tde_bindir}/kdesvnaskpass +%{tde_tdelibdir}/libkdesvnpart.la +%{tde_tdelibdir}/libkdesvnpart.so +%{tde_datadir}/applications/kde/kdesvn.desktop +%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh +%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd +%{tde_datadir}/apps/kdesvn/kdesvnui.rc +%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc +%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop +%{tde_datadir}/config.kcfg/kdesvn_part.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%{tde_datadir}/icons/hicolor/*/*/*.svgz +%{tde_mandir}/man1/kdesvn.1 +%{tde_mandir}/man1/kdesvnaskpass.1 +%{tde_tdedocdir}/HTML/*/ + +%files -n trinity-libsvnqt +%{tde_libdir}/libsvnqt.so.4 +%{tde_libdir}/libsvnqt.so.4.2.2 + +%files -n trinity-libsvnqt-devel +%{tde_includedir}/svnqt +%{tde_libdir}/libsvnqt.so + +%files kio-plugins +%{tde_datadir}/services/kded/kdesvnd.desktop +%{tde_datadir}/services/ksvn+file.protocol +%{tde_datadir}/services/ksvn+http.protocol +%{tde_datadir}/services/ksvn+https.protocol +%{tde_datadir}/services/ksvn+ssh.protocol +%{tde_datadir}/services/ksvn.protocol +%{tde_datadir}/services/svn+file.protocol +%{tde_datadir}/services/svn+http.protocol +%{tde_datadir}/services/svn+https.protocol +%{tde_datadir}/services/svn+ssh.protocol +%{tde_datadir}/services/svn.protocol +%{tde_datadir}/services/svn+file.protocol_tdesvn +%{tde_datadir}/services/svn+http.protocol_tdesvn +%{tde_datadir}/services/svn+https.protocol_tdesvn +%{tde_datadir}/services/svn+ssh.protocol_tdesvn +%{tde_datadir}/services/svn.protocol_tdesvn +%{tde_tdelibdir}/kio_ksvn.la +%{tde_tdelibdir}/kio_ksvn.so +%{tde_tdelibdir}/kded_kdesvnd.la +%{tde_tdelibdir}/kded_kdesvnd.so + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 1.0.4-4 +- Initial build for TDE 3.5.13.1 + +* Mon Jul 30 2012 Francois Andriot - 1.0.4-3 +- Installs SVN protocols as alternative, avoids conlict with TDESDK + +* Tue May 01 2012 Francois Andriot - 1.0.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix compilation with GCC 4.7 + +* Thu Dec 01 2011 Francois Andriot - 1.0.4-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.spec b/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.spec new file mode 100644 index 000000000..ce67e8923 --- /dev/null +++ b/redhat/applications/tdesvn/trinity-kdesvn-3.5.13.spec @@ -0,0 +1,274 @@ +# Default version for this component +%define kdecomp kdesvn + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: subversion client with tight KDE integration [Trinity] +Version: 1.0.4 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.elliptique.net/~ken/kima/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +# [kdesvn] Fix compilation with GCC 4.7 +Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch +# [kdesvn] Fix "not a string literal" error +Patch2: kdesvn-3.5.13-fix_not_a_string_literal_error.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: subversion-devel +Requires: trinity-kdesvn-kio-plugins = %{version}-%{release} + + +%description +KDESvn is a graphical client for the subversion revision control +system (svn). + +Besides offering common and advanced svn operations, it features +a tight integration into KDE and can be embedded into other KDE +applications like konqueror via the KDE component technology KParts. + + +%package -n trinity-libsvnqt +Group: Development/Libraries +Summary: Qt wrapper library for subversion [Trinity] + +%description -n trinity-libsvnqt +This package provides svnqt, a Qt wrapper library around the +subversion library. + +It is based on the RapidSvn SvnCpp library, a subversion client API +written in C++. + +%package -n trinity-libsvnqt-devel +Group: Development/Libraries +Requires: trinity-libsvnqt = %{version}-%{release} +Requires: qt-devel +Requires: subversion-devel +Summary: Qt wrapper library for subversion (development files) [Trinity] + +%description -n trinity-libsvnqt-devel +This package contains the header files and symbolic links that developers +using svnqt will need. + + +%package kio-plugins +Group: Development/Libraries +Conflicts: trinity-kdesdk-kio-plugins +Summary: subversion I/O slaves for Trinity + +%description kio-plugins +This packages includes KIO slaves for svn, svn+file, svn+http, +svn+https, svn+ssh. This allows you to access subversion repositories +inside any KIO enabled KDE application. + +This package is part of tdesvn-trinity. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch1 -p1 +%patch2 -p1 -b .stringliteral + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +find . -name CMakeLists.txt -exec %__sed -i {} \ + -e "s,/usr/include/tqt,%{tde_includedir}/tqt,g" \ + -e "s,/usr/bin/tmoc,%{tde_bindir}/tmoc,g" \ + -e "s,/usr/bin/uic-tqt,%{tde_bindir}/uic-tqt,g" \ + \; + +# More ugly hack to add TQT include directory in CMakeLists.txt +%__sed -i CMakeLists.txt \ + -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{tde_includedir}/tqt," + +# Moves HTML files to the correect location +find . -name "*.cmake" -exec %__sed -i {} \ + -e "s,/doc/HTML,/doc/kde/HTML,g" \ + \; + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" + +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ + -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + .. + +# SMP safe ! +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%find_lang %{kdecomp} || touch %{kdecomp}.lang + +# Installs SVN protocols as alternatives +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn +%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn +%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol +%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol +%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol +%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol +%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post -n trinity-libsvnqt +/sbin/ldconfig || : + +%post kio-plugins +for proto in svn+file svn+http svn+https svn+ssh svn; do + alternatives --install \ + %{tde_datadir}/services/${proto}.protocol \ + ${proto}.protocol \ + %{tde_datadir}/services/${proto}.protocol_tdesvn \ + 20 +done + +%preun kio-plugins +if [ $1 -eq 0 ]; then + for proto in svn+file svn+http svn+https svn+ssh svn; do + alternatives --remove \ + ${proto}.protocol \ + %{tde_datadir}/services/${proto}.protocol_tdesvn + done +fi + + + +%postun -n trinity-libsvnqt +/sbin/ldconfig || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kdesvn +%{tde_bindir}/kdesvnaskpass +%{tde_tdelibdir}/libkdesvnpart.la +%{tde_tdelibdir}/libkdesvnpart.so +%{tde_datadir}/applications/kde/kdesvn.desktop +%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh +%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd +%{tde_datadir}/apps/kdesvn/kdesvnui.rc +%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc +%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop +%{tde_datadir}/config.kcfg/kdesvn_part.kcfg +%{tde_datadir}/icons/hicolor/*/*/*.png +%{tde_datadir}/icons/hicolor/*/*/*.svgz +%{tde_mandir}/man1/kdesvn.1 +%{tde_mandir}/man1/kdesvnaskpass.1 +%{tde_tdedocdir}/HTML/*/ + +%files -n trinity-libsvnqt +%{tde_libdir}/libsvnqt.so.4 +%{tde_libdir}/libsvnqt.so.4.2.2 + +%files -n trinity-libsvnqt-devel +%{tde_includedir}/svnqt +%{tde_libdir}/libsvnqt.so + +%files kio-plugins +%{tde_datadir}/services/kded/kdesvnd.desktop +%{tde_datadir}/services/ksvn+file.protocol +%{tde_datadir}/services/ksvn+http.protocol +%{tde_datadir}/services/ksvn+https.protocol +%{tde_datadir}/services/ksvn+ssh.protocol +%{tde_datadir}/services/ksvn.protocol +%{tde_datadir}/services/svn+file.protocol +%{tde_datadir}/services/svn+http.protocol +%{tde_datadir}/services/svn+https.protocol +%{tde_datadir}/services/svn+ssh.protocol +%{tde_datadir}/services/svn.protocol +%{tde_datadir}/services/svn+file.protocol_tdesvn +%{tde_datadir}/services/svn+http.protocol_tdesvn +%{tde_datadir}/services/svn+https.protocol_tdesvn +%{tde_datadir}/services/svn+ssh.protocol_tdesvn +%{tde_datadir}/services/svn.protocol_tdesvn +%{tde_tdelibdir}/kio_ksvn.la +%{tde_tdelibdir}/kio_ksvn.so +%{tde_tdelibdir}/kded_kdesvnd.la +%{tde_tdelibdir}/kded_kdesvnd.so + + +%Changelog +* Mon Jul 30 2012 Francois Andriot - 1.0.4-3 +- Installs SVN protocols as alternative, avoids conlict with TDESDK + +* Tue May 01 2012 Francois Andriot - 1.0.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix compilation with GCC 4.7 + +* Thu Dec 01 2011 Francois Andriot - 1.0.4-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.1.spec new file mode 100644 index 000000000..bdd0aefab --- /dev/null +++ b/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.1.spec @@ -0,0 +1,130 @@ +# Default version for this component +%define kdecomp kdmtheme + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: theme manager for KDM [Trinity] +Version: 1.2.2 +Release: 3%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://beta.smileaf.org/projects + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM) +that allows you to easily install, remove and change your KDM themes. + + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/kcm_kdmtheme.la +%{tde_tdelibdir}/kcm_kdmtheme.so +%{tde_tdeappdir}/kdmtheme.desktop +%{tde_tdedocdir}/HTML/en/kdmtheme/ + + +%post +update-desktop-database %{tde_appdir} &> /dev/null + +%postun +update-desktop-database %{tde_appdir} &> /dev/null + + +%changelog +* Wed Oct 03 2012 Francois Andriot - 1.2.2-3 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 1.2.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Removes the 'lintian' stuff from Debian + +* Fri Nov 25 2011 Francois Andriot - 1.2.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.spec new file mode 100644 index 000000000..71d5dbdf0 --- /dev/null +++ b/redhat/applications/tdmtheme/trinity-kdmtheme-3.5.13.spec @@ -0,0 +1,121 @@ +# Default version for this component +%define kdecomp kdmtheme + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: theme manager for KDM [Trinity] +Version: 1.2.2 +Release: 2%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://beta.smileaf.org/projects + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM) +that allows you to easily install, remove and change your KDM themes. + + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%clean +%__rm -rf %{buildroot} + + + +%files +%defattr(-,root,root,-) +%{tde_tdelibdir}/kcm_kdmtheme.la +%{tde_tdelibdir}/kcm_kdmtheme.so +%{tde_tdeappdir}/kdmtheme.desktop +%{tde_tdedocdir}/HTML/en/kdmtheme/ + + +%post +update-desktop-database %{tde_appdir} &> /dev/null + +%postun +update-desktop-database %{tde_appdir} &> /dev/null + + +%Changelog +* Tue May 01 2012 Francois Andriot - 1.2.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun +- Removes the 'lintian' stuff from Debian + +* Fri Nov 25 2011 Francois Andriot - 1.2.2-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch b/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch deleted file mode 100644 index d6fa447dc..000000000 --- a/redhat/kde-i18n/kde-i18n-3.5.13-add_french_translations.patch +++ /dev/null @@ -1,1113 +0,0 @@ -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po kde-i18n-fr-3.5.10.p/messages/kdebase/kcmiccconfig.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcmiccconfig.po 1970-01-01 01:00:00.000000000 +0100 -+++ kde-i18n-fr-3.5.10/messages/kdebase/kcmiccconfig.po 2011-12-18 12:12:34.087743324 +0100 -@@ -0,0 +1,76 @@ -+# TDE 3.5.13 'iccconfig.cpp' translation -+ -+#: iccconfig.cpp:82 -+msgid "The global ICC color profile is a system wide setting, and requires administrator access
To alter the system's global ICC profile, click on the \"Administrator Mode\" button below." -+msgstr "Le profil de couleurs ICC global est un réglage système, et nécessite les droits d'administrateur.
Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous." -+ -+#: iccconfig.cpp:155 -+#: iccconfig.cpp:189 -+msgid "Please enter the new profile name below:" -+msgstr "Veuillez indiquer le nom du nouveau profil:" -+ -+#: iccconfig.cpp:159 -+#: iccconfig.cpp:193 -+msgid "ICC Profile Configuration" -+msgstr "Configuration du profil ICC" -+ -+#: iccconfig.cpp:166 -+#: iccconfig.cpp:200 -+msgid "Error: A profile with that name already exists" -+msgstr "Erreur: Il existe déja un profil portant ce nom." -+ -+#: iccconfig.cpp:406 -+msgid "" -+"

ICC Profile Configuration

This module allows you to configure KDE support" -+" for ICC profiles. This allows you to easily color correct your monitor" -+" for a more lifelike and vibrant image." -+msgstr "" -+"

Configuration du profil ICC

Ce module vous permet de configurer le support" -+" ICC de Trinity. Il permet de calibrer les couleurs de votre moniteur, " -+" afin d'obtenir une image plus vivante et plus vibrante." -+ -+#: iccconfigbase.ui:31 -+msgid "ICC Color Profile Configuration" -+msgstr "Configuration des profils de couleurs ICC" -+ -+#: iccconfigbase.ui:42 -+msgid "System Settings" -+msgstr "Paramètres Système" -+ -+#: iccconfigbase.ui:53 -+msgid "&Enable global ICC color profile support" -+msgstr "Activer le profil ICC global" -+ -+#: iccconfigbase.ui:61 -+#: iccconfigbase.ui:148 -+msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)" -+msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)" -+ -+#: iccconfigbase.ui:69 -+#: iccconfigbase.ui:156 -+msgid "ICC File" -+msgstr "Fichier ICC" -+ -+#: iccconfigbase.ui:79 -+msgid "User Settings" -+msgstr "Paramètres Utilisateurs" -+ -+#: iccconfigbase.ui:90 -+msgid "&Enable user ICC color profile support" -+msgstr "Activer le profil ICC utilisateur" -+ -+#: iccconfigbase.ui:103 -+msgid "Current Profile" -+msgstr "Profil actuel" -+ -+#: iccconfigbase.ui:111 -+msgid "Create New" -+msgstr "Créer" -+ -+#: iccconfigbase.ui:119 -+msgid "Rename" -+msgstr "Renommer" -+ -+#: iccconfigbase.ui:140 -+msgid "Settings for output" -+msgstr "Appliquer à la sortie" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10.p/messages/kdebase/kdesktop.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesktop.po 2008-08-19 20:29:30.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po 2011-12-18 18:12:48.482642367 +0100 -@@ -553,6 +553,36 @@ - "\n" - "" - -+# kdesktop/minicli_ui.ui:188 -+msgid "Autocomplete shows available &applications" -+msgstr "L'autocomplétion affiche les &applications disponibles" -+ -+# kdesktop/minicli_ui.ui:191 -+msgid "" -+"When enabled, the system shows available applications in the autocompletion area." -+"" -+msgstr "" -+"Lorsque cette case est cochée, le système affiche les applications " -+"disponibles dans la zone d'autocomplétion." -+ -+ -+# kdesktop/minicli_ui.ui:200 -+msgid "Autocomplete uses &filesystem instead of history" -+msgstr "L'autocomplétion utilise le système de &fichiers au lieu de l'historique" -+ -+# kdesktop/minicli_ui.ui:203 -+msgid "" -+"This selects whether the filesystem and the past command history will be used for autocompletion." -+"" -+msgstr "" -+"En cochant cette case, l'autocomplétion utilise le système de fichiers à la place de l'historique." -+"" -+ -+ -+# kdesktop/minicli_ui.ui:212 -+msgid "Autocomplete uses &both history and filesystem" -+msgstr "L'autocomplétion utilise l'historique &et le système de fichiers" -+ - #. i18n: file minicli_ui.ui line 199 - #: rc.cpp:14 - #, no-c-format -@@ -1144,3 +1182,20 @@ - "Cependant, certains écrans de veille\n" - " effectuent des calculs utiles, dans ces cas, il est souhaitable de ne " - "pas les désactiver." -+ -+### TDE 3.5.13 ### -+#: lockdlg.cc:109 -+msgid "Desktop Session Locked" -+msgstr "Session de bureau verrouillée" -+ -+#: lockdlg.cc:128 -+msgid "This computer is in use and has been locked." -+msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé." -+ -+#: lockdlg.cc:129 -+msgid "Only '%1' may unlock this session." -+msgstr "Seul '%1' peut déverouiller cette session." -+ -+#: lockdlg.cc:139 -+msgid "This session has been locked since %1" -+msgstr "Cette session est verrouillée depuis %1" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-fr-3.5.10.p/messages/kdebase/kicker.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kicker.po 2008-08-19 20:29:30.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/kicker.po 2011-12-18 20:30:31.365135597 +0100 -@@ -754,3 +754,292 @@ - #, no-c-format - msgid "Custom size" - msgstr "Taille personnalisée" -+ -+### TDE 3.5.13 ### -+#: panelextension.cpp:385 -+msgid "&Launch Process Manager..." -+msgstr "Gestionnaire de taches..." -+ -+## Kickoff menu (k_new_mnu.cpp) -+msgid "User %1 on %2" -+msgstr "Utilisateur %1 sur %2" -+ -+msgid "Most commonly used applications and documents" -+msgstr "Applications et documents utilisés récemment" -+ -+msgid "Search:" -+msgstr "Chercher:" -+ -+msgid "List of installed applications" -+msgstr "Liste des applications installées" -+ -+msgid "" -+"Information and configuration of your " -+"system, access to personal files, network resources and connected disk drives" -+msgstr "" -+"Informations et configuration de votre " -+"système, accès aux fichiers personnels, ressources réseau et disques connectés" -+ -+msgid "Recently used applications and documents" -+msgstr "Applications et documents utilisés récemment" -+ -+msgid "" -+"Logout, switch user, switch off or reset," -+" suspend of the system" -+msgstr "" -+"Se déconnecter, changer d'utilisateur, éteindre," -+" redémarrer ou interrompre le système" -+ -+msgid "

Favorites

" -+msgstr "

Favoris

" -+ -+msgid "

History

" -+msgstr "

Historique

" -+ -+msgid "

Computer

" -+msgstr "

Ordinateur

" -+ -+msgid "

Applications

" -+msgstr "

Applications

" -+ -+msgid "

Leave

" -+msgstr "

Quitter

" -+ -+msgid "Search Internet" -+msgstr "Chercher sur Internet" -+ -+msgid "Search Index" -+msgstr "Chercher dans l'index" -+ -+msgid "Applications, Contacts and Documents" -+msgstr "Applications, Concacts et Documents" -+ -+msgid "Start '%1'" -+msgstr "Démarrer '%1'" -+ -+msgid "Start '%1' (current)" -+msgstr "Démarrer '%1' (actuel)" -+ -+msgid "Restart and boot directly into '%1'" -+msgstr "Redémarrer et amorcer directement '%1'" -+ -+msgid "Start a parallel session" -+msgstr "Démarrer une session parallèle" -+ -+msgid "Switch to Session of User '%1'" -+msgstr "Basculer vers la session de l'utilisateur '%1'" -+ -+msgid "Session: %1" -+msgstr "Session: %1" -+ -+msgid "New Applications" -+msgstr "Nouvelles Applications" -+ -+msgid "Session" -+msgstr "Session" -+ -+msgid "Logout" -+msgstr "Déconnexion" -+ -+msgid "End session" -+msgstr "Terminer la session" -+ -+msgid "Lock" -+msgstr "Verrouiller" -+ -+msgid "Lock screen" -+msgstr "Verrouiller l'écran" -+ -+msgid "Save current Session for next login" -+msgstr "Enregistrer la session courante pour la prochaine connexion" -+ -+msgid "Manage parallel sessions" -+msgstr "Gérer les sessions parallèles" -+ -+msgid "System" -+msgstr "Système" -+ -+msgid "Shutdown Computer" -+msgstr "Eteindre l'ordinateur" -+ -+msgid "Turn off computer" -+msgstr "Eteindre l'ordinateur" -+ -+msgid "&Restart Computer" -+msgstr "&Redémarrer l'ordinateur" -+ -+msgid "Restart and boot the default system" -+msgstr "Redémarrer et amorcer le système par défaut" -+ -+msgid "Start Operating System" -+msgstr "Démarrer le système d'Exploitation" -+ -+msgid "Restart and boot another operating system" -+msgstr "Redémarrer et amorcer un autre système d'exploitation" -+ -+msgid "System Information" -+msgstr "Informations Système" -+ -+msgid "System Folders" -+msgstr "Dossiers Système" -+ -+msgid "Home Folder" -+msgstr "Dossier personnel" -+ -+msgid "My Documents" -+msgstr "Mes Documents" -+ -+msgid "Network Folders" -+msgstr "Dossiers Réseau" -+ -+msgid "" -+"
%1
\n" -+"You do not have permission to execute " -+"this command." -+msgstr "" -+"
%1
\n" -+"Vous n'êst pas autorisé(e) à exécuter " -+"cette commande." -+ -+msgid "" -+"
%1
\n" -+"Could not run the specified command." -+msgstr "" -+"
%1
\n" -+"La commande spécifiée n'a pas pu être exécutée." -+ -+msgid "" -+"
%1
\n" -+"The specified command does not exist." -+msgstr "" -+"
%1
\n" -+"La commande spécifiée n'existe pas." -+ -+msgid "Documents" -+msgstr "Documents" -+ -+msgid "Open Addressbook at %1" -+msgstr "Ouvrir le carnet d'adresse à %1" -+ -+msgid "- Add ext:type to specify a file extension." -+msgstr "- Ajouter ext:type pour indiquer une extension de fichier" -+ -+msgid "- When searching for a phrase, add quotes." -+msgstr "- Pour chercher une phrase, ajouter des guillemets." -+ -+msgid "- To exclude search terms, use the minus symbol in front." -+msgstr "- Pour exclure des éléments recherchés, utiliser le préfixe moins." -+ -+msgid "- To search for optional terms, use OR." -+msgstr "- Pour chercher des termes optionnels, utiliser OR." -+ -+msgid "- You can use upper and lower case." -+msgstr "- Vous pouvez écrire en majuscules ou minuscules." -+ -+msgid "Search Quick Tips" -+msgstr "Astuces de la recherche rapide" -+ -+msgid "%1 = %2" -+msgstr "%1 = %2" -+ -+msgid "Send Email to %1" -+msgstr "Envoyer un Email à %1" -+ -+msgid "Open Local File: %1" -+msgstr "Ouvrir le fichier local: %1" -+ -+msgid "Open Local Dir: %1" -+msgstr "Ouvrir le répertoire local: %1" -+ -+msgid "Open Remote Location: %1" -+msgstr "Ouvrir l'emplacement distant: %1" -+ -+msgid "Run '%1'" -+msgstr "Exécuter '%1'" -+ -+msgid "No matches found" -+msgstr "Aucune correspondance trouvée" -+ -+msgid "top %1 of %2" -+msgstr "Haut %1 de %2" -+ -+msgid "%1 (top %2 of %3)" -+msgstr "%1 (haut %2 de %3)" -+ -+msgid "Do you really want to end the session?" -+msgstr "Voulez-vous vraiment terminer cette session ?" -+ -+msgid "Logout Confirmation" -+msgstr "Confirmer la déconnexion" -+ -+msgid "Do you really want to turn off the computer?" -+msgstr "Voulez-vous vraiment éteindre l'ordinateur ?" -+ -+msgid "Shutdown Confirmation" -+msgstr "Confirmer l'arrêt" -+ -+msgid "Shutdown" -+msgstr "Arrêter" -+ -+msgid "Do you really want to reset the computer and boot (another operating system)?" -+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer (un autre système d'exploitation) ?" -+ -+msgid "Restart Confirmation" -+msgstr "Confirmer le redémarrage" -+ -+msgid "Restart" -+msgstr "Redémarrer" -+ -+msgid "Do you really want to reset the computer and boot Microsoft Windows" -+msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer Windows" -+ -+msgid "Start Windows Confirmation" -+msgstr "Confirmer le démarrage de Windows" -+ -+msgid "Start Windows" -+msgstr "Démarrer Windows" -+ -+msgid "Could not start Tomboy." -+msgstr "Impossible de démarrer Tomboy." -+ -+msgid "Remove From Favorites" -+msgstr "Supprimer des favoris" -+ -+msgid "Add to Favorites" -+msgstr "Ajouter aux favoris" -+ -+msgid "Advanced" -+msgstr "Avancé" -+ -+msgid "Clear Recently Used Applications" -+msgstr "Vider la liste d'applications récentes" -+ -+msgid "Clear Recently Used Documents" -+msgstr "Vider la liste des documents récents" -+ -+msgid "Media" -+msgstr "Media" -+ -+msgid "(%1 available)" -+msgstr "(%1 disponible)" -+ -+msgid "Directory: %1" -+msgstr "Répertoire: %1" -+ -+msgid "Suspend Computer" -+msgstr "Mettre en veille l'ordinateur" -+ -+msgid "Suspend to Disk" -+msgstr "Mettre en veille l'ordinateur (sur disque)" -+ -+msgid "Pause without logging out" -+msgstr "Mettre en pause sans se déconnecter" -+ -+msgid "Suspend to RAM" -+msgstr "Mettre en veille l'ordinateur (en RAM)" -+ -+msgid "Standby" -+msgstr "Mettre en veille" -+ -+msgid "Suspend failed" -+msgstr "La mise en veille a échoué" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-fr-3.5.10.p/messages/kdebase/konsole.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/konsole.po 2008-08-19 20:29:30.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/konsole.po 2011-12-18 12:12:34.093743256 +0100 -@@ -1475,3 +1475,8 @@ - #: zmodem_dialog.cpp:28 - msgid "&Stop" - msgstr "A&rrêter" -+ -+### TDE 3.5.13 ### -+#: konsole.cpp:736 -+msgid "&Open.." -+msgstr "Ouvrir.." -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-fr-3.5.10.p/messages/kdebase/krandr.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/krandr.po 2008-08-19 20:29:30.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/krandr.po 2011-12-18 12:12:34.094743245 +0100 -@@ -301,3 +301,33 @@ - "_: Refresh rate in Hertz (Hz)\n" - "%1 Hz" - msgstr "%1 Hz" -+ -+### TDE 3.5.13 ### -+ -+#: krandrtray.cpp:237 -+msgid "Global Configuation" -+msgstr "Configuration Globale" -+ -+#: krandrtray.cpp:239 -+msgid "Configure Color Profiles..." -+msgstr "Configurer les profils de couleurs ..." -+ -+#: krandrtray.cpp:249 -+msgid "Configure Shortcut Keys..." -+msgstr "Configurer les raccourcis clavier..." -+ -+#: krandrtray.cpp:477 -+msgid "Configure Display Color Profiles" -+msgstr "Configuration des profils de couleurs" -+ -+#: krandrbindings.cpp:29 -+msgid "Display Control" -+msgstr "Paramètres d'affichage" -+ -+#: krandrbindings.cpp:31 -+msgid "Switch Displays" -+msgstr "Permuter l'affichage" -+ -+#: configdialog.cpp:49 -+msgid "Global &Shortcuts" -+msgstr "Raccourcis Globaux" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksmserver.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksmserver.po 2007-05-14 10:07:36.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/ksmserver.po 2011-12-18 12:12:34.095743233 +0100 -@@ -92,3 +92,14 @@ - "_: current option in boot loader\n" - " (current)" - msgstr " (courant)" -+ -+### TDE 3.5.13 ### -+ -+#: shutdown.cpp:202 -+msgid "Synchronizing remote folders" -+msgstr "Synchronisation des dossiers distants" -+ -+#: shutdown.cpp:207 -+msgid "Saving your settings..." -+msgstr "Enregistrement de vos paramètres ..." -+ -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-fr-3.5.10.p/messages/kdebase/ksplash.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/ksplash.po 2005-09-10 13:02:44.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/ksplash.po 2011-12-18 12:12:34.095743233 +0100 -@@ -105,5 +105,5 @@ - msgstr "Rétablissement de la session" - - #: themeengine/objkstheme.cpp:135 --msgid "KDE is up and running" --msgstr "KDE est prêt" -+msgid "Trinity is up and running" -+msgstr "Trinity est prêt" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in kde-i18n-fr-3.5.10.p/messages/kdebase/Makefile.in ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/Makefile.in 2008-08-20 09:14:47.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdebase/Makefile.in 2011-12-18 12:12:34.096743221 +0100 -@@ -192,8 +192,8 @@ - SUBDIRS =. - #>- POFILES = AUTO - #>+ 2 --POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po --GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo -+POFILES = kio_sftp.po kate.po kjobviewer.po libkickermenu_konsole.po kcmkicker.po nsplugin.po display.po extensionproxy.po kdcop.po kcmbackground.po kstyle_keramik_config.po kcmlaunch.po kcminfo.po kcmkwinrules.po kasbarextension.po khtmlkttsd.po libdmctl.po ksplashthemes.po kgreet_classic.po kcontrol.po kmenuapplet.po kio_tar.po kcmview1394.po kcmbell.po kcmcomponentchooser.po kdmgreet.po kdesktop.po kpersonalizer.po ksplash.po kcmaccessibility.po kminipagerapplet.po kcmkded.po kio_remote.po kio_home.po kdeprintfax.po kcmicons.po filetypes.po kcmenergy.po kappfinder.po kthememanager.po kcmtaskbar.po kcmcgi.po kio_media.po libkickermenu_tom.po kio_finger.po ktip.po kaccess.po kio_pop3.po kdesud.po kio_fish.po kicker.po kcmkdnssd.po krdb.po libkickermenu_systemmenu.po kcmkio.po krunapplet.po kcmhtmlsearch.po kcmfonts.po libtaskbar.po useraccount.po knetattach.po kcmkonsole.po appletproxy.po dockbarextension.po kcmkonq.po kio_nntp.po kwriteconfig.po kio_ldap.po konsole.po kstart.po klipper.po kcmspellchecking.po kcmkurifilt.po kdepasswd.po clockapplet.po mediaapplet.po kdialog.po kcmlayout.po kpager.po kwin_clients.po kdebugdialog.po kcmnotify.po kio_nfs.po kcmprintmgr.po ksystemtrayapplet.po kcmxinerama.po kreadconfig.po kay.po libkickermenu_remotemenu.po lockout.po kcmkwindecoration.po kxkb.po kprinter.po libtaskmanager.po kio_system.po trashapplet.po kcmcrypto.po kcmnic.po privacy.po libkickermenu_kdeprint.po kscreensaver.po libkonq.po libkickermenu_recentdocs.po kmenuedit.po kio_trash.po kio_floppy.po krandr.po khotkeys.po kcmkclock.po kio_man.po ksystraycmd.po kcmsmartcard.po kwin.po libkicker.po khelpcenter.po ksmserver.po kgreet_winbind.po drkonqi.po kwin_lib.po kio_settings.po ksysguard.po kfontinst.po kcmscreensaver.po konqueror.po kdesu.po kcmsmserver.po kcmcolors.po kcminput.po kcmlocale.po kio_print.po kickermenu_kate.po kcmstyle.po kcmkeys.po kcmioslaveinfo.po kfmclient.po kfindpart.po kio_mac.po kio_smb.po kcmmedia.po naughtyapplet.po kcmkwm.po htmlsearch.po kcmcss.po kcmusb.po kcmperformance.po kio_thumbnail.po kcmarts.po libkickermenu_prefmenu.po joystick.po kdmconfig.po kcmaccess.po kcmkonqhtml.po quicklauncher.po kcmsamba.po kdeprint_part.po kio_smtp.po kcmiccconfig.po -+GMOFILES = kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo - #>- all: all-recursive - #>+ 1 - all: all-nls docs-am all-recursive -@@ -531,7 +531,7 @@ - .NOEXPORT: - - #>+ 2 --KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po -+KDE_DIST=libkickermenu_remotemenu.po appletproxy.po kcminput.po kcmaccessibility.po krandr.po kickermenu_kate.po kwin.po libtaskmanager.po libkickermenu_tom.po kappfinder.po dockbarextension.po kcmmedia.po filetypes.po kreadconfig.po kio_smtp.po ksplashthemes.po kcmcolors.po display.po kfmclient.po kate.po kcmnotify.po libkonq.po kstyle_keramik_config.po privacy.po kxkb.po kio_finger.po kcontrol.po konqueror.po kcmsamba.po ksmserver.po mediaapplet.po kcmenergy.po kdeprintfax.po kcmview1394.po kio_tar.po kcmxinerama.po libkickermenu_systemmenu.po kjobviewer.po kio_mac.po kcmkwindecoration.po ksplash.po kio_nfs.po ksystemtrayapplet.po htmlsearch.po kwin_lib.po kthememanager.po klipper.po kaccess.po kdepasswd.po kicker.po khtmlkttsd.po kwriteconfig.po kcmkonsole.po kmenuapplet.po kmenuedit.po kcmsmartcard.po kcmkeys.po kcmcgi.po kcmkclock.po Makefile.in kdesu.po kcmstyle.po kcmhtmlsearch.po kcminfo.po kdialog.po kcmcrypto.po libkickermenu_prefmenu.po kio_media.po kminipagerapplet.po kcmkonqhtml.po kcmaccess.po ksysguard.po kdesktop.po kio_floppy.po kcmnic.po kio_nntp.po kdmconfig.po trashapplet.po extensionproxy.po kio_ldap.po ktip.po kcmusb.po kcmperformance.po kdebugdialog.po khotkeys.po kgreet_winbind.po kio_smb.po libkickermenu_kdeprint.po kdmgreet.po knetattach.po nsplugin.po kcmcss.po kio_sftp.po kcmkio.po kcmfonts.po useraccount.po kcmkwm.po kwin_clients.po kio_settings.po libkickermenu_recentdocs.po kdcop.po kcmkdnssd.po libtaskbar.po kcmkurifilt.po kio_pop3.po joystick.po libkicker.po krunapplet.po kcmbackground.po lockout.po kcmkwinrules.po libdmctl.po krdb.po kio_home.po kdesud.po kcmioslaveinfo.po kio_remote.po kgreet_classic.po konsole.po libkickermenu_konsole.po kcmkonq.po kcmspellchecking.po kcmprintmgr.po kio_thumbnail.po kcmbell.po kdeprint_part.po kcmcomponentchooser.po kcmlocale.po kcmarts.po kasbarextension.po kio_system.po kay.po kscreensaver.po khelpcenter.po kprinter.po kpager.po drkonqi.po kcmscreensaver.po kcmlaunch.po kstart.po kcmlayout.po kfindpart.po kio_print.po kcmicons.po quicklauncher.po kio_fish.po clockapplet.po ksystraycmd.po kcmkicker.po kio_trash.po kfontinst.po kcmtaskbar.po naughtyapplet.po Makefile.am kio_man.po kpersonalizer.po kcmkded.po kcmsmserver.po kcmiccconfig.po - - #>+ 469 - kio_sftp.gmo: kio_sftp.po -@@ -1002,15 +1002,18 @@ - kio_smtp.gmo: kio_smtp.po - rm -f kio_smtp.gmo; $(GMSGFMT) -o kio_smtp.gmo $(srcdir)/kio_smtp.po - test ! -f kio_smtp.gmo || touch kio_smtp.gmo -+kcmiccconfig.gmo: kcmiccconfig.po -+ rm -f kcmiccconfig.gmo; $(GMSGFMT) -o kcmiccconfig.gmo $(srcdir)/kcmiccconfig.po -+ test ! -f kcmiccconfig.gmo || touch kcmiccconfig.gmo - - #>+ 3 - clean-nls: -- -rm -f kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo -+ -rm -f kio_sftp.gmo kate.gmo kjobviewer.gmo libkickermenu_konsole.gmo kcmkicker.gmo nsplugin.gmo display.gmo extensionproxy.gmo kdcop.gmo kcmbackground.gmo kstyle_keramik_config.gmo kcmlaunch.gmo kcminfo.gmo kcmkwinrules.gmo kasbarextension.gmo khtmlkttsd.gmo libdmctl.gmo ksplashthemes.gmo kgreet_classic.gmo kcontrol.gmo kmenuapplet.gmo kio_tar.gmo kcmview1394.gmo kcmbell.gmo kcmcomponentchooser.gmo kdmgreet.gmo kdesktop.gmo kpersonalizer.gmo ksplash.gmo kcmaccessibility.gmo kminipagerapplet.gmo kcmkded.gmo kio_remote.gmo kio_home.gmo kdeprintfax.gmo kcmicons.gmo filetypes.gmo kcmenergy.gmo kappfinder.gmo kthememanager.gmo kcmtaskbar.gmo kcmcgi.gmo kio_media.gmo libkickermenu_tom.gmo kio_finger.gmo ktip.gmo kaccess.gmo kio_pop3.gmo kdesud.gmo kio_fish.gmo kicker.gmo kcmkdnssd.gmo krdb.gmo libkickermenu_systemmenu.gmo kcmkio.gmo krunapplet.gmo kcmhtmlsearch.gmo kcmfonts.gmo libtaskbar.gmo useraccount.gmo knetattach.gmo kcmkonsole.gmo appletproxy.gmo dockbarextension.gmo kcmkonq.gmo kio_nntp.gmo kwriteconfig.gmo kio_ldap.gmo konsole.gmo kstart.gmo klipper.gmo kcmspellchecking.gmo kcmkurifilt.gmo kdepasswd.gmo clockapplet.gmo mediaapplet.gmo kdialog.gmo kcmlayout.gmo kpager.gmo kwin_clients.gmo kdebugdialog.gmo kcmnotify.gmo kio_nfs.gmo kcmprintmgr.gmo ksystemtrayapplet.gmo kcmxinerama.gmo kreadconfig.gmo kay.gmo libkickermenu_remotemenu.gmo lockout.gmo kcmkwindecoration.gmo kxkb.gmo kprinter.gmo libtaskmanager.gmo kio_system.gmo trashapplet.gmo kcmcrypto.gmo kcmnic.gmo privacy.gmo libkickermenu_kdeprint.gmo kscreensaver.gmo libkonq.gmo libkickermenu_recentdocs.gmo kmenuedit.gmo kio_trash.gmo kio_floppy.gmo krandr.gmo khotkeys.gmo kcmkclock.gmo kio_man.gmo ksystraycmd.gmo kcmsmartcard.gmo kwin.gmo libkicker.gmo khelpcenter.gmo ksmserver.gmo kgreet_winbind.gmo drkonqi.gmo kwin_lib.gmo kio_settings.gmo ksysguard.gmo kfontinst.gmo kcmscreensaver.gmo konqueror.gmo kdesu.gmo kcmsmserver.gmo kcmcolors.gmo kcminput.gmo kcmlocale.gmo kio_print.gmo kickermenu_kate.gmo kcmstyle.gmo kcmkeys.gmo kcmioslaveinfo.gmo kfmclient.gmo kfindpart.gmo kio_mac.gmo kio_smb.gmo kcmmedia.gmo naughtyapplet.gmo kcmkwm.gmo htmlsearch.gmo kcmcss.gmo kcmusb.gmo kcmperformance.gmo kio_thumbnail.gmo kcmarts.gmo libkickermenu_prefmenu.gmo joystick.gmo kdmconfig.gmo kcmaccess.gmo kcmkonqhtml.gmo quicklauncher.gmo kcmsamba.gmo kdeprint_part.gmo kio_smtp.gmo kcmiccconfig.gmo - - #>+ 10 - install-nls: - $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES -- @for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp ; do \ -+ @for base in kio_sftp kate kjobviewer libkickermenu_konsole kcmkicker nsplugin display extensionproxy kdcop kcmbackground kstyle_keramik_config kcmlaunch kcminfo kcmkwinrules kasbarextension khtmlkttsd libdmctl ksplashthemes kgreet_classic kcontrol kmenuapplet kio_tar kcmview1394 kcmbell kcmcomponentchooser kdmgreet kdesktop kpersonalizer ksplash kcmaccessibility kminipagerapplet kcmkded kio_remote kio_home kdeprintfax kcmicons filetypes kcmenergy kappfinder kthememanager kcmtaskbar kcmcgi kio_media libkickermenu_tom kio_finger ktip kaccess kio_pop3 kdesud kio_fish kicker kcmkdnssd krdb libkickermenu_systemmenu kcmkio krunapplet kcmhtmlsearch kcmfonts libtaskbar useraccount knetattach kcmkonsole appletproxy dockbarextension kcmkonq kio_nntp kwriteconfig kio_ldap konsole kstart klipper kcmspellchecking kcmkurifilt kdepasswd clockapplet mediaapplet kdialog kcmlayout kpager kwin_clients kdebugdialog kcmnotify kio_nfs kcmprintmgr ksystemtrayapplet kcmxinerama kreadconfig kay libkickermenu_remotemenu lockout kcmkwindecoration kxkb kprinter libtaskmanager kio_system trashapplet kcmcrypto kcmnic privacy libkickermenu_kdeprint kscreensaver libkonq libkickermenu_recentdocs kmenuedit kio_trash kio_floppy krandr khotkeys kcmkclock kio_man ksystraycmd kcmsmartcard kwin libkicker khelpcenter ksmserver kgreet_winbind drkonqi kwin_lib kio_settings ksysguard kfontinst kcmscreensaver konqueror kdesu kcmsmserver kcmcolors kcminput kcmlocale kio_print kickermenu_kate kcmstyle kcmkeys kcmioslaveinfo kfmclient kfindpart kio_mac kio_smb kcmmedia naughtyapplet kcmkwm htmlsearch kcmcss kcmusb kcmperformance kio_thumbnail kcmarts libkickermenu_prefmenu joystick kdmconfig kcmaccess kcmkonqhtml quicklauncher kcmsamba kdeprint_part kio_smtp kcmiccconfig ; do \ - echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ - if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ - elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ -@@ -1176,6 +1179,7 @@ - rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmsamba.mo - rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kdeprint_part.mo - rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kio_smtp.mo -+ rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/kcmiccconfig.mo - - #>+ 2 - all-nls: $(GMOFILES) -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-fr-3.5.10.p/messages/kdelibs/kdelibs.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdelibs/kdelibs.po 2008-08-19 20:29:58.000000000 +0200 -+++ kde-i18n-fr-3.5.10/messages/kdelibs/kdelibs.po 2011-12-18 12:19:38.552013274 +0100 -@@ -5557,123 +5557,104 @@ - - #: kdeui/kaboutkde.cpp:34 - msgid "" --"The K Desktop Environment is written and maintained by the KDE Team, a " --"world-wide network of software engineers committed to Trinity Desktop Environment is a fork of the " -+"K Desktop Environment version 3.5, which was originally written by the KDE Team, " -+"a world-wide network of software engineers committed to Free Software " --"development." --"
" --"
No single group, company or organization controls the KDE source code. " --"Everyone is welcome to contribute to KDE." --"
" --"
Visit http://www.kde.org " -+"development.

No single group, company or organization controls the " -+"Trinity source code. Everyone is welcome to contribute to Trinity.

Visit http://www.trinitydesktop.org for more information " -+"about Trinity, and http://www.kde.org " - "for more information on the KDE project. " - msgstr "" --"L'Environnement Bureautique KDE est écrit et maintenu par l'équipe de " --"KDE, des informaticiens du monde entier travaillant sur Internet au " --"développement de " --"logiciels libres." --"
" --"
Aucune société ni organisation ne contrôle le code source de KDE, et chacun " --"est invité à y contribuer." --"
" --"
Visitez http://www.kde.org/fr " -+"L'Environnement Bureautique Trinity est un clone de l'environnement " -+"KDE version 3.5, originellement écrit par l'équipe KDE, des informaticiens " -+"du monde entier travaillant sur Internet au développement de logiciels libres." -+"

Aucune société ni organisation ne contrôle le code source de Trinity, et chacun " -+"est invité à y contribuer.

Visitez " -+"http://www.trinitydesktop.org pour plus d'informations sur Trinity, et http://www.kde.org/fr " - "pour plus d'informations sur le projet KDE." - - #: kdeui/kaboutkde.cpp:43 - msgid "" --"Software can always be improved, and the KDE Team is ready to do so. However, " --"you - the user - must tell us when something does not work as expected or could " --"be done better." --"
" --"
The K Desktop Environment has a bug tracking system. Visit http://bugs.kde.org " --"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs." --"
" --"
If you have a suggestion for improvement then you are welcome to use the " --"bug tracking system to register your wish. Make sure you use the severity " --"called \"Wishlist\"." -+"Software can always be improved, and the Trinity Team is ready to " -+"do so. However, you - the user - must tell us when " -+"something does not work as expected or could be done better.

" -+"The Trinity Desktop Environment has a bug tracking system. Visit " -+"http://bugs.pearsoncomputing.net or " -+"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.

" -+"If you have a suggestion for improvement then you are welcome to use " -+"the bug tracking system to register your wish. Make sure you use the " -+"severity called \"Wishlist\"." - msgstr "" --"Les logiciels peuvent toujours être améliorés et l'équipe KDE est prête à le " -+"Les logiciels peuvent toujours être améliorés et l'équipe Trinity est prête à le " - "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne " --"fonctionne pas correctement ou pourrait être perfectionné." --"
" --"
L'Environnement de Bureau KDE possède un système de suivi des bogues. Allez " --"sur http://bugs.kde.org/ " --"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour " --"signaler les erreurs." --"
" --"
Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " -+"fonctionne pas correctement ou pourrait être perfectionné.

" -+"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez " -+"sur http://bugs.pearsoncomputing.net " -+"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les " -+"erreurs.

Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le " - "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous " - "d'avoir utilisé l'option « Souhait » (wish)." - - #: kdeui/kaboutkde.cpp:54 - msgid "" --"You do not have to be a software developer to be a member of the KDE team. You " --"can join the national teams that translate program interfaces. You can provide " --"graphics, themes, sounds, and improved documentation. You decide!" --"
" --"
Visit http://www.kde.org/jobs/ " -+"You do not have to be a software developer to be a member of the " -+"Trinity team. You can join the national teams that translate " -+"program interfaces. You can provide graphics, themes, sounds, and " -+"improved documentation. You decide!" -+"

" -+"Visit " -+"http://www.trinitydesktop.org/jobs/ " - "for information on some projects in which you can participate." --"
" --"
If you need more information or documentation, then a visit to http://developer.kde.org " -+"

" -+"If you need more information or documentation, then a visit to " -+"http://www.trinitydesktop.org/docs/ " - "will provide you with what you need." - msgstr "" --"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de KDE. " -+"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. " - "Vous pouvez rejoindre les équipes nationales qui traduisent les interfaces des " - "programmes. Vous pouvez réaliser des images, des thèmes, des sons et des " - "documentations enrichies. C'est vous qui décidez !" --"
" --"
Visitez " --"http://www.kde.org/fr/jobs.html pour des informations sur certains projets " --"auxquels vous pouvez participer." --"
" --"
Pour plus d'informations ou de documentations, une visite de http://developer.kde.org/ " -+"

" -+"Visitez " -+"http://www.trinitydesktop.org/jobs/" -+"pour des informations sur certains projets auxquels vous pouvez participer." -+"

" -+"Pour plus d'informations ou de documentations, une visite de http://www.trinitydesktop.org/docs/ " - "devrait vous fournir ce dont vous avez besoin." - - #: kdeui/kaboutkde.cpp:67 - msgid "" --"KDE is available free of charge, but making it is not free." --"
" --"
Thus, the KDE team formed the KDE e.V., a non-profit organization legally " --"founded in Tuebingen, Germany. The KDE e.V. represents the KDE project in legal " --"and financial matters. See " --"http://www.kde-ev.org for information on the KDE e.V." --"
" --"
The KDE team does need financial support. Most of the money is used to " --"reimburse members and others on expenses they experienced when contributing to " --"KDE. You are encouraged to support KDE through a financial donation, using one " --"of the ways described at " --"http://www.kde.org/support/." --"
" --"
Thank you very much in advance for your support." --msgstr "" --"KDE est disponible gratuitement, mais sa réalisation a un coût." --"
" --"
C'est pourquoi l'équipe de KDE a formé l'association KDE, une association à " --"but non lucratif fondée à Tübingen (Allemagne). L'association KDE représente " --"les aspects juridiques et financiers du Projet KDE. Consultez http://www.kde-ev.org/ " --"pour plus d'informations sur l'association KDE." --"
" --"
L'équipe de KDE a besoin d'un appui financier. La majeure partie de ses " -+"Trinity is available free of charge, but making it is not free.

" -+"

" -+"The Trinity team does need financial support. Most of the money is used to " -+"reimburse members and others on expenses they experienced when " -+"contributing to Trinity. You are encouraged to support Trinity through a financial " -+"donation, using one of the ways described at " -+"http://www.trinitydesktop.org/donate.php." -+"

Thank you very much in advance for your support!" -+msgstr "" -+"Trinity est disponible gratuitement, mais sa réalisation a un coût." -+"

" -+"
L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses " - "fonds sert à rembourser les membres et d'autres intervenants des dépenses " --"qu'ils ont engagées lors de leur contribution à KDE. Pour apporter votre " --"participation financière à KDE, utilisez l'une des possibilités décrites à " --"l'adresse http://www.kde.org/support/." --"
" --"
Nous vous remercions vivement de votre soutien." -+"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre " -+"participation financière à Trinity, utilisez l'une des possibilités décrites à " -+"l'adresse http://www.trinitydesktop.org/donate.php." -+"

Nous vous remercions vivement de votre soutien." - - #: kdeui/kaboutkde.cpp:81 - #, c-format --msgid "K Desktop Environment. Release %1" --msgstr "Environnement de bureau KDE. Version %1" -+msgid "Trinity Desktop Environment. Release %1" -+msgstr "Environnement de bureau Trinity. Version %1" - - #: kdeui/kaboutkde.cpp:83 - msgid "" --"_: About KDE\n" -+"_: About Trinity\n" - "&About" - msgstr "À &propos" - -@@ -5682,12 +5663,12 @@ - msgstr "Rapport de bogues et &souhaits" - - #: kdeui/kaboutkde.cpp:85 --msgid "&Join the KDE Team" --msgstr "Re&joignez l'équipe de KDE" -+msgid "&Join the Trinity Team" -+msgstr "Re&joignez l'équipe de Trinity" - - #: kdeui/kaboutkde.cpp:86 --msgid "&Support KDE" --msgstr "&Soutenez KDE" -+msgid "&Support Trinity" -+msgstr "&Soutenez Trinity" - - #: kdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804 - msgid "&Yes" -@@ -6286,6 +6267,10 @@ - msgid "&Browse..." - msgstr "&Parcourir..." - -+#: kdeui/kdialog.cpp:428 -+msgid "Please wait..." -+msgstr "Veuillez patienter ..." -+ - #: kdeui/kdialogbase.cpp:636 - msgid "&Try" - msgstr "&Essayer" -@@ -6623,8 +6608,8 @@ - msgstr "À &propos de : %1" - - #: kdeui/khelpmenu.cpp:176 kdeui/kstdaction_p.h:114 --msgid "About &KDE" --msgstr "À propos de &KDE" -+msgid "About &Trinity" -+msgstr "À propos de &Trinity" - - #: kdeui/kactionclasses.cpp:2072 - msgid "Exit F&ull Screen Mode" -diff -Nuar kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kcontrol.po 2011-12-18 22:34:04.982863520 +0100 -+++ kde-i18n-fr-3.5.10/messages/kdebase/kcontrol.po 2011-12-18 22:40:37.574949536 +0100 -@@ -34,8 +34,8 @@ - msgstr "duranceau@kde.org,caulier.gilles@free.fr,cousin@kde.org,kde@macolu.org" - - #: aboutwidget.cpp:43 main.cpp:104 --msgid "KDE Control Center" --msgstr "Centre de configuration de KDE" -+msgid "Trinity Control Center" -+msgstr "Centre de configuration de Trinity" - - #: aboutwidget.cpp:45 - msgid "Configure your desktop environment." -@@ -43,17 +43,17 @@ - - #: aboutwidget.cpp:47 - msgid "" --"Welcome to the \"KDE Control Center\", a central place to configure your " -+"Welcome to the \"Trinity Control Center\", a central place to configure your " - "desktop environment. Select an item from the index on the left to load a " - "configuration module." - msgstr "" --"Bienvenue dans le « Centre de configuration de KDE », l'endroit où configurer " -+"Bienvenue dans le « Centre de configuration de Trinity », l'endroit où configurer " - "votre environnement. Sélectionnez un élément dans l'index à gauche pour charger " - "le module de configuration correspondant." - - #: aboutwidget.cpp:53 main.cpp:108 --msgid "KDE Info Center" --msgstr "Centre d'informations de KDE" -+msgid "Trinity Info Center" -+msgstr "Centre d'informations de Trinity" - - #: aboutwidget.cpp:55 - msgid "Get system and desktop environment information" -@@ -61,10 +61,10 @@ - - #: aboutwidget.cpp:57 - msgid "" --"Welcome to the \"KDE Info Center\", a central place to find information about " -+"Welcome to the \"Trinity Info Center\", a central place to find information about " - "your computer system." - msgstr "" --"Bienvenue dans le « Centre d'informations de KDE », l'endroit où trouver des " -+"Bienvenue dans le « Centre d'informations de Trinity », l'endroit où trouver des " - "informations sur votre système." - - #: aboutwidget.cpp:61 -@@ -76,8 +76,8 @@ - "configuration particulière." - - #: aboutwidget.cpp:64 --msgid "KDE version:" --msgstr "Version de KDE :" -+msgid "Trinity version:" -+msgstr "Version de Trinity :" - - #: aboutwidget.cpp:65 - msgid "User:" -@@ -137,13 +137,13 @@ - - #: helpwidget.cpp:51 - msgid "" --"

KDE Info Center

There is no quick help available for the active info " -+"

Trinity Info Center

There is no quick help available for the active info " - "module." - "
" - "
Click here " - "to read the general Info Center manual." - msgstr "" --"

Centre d'informations de KDE

Désolé, aucune aide rapide n'est " -+"

Centre d'informations de Trinity

Désolé, aucune aide rapide n'est " - "disponible pour le module d'information courant." - "
" - "
Cliquez ici " -@@ -151,13 +151,13 @@ - - #: helpwidget.cpp:56 - msgid "" --"

KDE Control Center

There is no quick help available for the active " -+"

Trinity Control Center

There is no quick help available for the active " - "control module." - "
" - "
Click here " - "to read the general Control Center manual." - msgstr "" --"

Centre de configuration de KDE

Désolé, aucune aide rapide n'est " -+"

Centre de configuration de Trinity

Désolé, aucune aide rapide n'est " - "disponible pour le module de configuration courant." - "
" - "
Cliquez ici " -@@ -173,16 +173,16 @@ - "
Cliquez sur le bouton « Mode superutilisateur » ci-dessous." - - #: main.cpp:105 --msgid "The KDE Control Center" --msgstr "Le Centre de configuration de KDE" -+msgid "The Trinity Control Center" -+msgstr "Le Centre de configuration de Trinity" - - #: main.cpp:106 main.cpp:110 - msgid "(c) 1998-2004, The KDE Control Center Developers" - msgstr "(c) 1998-2004, Les développeurs du Centre de configuration de KDE" - - #: main.cpp:109 --msgid "The KDE Info Center" --msgstr "Le Centre d'informations de KDE" -+msgid "The Trinity Info Center" -+msgstr "Le Centre d'informations de Trinity" - - #: main.cpp:128 main.cpp:130 - msgid "Current Maintainer" ---- kde-i18n-fr-3.5.10.ORI/messages/kdebase/kpersonalizer.po 2011-12-19 21:25:27.471340645 +0100 -+++ kde-i18n-fr-3.5.10/messages/kdebase/kpersonalizer.po 2011-12-19 21:29:05.386322708 +0100 -@@ -79,8 +79,8 @@ - msgstr "Le style Platinium" - - #: kcountrypage.cpp:48 --msgid "

Welcome to KDE %1

" --msgstr "

Bienvenue dans KDE %1

" -+msgid "

Welcome to Trinity %1

" -+msgstr "

Bienvenue dans Trinity %1

" - - #: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82 - msgid "without name" -@@ -111,8 +111,8 @@ - msgstr "L'assistant se redémarre lui-même" - - #: main.cpp:32 --msgid "Personalizer is running before KDE session" --msgstr "L'assistant démarre avant la session KDE elle-même" -+msgid "Personalizer is running before Trinity session" -+msgstr "L'assistant démarre avant la session Trinity elle-même" - - #: kpersonalizer.cpp:67 - msgid "Step 1: Introduction" -@@ -141,13 +141,13 @@ - #: kpersonalizer.cpp:152 - msgid "" - "

Are you sure you want to quit the Desktop Settings Wizard?

" --"

The Desktop Settings Wizard helps you to configure the KDE desktop to your " -+"

The Desktop Settings Wizard helps you to configure the Trinity desktop to your " - "personal liking.

" - "

Click Cancel to return and finish your setup.

" - msgstr "" - "

Voulez-vous vraiment quitter l'assistant de configuration du bureau ?

" - "

L'assistant de configuration du bureau vous aide à configurer le bureau de " --"KDE selon vos convenances.

" -+"Trinity selon vos convenances.

" - "

Cliquez sur « Annuler » pour retourner et terminer vos réglages.

" - - #: kpersonalizer.cpp:156 -@@ -171,14 +171,14 @@ - "
Titlebar double-click: Shade window" - "
Mouse selection: Single click" - "
Application startup notification: busy cursor" --"
Keyboard scheme: KDE default" -+"
Keyboard scheme: Trinity default" - "
" - msgstr "" - "Activation des fenêtres : Cliquer pour avoir le focus" - "
Double-clic sur la barre de titre : Enroule la fenêtre" - "
Sélection par la souris : Simple clic" - "
Notification de démarrage des applications : Curseur occupé" --"
Actions du clavier : KDE par défaut" -+"
Actions du clavier : Trinity par défaut" - "
" - - #: kospage.cpp:364 -@@ -320,34 +320,34 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"

This Personalizer will help you configure the basic setup of your KDE " -+"

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.

\n" --"

You will be able to change all the settings later using the KDE Control " -+"

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 Skip Wizard. 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.

\n" --"

If you already like your KDE configuration and wish to quit the Wizard, " -+"

If you already like your Trinity configuration and wish to quit the Wizard, " - "click Skip Wizard, then Quit.

" - msgstr "" - "

Cet assistant vous aidera à configurer les réglages de base de votre bureau " --"KDE en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays " -+"Trinity en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays " - "(pour les formats de date et d'heure, etc.), votre langue, le comportement du " - "bureau et plein d'autres encore.

\n" - "

Vous pourrez changer tous ces réglages ultérieurement en utilisant le Centre " --"de configuration de KDE. Vous pouvez choisir de différer votre personnalisation " -+"de configuration de Trinity. Vous pouvez choisir de différer votre personnalisation " - "en cliquant sur « Passer l'assistant ». Cependant, il est conseillé pour " - "les nouveaux utilisateurs d'utiliser cette méthode.

\n" --"

Si votre configuration de KDE est déjà à votre goût et que vous désirez " -+"

Si votre configuration de Trinity est déjà à votre goût et que vous désirez " - "quitter l'assistant, cliquez sur « Passer l'assistant » puis sur  « " - "Quitter ».

" - - #. i18n: file kcountrypagedlg.ui line 100 - #: rc.cpp:11 - #, no-c-format --msgid "

Welcome to KDE %VERSION%!

" --msgstr "

Bienvenue dans KDE %VERSION% !

" -+msgid "

Welcome to Trinity %VERSION%!

" -+msgstr "

Bienvenue dans Trinity %VERSION% !

" - - #. i18n: file kcountrypagedlg.ui line 148 - #: rc.cpp:14 -@@ -359,14 +359,14 @@ - #: rc.cpp:17 - #, no-c-format - msgid "" --"

KDE offers many visually appealing special effects, such as smoothed fonts, " -+"

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.

\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." - msgstr "" --"

KDE offre de nombreux effets visuels, comme les polices lissées, les aperçus " -+"

Trinity offre de nombreux effets visuels, comme les polices lissées, les aperçus " - "dans le gestionnaire de fichiers et les menus animés. Toutes ces choses " - "superbes ont un coût en termes de performances.

\n" - "Si vous avez un processeur récent et rapide, vous pouvez toutes les activer, " -@@ -426,8 +426,8 @@ - #. i18n: file kospagedlg.ui line 79 - #: rc.cpp:44 - #, no-c-format --msgid "KDE (TM)" --msgstr "KDE ™" -+msgid "Trinity (TM)" -+msgstr "Trinity" - - #. i18n: file kospagedlg.ui line 90 - #: rc.cpp:47 -@@ -454,22 +454,22 @@ - "System Behavior" - "
\n" - "Graphical User Interfaces behave differently on various Operating Systems.\n" --"KDE allows you to customize its behavior according to your needs." -+"Trinity allows you to customize its behavior according to your needs." - msgstr "" - "Comportement du système" - "
\n" - "Les interfaces utilisateur graphiques se comportent différemment sur les " - "différents systèmes d'exploitation.\n" --"KDE vous permet de personnaliser son comportement selon vos désirs." -+"Trinity vous permet de personnaliser son comportement selon vos désirs." - - #. i18n: file kospagedlg.ui line 168 - #: rc.cpp:61 - #, no-c-format - msgid "" --"For motion impaired users, KDE provides keyboard gestures to activate special " -+"For motion impaired users, Trinity provides keyboard gestures to activate special " - "keyboard settings." - msgstr "" --"Pour les utilisateurs à déplacement réduit, KDE fournit des gestes permettant " -+"Pour les utilisateurs à déplacement réduit, Trinity fournit des gestes permettant " - "d'activer des réglages spéciaux du clavier." - - #. i18n: file kospagedlg.ui line 179 -@@ -494,26 +494,26 @@ - #: rc.cpp:71 - #, no-c-format - msgid "" --"You can refine the settings you made by starting the KDE Control Center by " -+"You can refine the settings you made by starting the Trinity Control Center by " - "choosing the entry Control Center in the K menu." - msgstr "" - "Vous pouvez affiner les réglages que vous avez faits en lançant le " --"Centre de configuration de KDE en choisissant l'entrée " -+"Centre de configuration de Trinity en choisissant l'entrée " - "Centre de configuration du menu K." - - #. i18n: file krefinepagedlg.ui line 133 - #: rc.cpp:74 - #, no-c-format --msgid "You can also start the KDE Control Center using the button below." -+msgid "You can also start the Trinity Control Center using the button below." - msgstr "" --"Vous pouvez également démarrer le Centre de configuration de KDE à l'aide du " -+"Vous pouvez également démarrer le Centre de configuration de Trinity à l'aide du " - "bouton ci-dessous." - - #. i18n: file krefinepagedlg.ui line 203 - #: rc.cpp:77 - #, no-c-format --msgid "&Launch KDE Control Center" --msgstr "&Lancer le Centre de configuration de KDE" -+msgid "&Launch Trinity Control Center" -+msgstr "&Lancer le Centre de configuration de Trinity" - - #. i18n: file kstylepagedlg.ui line 32 - #: rc.cpp:80 ---- kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po.ORI 2011-12-19 21:45:36.416030332 +0100 -+++ kde-i18n-fr-3.5.10/messages/kdebase/konqueror.po 2011-12-19 21:51:16.528801717 +0100 -@@ -1203,6 +1203,9 @@ - msgid "Open in &New Tab" - msgstr "Ouvrir dans un &nouvel onglet" - -+msgid "Open in &Background Tab" -+msgstr "Ouvrir dans un onglet en arrière-&plan" -+ - #: konq_mainwindow.cc:4689 - msgid "Open the document in a new tab" - msgstr "Ouvrir le document dans un nouvel onglet" diff --git a/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch b/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch deleted file mode 100644 index 11b9fe1ca..000000000 --- a/redhat/kde-i18n/kde-i18n-3.5.13-add_zh_TW_translations.patch +++ /dev/null @@ -1,136888 +0,0 @@ -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/entry.desktop kde-i18n-zh_TW-3.5.10/messages/entry.desktop ---- kde-i18n-zh_TW-3.5.10.ORI/messages/entry.desktop 2008-08-19 20:43:27.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/entry.desktop 2011-11-11 15:45:03.000000000 +0100 -@@ -83,5 +83,5 @@ - Name[wa]=Chinwès - Name[zh_CN]=繁体中文 - Name[zh_HK]=繁體中文 --Name[zh_TW]=繁體中文 -+Name[zh_TW]=傳統字漢語 - Name[zu]=Isi-Shayina -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kbstateapplet.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kbstateapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kbstateapplet.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kbstateapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kbstateapplet\n" - "POT-Creation-Date: 2005-10-02 02:46+0200\n" - "PO-Revision-Date: 2006-06-06 10:17+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -128,15 +127,15 @@ - - #: kbstate.cpp:158 - msgid "Configure AccessX Features..." --msgstr "設定 AccessX 功能..." -+msgstr "設定 AccessX 功能…" - - #: kbstate.cpp:159 - msgid "Configure Keyboard..." --msgstr "設定鍵盤..." -+msgstr "設定鍵盤…" - - #: kbstate.cpp:160 - msgid "Configure Mouse..." --msgstr "設定滑鼠..." -+msgstr "設定滑鼠…" - - #: kbstate.cpp:572 kbstate.cpp:586 kbstate.cpp:590 kbstate.cpp:1030 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmag.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmag.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmag.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmag.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kmag\n" - "POT-Creation-Date: 2006-05-28 04:04+0200\n" - "PO-Revision-Date: 2006-06-19 09:03+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -120,14 +119,15 @@ - - #: kmag.cpp:136 - msgid "" --"Clicking on this icon will start / stop " --"updating of the display. Stopping the update will zero the processing power " --"required (CPU usage)" --msgstr "點選此圖示會開始/停止更新顯示。停止更新會讓 CPU 使用率歸零。" -+"Clicking on this icon will start / stop updating of the " -+"display. Stopping the update will zero the processing power required (CPU " -+"usage)" -+msgstr "" -+"點選此圖示會開始/停止更新顯示。停止更新會讓 CPU 使用率歸零。" - - #: kmag.cpp:140 - msgid "&Save Snapshot As..." --msgstr "儲存畫面快照為(&S)..." -+msgstr "儲存畫面快照為(&S)…" - - #: kmag.cpp:142 - msgid "Saves the zoomed view to an image file." -@@ -147,8 +147,8 @@ - - #: kmag.cpp:153 - msgid "" --"Click on this button to copy the current zoomed view to the clipboard which you " --"can paste in other applications." -+"Click on this button to copy the current zoomed view to the clipboard which " -+"you can paste in other applications." - msgstr "點選此鍵以複製目前的放大畫面到剪貼簿中，您可以貼到其它的應用程式中。" - - #: kmag.cpp:154 -@@ -263,7 +263,8 @@ - - #: kmag.cpp:205 - msgid "" --"In this mode the area around the mouse is magnified to the bottom screen edge." -+"In this mode the area around the mouse is magnified to the bottom screen " -+"edge." - msgstr "在這個模式下，滑鼠周邊的區域會放大到底端螢幕邊緣。" - - #: kmag.cpp:207 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmousetool.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmousetool.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmousetool.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmousetool.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kmousetool\n" - "POT-Creation-Date: 2005-02-17 01:26+0100\n" - "PO-Revision-Date: 2003-07-14 21:32+0800\n" --"Last-Translator: Keng-Tso Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,7 +33,9 @@ - "There are unsaved changes in the active module.\n" - "Do you want to apply the changes before closing the configuration window or " - "discard the changes?" --msgstr "目前的模組有未儲存的變更。
您想要在關閉設定視窗前 套用這些變更或者捨棄這些變更？" -+msgstr "" -+"目前的模組有未儲存的變更。
您想要在關閉設定視窗前 套用這些變更或者捨棄這些" -+"變更？" - - #: kmousetool.cpp:560 - msgid "Closing Configuration Window" -@@ -44,7 +46,9 @@ - "There are unsaved changes in the active module.\n" - "Do you want to apply the changes before quitting KMousetool or discard the " - "changes?" --msgstr "目前的模組有未儲存的變更。
您想要在離開KMousetool前 套用這些變更或者捨棄這些變更？" -+msgstr "" -+"目前的模組有未儲存的變更。
您想要在離開KMousetool前 套用這些變更或者捨棄這" -+"些變更？" - - #: kmousetool.cpp:579 - msgid "Quitting KMousetool" -@@ -52,7 +56,7 @@ - - #: kmousetool.cpp:616 - msgid "&Configure KMouseTool..." --msgstr "設定 KMouseTool...（&C）" -+msgstr "設定 KMouseTool…（&C）" - - #: kmousetool.cpp:619 - msgid "KMousetool &Handbook" -@@ -150,9 +154,11 @@ - #: rc.cpp:39 - #, no-c-format - msgid "" --"KMouseTool will run as a background application after you close this dialog. To " --"change the settings again, restart KMouseTool or use the KDE system tray." --msgstr "KMouseTool 在您關閉這個對話框後，將在背景中執行。要再改變設定，請重新啟動 KMouseTool 或者使用 KDE 系統工具列。" -+"KMouseTool will run as a background application after you close this dialog. " -+"To change the settings again, restart KMouseTool or use the KDE system tray." -+msgstr "" -+"KMouseTool 在您關閉這個對話框後，將在背景中執行。要再改變設定，請重新啟動 " -+"KMouseTool 或者使用 KDE 系統工具列。" - - #~ msgid "Start" - #~ msgstr "開始" -@@ -176,14 +182,39 @@ - #~ msgid "Please enter a number between %1 and %2 for the dwell time." - #~ msgstr "請輸入介於 %1 和 %2 之間的數字為停留時間。" - --#~ msgid "

KMouseTool is written and maintained by Jeff Roush.

For more information, see the man page for kmousetool or the KDE documentation, both of which should have been installed with the program, or see www.mousetool.com.

This program is licensed under the GPL. In addition, by using this program, you agree not to hold the author of the program responsible for any damage it may cause.

" --#~ msgstr "

KMouseTool撰寫者及維護者為Jeff Roush.

想獲取更多資訊，請參見kmousetool的man page 或者KDE文件，這兩者應該都已隨程式一同安裝，或者參閱 www.mousetool.com.

這個程式是 以GPL的形式授權。另外，使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害的 責任。

" -+#~ msgid "" -+#~ "

KMouseTool is written and maintained by Jeff Roush.

For more information, see " -+#~ "the man page for kmousetool or the KDE documentation, both of " -+#~ "which should have been installed with the program, or see www.mousetool.com.

This program " -+#~ "is licensed under the GPL. In addition, by using this program, you agree " -+#~ "not to hold the author of the program responsible for any damage it may " -+#~ "cause.

" -+#~ msgstr "" -+#~ "

KMouseTool撰寫者及維護者為Jeff Roush.

想獲取更多資訊，請參見kmousetool的man " -+#~ "page 或者KDE文件，這兩者應該都已隨程式一同安裝，或者參閱 www.mousetool.com.

這個程式是 以GPL的形式" -+#~ "授權。另外，使用這個程式表示您同意不追究作者任何因使用這個程式所導致損害" -+#~ "的 責任。

" - --#~ msgid "If you have any ideas on how to improve this program, post them to the KDE Accessibility Mailing List, or send them directly to me, at Jeff Roush. " --#~ msgstr "如果您有任何改善這個程式的想法，請將您的想法貼到KDE Accessibility Mailing List，或者直接將您的想法直接寄給作者Jeff Roush. " -+#~ msgid "" -+#~ "If you have any ideas on how to improve this program, post them to the " -+#~ "KDE Accessibility Mailing List, or send them directly to me, at Jeff Roush. " -+#~ msgstr "" -+#~ "如果您有任何改善這個程式的想法，請將您的想法貼到KDE Accessibility Mailing " -+#~ "List，或者直接將您的想法直接寄給作者Jeff Roush. " - --#~ msgid "

This program is distributed under the GPL, the GNU Public License.

A copy of this license should have been installed along with the program.

" --#~ msgstr "

本程式是以GPL(GNU Public License)形式散佈。

這個授權書的副本應該已隨同程式安裝。

" -+#~ msgid "" -+#~ "

This program is distributed under the GPL, the GNU Public License.

A copy of this license should have been installed along with the " -+#~ "program.

" -+#~ msgstr "" -+#~ "

本程式是以GPL(GNU Public License)形式散布。

這個授權書的副本應該" -+#~ "已隨同程式安裝。

" - - #~ msgid "KMouseTool Version %1" - #~ msgstr "KMouseTool 版本 %1" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmouth.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmouth.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kmouth.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kmouth.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kmouth\n" - "POT-Creation-Date: 2005-07-24 01:41+0200\n" - "PO-Revision-Date: 2006-06-06 10:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -62,39 +61,39 @@ - - #: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291 - msgid "Parsing the KDE documentation..." --msgstr "分析 KDE 文件..." -+msgstr "分析 KDE 文件…" - - #: wordcompletion/wordlist.cpp:238 - msgid "Merging dictionaries..." --msgstr "合併字典..." -+msgstr "合併字典…" - - #: wordcompletion/wordlist.cpp:305 - msgid "Parsing file..." --msgstr "分析檔案..." -+msgstr "分析檔案…" - - #: wordcompletion/wordlist.cpp:315 - msgid "Parsing directory..." --msgstr "分析資料夾..." -+msgstr "分析資料夾…" - - #: wordcompletion/wordlist.cpp:504 - msgid "Performing spell check..." --msgstr "進行拼字檢查..." -+msgstr "進行拼字檢查…" - - #. i18n: file wordcompletion/kdedocsourceui.ui line 68 - #: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14 - #, no-c-format - msgid "" - "With this combo box you select which of the installed languages is used for " --"creating the new dictionary. KMouth will only parse documentation files of this " --"language." -+"creating the new dictionary. KMouth will only parse documentation files of " -+"this language." - msgstr "您可以在此選擇要建立新字典的語言。KMouth 將只分析此語言的文件檔。" - - #. i18n: file wordcompletion/creationsourcedetailsui.ui line 144 - #: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15 - #, no-c-format - msgid "" --"With this combo box you decide which language should be associated with the new " --"dictionary." -+"With this combo box you decide which language should be associated with the " -+"new dictionary." - msgstr "您可以在此決定新字典使用的語言。" - - #: wordcompletion/creationsourcedetailsui.ui.h:18 -@@ -134,8 +133,8 @@ - #: wordcompletion/dictionarycreationwizard.cpp:64 - #: wordcompletion/dictionarycreationwizard.cpp:66 - msgid "" --"With this input field you specify which directory you want to load for creating " --"the new dictionary." -+"With this input field you specify which directory you want to load for " -+"creating the new dictionary." - msgstr "您可以在此指定您要載入哪個字典以建立新字典。" - - #: wordcompletion/dictionarycreationwizard.cpp:238 -@@ -186,7 +185,7 @@ - - #: kmouth.cpp:98 - msgid "&Open as History..." --msgstr "開啟為歷史紀錄(&O)..." -+msgstr "開啟為歷史紀錄(&O)…" - - #: kmouth.cpp:99 kmouth.cpp:100 - msgid "Opens an existing file as history" -@@ -194,15 +193,15 @@ - - #: kmouth.cpp:102 - msgid "Save &History As..." --msgstr "另存歷史紀錄為(&H)..." -+msgstr "另存歷史紀錄為(&H)…" - - #: kmouth.cpp:103 kmouth.cpp:104 - msgid "Saves the actual history as..." --msgstr "另存目前的歷史紀錄為..." -+msgstr "另存目前的歷史紀錄為…" - - #: kmouth.cpp:106 - msgid "&Print History..." --msgstr "列印歷史紀錄(&P)..." -+msgstr "列印歷史紀錄(&P)…" - - #: kmouth.cpp:107 kmouth.cpp:108 - msgid "Prints out the actual history" -@@ -218,10 +217,12 @@ - - #: kmouth.cpp:117 - msgid "" --"Cuts the selected section and puts it to the clipboard. If there is some text " --"selected in the edit field it is placed it on the clipboard. Otherwise the " --"selected sentences in the history (if any) are placed on the clipboard." --msgstr "剪下選取至剪貼簿。如果編輯區有本文被選取，它將被剪貼到剪貼簿。否則在歷史紀錄中被選取的句子(如果有的話)將被剪貼到剪貼簿。" -+"Cuts the selected section and puts it to the clipboard. If there is some " -+"text selected in the edit field it is placed it on the clipboard. Otherwise " -+"the selected sentences in the history (if any) are placed on the clipboard." -+msgstr "" -+"剪下選取至剪貼簿。如果編輯區有本文被選取，它將被剪貼到剪貼簿。否則在歷史紀錄" -+"中被選取的句子(如果有的話)將被剪貼到剪貼簿。" - - #: kmouth.cpp:120 - msgid "Copies the selected section to the clipboard" -@@ -229,10 +230,12 @@ - - #: kmouth.cpp:121 - msgid "" --"Copies the selected section to the clipboard. If there is some text selected in " --"the edit field it is copied to the clipboard. Otherwise the selected sentences " --"in the history (if any) are copied to the clipboard." --msgstr "複製選取至剪貼簿。如果編輯區有本文被選取，它將被複製到剪貼簿。否則在歷史紀錄中被選取的句子(如果有的話)將被複製到剪貼簿。" -+"Copies the selected section to the clipboard. If there is some text selected " -+"in the edit field it is copied to the clipboard. Otherwise the selected " -+"sentences in the history (if any) are copied to the clipboard." -+msgstr "" -+"複製選取至剪貼簿。如果編輯區有本文被選取，它將被複製到剪貼簿。否則在歷史紀錄" -+"中被選取的句子(如果有的話)將被複製到剪貼簿。" - - #: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371 - #: phrasebook/phrasebookdialog.cpp:372 -@@ -258,11 +261,13 @@ - "Speaks the currently active sentence(s). If there is some text in the edit " - "field it is spoken. Otherwise the selected sentences in the history (if any) " - "are spoken." --msgstr "朗讀目前動態中的句子。如果編輯區內有文字，它將會被朗讀。否則歷史紀錄中的句子(如果有的話)將會被朗讀。" -+msgstr "" -+"朗讀目前動態中的句子。如果編輯區內有文字，它將會被朗讀。否則歷史紀錄中的句子" -+"(如果有的話)將會被朗讀。" - - #: kmouth.cpp:132 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: kmouth.cpp:137 kmouth.cpp:138 - msgid "Enables/disables the toolbar" -@@ -282,7 +287,7 @@ - - #: kmouth.cpp:148 - msgid "&Configure KMouth..." --msgstr "設定 Kmouth(&C)..." -+msgstr "設定 Kmouth(&C)…" - - #: kmouth.cpp:149 kmouth.cpp:150 - msgid "Opens the configuration dialog" -@@ -333,35 +338,35 @@ - - #: kmouth.cpp:207 kmouth.cpp:309 - msgid "Opening file..." --msgstr "正在開啟檔案..." -+msgstr "正在開啟檔案…" - - #: kmouth.cpp:317 - msgid "Saving history with a new filename..." --msgstr "以新檔名儲存歷史紀錄..." -+msgstr "以新檔名儲存歷史紀錄…" - - #: kmouth.cpp:326 - msgid "Printing..." --msgstr "正在列印..." -+msgstr "正在列印…" - - #: kmouth.cpp:339 - msgid "Exiting..." --msgstr "正在退出..." -+msgstr "正在退出…" - - #: kmouth.cpp:373 - msgid "Toggling menubar..." --msgstr "切換選單列..." -+msgstr "切換選單列…" - - #: kmouth.cpp:385 - msgid "Toggling toolbar..." --msgstr "切換工具列..." -+msgstr "切換工具列…" - - #: kmouth.cpp:402 - msgid "Toggling phrasebook bar..." --msgstr "切換片語書列..." -+msgstr "切換片語書列…" - - #: kmouth.cpp:419 - msgid "Toggle the statusbar..." --msgstr "切換狀態列..." -+msgstr "切換狀態列…" - - #: _translatorinfo.cpp:1 - msgid "" -@@ -415,7 +420,8 @@ - msgid "" - "This combo box specifies whether selected phrases of the phrase book are " - "immediately spoken or just inserted into the edit field." --msgstr "這個下拉式清單方塊指定片語書中所選取的片語是要立即朗讀或者是插入到編輯區。" -+msgstr "" -+"這個下拉式清單方塊指定片語書中所選取的片語是要立即朗讀或者是插入到編輯區。" - - #. i18n: file preferencesui.ui line 75 - #: rc.cpp:24 rc.cpp:113 -@@ -500,7 +506,8 @@ - #: rc.cpp:74 rc.cpp:77 rc.cpp:163 rc.cpp:166 - #, no-c-format - msgid "" --"This combo box specifies which character encoding is used for passing the text." -+"This combo box specifies which character encoding is used for passing the " -+"text." - msgstr "這個下拉式清單方塊指定傳遞本文時用的字元編碼。" - - #. i18n: file texttospeechconfigurationui.ui line 141 -@@ -527,13 +534,13 @@ - #: rc.cpp:89 rc.cpp:178 - #, no-c-format - msgid "" --"This check box specifies KMouth tries to use the KTTSD speech service prior to " --"calling the speech synthesizer directly. The KTTSD speech service is a KDE " --"daemon which gives KDE applications a standardized interface for speech " -+"This check box specifies KMouth tries to use the KTTSD speech service prior " -+"to calling the speech synthesizer directly. The KTTSD speech service is a " -+"KDE daemon which gives KDE applications a standardized interface for speech " - "synthesis and is currently developed in CVS." - msgstr "" --"勾選此選項的話，KMouth 會試著先使用 KTTSD 語音服務，而不是直接呼叫語音合成器。KTTSD 語音服務提供 KDE " --"應用程式一個標準化的語音合成介面，並且正在開發中。" -+"勾選此選項的話，KMouth 會試著先使用 KTTSD 語音服務，而不是直接呼叫語音合成" -+"器。KTTSD 語音服務提供 KDE 應用程式一個標準化的語音合成介面，並且正在開發中。" - - #. i18n: file phrasebook/buttonboxui.ui line 16 - #: rc.cpp:181 -@@ -551,8 +558,8 @@ - #: rc.cpp:187 rc.cpp:208 - #, no-c-format - msgid "" --"With this line edit you define the name of a sub-phrasebook or the contents of " --"a phrase." -+"With this line edit you define the name of a sub-phrasebook or the contents " -+"of a phrase." - msgstr "您可以在此定義片語書的名稱，或是片語的內容。" - - #. i18n: file phrasebook/buttonboxui.ui line 63 -@@ -565,8 +572,8 @@ - #: rc.cpp:193 - #, no-c-format - msgid "" --"If you select this option then the selected phrase will not be reachable by a " --"keyboard shortcut." -+"If you select this option then the selected phrase will not be reachable by " -+"a keyboard shortcut." - msgstr "如果選擇此選項，所選取的片語就不能使用鍵盤快速鍵。" - - #. i18n: file phrasebook/buttonboxui.ui line 74 -@@ -582,7 +589,9 @@ - "If you select this option then the selected phrase will be reachable by a " - "keyboard shortcut. You can change the shortcut with the button next to this " - "option." --msgstr "如果選取此選項，所選取的片語可以使用鍵盤快速鍵。您可以用按鍵來改變快速鍵定義。" -+msgstr "" -+"如果選取此選項，所選取的片語可以使用鍵盤快速鍵。您可以用按鍵來改變快速鍵定" -+"義。" - - #. i18n: file phrasebook/buttonboxui.ui line 85 - #: rc.cpp:202 -@@ -615,8 +624,8 @@ - #: rc.cpp:220 rc.cpp:232 - #, no-c-format - msgid "" --"With this combo box you select the character encoding used to load text files. " --"This combo box is not used for XML files or for dictionary files." -+"With this combo box you select the character encoding used to load text " -+"files. This combo box is not used for XML files or for dictionary files." - msgstr "您可以在此選擇要載入文字檔的字元編碼。這不是用於 XML 檔或字典檔。" - - #. i18n: file wordcompletion/creationsourcedetailsui.ui line 68 -@@ -629,16 +638,16 @@ - #: rc.cpp:226 rc.cpp:229 - #, no-c-format - msgid "" --"With this input field you specify which file you want to load for creating the " --"new dictionary." -+"With this input field you specify which file you want to load for creating " -+"the new dictionary." - msgstr "您可以在此指定您要載入以建立新字典的檔案。" - - #. i18n: file wordcompletion/creationsourcedetailsui.ui line 125 - #: rc.cpp:235 rc.cpp:286 - #, no-c-format - msgid "" --"With this input field you select the OpenOffice.org directory that will be used " --"to spellcheck the words of the new dictionary." -+"With this input field you select the OpenOffice.org directory that will be " -+"used to spellcheck the words of the new dictionary." - msgstr "您可以在此選擇要用於拼字檢查的 OpenOffice.org 字典。" - - #. i18n: file wordcompletion/creationsourcedetailsui.ui line 141 -@@ -659,7 +668,8 @@ - msgid "" - "If you select this box a new dictionary is created by either loading a " - "dictionary file or by counting the individual words in a text." --msgstr "如果選取此選項，會以載入一個字典檔或計算本文中個別單字的方式建立新字典。" -+msgstr "" -+"如果選取此選項，會以載入一個字典檔或計算本文中個別單字的方式建立新字典。" - - #. i18n: file wordcompletion/creationsourceui.ui line 38 - #: rc.cpp:250 -@@ -685,14 +695,15 @@ - #: rc.cpp:259 - #, no-c-format - msgid "" --"If you select this box a new dictionary is created by loading a file. You may " --"either select an XML file, a standard text file or a file containing a word " --"completion dictionary. If you select a standard text file or an XML file the " --"frequentness of the individual words is detected by simply counting the " --"occurrences of each word." -+"If you select this box a new dictionary is created by loading a file. You " -+"may either select an XML file, a standard text file or a file containing a " -+"word completion dictionary. If you select a standard text file or an XML " -+"file the frequentness of the individual words is detected by simply counting " -+"the occurrences of each word." - msgstr "" --"選取此選項的話，會以載入檔案的方式建立新字典。您可以指定一個 XML 檔，一個標準的文字檔，或是一個含有文字補完字典的檔案。如果選取標準文字檔或 XML " --"檔，會以計算單字出現的次數來偵測單字頻率。" -+"選取此選項的話，會以載入檔案的方式建立新字典。您可以指定一個 XML 檔，一個標準" -+"的文字檔，或是一個含有文字補完字典的檔案。如果選取標準文字檔或 XML 檔，會以計" -+"算單字出現的次數來偵測單字頻率。" - - #. i18n: file wordcompletion/creationsourceui.ui line 82 - #: rc.cpp:262 -@@ -707,7 +718,9 @@ - "If you select this box a new dictionary is created by parsing the KDE " - "documentation. The frequentness of the individual words is detect by simply " - "counting the occurrences of each word." --msgstr "選取此選項的話，會以分析 KDE 文件的方式建立新字典，並會以計算單字出現的次數來偵測單字頻率。" -+msgstr "" -+"選取此選項的話，會以分析 KDE 文件的方式建立新字典，並會以計算單字出現的次數來" -+"偵測單字頻率。" - - #. i18n: file wordcompletion/creationsourceui.ui line 107 - #: rc.cpp:268 -@@ -721,7 +734,8 @@ - msgid "" - "If you select this box a new dictionary is created by loading all files in a " - "folder and its subdirectories." --msgstr "選取此選項的話，會以載入資料夾及其子資料夾中所有檔案的方式來建立新字典。" -+msgstr "" -+"選取此選項的話，會以載入資料夾及其子資料夾中所有檔案的方式來建立新字典。" - - #. i18n: file wordcompletion/creationsourceui.ui line 135 - #: rc.cpp:274 -@@ -734,23 +748,25 @@ - #, no-c-format - msgid "" - "If you select this box a blank dictionary without any entries is created. As " --"KMouth automatically adds newly typed words to the dictionaries it will learn " --"your vocabulary with the time." --msgstr "選取此選項的話，會建立一個空的字典，不含任何項目。KMouth 可以將您新輸入的單字加入字典中。" -+"KMouth automatically adds newly typed words to the dictionaries it will " -+"learn your vocabulary with the time." -+msgstr "" -+"選取此選項的話，會建立一個空的字典，不含任何項目。KMouth 可以將您新輸入的單字" -+"加入字典中。" - - #. i18n: file wordcompletion/kdedocsourceui.ui line 30 - #: rc.cpp:283 - #, no-c-format - msgid "" --"If you select this check box the words from the KDE documentation are " --"spell-checked before they are inserted into the new dictionary." -+"If you select this check box the words from the KDE documentation are spell-" -+"checked before they are inserted into the new dictionary." - msgstr "勾選此選項的話，KDE 文件中的單字在插入新字典之前會先做拼字檢查。" - - #. i18n: file wordcompletion/wordcompletionui.ui line 40 - #: rc.cpp:295 - #, no-c-format - msgid "Add D&ictionary..." --msgstr "新增字典(&I)..." -+msgstr "新增字典(&I)…" - - #. i18n: file wordcompletion/wordcompletionui.ui line 43 - #: rc.cpp:298 -@@ -800,7 +816,7 @@ - #: rc.cpp:319 - #, no-c-format - msgid "&Export Dictionary..." --msgstr "輸出字典(&E)..." -+msgstr "輸出字典(&E)…" - - #. i18n: file wordcompletion/wordcompletionui.ui line 131 - #: rc.cpp:322 -@@ -824,11 +840,14 @@ - #: rc.cpp:331 - #, no-c-format - msgid "" --"This list contains all available dictionaries for the word completion. KMouth " --"will display a combo box next to the edit field in the main window if this list " --"contains more than one dictionary. You can use this combo box in order to " --"select the dictionary that actually gets used for the word completion." --msgstr "這個清單包含所有可用於單字補完的字典。如果有兩個以上的字典可選擇，KMouth 會在主視窗中顯示選單。您可以在此選擇要用於單字補完的字典。" -+"This list contains all available dictionaries for the word completion. " -+"KMouth will display a combo box next to the edit field in the main window if " -+"this list contains more than one dictionary. You can use this combo box in " -+"order to select the dictionary that actually gets used for the word " -+"completion." -+msgstr "" -+"這個清單包含所有可用於單字補完的字典。如果有兩個以上的字典可選擇，KMouth 會在" -+"主視窗中顯示選單。您可以在此選擇要用於單字補完的字典。" - - #. i18n: file wordcompletion/wordcompletionui.ui line 210 - #: rc.cpp:334 -@@ -862,8 +881,8 @@ - - #: phrasebook/phrasebookdialog.cpp:242 - msgid "" --"By clicking on this button you can select the keyboard shortcut associated with " --"the selected phrase." -+"By clicking on this button you can select the keyboard shortcut associated " -+"with the selected phrase." - msgstr "按下此按鍵，您可以選擇所選的片語使用的快速鍵。" - - #: phrasebook/phrasebookdialog.cpp:263 -@@ -880,9 +899,10 @@ - - #: phrasebook/phrasebookdialog.cpp:305 - msgid "" --"This list contains the current phrase book in a tree structure. You can select " --"and modify individual phrases and sub phrase books" --msgstr "這個清單包含目前的片語書，以樹狀圖顯示。您可以選擇並變更每個片語與片語書。" -+"This list contains the current phrase book in a tree structure. You can " -+"select and modify individual phrases and sub phrase books" -+msgstr "" -+"這個清單包含目前的片語書，以樹狀圖顯示。您可以選擇並變更每個片語與片語書。" - - #: phrasebook/phrasebookdialog.cpp:325 - msgid "&New Phrase" -@@ -906,7 +926,7 @@ - - #: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341 - msgid "&Import..." --msgstr "匯入(&I)..." -+msgstr "匯入(&I)…" - - #: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339 - #: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343 -@@ -923,7 +943,7 @@ - - #: phrasebook/phrasebookdialog.cpp:349 - msgid "&Export..." --msgstr "輸出(&E)..." -+msgstr "輸出(&E)…" - - #: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351 - msgid "Exports the currently selected phrase(s) or phrase book(s) into a file" -@@ -958,10 +978,10 @@ - - #: phrasebook/phrasebookdialog.cpp:545 - msgid "" --"There are unsaved changes." --"
Do you want to apply the changes before closing the \"phrase book\" window " --"or discard the changes?" --msgstr "有變更尚未儲存。
關閉片語書視窗之前，您要套用變更還是要放棄變更？" -+"There are unsaved changes.
Do you want to apply the changes before " -+"closing the \"phrase book\" window or discard the changes?" -+msgstr "" -+"有變更尚未儲存。
關閉片語書視窗之前，您要套用變更還是要放棄變更？" - - #: phrasebook/phrasebookdialog.cpp:546 - msgid "Closing \"Phrase Book\" Window" -@@ -969,9 +989,10 @@ - - #: phrasebook/phrasebookdialog.cpp:598 - msgid "" --"In order to use the '%1' key as a shortcut, it must be combined with the Win, " --"Alt, Ctrl, and/or Shift keys." --msgstr "要使用'%1'鍵作為快速鍵，必須和Win, Alt, Ctrl, 及/或 Shift 等鍵合併使用。" -+"In order to use the '%1' key as a shortcut, it must be combined with the " -+"Win, Alt, Ctrl, and/or Shift keys." -+msgstr "" -+"要使用'%1'鍵作為快速鍵，必須和Win, Alt, Ctrl, 及/或 Shift 等鍵合併使用。" - - #: phrasebook/phrasebookdialog.cpp:601 - msgid "Invalid Shortcut Key" -@@ -1033,10 +1054,11 @@ - - #: phrasebook/phrasebook.cpp:289 - msgid "" --"Your chosen filename %1 has a different extension than .phrasebook" --". Do you wish to add .phrasebook to the filename?" -+"Your chosen filename %1 has a different extension than ." -+"phrasebook. Do you wish to add .phrasebook to the filename?" - msgstr "" --"您選擇的檔案名稱 %1 延伸檔名與 .phrasebook不同。是否把 .phrasebook 加到檔案名稱？" -+"您選擇的檔案名稱 %1 延伸檔名與 .phrasebook不同。是否把 ." -+"phrasebook 加到檔案名稱？" - - #: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306 - msgid "File Extension" -@@ -1048,9 +1070,11 @@ - - #: phrasebook/phrasebook.cpp:305 - msgid "" --"Your chosen filename %1 has the extension .phrasebook" --". Do you wish to save in phrasebook format?" --msgstr "您選擇的檔案名稱 %1 有 .phrasebook 延伸檔名。您是否要以片語書格式儲存？" -+"Your chosen filename %1 has the extension .phrasebook. Do you " -+"wish to save in phrasebook format?" -+msgstr "" -+"您選擇的檔案名稱 %1 有 .phrasebook 延伸檔名。您是否要以片語書格" -+"式儲存？" - - #: phrasebook/phrasebook.cpp:306 - msgid "As Phrasebook" -@@ -1108,12 +1132,13 @@ - msgid "" - "This list contains the history of spoken sentences. You can select sentences " - "and press the speak button for re-speaking." --msgstr "這個列表包含已朗讀句子的歷史紀錄。您可以選擇句子並按下朗讀按鈕來再次朗讀。" -+msgstr "" -+"這個列表包含已朗讀句子的歷史紀錄。您可以選擇句子並按下朗讀按鈕來再次朗讀。" - - #: phraselist.cpp:74 - msgid "" --"Into this edit field you can type a phrase. Click on the speak button in order " --"to speak the entered phrase." -+"Into this edit field you can type a phrase. Click on the speak button in " -+"order to speak the entered phrase." - msgstr "您可以進入編輯區打入片語。按下朗讀按鈕以朗讀輸入的片語。" - - #: phraselist.cpp:454 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/ksayit.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/ksayit.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/ksayit.po 2008-08-19 20:43:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/ksayit.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: ksayit\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-06-06 10:28+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,11 +31,11 @@ - - #: contextmenuhandler.cpp:159 - msgid "Rename..." --msgstr "重新命名..." -+msgstr "重新命名…" - - #: contextmenuhandler.cpp:163 - msgid "Delete..." --msgstr "刪除..." -+msgstr "刪除…" - - #: contextmenuhandler.cpp:167 docbookclasses.cpp:133 docbookclasses.cpp:135 - #: docbookparser.cpp:91 doctreeviewimpl.cpp:799 -@@ -243,7 +242,7 @@ - - #: ksayit.cpp:401 - msgid "Say XML file..." --msgstr "朗讀 XML 檔..." -+msgstr "朗讀 XML 檔…" - - #: ksayit.cpp:435 ksayit.cpp:672 - msgid "Edit Mode ON." -@@ -255,7 +254,7 @@ - - #: ksayit.cpp:470 - msgid "Open file..." --msgstr "開啟檔案..." -+msgstr "開啟檔案…" - - #: ksayit.cpp:476 - msgid "File to Speak" -@@ -263,15 +262,15 @@ - - #: ksayit.cpp:502 - msgid "Save file..." --msgstr "儲存檔案..." -+msgstr "儲存檔案…" - - #: ksayit.cpp:519 - msgid "Save file as..." --msgstr "另存新檔..." -+msgstr "另存新檔…" - - #: ksayit.cpp:551 - msgid "Exiting..." --msgstr "離開中..." -+msgstr "離開中…" - - #: ksayit.cpp:552 - msgid "Do you really want to quit?" -@@ -279,7 +278,7 @@ - - #: ksayit.cpp:570 - msgid "Toggle the statusbar..." --msgstr "切換狀態列..." -+msgstr "切換狀態列…" - - #: ksayit.cpp:598 - msgid "Setup" -@@ -287,11 +286,11 @@ - - #: ksayit.cpp:686 - msgid "speaking Clipboard..." --msgstr "朗讀剪貼簿內容..." -+msgstr "朗讀剪貼簿內容…" - - #: ksayit.cpp:704 - msgid "synthesizing..." --msgstr "合成中..." -+msgstr "合成中…" - - #: ksayit.cpp:744 - msgid "Unable to speak text" -@@ -299,13 +298,11 @@ - - #: ksayit.cpp:792 - msgid "Paused..." --msgstr "暫停..." -+msgstr "暫停…" - - #: ksayitbookmarkhandler.cpp:59 --msgid "" --"This is not a KSayIt bookmark.\n" --msgstr "" --"這不是 KSayIt 書籤。\n" -+msgid "This is not a KSayIt bookmark.\n" -+msgstr "這不是 KSayIt 書籤。\n" - - #: ksayitbookmarkhandler.cpp:77 - msgid "Bookmark not found" -@@ -372,24 +369,20 @@ - msgstr "全部移除" - - #: saxhandler.cpp:129 --msgid "" --"Fatal error while parsing XML-Paragraph:\n" --msgstr "" --"分析 XML 段落時發生嚴重錯誤：\n" -+msgid "Fatal error while parsing XML-Paragraph:\n" -+msgstr "分析 XML 段落時發生嚴重錯誤：\n" - - #: saxhandler.cpp:130 - msgid "%1, Line: %2" --msgstr "%1，第 %2 行" -+msgstr "%1，第 %2 列" - - #: saxhandler.cpp:131 - msgid "Fatal error" - msgstr "嚴重錯誤" - - #: saxhandler.cpp:163 --msgid "" --"Unresolved entity found: %1.\n" --msgstr "" --"找到無法反解的實體：%1\n" -+msgid "Unresolved entity found: %1.\n" -+msgstr "找到無法反解的實體：%1\n" - - #: saxhandler.cpp:164 - msgid "KSayIt does not support DocBook files with external entities. " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kttsd.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kttsd.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/kttsd.po 2008-08-19 20:43:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/kttsd.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kttsd\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-11-04 13:58+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,10 +29,12 @@ - #: rc.cpp:15 rc.cpp:33 - #, no-c-format - msgid "" --"Select the language to be spoken. Note that after you configure a Talker, your " --"chosen Language may be overridden by the synthesizer, depending upon the " --"options you choose." --msgstr "選擇要發音的語言。注意，在您設定發音員之後，您所選擇的語言可能依據選項而被合成器蓋過。" -+"Select the language to be spoken. Note that after you configure a Talker, " -+"your chosen Language may be overridden by the synthesizer, depending upon " -+"the options you choose." -+msgstr "" -+"選擇要發音的語言。注意，在您設定發音員之後，您所選擇的語言可能依據選項而被合" -+"成器蓋過。" - - #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 95 - #: rc.cpp:18 rc.cpp:423 -@@ -51,10 +52,13 @@ - #: rc.cpp:27 - #, no-c-format - msgid "" --"The radio buttons below determine which box shows all possibilities. The box " --"to the left of the checked button shows all possibilities. The box to the left " --"of the unchecked box only shows those possibilities that match the other box." --msgstr "底下的圓鈕決定哪個盒子裡顯示所有的可用的選項。勾選的選項左方會顯示所有的選項。而另一邊則只會顯示符合所選取設定的選項。" -+"The radio buttons below determine which box shows all possibilities. The " -+"box to the left of the checked button shows all possibilities. The box to " -+"the left of the unchecked box only shows those possibilities that match the " -+"other box." -+msgstr "" -+"底下的圓鈕決定哪個盒子裡顯示所有的可用的選項。勾選的選項左方會顯示所有的選" -+"項。而另一邊則只會顯示符合所選取設定的選項。" - - #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 200 - #: rc.cpp:30 rc.cpp:435 -@@ -66,19 +70,23 @@ - #: rc.cpp:36 - #, no-c-format - msgid "" --"Check to list all the possible languages in the Language box at the left. When " --"a language has been chosen, the Synthesizer box will show only those " -+"Check to list all the possible languages in the Language box at the left. " -+"When a language has been chosen, the Synthesizer box will show only those " - "synthesizers that can speak in the chosen language." --msgstr "勾選後在左方語言盒中會列出所有可用的語言。選取語言之後，合成器盒中則會顯示該語言可使用的合成器。" -+msgstr "" -+"勾選後在左方語言盒中會列出所有可用的語言。選取語言之後，合成器盒中則會顯示該" -+"語言可使用的合成器。" - - #. i18n: file kcmkttsmgr/addtalkerwidget.ui line 241 - #: rc.cpp:39 - #, no-c-format - msgid "" --"Check this box to display all the available synthesizers in the Synthesizer box " --"to the left. When a synthesizer is chosen, only the languages that can be " --"spoken by that synthesizer appear in the Language box." --msgstr "勾選後在左方合成器盒中會列出所有可用的合成器。選取合成器之後，語言盒中則會顯示該合成器可發音的語言。" -+"Check this box to display all the available synthesizers in the Synthesizer " -+"box to the left. When a synthesizer is chosen, only the languages that can " -+"be spoken by that synthesizer appear in the Language box." -+msgstr "" -+"勾選後在左方合成器盒中會列出所有可用的合成器。選取合成器之後，語言盒中則會顯" -+"示該合成器可發音的語言。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 45 - #: rc.cpp:42 -@@ -108,13 +116,14 @@ - #: rc.cpp:54 - #, no-c-format - msgid "" --"When checked, KTTSMgr displays an icon in the system tray, and clicking OK or " --"Cancel buttons does not stop KTTSMgr. Use system tray context menu to quit " --"KTTSMgr. This setting takes effect when KTTSMgr is next started. This setting " --"has no effect when running in the KDE Control Center." --msgstr "" --"勾選此選項的話，KTTSMgr 會顯示在系統匣中，按下「確定」或「取消」不會停止 KTTSMgr，要點選系統匣圖示的選單才能離開 " --"KTTSMgr。這個設定在下次啟動時生效，在 KDE 控制中心中執行時則不會有作用。" -+"When checked, KTTSMgr displays an icon in the system tray, and clicking OK " -+"or Cancel buttons does not stop KTTSMgr. Use system tray context menu to " -+"quit KTTSMgr. This setting takes effect when KTTSMgr is next started. This " -+"setting has no effect when running in the KDE Control Center." -+msgstr "" -+"勾選此選項的話，KTTSMgr 會顯示在系統匣中，按下「確定」或「取消」不會停止 " -+"KTTSMgr，要點選系統匣圖示的選單才能離開 KTTSMgr。這個設定在下次啟動時生效，" -+"在 KDE 控制中心中執行時則不會有作用。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 123 - #: rc.cpp:57 -@@ -127,8 +136,11 @@ - #, no-c-format - msgid "" - "When checked, the KTTSMgr window is displayed when KTTSMgr starts. When " --"unchecked, click on the icon in the system tray to display the KTTSMgr window." --msgstr "勾選此選項的話，KTTSMgr 啟動時會顯示主視窗。此外，您也可以點選系統匣中的圖示來顯示主視窗。" -+"unchecked, click on the icon in the system tray to display the KTTSMgr " -+"window." -+msgstr "" -+"勾選此選項的話，KTTSMgr 啟動時會顯示主視窗。此外，您也可以點選系統匣中的圖示" -+"來顯示主視窗。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 164 - #: rc.cpp:63 -@@ -141,10 +153,11 @@ - #, no-c-format - msgid "" - "When checked, and KTTSMgr was automatically started when speech began, " --"automatically exits when speech has finished. Does not automatically exit if " --"KTTSMgr was started manually or started from the Control Center." -+"automatically exits when speech has finished. Does not automatically exit " -+"if KTTSMgr was started manually or started from the Control Center." - msgstr "" --"勾選此選項的話，KTTSMgr 在開始讀字時會自動啟動，發音結束後自動離開。但是若 KTTSMgr 是手動啟動的，或是從控制中心啟動的，就不會自動離開。" -+"勾選此選項的話，KTTSMgr 在開始讀字時會自動啟動，發音結束後自動離開。但是若 " -+"KTTSMgr 是手動啟動的，或是從控制中心啟動的，就不會自動離開。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 180 - #: rc.cpp:69 -@@ -157,11 +170,11 @@ - #, no-c-format - msgid "" - "When checked, if KTTSMgr is not already running and speech begins, starts " --"KTTSMgr and displays an icon in the system tray. Note" --": KTTSMgr only automatically starts for text jobs having 5 sentences or more." -+"KTTSMgr and displays an icon in the system tray. Note: KTTSMgr only " -+"automatically starts for text jobs having 5 sentences or more." - msgstr "" --"勾選此選項的話，如果 KTTSMgr 尚未執行，則在開始讀字時會啟動 KTTSMgr 並在系統匣中顯示圖示。注意：KTTSMgr " --"只會在有五句以上文字需要閱讀時才會啟動。" -+"勾選此選項的話，如果 KTTSMgr 尚未執行，則在開始讀字時會啟動 KTTSMgr 並在系統" -+"匣中顯示圖示。注意：KTTSMgr 只會在有五句以上文字需要閱讀時才會啟動。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 196 - #: rc.cpp:75 -@@ -218,19 +231,21 @@ - #: rc.cpp:99 rc.cpp:471 - #, no-c-format - msgid "" --"This is a list of all the configured Talkers. A Talker is a speech synthesizer " --"that has been configured with a language, voice, gender, speaking rate, and " --"volume. Talkers higher in the list have higher priority. The topmost Talker " --"will be used when no talker attributes have been specified by an application." --msgstr "" --"這個清單包括所有已設定的發音員。發音員是已設定好語言、聲音、性別、說話頻率與音量的語音合成器。清單中較高位置的發音員有較高的優先權。沒有特別指定發音員屬性的應用" --"程式會使用最頂端的發音員。" -+"This is a list of all the configured Talkers. A Talker is a speech " -+"synthesizer that has been configured with a language, voice, gender, " -+"speaking rate, and volume. Talkers higher in the list have higher " -+"priority. The topmost Talker will be used when no talker attributes have " -+"been specified by an application." -+msgstr "" -+"這個清單包括所有已設定的發音員。發音員是已設定好語言、聲音、性別、說話頻率與" -+"音量的語音合成器。清單中較高位置的發音員有較高的優先權。沒有特別指定發音員屬" -+"性的應用程式會使用最頂端的發音員。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 308 - #: rc.cpp:102 rc.cpp:150 rc.cpp:234 - #, no-c-format - msgid "Add..." --msgstr "新增..." -+msgstr "新增…" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 314 - #: rc.cpp:105 -@@ -254,7 +269,7 @@ - #: kcmkttsmgr/kcmkttsmgr.cpp:166 rc.cpp:114 rc.cpp:252 rc.cpp:669 - #, no-c-format - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 372 - #: rc.cpp:117 -@@ -299,7 +314,9 @@ - "This is a list of configured application events and actions to be taken when " - "received. The \"default\" event governs all events not specifically " - "configured." --msgstr "這分清單是設定接收到哪些應用程式的事件與動作時要讀出來。「預設」則是所有未特別設定的事件。" -+msgstr "" -+"這分清單是設定接收到哪些應用程式的事件與動作時要讀出來。「預設」則是所有未特" -+"別設定的事件。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 517 - #: rc.cpp:141 -@@ -314,7 +331,9 @@ - "Applies only to the default event. Does not affect application-specific " - "events. Only events that display in the manner which you select will be " - "spoken." --msgstr "只套用到預設的事件。不影響應用程式相關的事件。只有顯示在這裡的所選取的事件才會被讀出來。" -+msgstr "" -+"只套用到預設的事件。不影響應用程式相關的事件。只有顯示在這裡的所選取的事件才" -+"會被讀出來。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 555 - #: rc.cpp:153 -@@ -332,8 +351,8 @@ - #: rc.cpp:159 - #, no-c-format - msgid "" --"Click to remove a specific notification event from the list. You cannot remove " --"the default event." -+"Click to remove a specific notification event from the list. You cannot " -+"remove the default event." - msgstr "點選以從清單中移除指定的通知事件。您無法移除預設事件。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 591 -@@ -353,7 +372,7 @@ - #: rc.cpp:168 rc.cpp:738 - #, no-c-format - msgid "&Load..." --msgstr "載入(&L)..." -+msgstr "載入(&L)…" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 605 - #: rc.cpp:171 -@@ -365,7 +384,7 @@ - #: rc.cpp:174 rc.cpp:627 rc.cpp:744 - #, no-c-format - msgid "&Save..." --msgstr "儲存(&S)..." -+msgstr "儲存(&S)…" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 616 - #: rc.cpp:177 -@@ -383,9 +402,10 @@ - #: rc.cpp:183 - #, no-c-format - msgid "" --"Click this button to test the notification. A sample message will be spoken. " --"Note: The Text-to-Speech system must be enabled." --msgstr "點選此鍵以測試通知。會讀出一個簡單的訊息。注意：必須先開啟文字發音系統。" -+"Click this button to test the notification. A sample message will be " -+"spoken. Note: The Text-to-Speech system must be enabled." -+msgstr "" -+"點選此鍵以測試通知。會讀出一個簡單的訊息。注意：必須先開啟文字發音系統。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 656 - #: rc.cpp:186 -@@ -399,13 +419,14 @@ - msgid "" - "Specifies how KTTS should speak the event when received. If you select " - "\"Speak custom text\", enter the text in the box. You may use the following " --"substitution strings in the text:
%e
Name of the event
" --"%a
Application that sent the event
%m
" --"The message sent by the application
" --msgstr "" --"指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」，則在欄位中輸入要讀出來的文字。您可以在文字中使用底下的代換符號：
" --"%e
事件名稱
%a
送出此事件的應用程式
%m
" --"應用程式送出的訊息
" -+"substitution strings in the text:
%e
Name of the event
%a
Application that sent the event
%m
The " -+"message sent by the application
" -+msgstr "" -+"指定 KTTS 在接收到事件時要怎麼讀。如果選擇「讀出自訂的文字」，則在欄位中" -+"輸入要讀出來的文字。您可以在文字中使用底下的代換符號：
%e
事" -+"件名稱
%a
送出此事件的應用程式
%m
應用程式" -+"送出的訊息
" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 712 - #: rc.cpp:198 -@@ -426,7 +447,7 @@ - #: rc.cpp:714 rc.cpp:732 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 747 - #: rc.cpp:210 -@@ -446,7 +467,9 @@ - msgid "" - "When checked and KTTS is enabled, notification events from applications sent " - "via KNotify will be spoken according to the options you set on this tab." --msgstr "點選此項目而且 KTTS 已開啟的話，應用程式透過 KNotify 送出的通知事件會根據您在此設定的選項唸出來。" -+msgstr "" -+"點選此項目而且 KTTS 已開啟的話，應用程式透過 KNotify 送出的通知事件會根據您在" -+"此設定的選項唸出來。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 795 - #: rc.cpp:219 -@@ -476,13 +499,14 @@ - #: rc.cpp:231 - #, no-c-format - msgid "" --"This is a list of all the configured Filters. Filters higher in the list are " --"applied first. Filters modify text before it is spoken. They can be used to " --"substitute for mispronounced words, transform XML from one form to another, or " --"change the default Talker to be used for speech output." --msgstr "" --"所有已設定的過濾器的清單。清單中較高位置的過濾器會先被套用。過濾器會在文字被讀出來之前先做更改。用於替換發音不正確的字，將 XML " --"表格換成另一個，或是變更要使用的預設發音員等等。" -+"This is a list of all the configured Filters. Filters higher in the list " -+"are applied first. Filters modify text before it is spoken. They can be " -+"used to substitute for mispronounced words, transform XML from one form to " -+"another, or change the default Talker to be used for speech output." -+msgstr "" -+"所有已設定的過濾器的清單。清單中較高位置的過濾器會先被套用。過濾器會在文字被" -+"讀出來之前先做更改。用於替換發音不正確的字，將 XML 表格換成另一個，或是變更要" -+"使用的預設發音員等等。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 876 - #: rc.cpp:237 -@@ -494,16 +518,16 @@ - #: rc.cpp:243 - #, no-c-format - msgid "" --"Click to move selected filter up in the list. Filters higher in the list are " --"applied first." -+"Click to move selected filter up in the list. Filters higher in the list " -+"are applied first." - msgstr "點選以將所選取的過濾器往上移。較高的過濾器會先被套用。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 915 - #: rc.cpp:249 - #, no-c-format - msgid "" --"Click to move a filter down in the list. Filters lower in the list are applied " --"last." -+"Click to move a filter down in the list. Filters lower in the list are " -+"applied last." - msgstr "點選以將所選取的過濾器往下移。較低的過濾器被套用的順序就較後面。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 940 -@@ -528,15 +552,16 @@ - #: rc.cpp:267 - #, no-c-format - msgid "" --"This is a list of all the configured Sentence Boundary Detector (SBD) Filters. " --"SBDs break long text jobs up into sentences, which reduces the time before a " --"job begins speaking, and permits you to advance or rewind through a job. SBDs " --"are applied in the order listed (top to bottom) after all the normal filters at " --"the top of this screen have been applied. Filtering stops when the first SBD " --"modifies the text." --msgstr "" --"這份清單包含所有的「句子邊界偵測」過濾器（Sentence Boundary Detector，SBD）。SBD " --"會將需要發音的文字切成句子，以縮短發音前的準備工作，並允許您在發音過程中跳過或倒回。SBD 會在所有正常的過濾器套用之後依上到下的順序套用，當第一個 SBD " -+"This is a list of all the configured Sentence Boundary Detector (SBD) " -+"Filters. SBDs break long text jobs up into sentences, which reduces the " -+"time before a job begins speaking, and permits you to advance or rewind " -+"through a job. SBDs are applied in the order listed (top to bottom) after " -+"all the normal filters at the top of this screen have been applied. " -+"Filtering stops when the first SBD modifies the text." -+msgstr "" -+"這份清單包含所有的「句子邊界偵測」過濾器（Sentence Boundary Detector，SBD）。" -+"SBD 會將需要發音的文字切成句子，以縮短發音前的準備工作，並允許您在發音過程中" -+"跳過或倒回。SBD 會在所有正常的過濾器套用之後依上到下的順序套用，當第一個 SBD " - "改變文字後就停止。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1040 -@@ -549,8 +574,8 @@ - #: rc.cpp:273 - #, no-c-format - msgid "" --"Click this button to edit the Sentence Boundary Detector (SBD) configuration or " --"add additional SBD filters." -+"Click this button to edit the Sentence Boundary Detector (SBD) configuration " -+"or add additional SBD filters." - msgstr "點選此鍵以編輯或新增句子邊界偵測器。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1074 -@@ -565,15 +590,19 @@ - msgid "" - "Check the Pre-sound box and choose a Pre-sound audio file, which will sound " - "when a text job is interrupted by another message." --msgstr "勾選前置聲音選項並選取前置聲音音效檔，此聲音會在文字語音工作被另一個訊息中斷時播放。" -+msgstr "" -+"勾選前置聲音選項並選取前置聲音音效檔，此聲音會在文字語音工作被另一個訊息中斷" -+"時播放。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1115 - #: rc.cpp:282 rc.cpp:288 - #, no-c-format - msgid "" --"Check the Post-message box and enter a Post-message, which will be spoken when " --"a text job resumes after being interrupted by another message." --msgstr "勾選後置訊息選項並輸入後置訊息，此訊息會在文字語音工作被另一個訊息中斷後，又恢復工作時讀出來。" -+"Check the Post-message box and enter a Post-message, which will be spoken " -+"when a text job resumes after being interrupted by another message." -+msgstr "" -+"勾選後置訊息選項並輸入後置訊息，此訊息會在文字語音工作被另一個訊息中斷後，又" -+"恢復工作時讀出來。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1124 - #: rc.cpp:285 -@@ -599,7 +628,9 @@ - msgid "" - "Check the Pre-message box and enter a Pre-message, which will be spoken " - "whenever a text job is interrupted by another message." --msgstr "勾選前置訊息選項並輸入前置訊息，此訊息會在文字語音工作被另一個訊息中斷時讀出來。" -+msgstr "" -+"勾選前置訊息選項並輸入前置訊息，此訊息會在文字語音工作被另一個訊息中斷時讀出" -+"來。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1188 - #: rc.cpp:303 rc.cpp:309 -@@ -607,7 +638,9 @@ - msgid "" - "Check the Post-sound and choose a Post-sound audio file, which will sound " - "before a text job resumes after being interrupted by another message." --msgstr "勾選後置聲音選項並選取後置聲音音效檔，此聲音會在文字語音工作被另一個訊息中斷後，又恢復工作時讀出來。" -+msgstr "" -+"勾選後置聲音選項並選取後置聲音音效檔，此聲音會在文字語音工作被另一個訊息中斷" -+"後，又恢復工作時讀出來。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1196 - #: rc.cpp:306 -@@ -631,9 +664,10 @@ - #: rc.cpp:321 - #, no-c-format - msgid "" --"Check this if you want to keep the generated audio (wav) files. You will find " --"them in the indicated directory." --msgstr "此選項決定您是否要保留所產生的音效檔。您可以在指定的目錄中找到保留的檔案。" -+"Check this if you want to keep the generated audio (wav) files. You will " -+"find them in the indicated directory." -+msgstr "" -+"此選項決定您是否要保留所產生的音效檔。您可以在指定的目錄中找到保留的檔案。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1287 - #: rc.cpp:324 -@@ -651,12 +685,13 @@ - #: rc.cpp:330 rc.cpp:336 rc.cpp:339 rc.cpp:994 rc.cpp:1012 rc.cpp:1024 - #, no-c-format - msgid "" --"Sets the speed of speech. Slide the slider to the left to slow speech down; to " --"the right to increase talking speed. Anything less than 75 percent is " -+"Sets the speed of speech. Slide the slider to the left to slow speech down; " -+"to the right to increase talking speed. Anything less than 75 percent is " - "considered \"slow\", and anything greater than 125 percent is considered " - "\"fast\". You cannot change the speed of MultiSyn voices." - msgstr "" --"設定發音速度。滑動器左側表示慢速，右側表示快速。通常小於 75% 算是慢的，大於 125% 則算是快的。您無法改變 MultiSyn 聲音的速度。" -+"設定發音速度。滑動器左側表示慢速，右側表示快速。通常小於 75% 算是慢的，大於 " -+"125% 則算是快的。您無法改變 MultiSyn 聲音的速度。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1338 - #: rc.cpp:333 rc.cpp:883 rc.cpp:889 rc.cpp:1003 rc.cpp:1009 rc.cpp:1015 -@@ -675,12 +710,12 @@ - #: rc.cpp:345 - #, no-c-format - msgid "" --"

Select the audio output method desired. If you select GStreamer" --", you must also select a Sink.

" --"

Note: You must have GStreamer >= 0.87 to use GStreamer.

" -+"

Select the audio output method desired. If you select GStreamer, " -+"you must also select a Sink.

Note: You must have " -+"GStreamer >= 0.87 to use GStreamer.

" - msgstr "" --"

選擇音效輸出方法。如果您選擇 GStreamer，您也要選擇 接收器（Sink）。

" --"

注意：您必須安裝 GStreamer 0.87 版以上。

" -+"

選擇音效輸出方法。如果您選擇 GStreamer，您也要選擇 接收器" -+"（Sink）。

注意：您必須安裝 GStreamer 0.87 版以上。

" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1456 - #: rc.cpp:348 rc.cpp:357 -@@ -704,9 +739,11 @@ - #: rc.cpp:363 - #, no-c-format - msgid "" --"Select the sink to be used for aKode output. Select \"auto\" to let aKode pick " --"the best output method." --msgstr "選擇 aKode 輸出所使用的接收器（Sink）。選擇「自動」讓 aKode 自己選擇最好的輸出方法。" -+"Select the sink to be used for aKode output. Select \"auto\" to let aKode " -+"pick the best output method." -+msgstr "" -+"選擇 aKode 輸出所使用的接收器（Sink）。選擇「自動」讓 aKode 自己選擇最好的輸" -+"出方法。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1534 - #: rc.cpp:366 -@@ -718,9 +755,11 @@ - #: rc.cpp:369 - #, no-c-format - msgid "" --"

Check to use the GStreamer audio output system. You must also select a " --"Sink plugin.

" --msgstr "

勾選以使用 GStreamer 音效輸出系統。您必須選擇一個接收器外掛程式。

" -+"

Check to use the GStreamer audio output system. You must also select a " -+"Sink plugin.

" -+msgstr "" -+"

勾選以使用 GStreamer 音效輸出系統。您必須選擇一個接收器外掛程式。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1548 - #: rc.cpp:372 -@@ -744,8 +783,11 @@ - #: rc.cpp:381 - #, no-c-format - msgid "" --"

Check to use aKode for audio output. You must also select a Sink.

" --msgstr "

勾選以使用 aKode 做為音效輸出。您必須同時指定一個接收器（Sink）。

" -+"

Check to use aKode for audio output. You must also select a Sink." -+"

" -+msgstr "" -+"

勾選以使用 aKode 做為音效輸出。您必須同時指定一個接收器（Sink）。" - - #. i18n: file kcmkttsmgr/kcmkttsmgrwidget.ui line 1599 - #: rc.cpp:384 -@@ -803,8 +845,8 @@ - #: rc.cpp:411 - #, no-c-format - msgid "" --"When checked, will use the default Talker, which is the topmost Talker listed " --"in the Talkers tab." -+"When checked, will use the default Talker, which is the topmost Talker " -+"listed in the Talkers tab." - msgstr "勾選此選項的話，會使用發音員清單上最頂端的預設的發音員。" - - #. i18n: file libkttsd/selecttalkerwidget.ui line 72 -@@ -817,10 +859,12 @@ - #: rc.cpp:417 - #, no-c-format - msgid "" --"When checked, will use a configured Talker most closely matching the attributes " --"you choose. Attributes with checks next to them will be preferred over " --"unchecked attributes. Language is always preferred." --msgstr "勾選此選項的話，會比較發音員的設定，並選擇最接近所指定屬性的發音員。會優先比對所勾選的屬性，但是語言是一定會被比對的。" -+"When checked, will use a configured Talker most closely matching the " -+"attributes you choose. Attributes with checks next to them will be " -+"preferred over unchecked attributes. Language is always preferred." -+msgstr "" -+"勾選此選項的話，會比較發音員的設定，並選擇最接近所指定屬性的發音員。會優先比" -+"對所勾選的屬性，但是語言是一定會被比對的。" - - #. i18n: file libkttsd/selecttalkerwidget.ui line 125 - #: rc.cpp:420 -@@ -850,11 +894,13 @@ - #: rc.cpp:438 rc.cpp:702 rc.cpp:711 - #, no-c-format - msgid "" --"This filter is applied to text jobs of the specified language. You may select " --"more than one language by clicking the browse button and Ctrl-clicking on more " --"than one in the list. If blank, the filter applies to all text jobs of any " --"language." --msgstr "這個過濾器會套用到指定語言的文字發音工作上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留白的話，則會套用到任何語言的文字發音工作上。" -+"This filter is applied to text jobs of the specified language. You may " -+"select more than one language by clicking the browse button and Ctrl-" -+"clicking on more than one in the list. If blank, the filter applies to all " -+"text jobs of any language." -+msgstr "" -+"這個過濾器會套用到指定語言的文字發音工作上。您可以按下 Ctrl 鍵並點選一個以上" -+"的語言。如果留白的話，則會套用到任何語言的文字發音工作上。" - - #. i18n: file libkttsd/selecttalkerwidget.ui line 385 - #: rc.cpp:444 rc.cpp:534 rc.cpp:615 rc.cpp:717 -@@ -882,9 +928,11 @@ - #: rc.cpp:474 - #, no-c-format - msgid "" --"WARNING: This filter is a key component of the KTTS system. Please read the " --"KTTS Handbook before modifying these settings." --msgstr "警告：這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前，請先參考 KTTS 手冊。" -+"WARNING: This filter is a key component of the KTTS system. Please read " -+"the KTTS Handbook before modifying these settings." -+msgstr "" -+"警告：這個過濾器是 KTTS 系統的主要成員。要變更這些設定之前，請先參考 KTTS " -+"手冊。" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 49 - #: rc.cpp:477 rc.cpp:582 rc.cpp:684 rc.cpp:771 -@@ -914,7 +962,8 @@ - #: rc.cpp:492 rc.cpp:495 - #, no-c-format - msgid "" --"The regular expression that detects boundaries between sentences in text jobs." -+"The regular expression that detects boundaries between sentences in text " -+"jobs." - msgstr "用於偵測句子邊界的正規表示式。" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 132 -@@ -927,9 +976,10 @@ - #: rc.cpp:504 rc.cpp:507 - #, no-c-format - msgid "" --"This string replaces the matched regular expression. Important" --": must end with tab (\\t)." --msgstr "這個字串會取代正規表示式比對到的項目。重要：必須以 tab（\\t）結束。" -+"This string replaces the matched regular expression. Important: must " -+"end with tab (\\t)." -+msgstr "" -+"這個字串會取代正規表示式比對到的項目。重要：必須以 tab（\\t）結束。" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 160 - #: rc.cpp:510 rc.cpp:591 rc.cpp:789 -@@ -953,11 +1003,13 @@ - #: rc.cpp:519 rc.cpp:528 rc.cpp:600 rc.cpp:609 - #, no-c-format - msgid "" --"This filter is applied to text jobs of the specified language. You may select " --"more than one language by clicking the browse button and Ctrl-clicking on more " --"than one in the list. If blank the filter applies to all text jobs of any " --"language." --msgstr "此過濾器套用在所指定的語言上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留白的話，則會套用到任何語言的文字發音工作上。" -+"This filter is applied to text jobs of the specified language. You may " -+"select more than one language by clicking the browse button and Ctrl-" -+"clicking on more than one in the list. If blank the filter applies to all " -+"text jobs of any language." -+msgstr "" -+"此過濾器套用在所指定的語言上。您可以按下 Ctrl 鍵並點選一個以上的語言。如果留" -+"白的話，則會套用到任何語言的文字發音工作上。" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 200 - #: rc.cpp:522 rc.cpp:603 rc.cpp:705 -@@ -969,15 +1021,16 @@ - #: rc.cpp:525 rc.cpp:606 rc.cpp:708 - #, no-c-format - msgid "" --"Enter a DCOP Application ID. This filter will only apply to text jobs queued " --"by that application. You may enter more than one ID separated by commas. If " --"blank, this filter applies to text jobs queued by all applications. Tip: Use " --"kdcop from the command line to get the Application IDs of running applications. " --" Example: \"konversation, kvirc,ksirc,kopete\"" --msgstr "" --"輸入一個 DCOP " --"應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼，用逗號隔開。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 " --"kdcop 可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"" -+"Enter a DCOP Application ID. This filter will only apply to text jobs " -+"queued by that application. You may enter more than one ID separated by " -+"commas. If blank, this filter applies to text jobs queued by all " -+"applications. Tip: Use kdcop from the command line to get the Application " -+"IDs of running applications. Example: \"konversation, kvirc,ksirc,kopete\"" -+msgstr "" -+"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您" -+"也可以輸入一個以上的代碼，用逗號隔開。如果留白的話，預設套用到所有的應用程" -+"式。提示：在命令列上用 kdcop 可以知道應用程式的代碼。範例如下：\"konversaion," -+"kvirc,ksirc,kopete\"" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 259 - #: rc.cpp:537 rc.cpp:618 rc.cpp:720 -@@ -985,20 +1038,23 @@ - msgid "" - "Enter a DCOP Application ID. This filter will only apply to text jobs " - "queued by that application. You may enter more than one ID separated by " --"commas. Use knotify to match all messages sent as KDE notifications. " --"If blank, this filter applies to text jobs queued by all applications. Tip: " --"Use kdcop from the command line to get the Application IDs of running " --"applications. Example: \"konversation, kvirc,ksirc,kopete\"" --msgstr "" --"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼，用逗號隔開。使用 " --"knotify 則會套用在所有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 kdcop " --"可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"" -+"commas. Use knotify to match all messages sent as KDE " -+"notifications. If blank, this filter applies to text jobs queued by all " -+"applications. Tip: Use kdcop from the command line to get the Application " -+"IDs of running applications. Example: \"konversation, kvirc,ksirc,kopete\"" -+msgstr "" -+"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要" -+"求。您也可以輸入一個以上的代碼，用逗號隔開。使用 knotify 則會套用在所" -+"有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 " -+"kdcop 可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 287 - #: rc.cpp:540 rc.cpp:621 - #, no-c-format - msgid "Load..." --msgstr "載入..." -+msgstr "載入…" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 293 - #: rc.cpp:543 -@@ -1010,7 +1066,7 @@ - #: rc.cpp:546 - #, no-c-format - msgid "Sa&ve..." --msgstr "儲存(&V)..." -+msgstr "儲存(&V)…" - - #. i18n: file filters/sbd/sbdconfwidget.ui line 313 - #: rc.cpp:549 -@@ -1034,7 +1090,7 @@ - #: rc.cpp:558 - #, no-c-format - msgid "&Type" --msgstr "類型 (&T)" -+msgstr "類型(&T)" - - #. i18n: file filters/stringreplacer/editreplacementwidget.ui line 85 - #: rc.cpp:561 -@@ -1136,7 +1192,7 @@ - #: kcmkttsmgr/kcmkttsmgr.cpp:171 rc.cpp:651 - #, no-c-format - msgid "&Add..." --msgstr "新增(&A)..." -+msgstr "新增(&A)…" - - #. i18n: file filters/stringreplacer/stringreplacerconfwidget.ui line 328 - #: rc.cpp:654 -@@ -1207,9 +1263,11 @@ - #, no-c-format - msgid "" - "The new Talker that will be used when the conditions above are met. The " --"default Talker is the topmost in the Talkers tab. Click the button to choose a " --"Talker." --msgstr "新的發音員會在上列的狀況下使用。預設的發音員為發音員清單中最頂端的那一個。點選此鍵以選擇發音員。" -+"default Talker is the topmost in the Talkers tab. Click the button to " -+"choose a Talker." -+msgstr "" -+"新的發音員會在上列的狀況下使用。預設的發音員為發音員清單中最頂端的那一個。點" -+"選此鍵以選擇發音員。" - - #. i18n: file filters/talkerchooser/talkerchooserconfwidget.ui line 224 - #: rc.cpp:735 -@@ -1247,7 +1305,8 @@ - msgid "" - "Enter the full path to an XML Style Language - Transforms (XSLT) stylesheet " - "file. XSLT files usually end with extension .xsl." --msgstr "輸入 XML 風格語言轉換器（XSLT）檔案的完整路徑。XSLT 檔通常副檔名為 .xsl。" -+msgstr "" -+"輸入 XML 風格語言轉換器（XSLT）檔案的完整路徑。XSLT 檔通常副檔名為 .xsl。" - - #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 52 - #: rc.cpp:765 -@@ -1261,7 +1320,9 @@ - msgid "" - "Enter the path to the xsltproc executable program. If it is in the PATH " - "environment variable, just enter \"xsltproc\"." --msgstr "輸入 xsltproc 執行檔的完整路徑。如果它已經在您設定的執行路徑中，只要輸入 xsltproc 即可。" -+msgstr "" -+"輸入 xsltproc 執行檔的完整路徑。如果它已經在您設定的執行路徑中，只要輸入 " -+"xsltproc 即可。" - - #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 91 - #: rc.cpp:777 -@@ -1279,11 +1340,12 @@ - #: rc.cpp:795 rc.cpp:807 - #, no-c-format - msgid "" --"This filter will be applied only to text having the specified XML root element. " --" If blank, applies to all text. You may enter more than one root element " --"separated by commas. Example: \"html\"." -+"This filter will be applied only to text having the specified XML root " -+"element. If blank, applies to all text. You may enter more than one root " -+"element separated by commas. Example: \"html\"." - msgstr "" --"這個過濾器只會套用到含有指定的 XML 根元素的文字。如果留白的話，則會套用到所有的文字。您可以輸入一個以上的根元素，用逗號隔開。範例如下：\"html\"。" -+"這個過濾器只會套用到含有指定的 XML 根元素的文字。如果留白的話，則會套用到所有" -+"的文字。您可以輸入一個以上的根元素，用逗號隔開。範例如下：\"html\"。" - - #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 157 - #: rc.cpp:798 rc.cpp:813 -@@ -1293,23 +1355,25 @@ - "specification. If blank, applies to all text. You may enter more than one " - "DOCTYPE separated by commas. Example: \"xhtml\"." - msgstr "" --"這個過濾器只會套用到含有指定的 DOCTYPE 的文字。如果留白的話，則會套用到所有的文字。您可以輸入一個以上的 " --"DOCTYPE，用逗號隔開。範例如下：\"xhtml\"。" -+"這個過濾器只會套用到含有指定的 DOCTYPE 的文字。如果留白的話，則會套用到所有的" -+"文字。您可以輸入一個以上的 DOCTYPE，用逗號隔開。範例如下：\"xhtml\"。" - - #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 165 - #: rc.cpp:801 rc.cpp:819 - #, no-c-format - msgid "" --"Enter a DCOP Application ID. This filter will only apply to text queued by " --"that application. You may enter more than one ID separated by commas. Use " --"knotify to match all messages sent as KDE notifications. If blank, this " --"filter applies to text queued by all applications. Tip: Use kdcop from the " --"command line to get the Application IDs of running applications. Example: " --"\"konversation, kvirc,ksirc,kopete\"" --msgstr "" --"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要求。您也可以輸入一個以上的代碼，用逗號隔開。使用 " --"knotify 則會套用在所有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 kdcop " --"可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"" -+"Enter a DCOP Application ID. This filter will only apply to text queued " -+"by that application. You may enter more than one ID separated by commas. " -+"Use knotify to match all messages sent as KDE notifications. If " -+"blank, this filter applies to text queued by all applications. Tip: Use " -+"kdcop from the command line to get the Application IDs of running " -+"applications. Example: \"konversation, kvirc,ksirc,kopete\"" -+msgstr "" -+"輸入一個 DCOP 應用程式代碼。這個過濾器會只套用到該程式送出的文字發音要" -+"求。您也可以輸入一個以上的代碼，用逗號隔開。使用 knotify 則會套用在所" -+"有 KDE 通知上。如果留白的話，預設套用到所有的應用程式。提示：在命令列上用 " -+"kdcop 可以知道應用程式的代碼。範例如下：\"konversaion,kvirc,ksirc,kopete\"" - - #. i18n: file filters/xmltransformer/xmltransformerconfwidget.ui line 183 - #: rc.cpp:804 -@@ -1346,13 +1410,14 @@ - #, no-c-format - msgid "" - "This field specifies both the command used for speaking texts and its " --"parameters. If you want to pass the text as a parameter, write %t at the place " --"where the text should be inserted. To pass a file of the text, write %f. To " --"synthesize only and let KTTSD play the synthesized text, write %w for the " --"generated audio file." --msgstr "" --"這個欄位指定文字要發音的命令及參數。如果您要將文字當成參數傳遞，用 %t 來表示您要傳遞的文字。要傳遞文字檔案當成參數，用 %f 來表示。如果只要合成並讓 " --"KTTSD 來播放，用 %w 來表示產生的音效檔。" -+"parameters. If you want to pass the text as a parameter, write %t at the " -+"place where the text should be inserted. To pass a file of the text, write %" -+"f. To synthesize only and let KTTSD play the synthesized text, write %w for " -+"the generated audio file." -+msgstr "" -+"這個欄位指定文字要發音的命令及參數。如果您要將文字當成參數傳遞，用 %t 來表示" -+"您要傳遞的文字。要傳遞文字檔案當成參數，用 %f 來表示。如果只要合成並讓 KTTSD " -+"來播放，用 %w 來表示產生的音效檔。" - - #. i18n: file plugins/command/commandconfwidget.ui line 88 - #: rc.cpp:831 -@@ -1364,8 +1429,8 @@ - #: rc.cpp:834 - #, no-c-format - msgid "" --"This check box specifies whether the text is sent as standard input (stdin) to " --"the speech synthesizer." -+"This check box specifies whether the text is sent as standard input (stdin) " -+"to the speech synthesizer." - msgstr "勾選此選項的話，表示文字經由標準輸入傳遞給語音合成器。" - - #. i18n: file plugins/command/commandconfwidget.ui line 116 -@@ -1384,7 +1449,8 @@ - #: rc.cpp:843 rc.cpp:1045 - #, no-c-format - msgid "" --"This combo box specifies which character encoding is used for passing the text." -+"This combo box specifies which character encoding is used for passing the " -+"text." - msgstr "這個選單指定所傳遞的文字的編碼。" - - #. i18n: file plugins/command/commandconfwidget.ui line 175 -@@ -1439,11 +1505,13 @@ - #: rc.cpp:874 rc.cpp:886 rc.cpp:895 - #, no-c-format - msgid "" --"Sets the speed of speech. Slide the slider to the left to slow speech down; to " --"the right to increase talking speed. Anything less than 75 percent is " -+"Sets the speed of speech. Slide the slider to the left to slow speech down; " -+"to the right to increase talking speed. Anything less than 75 percent is " - "considered \"slow\", and anything greater than 125 percent is considered " - "\"fast\"." --msgstr "設定發音速度。滑動器左側表示慢速，右側表示快速。通常小於 75% 算是慢的，大於 125% 則算是快的。" -+msgstr "" -+"設定發音速度。滑動器左側表示慢速，右側表示快速。通常小於 75% 算是慢的，大於 " -+"125% 則算是快的。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 164 - #: rc.cpp:877 -@@ -1455,11 +1523,13 @@ - #: rc.cpp:880 rc.cpp:892 rc.cpp:898 - #, no-c-format - msgid "" --"Sets the tone (frequency) of speech. Slide the slider to the left to lower the " --"voice tone; to the right to increase tone. Anything less than 75 percent is " --"considered \"low\", and anything greater than 125 percent is considered " --"\"high\"." --msgstr "設定語音的音調。滑動器左側表示音調低，右側表示音調高。小於 75% 則算是低的，大於 125% 則算是高的。" -+"Sets the tone (frequency) of speech. Slide the slider to the left to lower " -+"the voice tone; to the right to increase tone. Anything less than 75 " -+"percent is considered \"low\", and anything greater than 125 percent is " -+"considered \"high\"." -+msgstr "" -+"設定語音的音調。滑動器左側表示音調低，右側表示音調高。小於 75% 則算是低的，大" -+"於 125% 則算是高的。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 346 - #: rc.cpp:901 -@@ -1471,10 +1541,12 @@ - #: rc.cpp:904 rc.cpp:916 - #, no-c-format - msgid "" --"If the Epos server program will be found due to your PATH environment variable, " --"simply enter \"epos\", otherwise enter the full path to the Epos server " --"executable program." --msgstr "如果 Epos 已經在您設定的執行路徑中，則輸入 epos 即可，否則請輸入 Epos 伺服器的完整路徑。" -+"If the Epos server program will be found due to your PATH environment " -+"variable, simply enter \"epos\", otherwise enter the full path to the Epos " -+"server executable program." -+msgstr "" -+"如果 Epos 已經在您設定的執行路徑中，則輸入 epos 即可，否則請輸入 Epos 伺服器" -+"的完整路徑。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 371 - #: rc.cpp:907 -@@ -1486,10 +1558,12 @@ - #: rc.cpp:910 rc.cpp:922 - #, no-c-format - msgid "" --"If the Epos client program will be found due to the PATH environment variable, " --"simply enter \"say\" here. Otherwise, specify the full path to the Epos client " --"program." --msgstr "如果 Epos 客戶端程式已經在您設定的執行路徑中，則輸入 say 即可，否則請輸入 Epos 客戶端的完整路徑。" -+"If the Epos client program will be found due to the PATH environment " -+"variable, simply enter \"say\" here. Otherwise, specify the full path to " -+"the Epos client program." -+msgstr "" -+"如果 Epos 客戶端程式已經在您設定的執行路徑中，則輸入 say 即可，否則請輸入 " -+"Epos 客戶端的完整路徑。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 406 - #: rc.cpp:913 -@@ -1515,15 +1589,19 @@ - msgid "" - "Optional. Enter any server command line options here. To see available " - "options, enter \"epos -h\" in a terminal. Do not use \"-o\"." --msgstr "在此輸入伺服器命令的選項。在命令列中使用 epos -h 可以看到可使用的選項清單。不要用 -o。" -+msgstr "" -+"在此輸入伺服器命令的選項。在命令列中使用 epos -h 可以看到可使用的選項清單。不" -+"要用 -o。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 475 - #: rc.cpp:931 - #, no-c-format - msgid "" --"Specify options to be passed to Epos client. To see available options, enter " --"\"say -h\" in a terminal. Do not use \"-o\"." --msgstr "在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選項清單。不要使用 -o。" -+"Specify options to be passed to Epos client. To see available options, " -+"enter \"say -h\" in a terminal. Do not use \"-o\"." -+msgstr "" -+"在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選" -+"項清單。不要使用 -o。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 501 - #: rc.cpp:934 -@@ -1541,15 +1619,18 @@ - #: rc.cpp:943 - #, no-c-format - msgid "" --"Specify options to be passed to Epos client. Do not use -o. To see available " --"options, enter \"say -h\" in a terminal. Do not use \"-o\"." --msgstr "在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選項清單。不要使用 -o。" -+"Specify options to be passed to Epos client. Do not use -o. To see " -+"available options, enter \"say -h\" in a terminal. Do not use \"-o\"." -+msgstr "" -+"在此指定要傳遞給 Epos 客戶端的選項。在命令列中使用 say -h 可以看到可使用的選" -+"項清單。不要使用 -o。" - - #. i18n: file plugins/epos/eposconfwidget.ui line 577 - #: rc.cpp:949 - #, no-c-format - msgid "" --"Click to test the configuration. If correct, you will hear a sentence spoken." -+"Click to test the configuration. If correct, you will hear a sentence " -+"spoken." - msgstr "點選以測試設定。設定正確的話，您就可以聽到一個句子。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 25 -@@ -1584,7 +1665,9 @@ - msgid "" - "If Festival is in your PATH environment variable, just enter \"festival\", " - "otherwise specify the full path to the Festival executable program." --msgstr "如果 Festival 已經在您設定的執行路徑中，則輸入 festival 即可，否則請輸入 Festival 執行檔的完整路徑。" -+msgstr "" -+"如果 Festival 已經在您設定的執行路徑中，則輸入 festival 即可，否則請輸入 " -+"Festival 執行檔的完整路徑。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 144 - #: rc.cpp:973 -@@ -1597,13 +1680,15 @@ - #, no-c-format - msgid "" - "Select a voice to speak text with. MultiSyn voices are high quality but are " --"slow to load. If no voices are shown, check the Festival executable path. You " --"must install at least one Festival voice. If you have installed a voice and " --"still none are shown, check your Festival configuration. (See the README that " --"comes with Festival.)" --msgstr "" --"選擇要發音的聲音。MultiSyn 品質很高，但是載入很慢。如果沒有顯示聲音，請檢查 Festival 執行路徑是否正確。您必須至少安裝一個 Festival " --"聲音。如果您已經安裝 Festival 聲音，但是這裡仍然沒有顯示，請檢查您的 Festival 設定（請看 Festival 的 README）。" -+"slow to load. If no voices are shown, check the Festival executable path. " -+"You must install at least one Festival voice. If you have installed a voice " -+"and still none are shown, check your Festival configuration. (See the " -+"README that comes with Festival.)" -+msgstr "" -+"選擇要發音的聲音。MultiSyn 品質很高，但是載入很慢。如果沒有顯示聲音，請檢查 " -+"Festival 執行路徑是否正確。您必須至少安裝一個 Festival 聲音。如果您已經安裝 " -+"Festival 聲音，但是這裡仍然沒有顯示，請檢查您的 Festival 設定（請看 Festival " -+"的 README）。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 177 - #: rc.cpp:982 -@@ -1616,10 +1701,12 @@ - #, no-c-format - msgid "" - "Sets the volume (loudness) of speech. Slide the slider to the left to lower " --"the volume; to the right to increase volume. Anything less than 75 percent is " --"considered \"soft\", and anything greater than 125 percent is considered " -+"the volume; to the right to increase volume. Anything less than 75 percent " -+"is considered \"soft\", and anything greater than 125 percent is considered " - "\"loud\"." --msgstr "設定發音音量。滑動器左側表示小聲，右側表示大聲。通常 小於 75% 算是小聲，大於 125% 則算是大聲。" -+msgstr "" -+"設定發音音量。滑動器左側表示小聲，右側表示大聲。通常 小於 75% 算是小聲，大於 " -+"125% 則算是大聲。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 234 - #: rc.cpp:991 -@@ -1637,12 +1724,13 @@ - #: rc.cpp:1000 rc.cpp:1018 rc.cpp:1027 - #, no-c-format - msgid "" --"Sets the tone (frequency) of speech. Slide the slider to the left to lower the " --"voice tone; to the right to increase tone. Anything less than 75 percent is " --"considered \"low\", and anything greater than 125 percent is considered " --"\"high\". You cannot change the pitch of MultiSyn voices." -+"Sets the tone (frequency) of speech. Slide the slider to the left to lower " -+"the voice tone; to the right to increase tone. Anything less than 75 " -+"percent is considered \"low\", and anything greater than 125 percent is " -+"considered \"high\". You cannot change the pitch of MultiSyn voices." - msgstr "" --"設定語音的音調。滑動器左側表示音調低，右側表示音調高。小於 75% 則算是低的，大於 125% 則算是高的。您無法改變 MultiSyn 的音準。" -+"設定語音的音調。滑動器左側表示音調低，右側表示音調高。小於 75% 則算是低的，大" -+"於 125% 則算是高的。您無法改變 MultiSyn 的音準。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 485 - #: rc.cpp:1030 -@@ -1655,19 +1743,19 @@ - #, no-c-format - msgid "" - "If checked, Festival will be started and this voice will be loaded when the " --"Text-to-Speech Deamon (KTTSD) is started. Check when a voice requires a long " --"time to load in Festival (for example, multisyn voices), otherwise, leave " --"unchecked." -+"Text-to-Speech Deamon (KTTSD) is started. Check when a voice requires a " -+"long time to load in Festival (for example, multisyn voices), otherwise, " -+"leave unchecked." - msgstr "" --"勾選此選項的話，在 KTTSD 啟動時，會同時啟動 Festival 並載入此聲音。如果這個聲音載入到 Festival 的時間較長（如 " --"MultiSyn），請勾選此選項，否則請不要勾選。" -+"勾選此選項的話，在 KTTSD 啟動時，會同時啟動 Festival 並載入此聲音。如果這個聲" -+"音載入到 Festival 的時間較長（如 MultiSyn），請勾選此選項，否則請不要勾選。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 516 - #: rc.cpp:1039 - #, no-c-format - msgid "" --"Click to test the configuration. Festival will be started and a test sentence " --"will be spoken." -+"Click to test the configuration. Festival will be started and a test " -+"sentence will be spoken." - msgstr "點選以測試設定。Festival 會啟動，然後您能聽到一個測試句子。" - - #. i18n: file plugins/festivalint/festivalintconfwidget.ui line 542 -@@ -1686,8 +1774,8 @@ - #: rc.cpp:1051 rc.cpp:1057 - #, no-c-format - msgid "" --"This is the configuration dialog for the Festival Lite (Flite) speech synthesis " --"engine." -+"This is the configuration dialog for the Festival Lite (Flite) speech " -+"synthesis engine." - msgstr "這個對話框用於設定 Festival Lite (Flite)語音合成器引擎。" - - #. i18n: file plugins/flite/fliteconfwidget.ui line 70 -@@ -1708,7 +1796,9 @@ - msgid "" - "If Flite is in your PATH environment variable, simply enter \"flite\", " - "otherwise specify the complete path to the Flite executable program." --msgstr "如果 Flite 已經在您設定的執行路徑中，則輸入 flite 即可，否則請輸入 Flite 執行檔的完整路徑。" -+msgstr "" -+"如果 Flite 已經在您設定的執行路徑中，則輸入 flite 即可，否則請輸入 Flite 執行" -+"檔的完整路徑。" - - #. i18n: file plugins/flite/fliteconfwidget.ui line 137 - #: rc.cpp:1066 -@@ -1776,15 +1866,17 @@ - #: rc.cpp:1105 rc.cpp:1108 - #, no-c-format - msgid "" --"Select a voice for speaking text. If no voices are listed, check your Mbrola " --"configuration. You must install at least one voice." --msgstr "選擇要發音的聲音。如果沒有列出任何聲音，請檢查您的 Mbrola 設定。您必須至少安裝一個聲音。" -+"Select a voice for speaking text. If no voices are listed, check your " -+"Mbrola configuration. You must install at least one voice." -+msgstr "" -+"選擇要發音的聲音。如果沒有列出任何聲音，請檢查您的 Mbrola 設定。您必須至少安" -+"裝一個聲音。" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 135 - #: rc.cpp:1111 - #, no-c-format - msgid "&Select..." --msgstr "選擇(&S)..." -+msgstr "選擇(&S)…" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 151 - #: rc.cpp:1114 -@@ -1804,8 +1896,8 @@ - #: rc.cpp:1132 rc.cpp:1138 rc.cpp:1141 - #, no-c-format - msgid "" --"Adjusts the speed of speech. Slide to left for slower speech; to the right for " --"faster." -+"Adjusts the speed of speech. Slide to left for slower speech; to the right " -+"for faster." - msgstr "調整語音的速度。滑動器左側表示慢，右側表示快。" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 327 -@@ -1833,8 +1925,11 @@ - #, no-c-format - msgid "" - "If the txt2pho program is in your PATH environment variable, simply enter " --"\"txt2pho\", otherwise specify the full path to the txt2pho executable program." --msgstr "如果 txt2pho 已經在您設定的執行路徑中，則輸入 txt2pho 即可，否則請輸入 txt2pho 執行檔的完整路徑。" -+"\"txt2pho\", otherwise specify the full path to the txt2pho executable " -+"program." -+msgstr "" -+"如果 txt2pho 已經在您設定的執行路徑中，則輸入 txt2pho 即可，否則請輸入 " -+"txt2pho 執行檔的完整路徑。" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 446 - #: rc.cpp:1171 -@@ -1848,15 +1943,20 @@ - msgid "" - "If the Mbrola program is in your PATH environment variable, simply enter " - "\"mbrola\", otherwise specify the full path to the Mbrola executable program." --msgstr "如果 Mbrola 已經在您設定的執行路徑中，則輸入 mbrola 即可，否則請輸入 Mbrola 執行檔的完整路徑。" -+msgstr "" -+"如果 Mbrola 已經在您設定的執行路徑中，則輸入 mbrola 即可，否則請輸入 Mbrola " -+"執行檔的完整路徑。" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 511 - #: rc.cpp:1183 - #, no-c-format - msgid "" --"This combo box specifies which character encoding is used for passing the text. " --" For most western languages, use ISO-8859-1. For Hungarian, use ISO-8859-2." --msgstr "這個選單指定傳遞的文字的編碼。大部份西方的語言使用 ISO-8859-1，匈牙利語請使用 ISO-8859-2。" -+"This combo box specifies which character encoding is used for passing the " -+"text. For most western languages, use ISO-8859-1. For Hungarian, use ISO-" -+"8859-2." -+msgstr "" -+"這個選單指定傳遞的文字的編碼。大部份西方的語言使用 ISO-8859-1，匈牙利語請使" -+"用 ISO-8859-2。" - - #. i18n: file plugins/hadifix/hadifixconfigui.ui line 551 - #: rc.cpp:1189 -@@ -2205,7 +2305,8 @@ - - #: filters/main.cpp:52 - msgid "" --"_: A string that appears in a single config file, not a group of config files\n" -+"_: A string that appears in a single config file, not a group of config " -+"files\n" - "Config file group name passed to filter" - msgstr "傳遞給過濾器的設定檔群組名稱" - -@@ -2249,22 +2350,22 @@ - - #: kcmkttsmgr/kcmkttsmgr.cpp:910 - msgid "" --"You have made changes to the configuration but have not saved them yet. Click " --"Apply to save the changes or Cancel to abandon the changes." --msgstr "您已經變更設定，但是還沒儲存。請點選「套用」以儲存設定，或是「取消」來取消更改。" -+"You have made changes to the configuration but have not saved them yet. " -+"Click Apply to save the changes or Cancel to abandon the changes." -+msgstr "" -+"您已經變更設定，但是還沒儲存。請點選「套用」以儲存設定，或是「取消」來取消更" -+"改。" - - #: kcmkttsmgr/kcmkttsmgr.cpp:1072 - msgid "" --"

Text-to-Speech

" --"

This is the configuration for the text-to-speech dcop service

" --"

This allows other applications to access text-to-speech resources

" --"

Be sure to configure a default language for the language you are using as " --"this will be the language used by most of the applications

" --msgstr "" --"

文字發音

" --"

這是文字發音 DCOP 服務的設定。

" --"

它允許其他應用程式使用文字發音的資源。

" --"

請確定已設定好您所使用的預設語言，這會被大部份的應用程式所套用。

" -+"

Text-to-Speech

This is the configuration for the text-to-speech " -+"dcop service

This allows other applications to access text-to-speech " -+"resources

Be sure to configure a default language for the language you " -+"are using as this will be the language used by most of the applications

" -+msgstr "" -+"

文字發音

這是文字發音 DCOP 服務的設定。

它允許其他應用程式使" -+"用文字發音的資源。

請確定已設定好您所使用的預設語言，這會被大部份的應" -+"用程式所套用。

" - - #: kcmkttsmgr/kcmkttsmgr.cpp:1080 kttsd/main.cpp:36 - #: players/artsplayer/artsplayer.cpp:240 -@@ -2443,35 +2544,32 @@ - #: kttsjobmgr/kttsjobmgr.cpp:127 - msgid "" - "

These are all the text jobs. The State column may be:" --"

    " --"
  • Queued - the job is waiting and will not be spoken until its state " --"is changed to Waiting by clicking the Resume or Restart " --"buttons.
    • " --"
  • Waiting - the job is ready to be spoken. It will be spoken when the " --"jobs preceding it in the list have finished.
    • " --"
  • Speaking - the job is speaking. The Position " --"column shows the current sentence of the job being spoken. You may pause a " --"speaking job by clicking the Hold button.
    • " --"
  • Paused - the job is currently paused. Paused jobs prevent jobs " --"below them from speaking. Use the Resume or Restart " --"buttons to resume speaking the job, or click Later " --"to move the job down in the list.
    • " --"
  • Finished - the job has finished speaking. When a second job " --"finishes, this one will be deleted. You may click Restart " --"to repeat the job.
Note: Messages, Warnings, and Screen " --"Reader Output do not appear in this list. See the Handbook for more " --"information.

" --msgstr "" --"

這些是所有的文字發音工作。狀態欄位可能為： " --"

    " --"
  • 已送進佇列：此工作已經在等待，但是除非點選恢復或重新開始讓狀態變成等待中" --"，否則不會被執行。
    • " --"
  • 等待中：此工作已經準備好被執行了，正在等待執行中的工作結束。
    • " --"
  • 執行中：此工作正在執行。位置欄位顯示目前正在唸的句子。您可以按下暫停來暫停此工作。
    • " --"
  • 已暫停：此工作目前暫停執行。之後的工作也不會被執行。用恢復或重新開始來恢復工作，或是延後" --"將工作放到清單的底部。
    • " --"
  • 已完成：此工作已完成。當下一個工作也完成後，這個工作就會被刪除。您可以點選重新開始來重新執行工作。
" --"注意：訊息、警告與螢幕讀取輸出不會出現在此清單中。詳情請參考手冊。

" -+"
  • Queued - the job is waiting and will not be spoken until its " -+"state is changed to Waiting by clicking the Resume or " -+"Restart buttons.
  • Waiting - the job is ready to be " -+"spoken. It will be spoken when the jobs preceding it in the list have " -+"finished.
  • Speaking - the job is speaking. The Position column shows the current sentence of the job being spoken. You may pause " -+"a speaking job by clicking the Hold button.
  • Paused - " -+"the job is currently paused. Paused jobs prevent jobs below them from " -+"speaking. Use the Resume or Restart buttons to resume " -+"speaking the job, or click Later to move the job down in the list.
  • Finished - the job has finished speaking. When a second job " -+"finishes, this one will be deleted. You may click Restart to repeat " -+"the job.
Note: Messages, Warnings, and Screen Reader " -+"Output do not appear in this list. See the Handbook for more information." -+msgstr "" -+"

這些是所有的文字發音工作。狀態欄位可能為：

  • 已送進佇列：此工作已經在等待，但是除非點選恢復或重新開始讓狀態變成等" -+"待中，否則不會被執行。
  • 等待中：此工作已經準備好被執行了，" -+"正在等待執行中的工作結束。
  • 執行中：此工作正在執行。位置欄位顯示目前正在唸的句子。您可以按下暫停來暫停此工作。
  • " -+"已暫停：此工作目前暫停執行。之後的工作也不會被執行。用恢復或重" -+"新開始來恢復工作，或是延後將工作放到清單的底部。
  • 已完" -+"成：此工作已完成。當下一個工作也完成後，這個工作就會被刪除。您可以點選" -+"重新開始來重新執行工作。
注意：訊息、警告與螢幕讀取輸" -+"出不會出現在此清單中。詳情請參考手冊。

" - - #: kttsjobmgr/kttsjobmgr.cpp:176 - msgid "Hold" -@@ -2480,12 +2578,13 @@ - #: kttsjobmgr/kttsjobmgr.cpp:178 - msgid "" - "

Changes a job to Paused state. If currently speaking, the job stops " --"speaking. Paused jobs prevent jobs that follow them from speaking, so either " --"click Resume to make the job speakable, or click Later " -+"speaking. Paused jobs prevent jobs that follow them from speaking, so " -+"either click Resume to make the job speakable, or click Later " - "to move it down in the list.

" - msgstr "" --"

將工作狀態變更為「已暫停」。如果正在發音，這個工作會暫停發音。之後的工作也會被卡住不會執行。點選恢復可以恢復工作，或是延後" --"將工作移到清單底部。

" -+"

將工作狀態變更為「已暫停」。如果正在發音，這個工作會暫停發音。之後的工作也" -+"會被卡住不會執行。點選恢復可以恢復工作，或是延後將工作移到清單" -+"底部。

" - - #: kttsjobmgr/kttsjobmgr.cpp:185 kttsmgr/kttsmgr.cpp:186 - msgid "Resume" -@@ -2493,9 +2592,11 @@ - - #: kttsjobmgr/kttsjobmgr.cpp:187 - msgid "" --"

Resumes a paused job or changes a Queued job to Waiting. If the job is the " --"top speakable job in the list, it begins speaking.

" --msgstr "

恢復已暫停的工作，或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單的最頂端，則會開始工作。

" -+"

Resumes a paused job or changes a Queued job to Waiting. If the job is " -+"the top speakable job in the list, it begins speaking.

" -+msgstr "" -+"

恢復已暫停的工作，或將已送進佇列的工作狀態改為「等待中」。如果此工作在清單" -+"的最頂端，則會開始工作。

" - - #: kttsjobmgr/kttsjobmgr.cpp:192 - msgid "R&estart" -@@ -2503,14 +2604,16 @@ - - #: kttsjobmgr/kttsjobmgr.cpp:194 - msgid "" --"

Rewinds a job to the beginning and changes its state to Waiting. If the job " --"is the top speakable job in the list, it begins speaking.

" --msgstr "

讓此工作從頭開始，並將狀態改變為「等待中」。如果此工作在清單的最頂端，則開始工作。

" -+"

Rewinds a job to the beginning and changes its state to Waiting. If the " -+"job is the top speakable job in the list, it begins speaking.

" -+msgstr "" -+"

讓此工作從頭開始，並將狀態改變為「等待中」。如果此工作在清單的最頂端，則開" -+"始工作。

" - - #: kttsjobmgr/kttsjobmgr.cpp:201 - msgid "" --"

Deletes the job. If it is currently speaking, it stops speaking. The next " --"speakable job in the list begins speaking.

" -+"

Deletes the job. If it is currently speaking, it stops speaking. The " -+"next speakable job in the list begins speaking.

" - msgstr "

刪除此工作。如果它正在工作，則會停止。下一個工作會開始執行。

" - - #: kttsjobmgr/kttsjobmgr.cpp:206 -@@ -2521,7 +2624,9 @@ - msgid "" - "

Moves a job downward in the list so that it will be spoken later. If the " - "job is currently speaking, its state changes to Paused.

" --msgstr "

將工作移到清單的最底部，稍後會繼續工作。如果此工作正在執行，它的狀態會改變為「已暫停」。

" -+msgstr "" -+"

將工作移到清單的最底部，稍後會繼續工作。如果此工作正在執行，它的狀態會改變" -+"為「已暫停」。

" - - #: kttsjobmgr/kttsjobmgr.cpp:214 - msgid "Pre&vious Part" -@@ -2561,10 +2666,13 @@ - - #: kttsjobmgr/kttsjobmgr.cpp:241 - msgid "" --"

Queues the current contents of the clipboard for speaking and sets its state " --"to Waiting. If the job is the topmost in the list, it begins speaking. The " --"job will be spoken by the topmost Talker in the Talkers tab.

" --msgstr "

將目前剪貼簿中的內容送進工作清單，並標技為「等待中」。如果此工作在清單的最頂端，則開始執行。它會用預設的發音員來讀。

" -+"

Queues the current contents of the clipboard for speaking and sets its " -+"state to Waiting. If the job is the topmost in the list, it begins " -+"speaking. The job will be spoken by the topmost Talker in the Talkers tab.

" -+msgstr "" -+"

將目前剪貼簿中的內容送進工作清單，並標技為「等待中」。如果此工作在清單的最" -+"頂端，則開始執行。它會用預設的發音員來讀。

" - - #: kttsjobmgr/kttsjobmgr.cpp:247 - msgid "Spea&k File" -@@ -2574,9 +2682,11 @@ - msgid "" - "

Prompts you for a file name and queues the contents of the file for " - "speaking. You must click the Resume button before the job will be " --"speakable. The job will be spoken by the topmost Talker in the Talkers " --"tab.

" --msgstr "

讓您選擇一個檔案，並將檔案內容送進工作清單。您必須點選恢復才能讓它開始工作。它會用預設的發音員來讀。

" -+"speakable. The job will be spoken by the topmost Talker in the Talkers tab.

" -+msgstr "" -+"

讓您選擇一個檔案，並將檔案內容送進工作清單。您必須點選恢復才能讓它" -+"開始工作。它會用預設的發音員來讀。

" - - #: kttsjobmgr/kttsjobmgr.cpp:255 - msgid "Change Talker" -@@ -2584,8 +2694,8 @@ - - #: kttsjobmgr/kttsjobmgr.cpp:257 - msgid "" --"

Prompts you with a list of your configured Talkers from the Talkers " --"tab. The job will be spoken using the selected Talker.

" -+"

Prompts you with a list of your configured Talkers from the Talkers tab. The job will be spoken using the selected Talker.

" - msgstr "

讓您選擇發音員。這個工作會使用所選取的發音員來讀。

" - - #: kttsjobmgr/kttsjobmgr.cpp:262 -@@ -2880,8 +2990,8 @@ - - #: players/artsplayer/artsplayer.cpp:235 - msgid "" --"Connecting/starting aRts soundserver failed. Make sure that artsd is configured " --"properly." -+"Connecting/starting aRts soundserver failed. Make sure that artsd is " -+"configured properly." - msgstr "連接/啟動 aRts 音效伺服器時發生錯誤，請確定你的 artsd 已正確設定。" - - #: plugins/command/commandconf.cpp:164 plugins/epos/eposconf.cpp:230 -@@ -2905,14 +3015,15 @@ - - #: plugins/festivalint/festivalintconf.cpp:578 - msgid "" --"Testing. MultiSyn voices require several seconds to load. Please be patient." -+"Testing. MultiSyn voices require several seconds to load. Please be " -+"patient." - msgstr "測試中。載入 MultiSync 聲音需要一些時間。請稍候。" - - #: plugins/freetts/freettsconf.cpp:96 - msgid "" - "Unable to locate freetts.jar in your path.\n" --"Please specify the path to freetts.jar in the Properties tab before using KDE " --"Text-to-Speech" -+"Please specify the path to freetts.jar in the Properties tab before using " -+"KDE Text-to-Speech" - msgstr "找不到 freetts.jar。請先在「內容」中指定 freetts.jar 的路徑。" - - #: plugins/freetts/freettsconf.cpp:96 -@@ -2933,7 +3044,7 @@ - - #: plugins/hadifix/hadifixconf.cpp:216 - msgid "This plugin is distributed under the terms of the GPL v2 or later." --msgstr "此外掛程式以 GPL 第二版或更新的版本散佈。" -+msgstr "此外掛程式以 GPL 第二版或更新的版本散布。" - - #: plugins/hadifix/hadifixconf.cpp:300 - msgid "Voice File - Hadifix Plugin" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/libKTTSD.po kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/libKTTSD.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaccessibility/libKTTSD.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaccessibility/libKTTSD.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libKTTSD\n" - "POT-Creation-Date: 2005-05-08 01:29+0200\n" - "PO-Revision-Date: 2006-06-06 10:40+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -42,7 +41,9 @@ - msgid "" - "

If you would like to change the configuration of KTTSD " - "please use the KDE Control Center or click the button below.

" --msgstr "

如果您要變更 KTTSD 的設定，請使用 KDE 控制中心，或按下方的按鍵。

" -+msgstr "" -+"

如果您要變更 KTTSD 的設定，請使用 KDE 控制中心，或按下方" -+"的按鍵。

" - - #. i18n: file KTTSDlibSetup.ui line 85 - #: rc.cpp:9 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/akregator_konqplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/akregator_konqplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/akregator_konqplugin.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/akregator_konqplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: akregator_konqplugin\n" - "POT-Creation-Date: 2006-11-11 02:39+0100\n" - "PO-Revision-Date: 2006-05-29 09:04+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,7 +27,7 @@ - - #: konqfeedicon.cpp:165 - msgid "Monitor this site for updates (using news feed)" --msgstr "監控此站台是否有更新（使用新的 Feed）" -+msgstr "監控此站臺是否有更新（使用新的 Feed）" - - #: konqfeedicon.cpp:209 pluginbase.cpp:56 pluginbase.cpp:66 - msgid "Imported Feeds" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/alsaplayerui.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/alsaplayerui.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/alsaplayerui.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/alsaplayerui.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: alsaplayerui\n" - "POT-Creation-Date: 2008-07-08 01:23+0200\n" - "PO-Revision-Date: 2002-08-30 10:50\n" --"Last-Translator: Tse-Chun Ho \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditinal) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -66,7 +66,7 @@ - #: rc.cpp:24 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file AlsaPlayer.ui line 2297 - #: rc.cpp:27 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ark_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ark_plugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ark_plugin.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ark_plugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: ark_plugin\n" - "POT-Creation-Date: 2006-10-17 02:38+0200\n" - "PO-Revision-Date: 2006-03-24 12:46+0800\n" --"Last-Translator: You-Cheng Hsieh \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +31,7 @@ - - #: arkplugin.cpp:126 - msgid "Add to Archive..." --msgstr "加入至壓縮檔..." -+msgstr "加入至壓縮檔…" - - #: arkplugin.cpp:136 - msgid "Extract" -@@ -52,7 +52,7 @@ - - #: arkplugin.cpp:155 arkplugin.cpp:162 - msgid "Extract To..." --msgstr "解壓縮至..." -+msgstr "解壓縮至…" - - #: arkplugin.cpp:435 arkplugin.cpp:479 - msgid "Archive" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/atlantikdesigner.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/atlantikdesigner.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/atlantikdesigner.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/atlantikdesigner.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: atlantikdesigner\n" - "POT-Creation-Date: 2004-12-29 14:56+0100\n" - "PO-Revision-Date: 2006-05-29 09:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -35,7 +34,7 @@ - - #: designer/main.cpp:13 - msgid "Atlantik gameboard designer" --msgstr "Atlantik 遊戲平台設計者" -+msgstr "Atlantik 遊戲平臺設計者" - - #: designer/main.cpp:15 - msgid "(c) 2002 Jason Katz-Brown" -@@ -51,11 +50,11 @@ - - #: designer/designer.cpp:56 - msgid "&Edit Gameboard Info..." --msgstr "編輯遊戲平台資訊...(&E)" -+msgstr "編輯遊戲平臺資訊…(&E)" - - #: designer/designer.cpp:57 - msgid "&Edit Groups..." --msgstr "編輯群組...(&E)" -+msgstr "編輯群組…(&E)" - - #: designer/designer.cpp:59 - msgid "&Add 4 Squares" -@@ -91,7 +90,7 @@ - - #: designer/designer.cpp:213 - msgid "There are unsaved changes to gameboard. Save them?" --msgstr "您尚未儲存遊戲平台的改變。要儲存嗎？" -+msgstr "您尚未儲存遊戲平臺的改變。要儲存嗎？" - - #: designer/designer.cpp:213 - msgid "Unsaved Changes" -@@ -103,7 +102,7 @@ - - #: designer/designer.cpp:529 - msgid "This board file is invalid; cannot open." --msgstr "這個平台檔無效；無法開啟。" -+msgstr "這個平臺檔無效；無法開啟。" - - #: designer/designer.cpp:529 - msgid "There are only %1 estates specified in this file." -@@ -116,7 +115,7 @@ - - #: designer/designer.cpp:949 - msgid "Atlantik Gameboard Editor" --msgstr "Atlantic 遊戲平台編輯器" -+msgstr "Atlantic 遊戲平臺編輯器" - - #: designer/group.cpp:23 - msgid "Group Editor" -@@ -173,7 +172,7 @@ - - #: designer/group.cpp:93 - msgid "&Add..." --msgstr "新增...(&A)" -+msgstr "新增…(&A)" - - #: designer/group.cpp:107 - msgid "Add Group" -@@ -305,11 +304,11 @@ - - #: designer/editor.cpp:655 - msgid "&Add Card..." --msgstr "新增卡片...(&A)" -+msgstr "新增卡片…(&A)" - - #: designer/editor.cpp:659 - msgid "&Rename..." --msgstr "更名...(&R)" -+msgstr "更名…(&R)" - - #: designer/editor.cpp:675 - msgid "&More Properties" -@@ -365,7 +364,7 @@ - - #: designer/boardinfo.cpp:19 - msgid "Gameboard Information" --msgstr "遊戲平台資訊" -+msgstr "遊戲平臺資訊" - - #: designer/boardinfo.cpp:42 - msgid "Version:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/audiorename_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/audiorename_plugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/audiorename_plugin.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/audiorename_plugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,7 +10,7 @@ - "Project-Id-Version: audiorename_plugin\n" - "POT-Creation-Date: 2007-01-07 02:43+0100\n" - "PO-Revision-Date: 2003-07-14 21:02+0800\n" --"Last-Translator: Keng-Tso Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -18,22 +18,16 @@ - "X-Generator: KBabel 1.0.1\n" - - #: audio_plugin.cpp:76 --msgid "" --"An older file named '%1' already exists.\n" --msgstr "" --"名稱為 '%1' 的較舊檔案已經存在。\n" -+msgid "An older file named '%1' already exists.\n" -+msgstr "名稱為 '%1' 的較舊檔案已經存在。\n" - - #: audio_plugin.cpp:78 --msgid "" --"A similar file named '%1' already exists.\n" --msgstr "" --"名稱為 '%1' 的類似檔案已經存在。\n" -+msgid "A similar file named '%1' already exists.\n" -+msgstr "名稱為 '%1' 的類似檔案已經存在。\n" - - #: audio_plugin.cpp:80 --msgid "" --"A newer file named '%1' already exists.\n" --msgstr "" --"名稱為 '%1' 的較新檔案已經存在。\n" -+msgid "A newer file named '%1' already exists.\n" -+msgstr "名稱為 '%1' 的較新檔案已經存在。\n" - - #: audio_plugin.cpp:82 - msgid "Source File" -@@ -54,7 +48,7 @@ - "Click on this label to load it.\n" - msgstr "" - "這個音樂檔案並未儲存\n" --"於這台主機\n" -+"於這臺主機\n" - "點選這個標籤來載入該檔案。\n" - - #: audiopreview.cpp:60 -@@ -62,35 +56,26 @@ - msgstr "無法載入音樂檔案" - - #: audiopreview.cpp:92 --msgid "" --"Artist: %1\n" --msgstr "" --"音樂家： %1\n" -+msgid "Artist: %1\n" -+msgstr "音樂家： %1\n" - - #: audiopreview.cpp:95 --msgid "" --"Title: %1\n" --msgstr "" --"標題： %1\n" -+msgid "Title: %1\n" -+msgstr "標題： %1\n" - - #: audiopreview.cpp:98 --msgid "" --"Comment: %1\n" --msgstr "" --"評論： %1\n" -+msgid "Comment: %1\n" -+msgstr "評論： %1\n" - - #: audiopreview.cpp:100 - msgid "" - "_: Biterate: 160 kbits/s\n" - "Bitrate: %1 %2\n" --msgstr "" --"位元率： %1 %2\n" -+msgstr "位元率： %1 %2\n" - - #: audiopreview.cpp:102 --msgid "" --"Sample rate: %1 %2\n" --msgstr "" --"取樣率： %1 %2\n" -+msgid "Sample rate: %1 %2\n" -+msgstr "取樣率： %1 %2\n" - - #: audiopreview.cpp:103 - msgid "Length: " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/autorefresh.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/autorefresh.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/autorefresh.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/autorefresh.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: autorefresh\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2003-07-14 21:05+0800\n" --"Last-Translator: Keng-Tso Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/babelfish.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/babelfish.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/babelfish.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/babelfish.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: babelfish\n" - "POT-Creation-Date: 2008-04-08 02:02+0200\n" - "PO-Revision-Date: 2006-05-29 09:18+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,113 +32,113 @@ - - #: plugin_babelfish.cpp:43 - msgid "Translate Web &Page" --msgstr "翻譯網頁 (&P)" -+msgstr "翻譯網頁(&P)" - - #: plugin_babelfish.cpp:47 - msgid "&English To" --msgstr "英文翻為(&E)" -+msgstr "英語翻為(&E)" - - #: plugin_babelfish.cpp:49 - msgid "&French To" --msgstr "法文翻為(&E)" -+msgstr "法語翻為(&E)" - - #: plugin_babelfish.cpp:51 - msgid "&German To" --msgstr "德文翻為(&G)" -+msgstr "德語翻為(&G)" - - #: plugin_babelfish.cpp:53 - msgid "&Spanish To" --msgstr "西班牙文翻為(&S)" -+msgstr "西班牙語翻為(&S)" - - #: plugin_babelfish.cpp:55 - msgid "&Portuguese To" --msgstr "葡萄牙文翻為(&P)" -+msgstr "葡萄牙語翻為(&P)" - - #: plugin_babelfish.cpp:57 - msgid "&Italian To" --msgstr "義大利文翻為(&I)" -+msgstr "義大利語翻為(&I)" - - #: plugin_babelfish.cpp:59 - msgid "&Dutch To" --msgstr "荷蘭文翻為(&D)" -+msgstr "荷蘭語翻為(&D)" - - #: plugin_babelfish.cpp:62 - msgid "&Chinese (Simplified)" --msgstr "簡體中文(&C)" -+msgstr "簡化字漢語(&C)" - - #: plugin_babelfish.cpp:65 - msgid "Chinese (&Traditional)" --msgstr "繁體中文(&T)" -+msgstr "傳統字漢語(&T)" - - #: plugin_babelfish.cpp:68 plugin_babelfish.cpp:102 - msgid "&Dutch" --msgstr "荷蘭文(&D)" -+msgstr "荷蘭語(&D)" - - #: plugin_babelfish.cpp:71 plugin_babelfish.cpp:124 plugin_babelfish.cpp:131 - #: plugin_babelfish.cpp:138 plugin_babelfish.cpp:145 plugin_babelfish.cpp:152 - msgid "&French" --msgstr "法文(&F)" -+msgstr "法語(&F)" - - #: plugin_babelfish.cpp:74 plugin_babelfish.cpp:108 - msgid "&German" --msgstr "德文(&G)" -+msgstr "德語(&G)" - - #: plugin_babelfish.cpp:77 plugin_babelfish.cpp:111 - msgid "&Italian" --msgstr "義大利文(&I)" -+msgstr "義大利語(&I)" - - #: plugin_babelfish.cpp:80 - msgid "&Japanese" --msgstr "日文(&J)" -+msgstr "日語(&J)" - - #: plugin_babelfish.cpp:83 - msgid "&Korean" --msgstr "韓文(&K)" -+msgstr "韓語(&K)" - - #: plugin_babelfish.cpp:86 - msgid "&Norwegian" --msgstr "挪威文(&N)" -+msgstr "挪威語(&N)" - - #: plugin_babelfish.cpp:89 plugin_babelfish.cpp:114 - msgid "&Portuguese" --msgstr "葡萄牙文(&P)" -+msgstr "葡萄牙語(&P)" - - #: plugin_babelfish.cpp:92 - msgid "&Russian" --msgstr "俄文(&R)" -+msgstr "俄語(&R)" - - #: plugin_babelfish.cpp:95 plugin_babelfish.cpp:117 - msgid "&Spanish" --msgstr "西班牙文(&S)" -+msgstr "西班牙語(&S)" - - #: plugin_babelfish.cpp:98 - msgid "T&hai" --msgstr "泰文(&H)" -+msgstr "泰語(&H)" - - #: plugin_babelfish.cpp:105 plugin_babelfish.cpp:121 plugin_babelfish.cpp:128 - #: plugin_babelfish.cpp:135 plugin_babelfish.cpp:142 plugin_babelfish.cpp:149 - msgid "&English" --msgstr "英文(&E)" -+msgstr "英語(&E)" - - #: plugin_babelfish.cpp:156 - msgid "&Chinese (Simplified) to English" --msgstr "簡體中文翻為英文(&C)" -+msgstr "簡化字漢語翻為英語(&C)" - - #: plugin_babelfish.cpp:159 - msgid "Chinese (&Traditional) to English" --msgstr "繁體中文翻為英文(&T)" -+msgstr "傳統字漢語翻為英語(&T)" - - #: plugin_babelfish.cpp:167 - msgid "&Japanese to English" --msgstr "日文翻為英文(&J)" -+msgstr "日語翻為英語(&J)" - - #: plugin_babelfish.cpp:170 - msgid "&Korean to English" --msgstr "韓文翻為英文(&K)" -+msgstr "韓語翻為英語(&K)" - - #: plugin_babelfish.cpp:174 - msgid "&Russian to English" --msgstr "俄文翻為英文(&R)" -+msgstr "俄語翻為英語(&R)" - - #: plugin_babelfish.cpp:217 - msgid "Cannot Translate Source" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/charlatanui.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/charlatanui.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/charlatanui.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/charlatanui.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: charlatanui\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 09:19+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/crashesplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/crashesplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/crashesplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/crashesplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: crashesplugin\n" - "POT-Creation-Date: 2005-08-10 10:20+0200\n" - "PO-Revision-Date: 2006-05-29 09:20+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dirfilterplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dirfilterplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dirfilterplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dirfilterplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: dirfilterplugin\n" - "POT-Creation-Date: 2005-12-31 03:19+0100\n" - "PO-Revision-Date: 2006-05-29 09:33+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,7 +32,8 @@ - - #: dirfilterplugin.cpp:195 - msgid "" --"Enter here a text which an item in the view must contain anywhere to be shown." -+"Enter here a text which an item in the view must contain anywhere to be " -+"shown." - msgstr "在此輸入要檢視的項目包含的字串。" - - #: dirfilterplugin.cpp:199 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/domtreeviewer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/domtreeviewer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/domtreeviewer.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/domtreeviewer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: domtreeviewer\n" - "POT-Creation-Date: 2006-05-18 04:07+0200\n" - "PO-Revision-Date: 2006-05-29 09:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -209,11 +208,11 @@ - - #: domtreewindow.cpp:162 - msgid "New &Element ..." --msgstr "新增元素...(&E)" -+msgstr "新增元素…(&E)" - - #: domtreewindow.cpp:166 - msgid "New &Text Node ..." --msgstr "新增文字節點...(&T)" -+msgstr "新增文字節點…(&T)" - - #: domtreewindow.cpp:174 - msgid "Delete attributes" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dub.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dub.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/dub.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/dub.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: dub\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 09:48+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ffrs.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ffrs.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ffrs.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ffrs.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: ffrs\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 09:50+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/fsview.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/fsview.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/fsview.po 2007-07-12 10:27:45.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/fsview.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: fsview\n" - "POT-Creation-Date: 2007-05-17 02:17+0200\n" - "PO-Revision-Date: 2006-05-29 09:59+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -66,14 +65,14 @@ - #: fsview_part.cpp:105 - msgid "" - "

This is the FSView plugin, a graphical browsing mode showing filesystem " --"utilization by using a tree map visualization.

" --"

Note that in this mode, automatic updating when filesystem changes are made " --"is intentionally not done.

" --"

For details on usage and options available, see the online help under menu " --"'Help/FSView Manual'.

" -+"utilization by using a tree map visualization.

Note that in this mode, " -+"automatic updating when filesystem changes are made is intentionally not done.

For details on usage and options available, see the online " -+"help under menu 'Help/FSView Manual'.

" - msgstr "" --"

這是 FSView，一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。

" --"

注意，在此模式下，不會自動更新檔案系統的狀況。詳細的用法與可用的選項，請參考 FSView 線上手冊。

" -+"

這是 FSView，一個使用樹狀圖來檢視目前檔案系統使用狀況的外掛程式。

" -+"注意，在此模式下，不會自動更新檔案系統的狀況。詳細的用法與可用的選項，" -+"請參考 FSView 線上手冊。

" - - #: fsview.cpp:294 fsview_part.cpp:121 - msgid "Stop at Area" -@@ -105,10 +104,13 @@ - - #: fsview_part.cpp:199 - msgid "" --"FSView intentionally does not support automatic updates when changes are made " --"to files or directories, currently visible in FSView, from the outside.\n" -+"FSView intentionally does not support automatic updates when changes are " -+"made to files or directories, currently visible in FSView, from the " -+"outside.\n" - "For details, see the 'Help/FSView Manual'." --msgstr "在檢視檔案系統時，若檔案系統中的檔案、目錄等有變更時，FSView 並不會自動變更狀態。這是刻意如此的。詳情請參考 FSView 手冊。" -+msgstr "" -+"在檢視檔案系統時，若檔案系統中的檔案、目錄等有變更時，FSView 並不會自動變更狀" -+"態。這是刻意如此的。詳情請參考 FSView 手冊。" - - #: treemap.cpp:1255 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imagerename_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imagerename_plugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imagerename_plugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imagerename_plugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: imagerename_plugin\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 10:03+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -38,8 +37,7 @@ - msgid "" - "_: The color depth of an image\n" - "Depth: %1\n" --msgstr "" --"深度：%1\n" -+msgstr "深度：%1\n" - - #: imagevisualizer.cpp:68 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imgalleryplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imgalleryplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/imgalleryplugin.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/imgalleryplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: imgalleryplugin\n" - "POT-Creation-Date: 2007-01-07 02:43+0100\n" - "PO-Revision-Date: 2006-05-29 10:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -90,7 +89,8 @@ - - #: imgallerydialog.cpp:201 - msgid "" --"

Whether subfolders should be included for the image gallery creation or not." -+"

Whether subfolders should be included for the image gallery creation or " -+"not." - msgstr "

建立相簿時是否要收入子資料夾的內容。" - - #: imgallerydialog.cpp:208 -@@ -103,8 +103,8 @@ - - #: imgallerydialog.cpp:212 - msgid "" --"

You can limit the number of folders the image gallery creator will traverse " --"to by setting an upper bound for the recursion depth." -+"

You can limit the number of folders the image gallery creator will " -+"traverse to by setting an upper bound for the recursion depth." - msgstr "

您可以限制要遞迴收錄多少層以內的子資料夾到相簿內。" - - #: imgallerydialog.cpp:224 -@@ -113,8 +113,8 @@ - - #: imgallerydialog.cpp:227 - msgid "" --"

This makes a copy of all images and the gallery will refer to these copies " --"instead of the original images." -+"

This makes a copy of all images and the gallery will refer to these " -+"copies instead of the original images." - msgstr "

這會將所有的影像複製一份在相簿中，並只存取此複本。" - - #: imgallerydialog.cpp:233 -@@ -123,11 +123,12 @@ - - #: imgallerydialog.cpp:237 - msgid "" --"

If you enable this option you can specify a comment file which will be used " --"for generating subtitles for the images." --"

For details about the file format please see the \"What's This?\" help " --"below." --msgstr "

開啟此選項的話，您可以指定使用一個備註檔，以記錄影像的子標題。

關於此檔案格式的詳情，請參考「這是什麼？」的說明。" -+"

If you enable this option you can specify a comment file which will be " -+"used for generating subtitles for the images.

For details about the file " -+"format please see the \"What's This?\" help below." -+msgstr "" -+"

開啟此選項的話，您可以指定使用一個備註檔，以記錄影像的子標題。

關於此檔" -+"案格式的詳情，請參考「這是什麼？」的說明。" - - #: imgallerydialog.cpp:244 - msgid "Comments &file:" -@@ -135,24 +136,13 @@ - - #: imgallerydialog.cpp:247 - msgid "" --"

You can specify the name of the comment file here. The comment file contains " --"the subtitles for the images. The format of this file is:" --"

FILENAME1:" --"
Description" --"
" --"
FILENAME2:" --"
Description" --"
" --"
and so on" -+"

You can specify the name of the comment file here. The comment file " -+"contains the subtitles for the images. The format of this file is:" -+"

FILENAME1:
Description

FILENAME2:
Description

and so " -+"on" - msgstr "" - "

您可以指定備註檔的檔名。備註檔內包含影像的子標題。檔案格式為： " --"

FILENAME1:" --"
Description" --"
" --"
FILENAME2:" --"
Description" --"
" --"
" -+"

FILENAME1:
Description

FILENAME2:
Description

" - "
依此類推。" - - #: imgallerydialog.cpp:274 -@@ -173,7 +163,7 @@ - - #: imgalleryplugin.cpp:54 - msgid "&Create Image Gallery..." --msgstr "建立相簿...(&C)" -+msgstr "建立相簿…(&C)" - - #: imgalleryplugin.cpp:63 - msgid "Could not create the plugin, please report a bug." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katecppsymbolviewer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katecppsymbolviewer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katecppsymbolviewer.po 2007-05-14 12:22:53.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katecppsymbolviewer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katecppsymbolviewer\n" - "POT-Creation-Date: 2007-03-26 02:16+0200\n" - "PO-Revision-Date: 2007-03-27 14:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefiletemplates.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefiletemplates.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefiletemplates.po 2007-10-08 12:00:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefiletemplates.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katefiletemplates\n" - "POT-Creation-Date: 2007-10-02 01:15+0200\n" - "PO-Revision-Date: 2006-05-29 10:56+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,7 +15,7 @@ - - #: filetemplates.cpp:135 - msgid "Any File..." --msgstr "任何檔案..." -+msgstr "任何檔案…" - - #: filetemplates.cpp:139 - msgid "&Use Recent" -@@ -24,7 +23,7 @@ - - #: filetemplates.cpp:251 - msgid "&Manage Templates..." --msgstr "管理樣本...(&M)" -+msgstr "管理樣本…(&M)" - - #: filetemplates.cpp:255 - msgid "New From &Template" -@@ -36,9 +35,8 @@ - - #: filetemplates.cpp:384 - msgid "" --"Error opening the file" --"
%1" --"
for reading. The document will not be created." -+"Error opening the file
%1
for reading. The " -+"document will not be created." - msgstr "開啟檔案 %1 時發生錯誤。
無法建立文件。" - - #: filetemplates.cpp:385 filetemplates.cpp:980 -@@ -60,10 +58,12 @@ - - #: filetemplates.cpp:561 - msgid "" --"

This string is used as the template's name and is displayed, for example, in " --"the Template menu. It should describe the meaning of the template, for example " --"'HTML Document'.

" --msgstr "

此字串用於樣本名稱，並在樣本選單中顯示。通常應該用來描述樣本的意義，例如，HTML 文件。

" -+"

This string is used as the template's name and is displayed, for example, " -+"in the Template menu. It should describe the meaning of the template, for " -+"example 'HTML Document'.

" -+msgstr "" -+"

此字串用於樣本名稱，並在樣本選單中顯示。通常應該用來描述樣本的意義，例如，" -+"HTML 文件。

" - - #: filetemplates.cpp:566 - msgid "Press to select or change the icon for this template" -@@ -76,9 +76,11 @@ - #: filetemplates.cpp:572 - msgid "" - "

The group is used for chosing a submenu for the plugin. If it is empty, " --"'Other' is used.

" --"

You can type any string to add a new group to your menu.

" --msgstr "

此群組是用於選擇外掛程式的子選單。如果保持空白，則會使用「其他」。

您可以輸入任何字串以新增群組到您的選單中。

" -+"'Other' is used.

You can type any string to add a new group to your " -+"menu.

" -+msgstr "" -+"

此群組是用於選擇外掛程式的子選單。如果保持空白，則會使用「其他」。

" -+"您可以輸入任何字串以新增群組到您的選單中。

" - - #: filetemplates.cpp:576 - msgid "Document &name:" -@@ -86,17 +88,16 @@ - - #: filetemplates.cpp:579 - msgid "" --"

This string will be used to set a name for the new document, to display in " --"the title bar and file list.

" --"

If the string contains '%N', that will be replaced with a number increasing " --"with each similarly named file.

" --"

For example, if the Document Name is 'New shellscript (%N).sh', the first " -+"

This string will be used to set a name for the new document, to display " -+"in the title bar and file list.

If the string contains '%N', that will " -+"be replaced with a number increasing with each similarly named file.

" -+"For example, if the Document Name is 'New shellscript (%N).sh', the first " - "document will be named 'New shellscript (1).sh', the second 'New shellscipt " - "(2).sh', and so on.

" - msgstr "" --"

這個字串用於設定新文件的名稱，以顯示於檔案清單及標頭列。

" --"

如果字串包含了 '%N'，則會替換為類似檔名的編號。

" --"

例如，如果文件名稱為 \"New shellscript (%N)\"，則第一個檔案名稱為 New shellscript (1)，第二個則為 New " -+"

這個字串用於設定新文件的名稱，以顯示於檔案清單及標頭列。

如果字串包" -+"含了 '%N'，則會替換為類似檔名的編號。

例如，如果文件名稱為 \"New " -+"shellscript (%N)\"，則第一個檔案名稱為 New shellscript (1)，第二個則為 New " - "shellscript (2) 依此類推。

" - - #: filetemplates.cpp:587 -@@ -119,8 +120,8 @@ - - #: filetemplates.cpp:596 - msgid "" --"

This string is used, for example, as context help for this template (such as " --"the 'whatsthis' help for the menu item.)

" -+"

This string is used, for example, as context help for this template (such " -+"as the 'whatsthis' help for the menu item.)

" - msgstr "

此字串用於描述此樣本。

" - - #: filetemplates.cpp:600 -@@ -129,18 +130,19 @@ - - #: filetemplates.cpp:603 - msgid "" --"

You can set this if you want to share your template with other users.

" --"

the recommended form is like an Email address: 'Anders Lund " --"<anders@alweb.dk>'

" -+"

You can set this if you want to share your template with other users.

the recommended form is like an Email address: 'Anders Lund <" -+"anders@alweb.dk>'

" - msgstr "" --"

如果您要將此樣本分享給其他使用者，您可以設定此值。

" --"

建議使用的格式是類似電子郵件地址：Anders Lund <anders@alweb.dk>

" -+"

如果您要將此樣本分享給其他使用者，您可以設定此值。

建議使用的格式是" -+"類似電子郵件地址：Anders Lund <anders@alweb.dk>

" - - #: filetemplates.cpp:675 - msgid "" - "

If you want to base this template on an existing file or template, select " - "the appropriate option below.

" --msgstr "

如果您要以現存檔案或樣本為基礎建立新樣本，請在下方選擇適當的選項。

" -+msgstr "" -+"

如果您要以現存檔案或樣本為基礎建立新樣本，請在下方選擇適當的選項。

" - - #: filetemplates.cpp:682 - msgid "Start with an &empty document" -@@ -186,10 +188,12 @@ - - #: filetemplates.cpp:793 - msgid "" --"

You can replace certain strings in the text with template macros." --"

If any of the data below is incorrect or missing, edit the data in the KDE " -+"

You can replace certain strings in the text with template macros.

If " -+"any of the data below is incorrect or missing, edit the data in the KDE " - "email information." --msgstr "

您可以將目前文字裡的字串換成樣本巨集。

如果底下的資料不正確或遺失，請編輯 KDE 電子郵件資訊裡的資料。" -+msgstr "" -+"

您可以將目前文字裡的字串換成樣本巨集。

如果底下的資料不正確或遺失，請編" -+"輯 KDE 電子郵件資訊裡的資料。" - - #: filetemplates.cpp:797 - msgid "Replace full name '%1' with the '%{fullname}' macro" -@@ -208,7 +212,9 @@ - "

The template will now be created and saved to the chosen location. To " - "position the cursor put a caret ('^') character where you want it in files " - "created from the template.

" --msgstr "

現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置，請放一個 ^ 符號在您想要的位置。

" -+msgstr "" -+"

現在要建立樣本並儲存到指定的位置了。若您要指定游標的位置，請放一個 ^ 符號" -+"在您想要的位置。

" - - #: filetemplates.cpp:822 - msgid "Open the template for editing" -@@ -220,11 +226,11 @@ - - #: filetemplates.cpp:923 - msgid "" --"

The file " --"
'%1'" --"
already exists; if you do not want to overwrite it, change the template " --"file name to something else." --msgstr "

檔案 %1 已存在。
如果您不想覆寫它，請修改樣本檔案名稱。" -+"

The file
'%1'
already exists; if you do not want " -+"to overwrite it, change the template file name to something else." -+msgstr "" -+"

檔案 %1 已存在。
如果您不想覆寫它，請修改樣本檔案名" -+"稱。" - - #: filetemplates.cpp:926 - msgid "File Exists" -@@ -236,9 +242,8 @@ - - #: filetemplates.cpp:978 - msgid "" --"Error opening the file" --"
%1" --"
for reading. The document will not be created" -+"Error opening the file
%1
for reading. The " -+"document will not be created" - msgstr "開啟 %1 時發生錯誤。無法建立文件。" - - #: filetemplates.cpp:1057 -@@ -260,16 +265,16 @@ - - #: filetemplates.cpp:1113 - msgid "New..." --msgstr "新增..." -+msgstr "新增…" - - #: filetemplates.cpp:1117 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: filetemplates.cpp:1125 - msgid "Upload..." --msgstr "上傳..." -+msgstr "上傳…" - - #: filetemplates.cpp:1129 - msgid "Download..." --msgstr "下載..." -+msgstr "下載…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_initplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_initplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_initplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_initplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katefll_initplugin\n" - "POT-Creation-Date: 2005-07-24 01:39+0200\n" - "PO-Revision-Date: 2006-05-29 10:57+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,15 +15,15 @@ - - #: katefll_plugin.cpp:77 - msgid "Open File List..." --msgstr "開啟檔案清單..." -+msgstr "開啟檔案清單…" - - #: katefll_plugin.cpp:86 - msgid "Save File List" --msgstr "儲存檔案清單..." -+msgstr "儲存檔案清單…" - - #: katefll_plugin.cpp:90 - msgid "Save File List As..." --msgstr "儲存檔案清單為..." -+msgstr "儲存檔案清單為…" - - #: katefll_plugin.cpp:148 - msgid "Do you want to close all other files first?" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_plugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katefll_plugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katefll_plugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katefll_plugin\n" - "POT-Creation-Date: 2005-07-24 01:39+0200\n" - "PO-Revision-Date: 2006-05-29 10:58+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,7 +15,7 @@ - - #: katefll_plugin.cpp:77 - msgid "Open File List..." --msgstr "開啟檔案清單..." -+msgstr "開啟檔案清單…" - - #: katefll_plugin.cpp:86 - msgid "Save File List" -@@ -24,7 +23,7 @@ - - #: katefll_plugin.cpp:90 - msgid "Save File List As..." --msgstr "儲存檔案清單為..." -+msgstr "儲存檔案清單為…" - - #: katefll_plugin.cpp:148 - msgid "Do you want to close all other files first?" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehelloworld.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehelloworld.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehelloworld.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehelloworld.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: katehelloworld\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-04-06 11:04+0800\n" --"Last-Translator: tonniewalker \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehtmltools.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehtmltools.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katehtmltools.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katehtmltools.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: katehtmltools\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 10:58+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,7 +16,7 @@ - - #: plugin_katehtmltools.cpp:53 - msgid "HT&ML Tag..." --msgstr "HTML 標籤... (&M)" -+msgstr "HTML 標籤…(&M)" - - #: plugin_katehtmltools.cpp:85 - msgid "HTML Tag" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateinsertcommand.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateinsertcommand.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateinsertcommand.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateinsertcommand.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kateinsertcommand\n" - "POT-Creation-Date: 2006-03-06 03:57+0100\n" - "PO-Revision-Date: 2006-06-19 09:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,12 +16,12 @@ - - #: plugin_kateinsertcommand.cpp:86 - msgid "Insert Command..." --msgstr "插入命令..." -+msgstr "插入命令…" - - #: plugin_kateinsertcommand.cpp:113 - msgid "" --"You are not allowed to execute arbitrary external applications. If you want to " --"be able to do this, contact your system administrator." -+"You are not allowed to execute arbitrary external applications. If you want " -+"to be able to do this, contact your system administrator." - msgstr "您無法執行任何外部應用程式。如果您要執行，請聯絡您的系統管理員。" - - #: plugin_kateinsertcommand.cpp:113 -@@ -58,7 +57,7 @@ - - #: plugin_kateinsertcommand.cpp:246 - msgid "Oops!" --msgstr "呃..." -+msgstr "呃…" - - #: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:73 - msgid "Insert Command" -@@ -66,15 +65,15 @@ - - #: plugin_kateinsertcommand.cpp:293 - msgid "Enter &command:" --msgstr "輸入命令 (&C)：" -+msgstr "輸入命令(&C)：" - - #: plugin_kateinsertcommand.cpp:305 - msgid "Choose &working folder:" --msgstr "選擇工作目錄 (&W)：" -+msgstr "選擇工作目錄(&W)：" - - #: plugin_kateinsertcommand.cpp:315 - msgid "Insert Std&Err messages" --msgstr "插入標準錯誤之訊息 (&E)" -+msgstr "插入標準錯誤之訊息(&E)" - - #: plugin_kateinsertcommand.cpp:318 - msgid "&Print command name" -@@ -88,8 +87,8 @@ - - #: plugin_kateinsertcommand.cpp:326 - msgid "" --"Sets the working folder of the command. The command executed is 'cd

" --"&& '" -+"Sets the working folder of the command. The command executed is 'cd && " -+"'" - msgstr "設定此命令的工作目錄。執行此命令時會執行 'cd && '" - - #: plugin_kateinsertcommand.cpp:329 -@@ -104,7 +103,7 @@ - msgid "" - "If you check this, the command string will be printed followed by a newline " - "before the output." --msgstr "勾選此選項的話，會先印出命令字串，並加入一個換行符號，然後再列印輸出。" -+msgstr "勾選此選項的話，會先印出命令字串，並加入一個換列符號，然後再列印輸出。" - - #: plugin_kateinsertcommand.cpp:379 - msgid "Remember" -@@ -124,7 +123,7 @@ - - #: plugin_kateinsertcommand.cpp:391 - msgid "&Document folder" --msgstr "文件目錄 (&D)" -+msgstr "文件目錄(&D)" - - #: plugin_kateinsertcommand.cpp:392 - msgid "&Latest used working folder" -@@ -138,21 +137,17 @@ - - #: plugin_kateinsertcommand.cpp:403 - msgid "" --"" --"

Decides what is suggested as working folder for the command.

" --"

Application Working Folder (default): " --"The folder from which you launched the application hosting the plugin, usually " --"your home folder.

" --"

Document Folder: The folder of the document. Used only for " --"local documents.

" --"

Latest Working Folder: The folder used last time you used " --"this plugin.

" -+"

Decides what is suggested as working folder for the command." -+"

Application Working Folder (default): The folder " -+"from which you launched the application hosting the plugin, usually your " -+"home folder.

Document Folder: The folder of the " -+"document. Used only for local documents.

Latest Working Folder:" -+" The folder used last time you used this plugin.

" - msgstr "" --"" --"

決定此命令建議的工作目錄。

" --"

應用程式工作目錄（預設）：您啟動此應用程式的資料夾，通常是您的家目錄。

" --"

文件目錄：文件所在的目錄。只使用於本地端文件。

" --"

最新使用的工作目錄：最後一此使用此外掛程式時使用的目錄。

" -+"

決定此命令建議的工作目錄。

應用程式工作目錄（預設）：您啟動此應用程式的資料夾，通常是您的家目錄。

文件目錄：" -+"文件所在的目錄。只使用於本地端文件。

最新使用的工作目" -+"錄：最後一此使用此外掛程式時使用的目錄。

" - - #: plugin_kateinsertcommand.h:75 - msgid "Configure Insert Command Plugin" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katekjswrapper.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katekjswrapper.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katekjswrapper.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katekjswrapper.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katekjswrapper\n" - "POT-Creation-Date: 2004-10-30 01:25+0200\n" - "PO-Revision-Date: 2006-05-29 11:08+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemake.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemake.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemake.po 2006-10-01 18:34:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemake.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katemake\n" - "POT-Creation-Date: 2006-08-18 04:13+0200\n" - "PO-Revision-Date: 2006-08-14 13:17+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -20,7 +19,7 @@ - - #: plugin_katemake.cpp:159 - msgid "Running make..." --msgstr "執行 make..." -+msgstr "執行 make…" - - #: plugin_katemake.cpp:160 plugin_katemake.cpp:509 - msgid "No Errors." -@@ -40,7 +39,7 @@ - - #: plugin_katemake.cpp:348 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: plugin_katemake.cpp:360 - msgid "Line" -@@ -74,7 +73,7 @@ - - #: plugin_katemake.cpp:692 - msgid "Source prefix:" --msgstr "源碼前置字元：" -+msgstr "原始碼前置字元：" - - #: plugin_katemake.cpp:697 - msgid "Build prefix:" -@@ -84,4 +83,4 @@ - #: rc.cpp:3 - #, no-c-format - msgid "&Make" --msgstr "Make (&M)" -+msgstr "Make(&M)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemodeline.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemodeline.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katemodeline.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katemodeline.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: katemodeline\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-06-27 10:40+1000\n" --"Last-Translator: Ben Wu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateopenheader.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateopenheader.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kateopenheader.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kateopenheader.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kateopenheader\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 11:10+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katepybrowse.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katepybrowse.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katepybrowse.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katepybrowse.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: katepybrowse\n" - "POT-Creation-Date: 2005-05-08 01:27+0200\n" - "PO-Revision-Date: 2006-05-29 11:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -50,4 +49,4 @@ - #: rc.cpp:3 - #, no-c-format - msgid "P&ython" --msgstr "Python (&Y)" -+msgstr "Python(&Y)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katesnippets.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katesnippets.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katesnippets.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katesnippets.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: katesnippets\n" - "POT-Creation-Date: 2005-05-08 01:27+0200\n" - "PO-Revision-Date: 2006-05-29 11:12+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetabbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetabbarextension.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetabbarextension.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetabbarextension.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: katetabbarextension\n" - "POT-Creation-Date: 2008-02-22 01:36+0100\n" - "PO-Revision-Date: 2007-06-25 08:13+0800\n" --"Last-Translator: Franklin Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetextfilter.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetextfilter.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katetextfilter.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katetextfilter.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: katetextfilter\n" - "POT-Creation-Date: 2006-01-02 03:18+0100\n" - "PO-Revision-Date: 2006-05-29 11:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -19,12 +18,12 @@ - - #: plugin_katetextfilter.cpp:66 - msgid "Filter Te&xt..." --msgstr "過濾文字...(&X)" -+msgstr "過濾文字…(&X)" - - #: plugin_katetextfilter.cpp:257 - msgid "" --"You are not allowed to execute arbitrary external applications. If you want to " --"be able to do this, contact your system administrator." -+"You are not allowed to execute arbitrary external applications. If you want " -+"to be able to do this, contact your system administrator." - msgstr "您無法執行任何外部應用程式。如果您要執行，請聯絡您的系統管理員。" - - #: plugin_katetextfilter.cpp:259 -@@ -41,14 +40,11 @@ - - #: plugin_katetextfilter.cpp:311 - msgid "" --"" --"

Usage: textfilter COMMAND

" --"

Replace the selection with the output of the specified shell command.

" --"" -+"

Usage: textfilter COMMAND

Replace the selection " -+"with the output of the specified shell command.

" - msgstr "" --"" --"

用法：textfilter <命令>

" --"

將所選擇的取代為指定的文稿命令的輸出。

" -+"

用法：textfilter <命令>

將所選擇的取代為指定的文稿" -+"命令的輸出。

" - - #: plugin_katetextfilter.cpp:320 - msgid "You need to have a selection to use textfilter" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmlcheck.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmlcheck.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmlcheck.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmlcheck.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: katexmlcheck\n" - "POT-Creation-Date: 2005-05-08 01:27+0200\n" - "PO-Revision-Date: 2006-05-29 13:00+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -50,7 +49,9 @@ - msgid "" - "Error: Failed to execute xmllint. Please make sure that xmllint is " - "installed. It is part of libxml2." --msgstr "錯誤: 無法啟動xmllint。 請確定xmllint已經安裝。xmllint是libxml2的一部分" -+msgstr "" -+"錯誤: 無法啟動xmllint。 請確定xmllint已經安裝。xmllint是libxml2的一部" -+"分" - - #. i18n: file ui.rc line 4 - #: rc.cpp:3 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmltools.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmltools.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/katexmltools.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/katexmltools.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: katexmltools\n" - "POT-Creation-Date: 2005-05-08 01:27+0200\n" - "PO-Revision-Date: 2006-05-29 13:01+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -20,7 +19,7 @@ - - #: plugin_katexmltools.cpp:152 - msgid "&Insert Element..." --msgstr "插入元素(&I)..." -+msgstr "插入元素(&I)…" - - #: plugin_katexmltools.cpp:154 - msgid "&Close Element" -@@ -36,8 +35,8 @@ - - #: plugin_katexmltools.cpp:467 - msgid "" --"The current file has been identified as a document of type \"%1\". The meta DTD " --"for this document type will now be loaded." -+"The current file has been identified as a document of type \"%1\". The meta " -+"DTD for this document type will now be loaded." - msgstr "這個檔案已經被鑑定為\"%1\"文件類型。將載入此類型文件的meta DTD" - - #: plugin_katexmltools.cpp:470 -@@ -70,13 +69,14 @@ - - #: pseudo_dtd.cpp:56 - msgid "" --"The file '%1' is not in the expected format. Please check that the file is of " --"this type:\n" -+"The file '%1' is not in the expected format. Please check that the file is " -+"of this type:\n" - "-//Norman Walsh//DTD DTDParse V2.0//EN\n" --"You can produce such files with dtdparse. See the Kate Plugin documentation for " --"more information." -+"You can produce such files with dtdparse. See the Kate Plugin documentation " -+"for more information." - msgstr "" --"檔案'%1'並不是預期的格式。請檢查這個檔案是否符合這個類型:-//Norman Walsh//DTD DTDParse V2.0//EN\n" -+"檔案'%1'並不是預期的格式。請檢查這個檔案是否符合這個類型:-//Norman Walsh//" -+"DTD DTDParse V2.0//EN\n" - "您可以用dtaparse製作這類檔案。請看Kate Plugin文件來獲取更多資訊" - - #: pseudo_dtd.cpp:71 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kbinaryclock.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kbinaryclock.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kbinaryclock.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kbinaryclock.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kbinaryclock\n" - "POT-Creation-Date: 2008-07-08 01:23+0200\n" - "PO-Revision-Date: 2006-05-29 13:04+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,11 +31,11 @@ - - #: kbinaryclock.cpp:310 - msgid "&Adjust Date && Time..." --msgstr "調整日期及時間...(&A)" -+msgstr "調整日期及時間…(&A)" - - #: kbinaryclock.cpp:312 - msgid "Date && Time &Format..." --msgstr "日期及時間格式...(&F)" -+msgstr "日期及時間格式…(&F)" - - #: kbinaryclock.cpp:315 - msgid "C&opy to Clipboard" -@@ -44,7 +43,7 @@ - - #: kbinaryclock.cpp:319 - msgid "&Configure KBinaryClock..." --msgstr "設定 KBinaryClock...(&C)" -+msgstr "設定 KBinaryClock…(&C)" - - #. i18n: file settings.ui line 38 - #: rc.cpp:3 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kcmkuick.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kcmkuick.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kcmkuick.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kcmkuick.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kcmkuick\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 13:06+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,9 +38,11 @@ - - #: kcmkuick.cpp:151 - msgid "" --"

Kuick

With this module you can configure Kuick, the KDE quickcopy and " --"move plugin for Konqueror." --msgstr "

Kuick

有了這個模組，您可以設定 kuick(KDE quickcopy) 和運行 Konqueror 的外掛。" -+"

Kuick

With this module you can configure Kuick, the KDE quickcopy " -+"and move plugin for Konqueror." -+msgstr "" -+"

Kuick

有了這個模組，您可以設定 kuick(KDE quickcopy) 和運行 " -+"Konqueror 的外掛。" - - #. i18n: file kcmkuickdialog.ui line 30 - #: rc.cpp:3 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_cert.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_cert.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_cert.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_cert.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_cert\n" - "POT-Creation-Date: 2004-11-11 01:23+0100\n" - "PO-Revision-Date: 2006-05-29 13:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_desktop.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_desktop.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_desktop.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_desktop.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfile_desktop\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-05-23 19:24+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n <>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_folder.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_folder.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_folder.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_folder.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfile_folder\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-10-28 22:16+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_html.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_html.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_html.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_html.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kfile_html\n" - "POT-Creation-Date: 2006-11-26 03:48+0100\n" - "PO-Revision-Date: 2006-05-29 13:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_lnk.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_lnk.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_lnk.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_lnk.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_lnk\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 13:10+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_mhtml.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_mhtml.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_mhtml.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_mhtml.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_mhtml\n" - "POT-Creation-Date: 2005-01-19 01:25+0100\n" - "PO-Revision-Date: 2006-05-29 13:10+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_txt.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_txt.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kfile_txt.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kfile_txt.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfilt_txt\n" - "POT-Creation-Date: 2005-01-08 01:24+0100\n" - "PO-Revision-Date: 2002-05-23 19:29+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n <>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/khtmlsettingsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/khtmlsettingsplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/khtmlsettingsplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/khtmlsettingsplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: khtmlsettingsplugin\n" - "POT-Creation-Date: 2005-02-10 01:34+0100\n" - "PO-Revision-Date: 2006-05-29 13:13+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,7 +38,7 @@ - - #: settingsplugin.cpp:59 - msgid "Java&Script" --msgstr "JavaScript (&S)" -+msgstr "JavaScript(&S)" - - #: settingsplugin.cpp:64 - msgid "&Java" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kmathapplet.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kmathapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kmathapplet.po 2005-09-10 13:14:56.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kmathapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kmathapplet\n" - "POT-Creation-Date: 2004-12-17 01:25+0100\n" - "PO-Revision-Date: 2005-08-17 10:28+0800\n" --"Last-Translator: Abel Cheung \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kolourpicker.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kolourpicker.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kolourpicker.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kolourpicker.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kolourpicker\n" - "POT-Creation-Date: 2008-08-12 01:19+0200\n" - "PO-Revision-Date: 2003-08-03 20:42+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_delicious.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_delicious.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_delicious.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_delicious.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: konqsidebar_delicious\n" - "POT-Creation-Date: 2005-08-18 04:32+0200\n" - "PO-Revision-Date: 2006-05-29 13:15+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,7 +27,7 @@ - - #: mainWidget.cpp:238 - msgid "Rename Tag..." --msgstr "重新命名標籤..." -+msgstr "重新命名標籤…" - - #: mainWidget.cpp:305 - msgid "Rename Tag" -@@ -98,7 +97,7 @@ - #: rc.cpp:27 - #, no-c-format - msgid "Post &New..." --msgstr "發表新的書籤...(&N)" -+msgstr "發表新的書籤…(&N)" - - #. i18n: file widget.ui line 114 - #: rc.cpp:30 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_mediaplayer.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_mediaplayer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_mediaplayer.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_mediaplayer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: konqsidebar_mediaplayer\n" - "POT-Creation-Date: 2004-12-11 01:24+0100\n" - "PO-Revision-Date: 2006-05-29 13:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_metabar.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_metabar.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_metabar.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_metabar.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: konqsidebar_metabar\n" - "POT-Creation-Date: 2006-03-13 03:59+0100\n" - "PO-Revision-Date: 2006-06-19 09:08+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -44,19 +43,19 @@ - - #: configdialog.cpp:112 - msgid "Themes" --msgstr "佈景主題" -+msgstr "布景主題" - - #: configdialog.cpp:118 - msgid "Install New Theme..." --msgstr "安裝新主題..." -+msgstr "安裝新主題…" - - #: configdialog.cpp:127 - msgid "New..." --msgstr "新增..." -+msgstr "新增…" - - #: configdialog.cpp:133 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: configdialog.cpp:150 settingsplugin.cpp:103 - msgid "Name" -@@ -165,11 +164,11 @@ - - #: metabarwidget.cpp:121 - msgid "Configure %1..." --msgstr "設定 %1..." -+msgstr "設定 %1…" - - #: metabarwidget.cpp:124 - msgid "Reload Theme" --msgstr "重新載入佈景主題" -+msgstr "重新載入布景主題" - - #: metabarwidget.cpp:435 - msgid "Less" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_news.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_news.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/konqsidebar_news.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/konqsidebar_news.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: konqsidebar_news\n" - "POT-Creation-Date: 2004-12-11 01:24+0100\n" - "PO-Revision-Date: 2006-05-29 13:21+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -53,7 +52,7 @@ - - #: nsstacktabwidget.cpp:88 - msgid "&Configure Newsticker..." --msgstr "設定 Newsticker...(&N)" -+msgstr "設定 Newsticker…(&N)" - - #: nsstacktabwidget.cpp:98 - msgid "&About Newsticker" -@@ -61,7 +60,7 @@ - - #: nsstacktabwidget.cpp:100 - msgid "&Report Bug..." --msgstr "回報問題...(&R)" -+msgstr "回報問題…(&R)" - - #. i18n: file configfeedsbase.ui line 16 - #: rc.cpp:3 -@@ -77,11 +76,12 @@ - - #: sidebar_news.cpp:76 - msgid "" --"Cannot connect to RSS service. Please make sure the " --"rssservice program is available (usually distributed as part of " --"kdenetwork)." -+"Cannot connect to RSS service. Please make sure the rssservice program is available (usually distributed as part of kdenetwork)." - msgstr "" --"無法連接到 RSS 服務。請確定 rssservice 程式存在（通常會跟著 kdenetwork 一起）。" -+"無法連接到 RSS 服務。請確定 rssservice 程式存在（通常會" -+"跟著 kdenetwork 一起）。" - - #: sidebar_news.cpp:80 - msgid "Sidebar Newsticker" -@@ -89,10 +89,10 @@ - - #: sidebar_news.cpp:171 - msgid "Connecting..." --msgstr "連線中..." -+msgstr "連線中…" - - #~ msgid "Initializing" - #~ msgstr "初始化" - - #~ msgid "Please wait..." --#~ msgstr "請稍候..." -+#~ msgstr "請稍候…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ksig.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ksig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ksig.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ksig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: ksig\n" - "POT-Creation-Date: 2005-03-07 01:46+0100\n" - "PO-Revision-Date: 2006-05-29 13:24+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -54,7 +53,9 @@ - msgid "" - "To get started, first create a new signature by selecting \"New\" above. You " - "will then be able to edit and save your collection of signatures." --msgstr "要開始使用，請您先用上方的「新增」來產生新的簽名。接著您就可以編輯與儲存您收集的簽名。" -+msgstr "" -+"要開始使用，請您先用上方的「新增」來產生新的簽名。接著您就可以編輯與儲存您收" -+"集的簽名。" - - #: ksig.cpp:170 - msgid "Do you want to save your changes before exiting?" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ktimemon.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ktimemon.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/ktimemon.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/ktimemon.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: ktimemon\n" - "POT-Creation-Date: 2006-04-15 04:00+0200\n" - "PO-Revision-Date: 2006-06-19 09:12+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -161,12 +160,13 @@ - "Unable to initialize the 'kstat' library. This library is used for accessing " - "kernel information. The diagnostics are:\n" - "%1.\n" --"Are you really running Solaris? Please contact the maintainer at " --"mueller@kde.org who will try to figure out what went wrong." -+"Are you really running Solaris? Please contact the maintainer at mueller@kde." -+"org who will try to figure out what went wrong." - msgstr "" - "無法初始化 'kstat' 函式庫。此函式庫被用來取得核心資訊。診斷結果是：\n" - "%1 。\n" --"您確定是在執行 Solaris 嗎？請聯絡維護者 mueller@kde.org 他會試著評估是那兒出錯了。" -+"您確定是在執行 Solaris 嗎？請聯絡維護者 mueller@kde.org 他會試著評估是那兒出" -+"錯了。" - - #: sample.cc:212 - msgid "" -@@ -178,13 +178,15 @@ - - #: sample.cc:222 - msgid "" --"The memory usage file '%1' seems to use a different file format than expected.\n" -+"The memory usage file '%1' seems to use a different file format than " -+"expected.\n" - "Maybe your version of the proc filesystem is incompatible with supported " --"versions. Please contact the developer at http://bugs.kde.org/ who will try to " --"sort this out." -+"versions. Please contact the developer at http://bugs.kde.org/ who will try " -+"to sort this out." - msgstr "" - "檔案 %1 的記憶體使用量似乎不是用預期中的檔案格式。\n" --"也許您的 proc 檔案系統版本與我們所支援的版本不同。請回報到 http://bugs.kde.org。" -+"也許您的 proc 檔案系統版本與我們所支援的版本不同。請回報到 http://bugs.kde." -+"org。" - - #: sample.cc:239 - msgid "" -@@ -207,12 +209,13 @@ - - #: sample.cc:309 - msgid "" --"Unable to find any entries for CPU statistics in the 'kstat' library. Are you " --"running a non-standard version of Solaris?\n" -+"Unable to find any entries for CPU statistics in the 'kstat' library. Are " -+"you running a non-standard version of Solaris?\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort " - "this out." - msgstr "" --"無法在 'kstat' 函式庫發現任何 CPU 統計進入點。您是否執行非標準版本的 Solaris ？\n" -+"無法在 'kstat' 函式庫發現任何 CPU 統計進入點。您是否執行非標準版本的 " -+"Solaris ？\n" - "請透過 http://bugs.kde.org/ 聯絡維護者，他們會試著解決這個問題。" - - #: sample.cc:325 -@@ -227,8 +230,8 @@ - - #: sample.cc:338 - msgid "" --"The number of CPUs appears to have changed at very short notice, or the 'kstat' " --"library returns inconsistent results (%1 vs. %2 CPUs).\n" -+"The number of CPUs appears to have changed at very short notice, or the " -+"'kstat' library returns inconsistent results (%1 vs. %2 CPUs).\n" - "Please contact the maintainer via http://bugs.kde.org/ who will try to sort " - "this out." - msgstr "" -@@ -239,18 +242,19 @@ - msgid "" - "Unable to read the memory statistics entry from the 'kstat' library. The " - "diagnostics are '%1'\n" --"You might want to contact the maintainer at http://bugs.kde.org/ who will try " --"to sort this out." -+"You might want to contact the maintainer at http://bugs.kde.org/ who will " -+"try to sort this out." - msgstr "" - "無法從 'kstat' 函式庫讀取記憶體統計進入點。診斷結果為 '%1'。\n" - "請透過 http://bugs.kde.org/ 聯絡維護者，他們會試著解決這個問題。" - - #: sample.cc:367 - msgid "" --"There seems to be a problem with KTimeMon's handling of the 'kstat' library: 0 " --"bytes of physical memory determined!\n" -+"There seems to be a problem with KTimeMon's handling of the 'kstat' library: " -+"0 bytes of physical memory determined!\n" - "Free memory is %1, available memory is %2.\n" --"Please contact the maintainer at mueller@kde.org who will try to sort this out." -+"Please contact the maintainer at mueller@kde.org who will try to sort this " -+"out." - msgstr "" - "似乎在 KTimeMon 處理 'kstat' 函式庫時有一個問題： 測定實體記憶體 0 bytes ！\n" - "閒置記憶體為 %1 ，可用記憶體為 %2 。\n" -@@ -259,8 +263,8 @@ - #: sample.cc:379 - msgid "" - "Unable to determine the number of swap spaces. The diagnostics are '%1'.\n" --"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this " --"out." -+"Please contact the maintainer at http://bugs.kde.org/ who will try to sort " -+"this out." - msgstr "" - "無法決定置換空間的數目。診斷結果為 '%1' 。\n" - "請透過 http://bugs.kde.org/ 聯絡維護者，他們會試著解決這個問題。" -@@ -269,8 +273,8 @@ - msgid "" - "KTimeMon ran out of memory while trying to determine the swap usage.\n" - "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n" --"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this " --"out." -+"Please contact the maintainer at http://bugs.kde.org/ who will try to sort " -+"this out." - msgstr "" - "當 KTimeMon 試著去測定置換使用時，缺乏執行記憶體。\n" - "試圖配置 %1 bytes 的記憶體（2 * %2 + %3 * %4）。\n" -@@ -280,8 +284,8 @@ - msgid "" - "Unable to determine the swap usage.\n" - "The diagnostics are '%1'.\n" --"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this " --"out." -+"Please contact the maintainer at http://bugs.kde.org/ who will try to sort " -+"this out." - msgstr "" - "無法決定分割區的使用情形。\n" - "診斷結果為 '%1' 。\n" -@@ -292,8 +296,8 @@ - "Information was requested for %1 swap spaces, but only %2 swap entries were " - "returned.\n" - "KTimeMon will attempt to continue.\n" --"Please contact the maintainer at http://bugs.kde.org/ who will try to sort this " --"out." -+"Please contact the maintainer at http://bugs.kde.org/ who will try to sort " -+"this out." - msgstr "" - "訊息要求 %1 置換空間，但只有 %2 置換進入點傳回。\n" - "KTimeMon 將試圖繼續。\n" -@@ -331,7 +335,7 @@ - - #: timemon.cc:248 - msgid "Preferences..." --msgstr "偏好設定..." -+msgstr "偏好設定…" - - #: timemon.cc:428 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kuick_plugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kuick_plugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/kuick_plugin.po 2007-01-15 10:56:29.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/kuick_plugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kuick_plugin\n" - "POT-Creation-Date: 2006-11-03 02:41+0100\n" - "PO-Revision-Date: 2006-05-29 13:41+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -55,7 +54,7 @@ - - #: kmetamenu.cpp:114 - msgid "&Browse..." --msgstr "瀏覽...(&B)" -+msgstr "瀏覽…(&B)" - - #: kuick_plugin.cpp:96 - msgid "&Copy Here" -@@ -74,7 +73,7 @@ - msgstr "移動到" - - #~ msgid "&Home Directory" --#~ msgstr "家目錄 (&H)" -+#~ msgstr "家目錄(&H)" - - #~ msgid "&Root Directory" --#~ msgstr "根目錄 (&R)" -+#~ msgstr "根目錄(&R)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_geo_xxport.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_geo_xxport.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_geo_xxport.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_geo_xxport.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libkaddrbk_geo_xxport\n" - "POT-Creation-Date: 2004-11-25 01:30+0100\n" - "PO-Revision-Date: 2006-05-29 13:42+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,7 +15,7 @@ - - #: geo_xxport.cpp:46 - msgid "Export Geo Data..." --msgstr "匯出 Geo 資料..." -+msgstr "匯出 Geo 資料…" - - #. i18n: file geo_xxportui.rc line 6 - #: rc.cpp:6 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_gmx_xxport.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_gmx_xxport.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/libkaddrbk_gmx_xxport.po 2006-10-01 18:34:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/libkaddrbk_gmx_xxport.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libkaddrbk_gmx_xxport\n" - "POT-Creation-Date: 2006-08-28 02:41+0200\n" - "PO-Revision-Date: 2006-05-29 13:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,11 +15,11 @@ - - #: gmx_xxport.cpp:54 - msgid "Import GMX Address Book..." --msgstr "匯入 GMX 通訊錄..." -+msgstr "匯入 GMX 通訊錄…" - - #: gmx_xxport.cpp:55 - msgid "Export GMX Address Book..." --msgstr "匯出 GMX 通訊錄..." -+msgstr "匯出 GMX 通訊錄…" - - #: gmx_xxport.cpp:82 - msgid "Unable to open %1 for reading." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/lyrics.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/lyrics.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/lyrics.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/lyrics.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: lyrics\n" - "POT-Creation-Date: 2004-11-24 01:22+0100\n" - "PO-Revision-Date: 2006-05-29 13:55+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -59,13 +58,14 @@ - "For your query, you can use any property of your multimedia item, just " - "enclosing it with a $(property).\n" - "\n" --"Some common properties used are $(title), $(author) and $(album). For example, " --"to search in Google for the author, title and track, just use:\n" -+"Some common properties used are $(title), $(author) and $(album). For " -+"example, to search in Google for the author, title and track, just use:\n" - "http://www.google.com/search?q=$(author)+$(title)+$(track)" - msgstr "" - "您查詢時，可以使用任何多媒體項目的屬性，只要封裝在 $(property) 中。\n" - "\n" --"一些共同的屬性包括：$(title)，$(author)，與 $(album)等。例如，要在 Google 搜尋作者，標題與音軌，只要使用：\n" -+"一些共同的屬性包括：$(title)，$(author)，與 $(album)等。例如，要在 Google 搜" -+"尋作者，標題與音軌，只要使用：\n" - "http://www.google.com/search?q=$(author)+$(title)+$(track)" - - #: cmodule.cpp:122 -@@ -109,18 +109,20 @@ - #: lyrics.cpp:101 - msgid "" - "Choosing this option, the current URL will be attached to the current file. " --"This way, if you try to view the lyrics of this file later, you won't have to " --"search for it again. This information can be stored between sessions, as long " --"as your playlist stores metadata about the multimedia items (almost all the " --"playlists do). If you want to be able to search for other lyrics for this " --"music, you must select this option again to clear the stored URL." --msgstr "" --"選取此項目的話，目前的網址會被附加到目前的檔案中。如此一來，如果您稍後要檢視此檔案的歌詞，您不需要再搜尋。這個資訊可以保存起來，只要您的播放清單中有儲存此多媒體" --"項目的資料。如果您要搜尋此音樂的其他歌詞，您要再選取此項以清除已儲存的網址。" -+"This way, if you try to view the lyrics of this file later, you won't have " -+"to search for it again. This information can be stored between sessions, as " -+"long as your playlist stores metadata about the multimedia items (almost all " -+"the playlists do). If you want to be able to search for other lyrics for " -+"this music, you must select this option again to clear the stored URL." -+msgstr "" -+"選取此項目的話，目前的網址會被附加到目前的檔案中。如此一來，如果您稍後要檢視" -+"此檔案的歌詞，您不需要再搜尋。這個資訊可以保存起來，只要您的播放清單中有儲存" -+"此多媒體項目的資料。如果您要搜尋此音樂的其他歌詞，您要再選取此項以清除已儲存" -+"的網址。" - - #: lyrics.cpp:117 - msgid "Loading..." --msgstr "載入中..." -+msgstr "載入中…" - - #: lyrics.cpp:124 - msgid "Loaded" -@@ -133,7 +135,8 @@ - - #: lyrics.cpp:180 - msgid "" --"You can only view the lyrics of the current song, and currently there is none." -+"You can only view the lyrics of the current song, and currently there is " -+"none." - msgstr "您只能檢視目前歌曲的歌詞，而目前沒有歌詞可以檢視。" - - #: lyrics.cpp:199 -@@ -143,38 +146,33 @@ - - #: lyrics.cpp:203 - msgid "" --"" --"

Please wait! Searching for...

" --"
" --"Title%1
" --"Author%2
" --"Album%3
" --msgstr "" --"" --"

請稍候，搜尋下列條件中...

" --" " --" " --"
標題 %1
作者 %2
專輯 %3
" -+"

Please wait! Searching for...

Title%1
Author%2
Album%3
" -+msgstr "" -+"

請稍候，搜尋下列條件中...

標題 %1
作者 %2
專輯 %3
" - - #: lyrics.cpp:221 - msgid "" --"
" --"

Searching at %1" --"
(%2)

" --msgstr "" --"
" --"

搜尋於 %1..." --"
（%2）

" -+"

Searching at %1
(%2)

" -+msgstr "" -+"

搜尋於 %1...
（%2）

" - - #: lyrics.cpp:229 - msgid "" --"
" --"

Using the stored URL" --"
(%1)

" --msgstr "" --"
" --"

使用已儲存的網址" --"
%1

" -+"

Using the stored URL
(%1)

" -+msgstr "" -+"

使用已儲存的網址
%1

" - - #: lyrics.cpp:235 - msgid "" -@@ -184,11 +182,13 @@ - "not be present or be incorrect. In that case, the Lyrics plugin will not be " - "able to find the lyrics until these properties are fixed (you can fix them " - "using the tag editor).\n" --"Hint: The lucky tag plugin, present in the kdeaddons module, can try to guess " --"properties such as title and author from the filename of a song. Enabling it " --"may increase the probability of finding lyrics." --msgstr "" --"要找到目前歌曲的歌詞，此外掛程式對每首歌會儲存其屬性，如標題、作者、專輯等等。這些屬性通常會由標籤閱讀器讀取，不過有時無法讀取或不正確。這種狀況下，Lyrics" --" 外掛程式就無法找到歌詞，直到這些屬性被修正為止。（您可以用標籤編輯器修正）。\n" --"提示：由 kdeaddons 模組提供的「幸運標籤外掛程式（lucky tag " --"plugin）」，可以試著由歌曲的檔名來猜測其標題、作者等資訊。開啟此選項可以增加找到歌詞的機率。" -+"Hint: The lucky tag plugin, present in the kdeaddons module, can try to " -+"guess properties such as title and author from the filename of a song. " -+"Enabling it may increase the probability of finding lyrics." -+msgstr "" -+"要找到目前歌曲的歌詞，此外掛程式對每首歌會儲存其屬性，如標題、作者、專輯等" -+"等。這些屬性通常會由標籤閱讀器讀取，不過有時無法讀取或不正確。這種狀況下，" -+"Lyrics 外掛程式就無法找到歌詞，直到這些屬性被修正為止。（您可以用標籤編輯器修" -+"正）。\n" -+"提示：由 kdeaddons 模組提供的「幸運標籤外掛程式（lucky tag plugin）」，可以試" -+"著由歌曲的檔名來猜測其標題、作者等資訊。開啟此選項可以增加找到歌詞的機率。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mediacontrol.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mediacontrol.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mediacontrol.po 2008-08-19 20:43:08.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mediacontrol.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: mediacontrol\n" - "POT-Creation-Date: 2008-08-12 01:19+0200\n" - "PO-Revision-Date: 2006-05-29 14:00+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -93,7 +92,7 @@ - - #: mediacontrol.cpp:156 - msgid "Configure MediaControl..." --msgstr "設定 MediaControl..." -+msgstr "設定 MediaControl…" - - #: mediacontrol.cpp:158 - msgid "About MediaControl" -@@ -170,19 +169,19 @@ - #: rc.cpp:15 - #, no-c-format - msgid "Sets the number of lines a mousewheel will scroll in the current file." --msgstr "設定滑鼠滾輪捲軸此檔案的行數。" -+msgstr "設定滑鼠滾輪捲軸此檔案的列數。" - - #. i18n: file mediacontrolconfigwidget.ui line 109 - #: rc.cpp:18 - #, no-c-format - msgid "&Themes" --msgstr "佈景主題(&T)" -+msgstr "布景主題(&T)" - - #. i18n: file mediacontrolconfigwidget.ui line 120 - #: rc.cpp:21 - #, no-c-format - msgid "&Use themes" --msgstr "使用佈景主題(&U)" -+msgstr "使用布景主題(&U)" - - #. i18n: file mediacontrolconfigwidget.ui line 126 - #: rc.cpp:24 -@@ -200,7 +199,7 @@ - #: rc.cpp:30 - #, no-c-format - msgid "Shows you how the selected theme will look" --msgstr "顯示此佈景主題的外觀" -+msgstr "顯示此布景主題的外觀" - - #. i18n: file mediacontrolconfigwidget.ui line 215 - #: rc.cpp:33 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mf_konqplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mf_konqplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/mf_konqplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/mf_konqplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: mf_konqplugin\n" - "POT-Creation-Date: 2005-06-13 01:32+0200\n" - "PO-Revision-Date: 2006-05-29 14:02+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,4 +26,4 @@ - msgid "" - "_n: This site has a microformat entry\n" - "This site has %n microformat entries" --msgstr "此站台有 %n 個 microformat 項目" -+msgstr "此站臺有 %n 個 microformat 項目" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/minitoolsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/minitoolsplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/minitoolsplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/minitoolsplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: minitoolsplugin\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:02+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,11 +15,11 @@ - - #: minitoolsplugin.cpp:49 - msgid "&Minitools" --msgstr "Minitools (&M)" -+msgstr "Minitools(&M)" - - #: minitoolsplugin.cpp:118 - msgid "&Edit Minitools" --msgstr "編輯 Minitools (&E)" -+msgstr "編輯 Minitools(&E)" - - #. i18n: file minitoolsplugin.rc line 8 - #: rc.cpp:6 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/nexscope.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/nexscope.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/nexscope.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/nexscope.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: nexscope\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:06+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/pitchablespeed.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/pitchablespeed.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/pitchablespeed.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/pitchablespeed.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: pitchablespeed\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/rellinks.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/rellinks.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/rellinks.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/rellinks.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: rellinks\n" - "POT-Creation-Date: 2005-09-05 02:42+0200\n" - "PO-Revision-Date: 2006-05-29 14:13+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -69,7 +68,8 @@ - - #: plugin_rellinks.cpp:88 - msgid "" --"

This link references the next document in an ordered series of documents.

" -+"

This link references the next document in an ordered series of documents." -+"

" - msgstr "

此連結為順序文件的下一份文件。

" - - #: plugin_rellinks.cpp:90 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/searchbarplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/searchbarplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/searchbarplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/searchbarplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: searchbarplugin\n" - "POT-Creation-Date: 2006-06-20 04:04+0200\n" - "PO-Revision-Date: 2006-06-21 08:42+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -26,8 +25,8 @@ - - #: searchbar.cpp:79 - msgid "" --"Search Bar" --"

Enter a search term. Click on the icon to change search mode or provider." -+"Search Bar

Enter a search term. Click on the icon to change search mode or " -+"provider." - msgstr "搜尋列

輸入搜尋條件。點選此圖示改變搜尋模式或提供者。" - - #: searchbar.cpp:82 -@@ -44,4 +43,4 @@ - - #: searchbar.cpp:358 - msgid "Select Search Engines..." --msgstr "選擇搜尋引擎..." -+msgstr "選擇搜尋引擎…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/synaescope.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/synaescope.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/synaescope.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/synaescope.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: synaescope\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tippecanoe.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tippecanoe.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tippecanoe.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tippecanoe.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: tippecanoe\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tyler.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tyler.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/tyler.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/tyler.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: tyler\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-10-31 08:32+0800\n" --"Last-Translator: Jupiter K.T. Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/uachangerplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/uachangerplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/uachangerplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/uachangerplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: uachangerplugin\n" - "POT-Creation-Date: 2005-06-28 01:37+0200\n" - "PO-Revision-Date: 2006-05-29 14:18+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,7 +38,7 @@ - - #: uachangerplugin.cpp:60 - msgid "Change Browser &Identification" --msgstr "改變瀏覽器識別 (&I)" -+msgstr "改變瀏覽器識別(&I)" - - #: uachangerplugin.cpp:143 - #, c-format -@@ -68,8 +67,8 @@ - - #: uachangerplugin.cpp:247 - msgid "Apply to Entire Site" --msgstr "套用到整個站台" -+msgstr "套用到整個站臺" - - #: uachangerplugin.cpp:252 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/validatorsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/validatorsplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/validatorsplugin.po 2006-07-22 10:04:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/validatorsplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: validatorsplugin\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2006-05-29 14:21+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,11 +32,11 @@ - - #: plugin_validators.cpp:53 - msgid "&Validate Web Page" --msgstr "驗證網頁 (&V)" -+msgstr "驗證網頁(&V)" - - #: plugin_validators.cpp:57 - msgid "Validate &HTML" --msgstr "驗證 HTML (&H)" -+msgstr "驗證 HTML(&H)" - - #: plugin_validators.cpp:62 - msgid "Validate &CSS" -@@ -45,11 +44,11 @@ - - #: plugin_validators.cpp:67 - msgid "Validate &Links" --msgstr "驗證連結 (&L)" -+msgstr "驗證連結(&L)" - - #: plugin_validators.cpp:76 - msgid "C&onfigure Validator..." --msgstr "設定 Validator...(&O)" -+msgstr "設定 Validator…(&O)" - - #: plugin_validators.cpp:146 - msgid "Cannot Validate Source" -@@ -73,9 +72,12 @@ - - #: plugin_validators.cpp:184 - msgid "" --"The selected URL cannot be verified because it contains a password. Sending " --"this URL to %1 would put the security of %2 at risk." --msgstr "所選取的網址無法檢查，因為包含密碼。將此網址所到 %1 會有 %2 安全上的風險。" -+"The selected URL cannot be verified because it contains a password. " -+"Sending this URL to %1 would put the security of %2 at risk." -+msgstr "" -+"所選取的網址無法檢查，因為包含密碼。將此網址所到 %1 會有 %2 安全上" -+"的風險。" - - #. i18n: file plugin_validators.rc line 8 - #: rc.cpp:6 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wakeup.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wakeup.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wakeup.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wakeup.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: wakeup\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-09-08 08:25+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wavecapture.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wavecapture.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/wavecapture.po 2005-09-10 11:24:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/wavecapture.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: wavecapture\n" - "POT-Creation-Date: 2004-10-12 01:18+0200\n" - "PO-Revision-Date: 2002-10-31 08:36+0800\n" --"Last-Translator: Jupiter K.T. Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/webarchiver.po kde-i18n-zh_TW-3.5.10/messages/kdeaddons/webarchiver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeaddons/webarchiver.po 2007-05-14 12:22:53.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeaddons/webarchiver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: webarchiver\n" - "POT-Creation-Date: 2007-01-25 02:44+0100\n" - "PO-Revision-Date: 2006-05-29 14:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -56,7 +55,7 @@ - - #: plugin_webarchiver.cpp:57 - msgid "Archive &Web Page..." --msgstr "網頁存檔...(&W)" -+msgstr "網頁存檔…(&W)" - - #: plugin_webarchiver.cpp:90 - msgid "*.war *.tgz|Web Archives" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcmlilo.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcmlilo.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcmlilo.po 2007-05-14 12:23:04.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcmlilo.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmlilo\n" - "POT-Creation-Date: 2007-03-13 02:18+0100\n" - "PO-Revision-Date: 2005-12-08 10:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -15,7 +15,7 @@ - - #: kde-qt-common/EditWidget.cpp:43 - msgid "Select..." --msgstr "選擇..." -+msgstr "選擇…" - - #: kde-qt-common/expert.cpp:41 - msgid "" -@@ -29,21 +29,20 @@ - - #: kde-qt-common/general.cpp:55 - msgid "" --"Select the drive or partition you want to install the LILO boot loader to here. " --"Unless you intend to use other boot managers in addition to LILO, this should " --"be the MBR (master boot record) of your boot drive." --"
In this case, you should probably select /dev/hda " --"if your boot drive is an IDE drive or /dev/sda " --"if your boot drive is SCSI." --msgstr "" --"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的啟動管理器，它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) " --"中。" --"
在這種狀況下，如果您使用 IDE 磁碟，您應該會使用 /dev/hda；如果您使用 SCSI 磁碟，使用 /dev/sda" --"。" -+"Select the drive or partition you want to install the LILO boot loader to " -+"here. Unless you intend to use other boot managers in addition to LILO, this " -+"should be the MBR (master boot record) of your boot drive.
In this case, " -+"you should probably select /dev/hda if your boot drive is an IDE " -+"drive or /dev/sda if your boot drive is SCSI." -+msgstr "" -+"在此選擇您想要安裝 LILO 啟動載入器的磁碟或分割區。除非您預備使用 LILO 以外的" -+"啟動管理器，它應該被安裝在您的開機磁碟的 MBR (主要啟動紀錄) 中。
在這種狀" -+"況下，如果您使用 IDE 磁碟，您應該會使用 /dev/hda；如果您使用 SCSI 磁" -+"碟，使用 /dev/sda。" - - #: kde-qt-common/general.cpp:58 - msgid "Boot the default kernel/OS &after:" --msgstr "在...後啟動預設核心/作業系統(&A):" -+msgstr "在…後啟動預設核心/作業系統(&A):" - - #: kde-qt-common/general.cpp:60 - msgid "/10 seconds" -@@ -51,9 +50,11 @@ - - #: kde-qt-common/general.cpp:64 - msgid "" --"LILO will wait the amount of time specified here before booting the kernel (or " --"OS) marked as default in the Images tab." --msgstr "LILO 將會等待在這邊指定的時間之後，自動啟動在映像分頁中標記為預設的核心（或作業系統）。" -+"LILO will wait the amount of time specified here before booting the kernel " -+"(or OS) marked as default in the Images tab." -+msgstr "" -+"LILO 將會等待在這邊指定的時間之後，自動啟動在映像分頁中標記為預設的核心（或作業系統）。" - - #: kde-qt-common/general.cpp:67 - msgid "Use &linear mode" -@@ -61,17 +62,16 @@ - - #: kde-qt-common/general.cpp:69 - msgid "" --"Check this box if you want to use the linear mode." --"
Linear mode tells the boot loader the location of kernels in linear " --"addressing rather than sector/head/cylinder." --"
linear mode is required for some SCSI drives, and shouldn't hurt unless " --"you're planning to create a boot disk to be used with a different computer." --"
See the lilo.conf man page for details." --msgstr "" --"如果您要使用線性模式，核取此方塊。" --"
線性模式會使啟動載入器以線性位置載入核心而不用 CHS 方式。" --"
對有些 SCSI 磁碟而言，線性模式是必須的。除非您要建立在別台電腦上使用的開機磁碟，這也不會造成傷害。" --"
詳細資料請參照 lilo.conf 手冊頁。" -+"Check this box if you want to use the linear mode.
Linear mode tells the " -+"boot loader the location of kernels in linear addressing rather than sector/" -+"head/cylinder.
linear mode is required for some SCSI drives, and " -+"shouldn't hurt unless you're planning to create a boot disk to be used with " -+"a different computer.
See the lilo.conf man page for details." -+msgstr "" -+"如果您要使用線性模式，核取此方塊。
線性模式會使啟動載入器以線性位置載入核" -+"心而不用 CHS 方式。
對有些 SCSI 磁碟而言，線性模式是必須的。除非您要建立在" -+"別臺電腦上使用的開機磁碟，這也不會造成傷害。
詳細資料請參照 lilo.conf 手冊" -+"頁。" - - #: kde-qt-common/general.cpp:70 - msgid "Use &compact mode" -@@ -79,13 +79,13 @@ - - #: kde-qt-common/general.cpp:72 - msgid "" --"Check this box if you want to use the compact mode." --"
The compact mode tries to merge read requests for adjacent sectors into a " --"single read request. This reduces load time and keeps the boot map smaller, but " --"will not work on all systems." -+"Check this box if you want to use the compact mode.
The compact mode " -+"tries to merge read requests for adjacent sectors into a single read " -+"request. This reduces load time and keeps the boot map smaller, but will not " -+"work on all systems." - msgstr "" --"如果您要使用緊密模式，核取此方塊。" --"
緊密模式嘗試將多個磁區的讀取合併成一次讀取。這可以減少載入的時間並保持較小的啟動對應檔，但不是所有系統都能使用。" -+"如果您要使用緊密模式，核取此方塊。
緊密模式嘗試將多個磁區的讀取合併成一次" -+"讀取。這可以減少載入的時間並保持較小的啟動對應檔，但不是所有系統都能使用。" - - #: kde-qt-common/general.cpp:76 kde/Details.cpp:82 qt/Details.cpp:85 - msgid "&Record boot command lines for defaults" -@@ -94,11 +94,12 @@ - #: kde-qt-common/general.cpp:78 - msgid "" - "Checking this box enables automatic recording of boot command lines as the " --"defaults for the following boots. This way, lilo \"locks\" on a choice until it " --"is manually overridden.\n" -+"defaults for the following boots. This way, lilo \"locks\" on a choice until " -+"it is manually overridden.\n" - "This sets the lock option in lilo.conf." - msgstr "" --"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。\n" -+"核取這個方塊以自動紀錄開機命令成為往後開機的預設值。這種方式會讓 LILO “鎖" -+"定”這個選擇直到手動變更。\n" - "這會設定 lilo.conf 中的 lock 選項。" - - #: kde-qt-common/general.cpp:79 kde/Details.cpp:84 qt/Details.cpp:87 -@@ -108,17 +109,17 @@ - #: kde-qt-common/general.cpp:82 - msgid "" - "If this box is checked, a password (entered below) is required only if any " --"parameters are changed (i.e. the user can boot linux, but not " --"linux single or linux init=/bin/sh).\n" --"This sets the restricted option in lilo.conf." --"
This sets a default for all Linux kernels you want to boot. If you need a " --"per-kernel setting, go to the Operating systems tab and select " --"Details." --msgstr "" --"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可以啟動 linux 但不能使用 linux single " --"或 linux init=/bin/sh。\n" --"這會設定 lilo.conf 中的 restricted 選項。這個會影響所有的核心。如果您希望在每個核心有不同的設定，請到 " --"作業系統 分頁並選擇 詳細資料。" -+"parameters are changed (i.e. the user can boot linux, but not " -+"linux single or linux init=/bin/sh).\n" -+"This sets the restricted option in lilo.conf.
This sets a default " -+"for all Linux kernels you want to boot. If you need a per-kernel setting, go " -+"to the Operating systems tab and select Details." -+msgstr "" -+"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可" -+"以啟動 linux 但不能使用 linux single 或 linux init=/bin/sh。\n" -+"這會設定 lilo.conf 中的 restricted 選項。這個會影響所有的核心。如果您" -+"希望在每個核心有不同的設定，請到 作業系統 分頁並選擇 詳細資料。" - - #: kde-qt-common/general.cpp:86 kde/Details.cpp:89 qt/Details.cpp:93 - msgid "Require &password:" -@@ -130,15 +131,15 @@ - "above is checked, the password is required for additional parameters only." - "
WARNING: The password is stored in clear text in /etc/lilo.conf. " - "You'll want to make sure nobody untrusted can read this file. Also, you " --"probably don't want to use your normal/root password here." --"
This sets a default for all Linux kernels you want to boot. If you need a " --"per-kernel setting, go to the Operating systems tab and select " --"Details." --msgstr "" --"在這邊輸入開機時需要的密碼。如果使用了上面的 限制參數 功能，必須要使用這個密碼才能變更參數。" --"
警告： 這個密碼是以未編碼的方式存在 /etc/lilo.conf " --"中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一般/管理者密碼。" --"
這個會影響所有的核心，如果您希望在每個核心有不同的設定，請到 作業系統 分頁並使用 詳細資料。" -+"probably don't want to use your normal/root password here.
This sets a " -+"default for all Linux kernels you want to boot. If you need a per-kernel " -+"setting, go to the Operating systems tab and select Details." -+msgstr "" -+"在這邊輸入開機時需要的密碼。如果使用了上面的 限制參數 功能，必須要使用" -+"這個密碼才能變更參數。
警告： 這個密碼是以未編碼的方式存在 /etc/" -+"lilo.conf 中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一" -+"般/管理者密碼。
這個會影響所有的核心，如果您希望在每個核心有不同的設定，請" -+"到 作業系統 分頁並使用 詳細資料。" - - #: kde-qt-common/general.cpp:97 - msgid "&Default graphics mode on text console:" -@@ -146,17 +147,17 @@ - - #: kde-qt-common/general.cpp:100 - msgid "" --"You can select the default graphics mode here." --"
If you intend to use a VGA graphics mode, you must compile the kernel with " --"support for framebuffer devices. The ask setting brings up a prompt at " --"boot time." --"
This sets a default for all Linux kernels you want to boot. If you need a " --"per-kernel setting, go to the Operating systems tab and select " --"Details." --msgstr "" --"您可以在這邊選擇預設的圖形模式。" --"
如果您希望使用 VGA 圖形模式，您必須在編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。" --"

這個會影響所有的核心，如果您希望在每個核心有不同的設定，請到 作業系統 分頁並使用 詳細資料。" -+"You can select the default graphics mode here.
If you intend to use a VGA " -+"graphics mode, you must compile the kernel with support for framebuffer " -+"devices. The ask setting brings up a prompt at boot time.
This " -+"sets a default for all Linux kernels you want to boot. If you need a per-" -+"kernel setting, go to the Operating systems tab and select " -+"Details." -+msgstr "" -+"您可以在這邊選擇預設的圖形模式。
如果您希望使用 VGA 圖形模式，您必須在編譯" -+"核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。

這個會" -+"影響所有的核心，如果您希望在每個核心有不同的設定，請到 作業系統 分頁並" -+"使用 詳細資料。" - - #: kde-qt-common/general.cpp:101 kde/Details.cpp:48 qt/Details.cpp:48 - msgid "default" -@@ -270,12 +271,12 @@ - msgid "" - "If this box is checked, LILO goes to the LILO prompt whether or not a key is " - "pressed. If it is turned off, LILO boots the default operating system unless " --"shift is pressed (in that case, it goes to the LILO prompt)." --"
This sets the prompt option in lilo.conf." -+"shift is pressed (in that case, it goes to the LILO prompt).
This sets " -+"the prompt option in lilo.conf." - msgstr "" --"如果核取這個方塊，不論是否有按下按鍵都會出現 LILO 提示。如果關閉， LILO 將會啟動預設的作業系統，除非您按下“shift”（這樣就會進入 LILO " --"提示）。" --"
這個會設定 lilo.conf 中的 prompt 選項。" -+"如果核取這個方塊，不論是否有按下按鍵都會出現 LILO 提示。如果關閉， LILO 將會" -+"啟動預設的作業系統，除非您按下“shift”（這樣就會進入 LILO 提示）。
這個會設" -+"定 lilo.conf 中的 prompt 選項。" - - #: kde-qt-common/images.cpp:53 - msgid "" -@@ -306,8 +307,8 @@ - - #: kde-qt-common/images.cpp:66 kde-qt-common/images.cpp:189 - msgid "" --"Enter the root filesystem (i.e. the partition that will be mounted as / at boot " --"time) for the kernel you want to boot here." -+"Enter the root filesystem (i.e. the partition that will be mounted as / at " -+"boot time) for the kernel you want to boot here." - msgstr "請在這邊輸入您核心所需的根檔案系統（在開機時被掛載於 / 的分割區）。" - - #: kde-qt-common/images.cpp:68 kde-qt-common/images.cpp:190 -@@ -319,7 +320,9 @@ - "If you want to use an initial ramdisk (initrd) for this kernel, enter its " - "filename here. Leave this field blank if you don't intend to use an initial " - "ramdisk for this kernel." --msgstr "如果您希望在這個核心上使用初始化記憶體磁碟(initrd)，請在這邊輸入檔案名稱。否則請留下空白。" -+msgstr "" -+"如果您希望在這個核心上使用初始化記憶體磁碟(initrd)，請在這邊輸入檔案名稱。否" -+"則請留下空白。" - - #: kde-qt-common/images.cpp:71 - msgid "E&xtra parameters:" -@@ -327,10 +330,11 @@ - - #: kde-qt-common/images.cpp:72 - msgid "" --"Enter any extra parameters you wish to pass to the kernel here. Usually, this " --"can be left blank." --"
This sets the append option in lilo.conf." --msgstr "在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。
這會設定 lilo.conf 中的append選項。" -+"Enter any extra parameters you wish to pass to the kernel here. Usually, " -+"this can be left blank.
This sets the append option in lilo.conf." -+msgstr "" -+"在這邊輸入任何您希望傳遞給核心的額外參數。通常您可以保留空白。
這會設定 " -+"lilo.conf 中的append選項。" - - #: kde-qt-common/images.cpp:79 - msgid "Set &Default" -@@ -368,7 +372,7 @@ - - #: kde-qt-common/images.cpp:91 - msgid "Add &Kernel..." --msgstr "增加核心(&K)..." -+msgstr "增加核心(&K)…" - - #: kde-qt-common/images.cpp:93 - msgid "Add a new Linux kernel to the boot menu" -@@ -376,7 +380,7 @@ - - #: kde-qt-common/images.cpp:94 - msgid "Add Other &OS..." --msgstr "增加其他作業系統(&O)..." -+msgstr "增加其他作業系統(&O)…" - - #: kde-qt-common/images.cpp:96 - msgid "Add a non-Linux OS to the boot menu" -@@ -391,20 +395,16 @@ - msgstr "從開機選單移除項目" - - #: kde-qt-common/images.cpp:177 --msgid "" --"Configuration ok. LILO said:\n" --msgstr "" --"組態正確。 LILO 說：\n" -+msgid "Configuration ok. LILO said:\n" -+msgstr "組態正確。 LILO 說：\n" - - #: kde-qt-common/images.cpp:178 - msgid "Configuration OK" - msgstr "組態設定正確" - - #: kde-qt-common/images.cpp:180 --msgid "" --"Configuration NOT ok. LILO said:\n" --msgstr "" --"組態不正確。 LILO 說：\n" -+msgid "Configuration NOT ok. LILO said:\n" -+msgstr "組態不正確。 LILO 說：\n" - - #: kde-qt-common/images.cpp:181 - msgid "Configuration NOT ok" -@@ -458,13 +458,12 @@ - - #: kde/Details.cpp:47 qt/Details.cpp:47 - msgid "" --"You can select the graphics mode for this kernel here." --"
If you intend to use a VGA graphics mode, you must compile the kernel with " --"support for framebuffer devices. The ask setting brings up a prompt at " --"boot time." -+"You can select the graphics mode for this kernel here.
If you intend to " -+"use a VGA graphics mode, you must compile the kernel with support for " -+"framebuffer devices. The ask setting brings up a prompt at boot time." - msgstr "" --"您可以在這邊選擇核心所使用的圖形模式。" --"
如果您要使用 VGA 圖形模式，您必須在編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。" -+"您可以在這邊選擇核心所使用的圖形模式。
如果您要使用 VGA 圖形模式，您必須在" -+"編譯核心時加入 framebuffer 的支援。選擇 詢問 將會在開機時詢問您。" - - #: kde/Details.cpp:75 qt/Details.cpp:76 - msgid "Mount root filesystem &read-only" -@@ -473,12 +472,13 @@ - #: kde/Details.cpp:76 qt/Details.cpp:77 - msgid "" - "Mount the root filesystem for this kernel read-only. Since the init scripts " --"normally take care of remounting the root filesystem in read-write mode after " --"running some checks, this should always be turned on." --"
Don't turn this off unless you know what you're doing." --msgstr "" --"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言， init 命令稿會在一些檢查之後，將根檔案系統重新掛載為讀寫模式，這應該要被開啟。" --"
不要關閉這個功能除非您非常確定。" -+"normally take care of remounting the root filesystem in read-write mode " -+"after running some checks, this should always be turned on.
Don't turn " -+"this off unless you know what you're doing." -+msgstr "" -+"啟動這個核心時要以唯讀方式掛載的檔案系統。一般而言， init 命令稿會在一些檢查" -+"之後，將根檔案系統重新掛載為讀寫模式，這應該要被開啟。
不要關閉這個功能除" -+"非您非常確定。" - - #: kde/Details.cpp:78 qt/Details.cpp:80 - msgid "Do not check &partition table" -@@ -486,34 +486,37 @@ - - #: kde/Details.cpp:79 - msgid "" --"This turns off some sanity checks while writing the configuration. This should " --"not be used under \"normal\" circumstances, but it can be useful, for example, " --"by providing the capability of booting from a floppy disk, without having a " --"floppy in the drive every time you run lilo." --"
This sets the unsafe keyword in lilo.conf." -+"This turns off some sanity checks while writing the configuration. This " -+"should not be used under \"normal\" circumstances, but it can be useful, for " -+"example, by providing the capability of booting from a floppy disk, without " -+"having a floppy in the drive every time you run lilo.
This sets the " -+"unsafe keyword in lilo.conf." - msgstr "" --"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下，這不應該被使用，但是這仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。" -+"這個功能關閉一些寫入設定檔時的檢查。在“一般”的情形下，這不應該被使用，但是這" -+"仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。" - "
這會設定 lilo.conf 中的 unsafe 關鍵字。" - - #: kde/Details.cpp:83 qt/Details.cpp:86 - msgid "" - "Checking this box enables automatic recording of boot command lines as the " --"default for the following bootups. This way, lilo \"locks\" on a choice until " --"it is manually overridden." --"
This sets the lock option in lilo.conf" --msgstr "" --"啟動這個功能以啟動自動紀錄開機指令的功能，並將之作為往後開機的預設值。這種方式會讓 LILO “鎖定”這個選擇直到手動變更。" --"
這會設定 lilo.conf 中的 lock 選項。" -+"default for the following bootups. This way, lilo \"locks\" on a choice " -+"until it is manually overridden.
This sets the lock option in lilo." -+"conf" -+msgstr "" -+"啟動這個功能以啟動自動紀錄開機指令的功能，並將之作為往後開機的預設值。這種方" -+"式會讓 LILO “鎖定”這個選擇直到手動變更。
這會設定 lilo.conf 中的 lock 選項。" - - #: kde/Details.cpp:86 qt/Details.cpp:89 - msgid "" - "If this box is checked, a password (entered below) is required only if any " --"parameters are changed (i.e. the user can boot linux, but not " --"linux single or linux init=/bin/sh).\n" -+"parameters are changed (i.e. the user can boot linux, but not " -+"linux single or linux init=/bin/sh).\n" - "This sets the restricted option in lilo.conf." - msgstr "" --"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可以啟動 linux 但不能使用 linux single " --"或 linux init=/bin/sh。\n" -+"如果核取這個方塊，要變更任何參數時，在下面輸入的密碼是必須的。也就是使用者可" -+"以啟動 linux 但不能使用 linux single 或 linux init=/bin/sh。\n" - "這會設定 lilo.conf 中的 restricted 選項。" - - #: kde/Details.cpp:94 qt/Details.cpp:98 -@@ -524,9 +527,10 @@ - "You'll want to make sure nobody untrusted can read this file. Also, you " - "probably don't want to use your normal/root password here." - msgstr "" --"在這邊輸入開機時需要的密碼（如果有的話）。如果使用了上面的 限制參數 功能，必須要使用這個密碼才能變更參數。" --"
警告： 這個密碼是以未編碼的方式存在 /etc/lilo.conf " --"中。您必須確定未授權的人不能讀取這個檔案。同時，建議不要使用您的一般/管理者密碼。" -+"在這邊輸入開機時需要的密碼（如果有的話）。如果使用了上面的 限制參數 功" -+"能，必須要使用這個密碼才能變更參數。
警告： 這個密碼是以未編碼的方" -+"式存在 /etc/lilo.conf 中。您必須確定未授權的人不能讀取這個檔案。同時，建議不" -+"要使用您的一般/管理者密碼。" - - #: kde/kcontrol.cpp:48 - msgid "kcmlilo" -@@ -543,12 +547,13 @@ - #: qt/Details.cpp:81 - msgid "" - "This turns off some sanity checks while writing the configuration. This " --"shouldn't be used under \"normal\" circumstances, but it's useful, for example, " --"for installing the possibility to boot from a floppy disk without having a " --"floppy in the drive every time you run lilo." --"
This sets the unsafe keyword in lilo.conf." -+"shouldn't be used under \"normal\" circumstances, but it's useful, for " -+"example, for installing the possibility to boot from a floppy disk without " -+"having a floppy in the drive every time you run lilo.
This sets the " -+"unsafe keyword in lilo.conf." - msgstr "" --"這個功能關閉一些寫入設定檔時的檢查，在“一般”的情形下，這不應該被使用。但是這仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。" -+"這個功能關閉一些寫入設定檔時的檢查，在“一般”的情形下，這不應該被使用。但是這" -+"仍是有用的，例如提供自軟碟開機的功能而不需要在每次執行 lilo 時放入軟碟片。" - "
這會設定 lilo.conf 中的 unsafe 關鍵字。" - - #: qt/standalone.cpp:41 -@@ -557,17 +562,21 @@ - - #: qt/standalone.cpp:43 - msgid "" --"The What's This? button is part of this program's help system. Click on " --"the What's This? button then on any widget in the window to get information " --"(like this) on it." --msgstr "這是什麼？ 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元件以取得像這樣的說明視窗。" -+"The What's This? button is part of this program's help system. Click " -+"on the What's This? button then on any widget in the window to get " -+"information (like this) on it." -+msgstr "" -+"這是什麼？ 按鈕是這個程式說明系統的一部份。按下這個按鈕以及任何程式元" -+"件以取得像這樣的說明視窗。" - - #: qt/standalone.cpp:47 - msgid "" --"This button calls up the program's online help system. If it does nothing, no " --"help file has been written (yet); in that case, use the What's This " --"button on the left." --msgstr "這個按鈕呼叫程式的線上說明系統。如果它沒有作用，是因為目前沒有說明檔案；此時，請使用右邊的 這是什麼？ 按鈕。" -+"This button calls up the program's online help system. If it does nothing, " -+"no help file has been written (yet); in that case, use the What's This button on the left." -+msgstr "" -+"這個按鈕呼叫程式的線上說明系統。如果它沒有作用，是因為目前沒有說明檔案；此" -+"時，請使用右邊的 這是什麼？ 按鈕。" - - #: qt/standalone.cpp:49 - msgid "&Default" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcron.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcron.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kcron.po 2007-07-12 10:27:49.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kcron.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kcron\n" - "POT-Creation-Date: 2007-05-25 02:16+0200\n" - "PO-Revision-Date: 2006-01-16 16:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -266,7 +265,8 @@ - - #: cttask.cpp:252 - msgid "" --"_: Please translator, read the README.translators file in kcron's source code\n" -+"_: Please translator, read the README.translators file in kcron's source " -+"code\n" - "DAYS_OF_MONTH of MONTHS" - msgstr "MONTHS 月 DAYS_OF_MONTH 日" - -@@ -325,8 +325,8 @@ - #: ktapp.cpp:96 - msgid "" - "You can use this application to schedule programs to run in the background.\n" --"To schedule a new task now, click on the Tasks folder and select Edit/New from " --"the menu." -+"To schedule a new task now, click on the Tasks folder and select Edit/New " -+"from the menu." - msgstr "" - "你可以使用這個程式來排程程式在背景執行。\n" - "要立刻排程一個新工作，請按下工作資料夾並從選單中選編輯/新增。" -@@ -337,11 +337,11 @@ - - #: ktapp.cpp:131 - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #: ktapp.cpp:133 - msgid "M&odify..." --msgstr "修改(&O)..." -+msgstr "修改(&O)…" - - #: ktapp.cpp:135 kttask.cpp:171 ktvariable.cpp:74 - msgid "&Enabled" -@@ -367,47 +367,47 @@ - - #: ktapp.cpp:255 - msgid "Saving..." --msgstr "儲存中..." -+msgstr "儲存中…" - - #: ktapp.cpp:266 - msgid "Printing..." --msgstr "列印中..." -+msgstr "列印中…" - - #: ktapp.cpp:285 - msgid "Cutting to clipboard..." --msgstr "剪下至剪貼簿..." -+msgstr "剪下至剪貼簿…" - - #: ktapp.cpp:293 - msgid "Copying to clipboard..." --msgstr "複製至剪貼簿..." -+msgstr "複製至剪貼簿…" - - #: ktapp.cpp:300 - msgid "Pasting from clipboard..." --msgstr "自剪貼簿貼上..." -+msgstr "自剪貼簿貼上…" - - #: ktapp.cpp:307 - msgid "Adding new entry..." --msgstr "新增項目..." -+msgstr "新增項目…" - - #: ktapp.cpp:314 - msgid "Modifying entry..." --msgstr "修改項目..." -+msgstr "修改項目…" - - #: ktapp.cpp:321 - msgid "Deleting entry..." --msgstr "刪除項目..." -+msgstr "刪除項目…" - - #: ktapp.cpp:331 - msgid "Disabling entry..." --msgstr "停用項目..." -+msgstr "停用項目…" - - #: ktapp.cpp:337 - msgid "Enabling entry..." --msgstr "啟用項目..." -+msgstr "啟用項目…" - - #: ktapp.cpp:346 - msgid "Running command..." --msgstr "執行指令..." -+msgstr "執行指令…" - - #: ktapp.cpp:395 - msgid "Create a new task or variable." -@@ -471,7 +471,7 @@ - - #: ktlisttasks.cpp:85 - msgid "No tasks..." --msgstr "沒有工作..." -+msgstr "沒有工作…" - - #: ktlistvar.cpp:72 - msgid "Modify Variable" -@@ -491,7 +491,7 @@ - - #: ktlistvars.cpp:81 - msgid "No variables..." --msgstr "沒有變數..." -+msgstr "沒有變數…" - - #: ktlistvars.cpp:98 - msgid "Variables" -@@ -527,7 +527,7 @@ - - #: kttask.cpp:165 - msgid "&Browse..." --msgstr "瀏覽(&B)..." -+msgstr "瀏覽(&B)…" - - #: kttask.cpp:176 - msgid "&Silent" -@@ -576,10 +576,8 @@ - msgstr "分鐘" - - #: kttask.cpp:528 --msgid "" --"Please enter the following to schedule the task:\n" --msgstr "" --"請輸入下列資訊以方便安排工作:\n" -+msgid "Please enter the following to schedule the task:\n" -+msgstr "請輸入下列資訊以方便安排工作:\n" - - #: kttask.cpp:534 - msgid "the program to run" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kdat.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kdat.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kdat.po 2008-08-19 20:43:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kdat.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: kdat\n" - "POT-Creation-Date: 2008-07-08 01:20+0200\n" - "PO-Revision-Date: 2005-12-08 14:19+0800\n" --"Last-Translator: Frank Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -75,7 +75,7 @@ - - #: BackupDlg.cpp:138 IndexDlg.cpp:115 - msgid "Save Log..." --msgstr "保存紀錄..." -+msgstr "保存紀錄…" - - #: BackupDlg.cpp:279 - msgid "No files to back up. Aborting." -@@ -288,7 +288,7 @@ - - #: KDatMainWindow.cpp:104 KDatMainWindow.cpp:144 - msgid "Format Tape..." --msgstr "格式化磁帶..." -+msgstr "格式化磁帶…" - - #: KDatMainWindow.cpp:107 KDatMainWindow.cpp:113 KDatMainWindow.cpp:141 - #: KDatMainWindow.cpp:781 KDatMainWindow.cpp:795 -@@ -297,15 +297,15 @@ - - #: KDatMainWindow.cpp:110 KDatMainWindow.cpp:116 KDatMainWindow.cpp:136 - msgid "Verify..." --msgstr "檢驗..." -+msgstr "檢驗…" - - #: KDatMainWindow.cpp:111 KDatMainWindow.cpp:117 KDatMainWindow.cpp:135 - msgid "Restore..." --msgstr "資料重建..." -+msgstr "資料重建…" - - #: KDatMainWindow.cpp:120 KDatMainWindow.cpp:129 KDatMainWindow.cpp:134 - msgid "Backup..." --msgstr "備份..." -+msgstr "備份…" - - #: KDatMainWindow.cpp:123 KDatMainWindow.cpp:829 - msgid "Delete Tape Index" -@@ -325,7 +325,7 @@ - - #: KDatMainWindow.cpp:149 - msgid "Configure KDat..." --msgstr "設定 KDat..." -+msgstr "設定 KDat…" - - #: KDatMainWindow.cpp:155 - msgid "" -@@ -367,8 +367,8 @@ - "to restore them. To restore your files by hand, you need to know\n" - "the name of the *non-rewinding* version of your tape device %1.\n" - msgstr "" --"KDat 會將您的檔案存進磁帶中。要將檔案從磁帶中取出，您必須知道您的磁帶機設備 %1 的「不迴帶設備名稱」 (non-rewinding device " --"name)。\n" -+"KDat 會將您的檔案存進磁帶中。要將檔案從磁帶中取出，您必須知道您的磁帶機設備 %" -+"1 的「不迴帶設備名稱」 (non-rewinding device name)。\n" - - #: KDatMainWindow.cpp:423 - msgid "" -@@ -384,7 +384,8 @@ - " - KDat Maintenance Team\n" - msgstr "" - "例如，如果您的磁帶機設備名稱是 /dev/st0，「不迴帶設備名稱」就是 /dev/nst0。\n" --"如果您的設備名稱不是像這樣，請輸入 ls -l %2 看看您的磁帶機設備名稱，並將以下說明的 /dev/nst0 換成您的設備名稱。\n" -+"如果您的設備名稱不是像這樣，請輸入 ls -l %2 看看您的磁帶機設備名稱，並將以下" -+"說明的 /dev/nst0 換成您的設備名稱。\n" - "開啟終端機視窗，輸入下列命令：\n" - "tar tfv /dev/nst0; tar tfv /dev/nst0\n" - "tar xfv /dev/nst0\n" -@@ -398,7 +399,7 @@ - - #: KDatMainWindow.cpp:467 - msgid "Performing backup..." --msgstr "正在進行備份..." -+msgstr "正在進行備份…" - - #: KDatMainWindow.cpp:472 KDatMainWindow.cpp:494 - msgid "Backup canceled." -@@ -416,7 +417,7 @@ - - #: KDatMainWindow.cpp:501 TapeDrive.cpp:525 TapeDrive.cpp:546 - msgid "Rewinding tape..." --msgstr "正在倒帶..." -+msgstr "正在倒帶…" - - #: KDatMainWindow.cpp:504 - msgid "" -@@ -436,7 +437,7 @@ - - #: KDatMainWindow.cpp:512 - msgid "Skipping to end of tape..." --msgstr "正在跳到磁帶尾端..." -+msgstr "正在跳到磁帶尾端…" - - #: KDatMainWindow.cpp:515 - msgid "" -@@ -448,7 +449,7 @@ - - #: KDatMainWindow.cpp:521 - msgid "Backup in progress..." --msgstr "正在備份..." -+msgstr "正在備份…" - - #: KDatMainWindow.cpp:535 - msgid "Backup complete." -@@ -456,11 +457,11 @@ - - #: KDatMainWindow.cpp:667 - msgid "Restore in progress..." --msgstr "正在讀出資料..." -+msgstr "正在讀出資料…" - - #: KDatMainWindow.cpp:669 - msgid "Verify in progress..." --msgstr "正在檢驗..." -+msgstr "正在檢驗…" - - #: KDatMainWindow.cpp:676 - msgid "Restore complete." -@@ -486,7 +487,8 @@ - "/dev/st0). If you hear the tape drive moving, wait\n" - "until it stops and then try mounting it again." - msgstr "" --"磁帶機 %1 中沒有磁帶。請檢查設定是否指向正確的磁帶機設備（如 /dev/st0）。如果您有聽到磁帶機在運轉中，請稍候直到運轉停止，並試著重新掛載。" -+"磁帶機 %1 中沒有磁帶。請檢查設定是否指向正確的磁帶機設備（如 /dev/st0）。如果" -+"您有聽到磁帶機在運轉中，請稍候直到運轉停止，並試著重新掛載。" - - #: KDatMainWindow.cpp:723 - msgid "The current tape index will be overwritten, continue?" -@@ -552,8 +554,8 @@ - #: KDatMainWindow.cpp:811 - msgid "" - "No tape index is selected.\n" --"In order to delete a tape index, the tape index to be deleted must be selected " --"in the tree first." -+"In order to delete a tape index, the tape index to be deleted must be " -+"selected in the tree first." - msgstr "" - "沒有選擇磁帶索引。\n" - "請在樹狀列表中選擇要刪除的磁帶索引。" -@@ -605,7 +607,7 @@ - - #: KDatMainWindow.cpp:884 - msgid "Formatting tape..." --msgstr "正在格式化磁帶..." -+msgstr "正在格式化磁帶…" - - #: KDatMainWindow.cpp:887 - msgid "Format complete." -@@ -622,8 +624,8 @@ - - #: KDatMainWindow.cpp:940 - msgid "" --"In order to delete a backup profile, the backup profile to be deleted must be " --"selected in the tree first." -+"In order to delete a backup profile, the backup profile to be deleted must " -+"be selected in the tree first." - msgstr "請先在樹狀列表中選擇要刪除的備份設定。" - - #: KDatMainWindow.cpp:949 -@@ -640,7 +642,7 @@ - - #: KDatMainWindow.cpp:996 - msgid "Reading tape header..." --msgstr "正在讀取磁帶標頭..." -+msgstr "正在讀取磁帶標頭…" - - #: KDatMainWindow.cpp:1003 - msgid "This tape has not been formatted by KDat." -@@ -782,9 +784,11 @@ - #, c-format - msgid "" - "The tape index file format is version %d. The index cannot be read by this " --"version of KDat. Perhaps the tape index file was created by a newer version of " --"KDat?" --msgstr "磁帶索引檔案格式版本為 %d。你用的 KDat 不能讀取索引檔案。也許，磁帶索引檔案是用新版本的KDat生成的？" -+"version of KDat. Perhaps the tape index file was created by a newer version " -+"of KDat?" -+msgstr "" -+"磁帶索引檔案格式版本為 %d。你用的 KDat 不能讀取索引檔案。也許，磁帶索引檔案是" -+"用新版本的KDat生成的？" - - #: Tape.cpp:380 - msgid "Error during fseek #1 while accessing archive: \"" -@@ -884,7 +888,7 @@ - - #: TapeDrive.cpp:231 - msgid "Reading magic string..." --msgstr "正在讀取 magic 字串..." -+msgstr "正在讀取 magic 字串…" - - #: TapeDrive.cpp:234 - msgid "Reading magic string failed." -@@ -892,7 +896,7 @@ - - #: TapeDrive.cpp:243 - msgid "Reading version number..." --msgstr "正在讀版本號..." -+msgstr "正在讀版本號…" - - #: TapeDrive.cpp:251 - msgid "" -@@ -901,7 +905,7 @@ - - #: TapeDrive.cpp:255 - msgid "Reading tape ID..." --msgstr "讀取磁帶 ID..." -+msgstr "讀取磁帶 ID…" - - #: TapeDrive.cpp:258 - msgid "Reading tape ID length failed." -@@ -909,11 +913,11 @@ - - #: TapeDrive.cpp:520 - msgid "Skipping to archive..." --msgstr "跳至歸檔..." -+msgstr "跳至歸檔…" - - #: TapeDrive.cpp:542 - msgid "Skipping to block..." --msgstr "跳至區塊..." -+msgstr "跳至區塊…" - - #: TapeFileInfoWidget.cpp:39 - msgid "Start record:" -@@ -957,17 +961,15 @@ - - #: VerifyDlg.cpp:144 - msgid "&Save Log..." --msgstr "保存紀錄 (&S)..." -+msgstr "保存紀錄(&S)…" - - #: VerifyDlg.cpp:149 - msgid "&Abort" - msgstr "中斷(&A)" - - #: VerifyDlg.cpp:344 --msgid "" --"failed while reading tape data.\n" --msgstr "" --"無法讀取磁帶資料。\n" -+msgid "failed while reading tape data.\n" -+msgstr "無法讀取磁帶資料。\n" - - #: VerifyOptDlg.cpp:41 VerifyOptDlg.cpp:42 - msgid "KDat: Restore Options" -@@ -989,7 +991,7 @@ - #: VerifyOptDlg.cpp:60 rc.cpp:30 rc.cpp:42 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #: VerifyOptDlg.cpp:65 - msgid "Restore files:" -@@ -1033,8 +1035,8 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"This setting determines the capacity that KDat assumes your backup tapes to be. " --" This is used when formatting the tapes." -+"This setting determines the capacity that KDat assumes your backup tapes to " -+"be. This is used when formatting the tapes." - msgstr "這個設定是讓 KDat 猜測您的備份磁帶容量。用於格式化磁帶時。" - - #. i18n: file OptionsDlgWidget.ui line 67 -@@ -1042,10 +1044,11 @@ - #, no-c-format - msgid "" - "Tape drives read and write data in individual blocks. This setting controls " --"the size of each block, and should be set to your tape drive's block size. For " --"floppy tape drives this should be set to 10240 bytes." -+"the size of each block, and should be set to your tape drive's block size. " -+"For floppy tape drives this should be set to 10240 bytes." - msgstr "" --"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小，應該與您的磁帶機的區塊大小一致。Floppy 磁帶機應該設定為 10240 bytes。" -+"磁帶機於個別的區塊讀寫資料。這個設定控制區塊大小，應該與您的磁帶機的區塊大小" -+"一致。Floppy 磁帶機應該設定為 10240 bytes。" - - #. i18n: file OptionsDlgWidget.ui line 73 - #: rc.cpp:12 -@@ -1063,8 +1066,8 @@ - #: rc.cpp:18 - #, no-c-format - msgid "" --"This option chooses whether the default tape size to the left is in megabytes " --"(MB) or gigabytes (GB)." -+"This option chooses whether the default tape size to the left is in " -+"megabytes (MB) or gigabytes (GB)." - msgstr "這個選項設定磁帶大小是以 MB 或 GB 為單位。" - - #. i18n: file OptionsDlgWidget.ui line 96 -@@ -1095,8 +1098,8 @@ - #: rc.cpp:36 - #, no-c-format - msgid "" --"The location in the filesystem of the non-rewinding " --"tape device. The default is /dev/tape." -+"The location in the filesystem of the non-rewinding tape device. " -+"The default is /dev/tape." - msgstr "不迴帶設備名稱在檔案系統中的位置。預設為/dev/type。" - - #. i18n: file OptionsDlgWidget.ui line 155 -@@ -1115,9 +1118,11 @@ - #: rc.cpp:48 - #, no-c-format - msgid "" --"This setting controls the command that KDat uses to perform the tape backup. " --"The full path should be given. The default is tar." --msgstr "這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 tar。" -+"This setting controls the command that KDat uses to perform the tape " -+"backup. The full path should be given. The default is tar." -+msgstr "" -+"這個設定控制 KDat 用於進行磁帶備份的命令。您應該用完整的路徑名稱。預設值為 " -+"tar。" - - #. i18n: file OptionsDlgWidget.ui line 185 - #: rc.cpp:51 -@@ -1147,8 +1152,8 @@ - #: rc.cpp:63 - #, no-c-format - msgid "" --"This command issues an mtload command to the tape device before trying " --"to mount it.\n" -+"This command issues an mtload command to the tape device before " -+"trying to mount it.\n" - "\n" - "This is required by some tape drives." - msgstr "" -@@ -1172,8 +1177,8 @@ - #: rc.cpp:74 - #, no-c-format - msgid "" --"This option makes KDat try to disable the eject button on the tape drive after " --"the tape has been mounted.\n" -+"This option makes KDat try to disable the eject button on the tape drive " -+"after the tape has been mounted.\n" - "\n" - "This doesn't work for all tape drives." - msgstr "" -@@ -1221,8 +1226,8 @@ - #: rc.cpp:96 - #, no-c-format - msgid "" --"Some tape drives support different sizes of the data block. With this option, " --"KDat will attempt to enable that support.\n" -+"Some tape drives support different sizes of the data block. With this " -+"option, KDat will attempt to enable that support.\n" - "\n" - "You must still specify the block size." - msgstr "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_deb.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_deb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_deb.po 2005-09-10 11:24:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_deb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfile_deb.po\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2002-06-27 10:17\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_rpm.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_rpm.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kfile_rpm.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kfile_rpm.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kfile_rpm\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2005-12-15 15:38+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/knetworkconf.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/knetworkconf.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/knetworkconf.po 2008-08-19 20:43:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/knetworkconf.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,8 @@ - "Project-Id-Version: knetworkconf\n" - "POT-Creation-Date: 2008-07-08 01:20+0200\n" - "PO-Revision-Date: 2006-06-19 09:12+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" -+"tw>\n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -128,8 +129,8 @@ - - #: knetworkconf.cpp:716 - msgid "" --"Could not launch backend to change network device state. You will have to do it " --"manually." -+"Could not launch backend to change network device state. You will have to do " -+"it manually." - msgstr "無法叫出後端來更新網路設備的狀態。您必須手動執行。" - - #: knetworkconf.cpp:737 -@@ -341,13 +342,13 @@ - msgid "" - "

Using an dynamic IP address causes this device to get a free IP address " - "automatically.

\n" --"

The interface will try to contact an DHCP- or BOOTP-Server during the boot " --"process.

\n" -+"

The interface will try to contact an DHCP- or BOOTP-Server during the " -+"boot process.

\n" - "

Rendevouz is not supported yet.

" - msgstr "" - "

使用動態 IP 位址，網路設備會自動取得 IP 位址。

\n" --"

此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。

" --"

Rendevouz 尚未支援。

" -+"

此介面會在開機時試著去尋找 DHCP 或 BOOTP 伺服器。

Rendevouz 尚未支" -+"援。

" - - #. i18n: file kadddevicedlg.ui line 184 - #: rc.cpp:42 -@@ -368,7 +369,9 @@ - "

Ensures that this interface gets activated during boot time.

\n" - "

Otherwise, you will have to active the interface manually after you have " - "logged in after the boot process.

" --msgstr "

確保在開機期間此介面已經被開啟。

不然您就必須在開完機後登入系統，再手動啟動介面。

" -+msgstr "" -+"

確保在開機期間此介面已經被開啟。

不然您就必須在開完機後登入系統，再" -+"手動啟動介面。

" - - #. i18n: file kadddevicedlg.ui line 197 - #: rc.cpp:52 -@@ -425,8 +428,8 @@ - "

Please enter the desired subnetmask for the interface here.

\n" - "

For small private networks, 255.255.255.0 will most often be a reasonable " - "default value.

\n" --"

This field will change from a popup box to a combo box as soon as you enable " --"the advanced settings below.

" -+"

This field will change from a popup box to a combo box as soon as you " -+"enable the advanced settings below.

" - msgstr "" - "

請輸入此介面的子網路遮罩。

\n" - "

對某些小的私密網路而言，255.255.255.0 通常是合理的預設值。

\n" -@@ -442,8 +445,8 @@ - #: rc.cpp:84 rc.cpp:87 - #, no-c-format - msgid "" --"The netmask defines a range of IP numbers which will build a subnet inside the " --"network." -+"The netmask defines a range of IP numbers which will build a subnet inside " -+"the network." - msgstr "網路遮罩定義子網路內可用的 IP 範圍。" - - #. i18n: file kadddevicedlg.ui line 301 -@@ -457,26 +460,29 @@ - #, no-c-format - msgid "" - "

Here you should enter the IP address for the network interface.

\n" --"

Please note: If your network is connected to the internet, you should only " --"enter IP addresses you have been given by your provider.

\n" -+"

Please note: If your network is connected to the internet, you should " -+"only enter IP addresses you have been given by your provider.

\n" - "

Otherwise, you should enter one of the IP addresses which are explicitly " - "reserved for private use.

\n" - "

Most small private networks use class C networks, which allow up to 255 " - "computers in your network. So simply use addresses like 192.168.1.1, " - "192.168.1.2, 192.168.1.171 and so on for your computers.

\n" --"

Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13.

" --"\n" --"

Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5

\n" -+"

Cass C networks: 192.168.0.0 to 192.168.255.25, for example 192.168.0.13." -+"

\n" -+"

Class B networks: 172.16.0.0 to 172.31.255.255, for example 172.28.2.5\n" - "

Class A networks: 10.0.0.0 to 10.255.255.255, for example 10.5.12.14

\n" --"

Please ensure that all IP addresses you give to your computers are unique; " --"you will have many problems if the same address is assigned to more than one " --"network device.

" -+"

Please ensure that all IP addresses you give to your computers are " -+"unique; you will have many problems if the same address is assigned to more " -+"than one network device.

" - msgstr "" - "

請在此輸入網路介面的 IP 位址。

\n" --"

請注意：如果您是連接到網際網路上，您應該輸入您的網路服務提供者給您的 IP 位址。

\n" -+"

請注意：如果您是連接到網際網路上，您應該輸入您的網路服務提供者給您的 IP 位" -+"址。

\n" - "

否則，您應該輸入私密網路的位址。

\n" --"

大部份小的私密網路使用的是 C class 的網路，允許 255 台電腦在同一個網域內。

" --"

C class 網路：192.168.0.0 到 192.168.255.255，例如 192.168.0.13。

\n" -+"

大部份小的私密網路使用的是 C class 的網路，允許 255 臺電腦在同一個網域內。" -+"

C class 網路：192.168.0.0 到 192.168.255.255，例如 192.168.0.13。\n" - "

B class 網路：172.16.0.0 到 172.31.255.255，例如 172.28.2.5。

\n" - "

A class 網路：10.0.0.0 到 10.255.255.255，例如 10.5.12.14。

\n" - "

請確定您設定的 IP 位址不會跟別人衝突，否則您會遇到一大堆的麻煩。

" -@@ -640,25 +646,25 @@ - #: rc.cpp:214 rc.cpp:310 rc.cpp:328 - #, no-c-format - msgid "&Add..." --msgstr "新增(&A)..." -+msgstr "新增(&A)…" - - #. i18n: file kaddknownhostdlg.ui line 201 - #: rc.cpp:217 rc.cpp:313 rc.cpp:331 - #, no-c-format - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #. i18n: file kdetectdistrodlg.ui line 16 - #: rc.cpp:223 - #, no-c-format - msgid "Detecting Your Current Platform" --msgstr "偵測您目前的平台" -+msgstr "偵測您目前的平臺" - - #. i18n: file kdetectdistrodlg.ui line 60 - #: rc.cpp:226 - #, no-c-format - msgid "Please wait while detecting your current platform..." --msgstr "請稍候，正在偵測您目前的平台..." -+msgstr "請稍候，正在偵測您目前的平臺…" - - #. i18n: file kinterfaceupdowndlg.ui line 16 - #: rc.cpp:229 -@@ -670,7 +676,7 @@ - #: rc.cpp:232 - #, no-c-format - msgid "Bringing up interface eth0..." --msgstr "帶起介面eth0..." -+msgstr "帶起介面eth0…" - - #. i18n: file knetworkconfdlg.ui line 36 - #: rc.cpp:235 -@@ -742,7 +748,7 @@ - #: rc.cpp:268 - #, no-c-format - msgid "Configure Interface..." --msgstr "設定介面..." -+msgstr "設定介面…" - - #. i18n: file knetworkconfdlg.ui line 197 - #: rc.cpp:271 -@@ -868,7 +874,7 @@ - #: rc.cpp:358 - #, no-c-format - msgid "&Create New..." --msgstr "建立新的(&C)..." -+msgstr "建立新的(&C)…" - - #. i18n: file knetworkconfdlg.ui line 845 - #: rc.cpp:361 -@@ -894,7 +900,7 @@ - #: rc.cpp:374 - #, no-c-format - msgid "Unsupported Platform" --msgstr "不支援的平台" -+msgstr "不支援的平臺" - - #. i18n: file kselectdistrodlg.ui line 69 - #: rc.cpp:383 -@@ -906,18 +912,20 @@ - #: rc.cpp:386 - #, no-c-format - msgid "" --"

Your Platform is Not Supported

" --"" --msgstr "

未支援您的平台

" -+"

Your Platform is Not Supported" -+msgstr "

未支援您的平臺

" - - #. i18n: file kselectdistrodlg.ui line 102 - #: rc.cpp:389 - #, no-c-format - msgid "" --"You may choose one of the following supported platforms if you are sure " --"your platform behaves the same as the chosen one. Please be sure, because your " --"current network configuration could be damaged." --msgstr "如果您十分確定您的平台的行為與以下的平台一樣，您可以選擇其中一個。但請您要十分確定，因為您的網路設定可能會損毀。" -+"You may choose one of the following supported platforms if you are sure your platform behaves the same as the chosen one. Please be sure, because " -+"your current network configuration could be damaged." -+msgstr "" -+"如果您十分確定您的平臺的行為與以下的平臺一樣，您可以選擇其中一個。但請" -+"您要十分確定，因為您的網路設定可能會損毀。" - - #: knetworkconfmodule.cpp:94 - msgid "KNetworkConf" -@@ -998,7 +1006,7 @@ - - #: knetworkconfigparser.cpp:304 - msgid "%1Please wait while saving the network settings...%2" --msgstr "%1請稍候，正在儲存網路設定...%2" -+msgstr "%1請稍候，正在儲存網路設定…%2" - - #: knetworkconfigparser.cpp:762 - msgid "Ethernet Network Device" -@@ -1014,13 +1022,13 @@ - - #: knetworkconfigparser.cpp:1030 - msgid "" --"Could not parse the list of supported platforms from the network configuration " --"backend." --msgstr "無法剖析網路後端送來的支援平台清單。" -+"Could not parse the list of supported platforms from the network " -+"configuration backend." -+msgstr "無法剖析網路後端送來的支援平臺清單。" - - #: knetworkconfigparser.cpp:1031 - msgid "Error Obtaining Supported Platforms List" --msgstr "取得支援平台清單時發生錯誤" -+msgstr "取得支援平臺清單時發生錯誤" - - #: version.h:5 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kpackage.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kpackage.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kpackage.po 2006-10-01 18:34:21.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kpackage.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kpackage\n" - "POT-Creation-Date: 2006-08-29 02:38+0200\n" - "PO-Revision-Date: 2006-08-30 09:27+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,8 +28,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"lancelot@pchome.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv " --"dot tw" -+"lancelot@pchome.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot " -+"idv dot tw" - - #: cache.cpp:63 cache.cpp:84 - #, c-format -@@ -374,22 +373,21 @@ - - #: kpPty.cpp:160 - msgid "" --"The action you requested uses ssh. Please enter the password or pass phrase.\n" --msgstr "" --"您要求的動作需要 ssh。請輸入密碼或密碼片語。\n" -+"The action you requested uses ssh. Please enter the password or pass " -+"phrase.\n" -+msgstr "您要求的動作需要 ssh。請輸入密碼或密碼片語。\n" - - #: kpPty.cpp:163 - msgid "" --"The action you requested needs root privileges. Please enter root's password.\n" --msgstr "" --"您要求的動作需要 root 權限。請輸入 root 密碼。\n" -+"The action you requested needs root privileges. Please enter root's " -+"password.\n" -+msgstr "您要求的動作需要 root 權限。請輸入 root 密碼。\n" - - #: kpPty.cpp:166 - msgid "" - "The action you requested needs root privileges. Please enter your SUDO " - "password.\n" --msgstr "" --"您要求的動作需要 root 權限。請輸入您的 sudo 密碼。\n" -+msgstr "您要求的動作需要 root 權限。請輸入您的 sudo 密碼。\n" - - #: kpPty.cpp:182 - msgid "Login Problem: Please login manually" -@@ -397,11 +395,11 @@ - - #: kpackage.cpp:103 - msgid "Find &Package..." --msgstr "搜尋套件(&P)..." -+msgstr "搜尋套件(&P)…" - - #: kpackage.cpp:107 - msgid "Find &File..." --msgstr "搜尋檔案(&F)..." -+msgstr "搜尋檔案(&F)…" - - #: kpackage.cpp:124 - msgid "&Expand Tree" -@@ -437,7 +435,7 @@ - - #: kpackage.cpp:173 - msgid "Configure &KPackage..." --msgstr "設定 Kpackage (&K)..." -+msgstr "設定 Kpackage(&K)…" - - #: kpackage.cpp:177 - msgid "Clear Package &Folder Cache" -@@ -563,10 +561,8 @@ - msgstr "建立套件的樹狀結構" - - #: managementWidget.cpp:444 --msgid "" --"Filename not available\n" --msgstr "" --"檔案名稱不存在\n" -+msgid "Filename not available\n" -+msgstr "檔案名稱不存在\n" - - #: options.cpp:73 - msgid "&Types" -@@ -594,7 +590,7 @@ - - #: options.cpp:105 - msgid "Location of Packages" --msgstr "套件的位置..." -+msgstr "套件的位置…" - - #: options.cpp:114 - msgid "Cac&he" -@@ -630,7 +626,7 @@ - - #: options.cpp:162 - msgid "Execute Privileged Commands Using" --msgstr "執行已設限的命令用..." -+msgstr "執行已設限的命令用…" - - #: options.cpp:168 - msgid "su command" -@@ -674,7 +670,7 @@ - - #: packageDisplay.cpp:375 - msgid "&Open With..." --msgstr "開啟用...(&O)" -+msgstr "開啟用…(&O)" - - #: packageInfo.cpp:114 slackInterface.cpp:344 - msgid "OTHER" -@@ -1098,4 +1094,4 @@ - - #: updateLoc.cpp:344 - msgid "File truncated..." --msgstr "檔案被截斷..." -+msgstr "檔案被截斷…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/ksysv.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/ksysv.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/ksysv.po 2007-10-08 12:00:19.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/ksysv.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: ksysv\n" - "POT-Creation-Date: 2007-09-19 01:14+0200\n" - "PO-Revision-Date: 2005-12-15 15:45+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -19,47 +18,37 @@ - - #: IOCore.cpp:51 - msgid "" --"FAILED to remove %1 from %2: \"%3\"" --"
" -+"FAILED to remove %1 from %2: \"%3\"
" - msgstr "從 %2 移除 %1 失敗: \"%3\"
" - - #: IOCore.cpp:55 --msgid "" --"FAILED to remove %1 from %2: \"%3\"\n" --msgstr "" --"無法從 %2 移除 %1: \"%3\"\n" -+msgid "FAILED to remove %1 from %2: \"%3\"\n" -+msgstr "無法從 %2 移除 %1: \"%3\"\n" - - #: IOCore.cpp:62 - msgid "removed %1 from %2
" - msgstr "從 %2 移除 %1
" - - #: IOCore.cpp:66 --msgid "" --"removed %1 from %2\n" --msgstr "" --"從 %2 移除 %1\n" -+msgid "removed %1 from %2\n" -+msgstr "從 %2 移除 %1\n" - - #: IOCore.cpp:95 - msgid "created %1 in %2
" - msgstr "在 %2 建立 %1
" - - #: IOCore.cpp:96 --msgid "" --"created %1 in %2\n" --msgstr "" --"在 %2 建立 %1\n" -+msgid "created %1 in %2\n" -+msgstr "在 %2 建立 %1\n" - - #: IOCore.cpp:100 - msgid "" --"FAILED to create %1 in %2: \"%3\"" --"
" -+"FAILED to create %1 in %2: \"%3\"
" - msgstr "在 %2 建立 %1 失敗: \"%3\"
" - - #: IOCore.cpp:105 --msgid "" --"FAILED to create %1 in %2: \"%3\"\n" --msgstr "" --"無法在 %2 建立 %1: \"%3\"\n" -+msgid "FAILED to create %1 in %2: \"%3\"\n" -+msgstr "無法在 %2 建立 %1: \"%3\"\n" - - #. i18n: file ksysvui.rc line 73 - #: OldView.cpp:89 OldView.cpp:91 rc.cpp:21 rc.cpp:27 -@@ -79,27 +68,27 @@ - "Services" - msgstr "" - "可用\n" --"服務 (&A)" -+"服務(&A)" - - #: OldView.cpp:198 - msgid "" - "

These are the services " --"available on your computer. To start a service, drag it onto the Start " --"section of a runlevel.

" --"

To stop one, do the same for the Stop section.

" --msgstr "" --"

這式您系統紹可用的 服務" --". 要啟動一個服務, 拖曳他到執行層級的啟動區域.

" --"

要停止, 拖曳到停止區域.

" -+"available on your computer. To start a service, drag it onto the Start section of a runlevel.

To stop one, do the same for the Stop section.

" -+msgstr "" -+"

這式您系統紹可用的 服務. 要啟動" -+"一個服務, 拖曳他到執行層級的啟動區域.

要停止, 拖曳到停止區域.

" - - #: OldView.cpp:242 - msgid "" - "

You can drag services from a runlevel onto the " --"trashcan to delete them from that runlevel.

" --"

The Undo command can be used to restore deleted entries.

" -+"trashcan to delete them from that runlevel.

The " -+"Undo command can be used to restore deleted entries.

" - msgstr "" --"

您可以從啟動層級拖曳服務到 資源回收桶 以將之刪除.

" --"

復原 可以用來復原刪除的項目.

" -+"

您可以從啟動層級拖曳服務到 資源回收桶 以將之刪除.

復原 可以用來復原刪除的項目.

" - - #: OldView.cpp:254 - #, c-format -@@ -113,18 +102,17 @@ - - #: OldView.cpp:260 - msgid "" --"

These are the services started in runlevel %1.

" --"

The number shown on the left of the " --"icon determines the order in which the services are started. You can arrange " --"them via drag and drop, as long as a suitable sorting number " --"can be generated.

" --"

If that's not possible, you have to change the number manually via the " --"Properties dialog box.

" --msgstr "" --"

這是在啟動層級 %1 所啟動 的服務.

" --"

在圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此適當的" --"排列編號會被產生.

" --"

如果沒有適當的產生, 您可以經由在內容對話方塊中手動改變編號.

" -+"

These are the services started in runlevel %1.

The " -+"number shown on the left of the icon " -+"determines the order in which the services are started. You can arrange them " -+"via drag and drop, as long as a suitable sorting number can be " -+"generated.

If that's not possible, you have to change the number " -+"manually via the Properties dialog box.

" -+msgstr "" -+"

這是在啟動層級 %1 所啟動 的服務.

在圖示左邊的編號決定了服務啟動的順序. 您可以經由拖放來排序, 如此" -+"適當的排列編號會被產生.

如果沒有適當的產生, 您可以經由在" -+"內容對話方塊中手動改變編號.

" - - #: OldView.cpp:268 - msgid "Start" -@@ -132,18 +120,17 @@ - - #: OldView.cpp:278 - msgid "" --"

These are the services stopped in runlevel %1.

" --"

The number shown on the left of the " --"icon determines the order in which the services are stopped. You can arrange " --"them via drag and drop, as long as a suitable sorting number " --"can be generated.

" --"

If that's not possible, you have to change the number manually via the " --"Properties dialog box.

" --msgstr "" --"

這是在啟動層級 %1 所停止 的服務.

" --"

在圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此適當的" --"排列編號會被產生.

" --"

如果沒有適當的產生, 您可以經由在內容對話方塊中手動改變編號.

" -+"

These are the services stopped in runlevel %1.

The " -+"number shown on the left of the icon " -+"determines the order in which the services are stopped. You can arrange them " -+"via drag and drop, as long as a suitable sorting number can be " -+"generated.

If that's not possible, you have to change the number " -+"manually via the Properties dialog box.

" -+msgstr "" -+"

這是在啟動層級 %1 所停止 的服務.

在圖示左邊的編號決定了服務停止的順序. 您可以經由拖放來排序, 如此" -+"適當的排列編號會被產生.

如果沒有適當的產生, 您可以經由在" -+"內容對話方塊中手動改變編號.

" - - #: OldView.cpp:353 - #, c-format -@@ -221,19 +208,20 @@ - - #: OldView.cpp:937 - msgid "" --"

You have specified that your system's init scripts are located in the folder " --"%1, but this folder does not exist. You probably selected the " --"wrong distribution during configuration.

" --"

If you reconfigure %2, it may be possible to fix the problem. If you choose " --"to reconfigure, you should shut down the application and the configuration " --"wizard will appear the next time %3 is run. If you choose not to reconfigure, " --"you will not be able to view or edit your system's init configuration.

" --"

Would you like to reconfigure %4?

" --msgstr "" --"

你剛才將你系統的啟動 scrpit 目錄指定到 %1,但這個目錄並不存在。你可能在設定時選擇了錯誤的版本。

" --"

如果你重新設定 %2,或許就可以修正這個錯誤。如果你選擇要重新設定，你應該將這個程式關掉, 這樣組態設定精靈就會在下一次 %3 " --"啟動時執行。如果你選擇不要重新設定組態，你將無法檢視或是編輯你系統啟動時的設定。

" --"

你願意重新設定 %4 ?

" -+"

You have specified that your system's init scripts are located in the " -+"folder %1, but this folder does not exist. You probably " -+"selected the wrong distribution during configuration.

If you " -+"reconfigure %2, it may be possible to fix the problem. If you choose to " -+"reconfigure, you should shut down the application and the configuration " -+"wizard will appear the next time %3 is run. If you choose not to " -+"reconfigure, you will not be able to view or edit your system's init " -+"configuration.

Would you like to reconfigure %4?

" -+msgstr "" -+"

你剛才將你系統的啟動 scrpit 目錄指定到 %1,但這個目錄並不存" -+"在。你可能在設定時選擇了錯誤的版本。

如果你重新設定 %2,或許就可以修正" -+"這個錯誤。如果你選擇要重新設定，你應該將這個程式關掉, 這樣組態設定精靈就會在" -+"下一次 %3 啟動時執行。如果你選擇不要重新設定組態，你將無法檢視或是編輯你系統" -+"啟動時的設定。

你願意重新設定 %4 ?

" - - #: OldView.cpp:954 - msgid "Folder Does Not Exist" -@@ -250,16 +238,17 @@ - #: OldView.cpp:965 - msgid "" - "

You do not have the right permissions to edit your system's init " --"configuration. However, you are free to browse the runlevels.

" --"

If you really want to edit the configuration, either restart " --"%1 as root (or another privileged user), or ask your sysadmin " --"to install %2 suid or sgid.

" --"

The latter way is not recommended though, due to security issues.

" --msgstr "" --"

抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層級.

" --"

如果您比較希望編輯這個組態, 您可以用 root 的身分重新啟動 " --"%1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 suid 或 sgid 模式安裝 %2.

" --"

但因為安全的因素, 不建議後者.

" -+"configuration. However, you are free to browse the runlevels.

If you " -+"really want to edit the configuration, either restart %1 " -+"as root (or another privileged user), or ask your sysadmin " -+"to install %2 suid or sgid.

The latter way is not " -+"recommended though, due to security issues.

" -+msgstr "" -+"

抱歉, 您沒有足夠的權限可以編輯您系統的啟動組態.然而, 您可以瀏覽這個啟動層" -+"級.

如果您比較希望編輯這個組態, 您可以用 root 的身分重新啟動 %1 (或使用一個具有較多權限的使用者), 或要求您的系統管理者以 " -+"suid 或 sgid 模式安裝 %2.

但因為安全的因素, 不建議後" -+"者.

" - - #: OldView.cpp:977 - msgid "Insufficient Permissions" -@@ -267,7 +256,7 @@ - - #: OldView.cpp:1029 - msgid "&Other..." --msgstr "其他 (&O)..." -+msgstr "其他(&O)…" - - #. i18n: file lookandfeelconfig.ui line 18 - #: PreferencesDialog.cpp:41 rc.cpp:111 -@@ -305,7 +294,7 @@ - - #: Properties.cpp:42 - msgid "&Service" --msgstr "服務 (&S)" -+msgstr "服務(&S)" - - #: Properties.cpp:50 - msgid "Description:" -@@ -317,27 +306,27 @@ - - #: Properties.cpp:67 - msgid "S&top" --msgstr "停止 (&T)" -+msgstr "停止(&T)" - - #: Properties.cpp:70 - msgid "&Restart" --msgstr "重新啟動 (&R)" -+msgstr "重新啟動(&R)" - - #: Properties.cpp:121 - msgid "&Entry" --msgstr "項目 (&E)" -+msgstr "項目(&E)" - - #: Properties.cpp:126 - msgid "&Name:" --msgstr "名稱 (&N):" -+msgstr "名稱(&N):" - - #: Properties.cpp:131 - msgid "&Points to service:" --msgstr "指向服務 (&P):" -+msgstr "指向服務(&P):" - - #: Properties.cpp:137 - msgid "&Sorting number:" --msgstr "排序編號 (&S):" -+msgstr "排序編號(&S):" - - #: RunlevelAuthIcon.cpp:27 - msgid "Editing disabled - please check your permissions" -@@ -353,7 +342,7 @@ - - #: TopWidget.cpp:119 - msgid "&Choose which service to start:" --msgstr "選擇要啟動的服務 (&C):" -+msgstr "選擇要啟動的服務(&C):" - - #: TopWidget.cpp:121 - msgid "Stop Service" -@@ -361,7 +350,7 @@ - - #: TopWidget.cpp:122 - msgid "&Choose which service to stop:" --msgstr "選擇要停止的服務 (&C):" -+msgstr "選擇要停止的服務(&C):" - - #: TopWidget.cpp:124 - msgid "Restart Service" -@@ -369,7 +358,7 @@ - - #: TopWidget.cpp:125 - msgid "&Choose which service to restart:" --msgstr "選擇要重新啟動的服務 (&C):" -+msgstr "選擇要重新啟動的服務(&C):" - - #: TopWidget.cpp:127 - msgid "Edit Service" -@@ -377,7 +366,7 @@ - - #: TopWidget.cpp:128 - msgid "&Choose which service to edit:" --msgstr "選擇要編輯的服務 (&C):" -+msgstr "選擇要編輯的服務(&C):" - - #: TopWidget.cpp:215 - msgid "Re&vert Configuration" -@@ -389,27 +378,27 @@ - - #: TopWidget.cpp:226 - msgid "Save &Log..." --msgstr "儲存紀錄 (&L)..." -+msgstr "儲存紀錄(&L)…" - - #: TopWidget.cpp:234 - msgid "&Print Log..." --msgstr "列印紀錄 (&P)..." -+msgstr "列印紀錄(&P)…" - - #: TopWidget.cpp:250 - msgid "P&roperties" --msgstr "內容 (&R)" -+msgstr "內容(&R)" - - #: TopWidget.cpp:254 - msgid "&Open" --msgstr "開啟 (&O)" -+msgstr "開啟(&O)" - - #: TopWidget.cpp:258 - msgid "Open &With" --msgstr "以...開啟 (&W)" -+msgstr "以…開啟(&W)" - - #: TopWidget.cpp:267 - msgid "Show &Log" --msgstr "顯示紀錄 (&L)" -+msgstr "顯示紀錄(&L)" - - #: TopWidget.cpp:270 - msgid "Hide &Log" -@@ -417,19 +406,19 @@ - - #: TopWidget.cpp:273 - msgid "&Start Service..." --msgstr "啟動服務 (&S)..." -+msgstr "啟動服務(&S)…" - - #: TopWidget.cpp:277 - msgid "&Stop Service..." --msgstr "停止服務 (&S)..." -+msgstr "停止服務(&S)…" - - #: TopWidget.cpp:281 - msgid "&Restart Service..." --msgstr "重新啟動服務 (&R)..." -+msgstr "重新啟動服務(&R)…" - - #: TopWidget.cpp:285 - msgid "&Edit Service..." --msgstr "編輯服務 (&E)..." -+msgstr "編輯服務(&E)…" - - #: TopWidget.cpp:299 - msgid "There are unsaved changes. Are you sure you want to quit?" -@@ -445,14 +434,16 @@ - - #: TopWidget.cpp:315 - msgid "&Revert" --msgstr "復原 (&R)" -+msgstr "復原(&R)" - - #: TopWidget.cpp:326 - msgid "" - "You're about to save the changes made to your init configuration. Wrong " - "settings can make your system hang on startup.\n" - "Do you wish to continue?" --msgstr "您正要儲存您對啟動程式的變更.請認知錯誤的設定可以造成您系統啟動無法完成.您是否要繼續?" -+msgstr "" -+"您正要儲存您對啟動程式的變更.請認知錯誤的設定可以造成您系統啟動無法完成.您是" -+"否要繼續?" - - #: TopWidget.cpp:330 - msgid "Save Configuration" -@@ -461,12 +452,11 @@ - #: TopWidget.cpp:398 - msgid "" - "

Click on the checkboxes to show or hide " --"runlevels.

" --"

The list of currently visible runlevels is saved when you use the " --"Save Options command.

" -+"runlevels.

The list of currently visible runlevels is saved when you " -+"use the Save Options command.

" - msgstr "" --"

在方塊中點選以顯示或隱藏啟動層級.

" --"

目前可見的執行層級列表會在您使用儲存選項時被儲存.

" -+"

在方塊中點選以顯示或隱藏啟動層級.

" -+"目前可見的執行層級列表會在您使用儲存選項時被儲存.

" - - #: TopWidget.cpp:402 - msgid "Show only the selected runlevels" -@@ -478,19 +468,16 @@ - - #: TopWidget.cpp:422 - msgid "" --"

If the lock is closed " --", you don't have the right permissions " --"to edit the init configuration.

" --"

Either restart %1 as root (or another more privileged user), or ask your " --"sysadmin to install %1 suid or sgid.

" --"

The latter way is not recommended though, due to security " --"issues.

" --msgstr "" --"

當鎖定被關閉, 您不能得到正確的權限" --"來編輯啟動組態.

" --"

重新以 root 啟動 %1 (或是以一個擁有比較多權限的使用者) 或要求您的系統管理者以 suid 或 sgid" --"安裝 %1.

" --"

但因為安全的因素, 不建議後者.

" -+"

If the lock is closed , you don't have " -+"the right permissions to edit the init configuration.

Either restart %1 as root (or another more privileged user), or ask " -+"your sysadmin to install %1 suid or sgid.

The latter " -+"way is not recommended though, due to security issues.

" -+msgstr "" -+"

當鎖定被關閉, 您不能得到正確的權限" -+"來編輯啟動組態.

重新以 root 啟動 %1 (或是以一個擁有比較多權限" -+"的使用者) 或要求您的系統管理者以 suid 或 sgid安裝 %1.

但因為安全的因素, 不建議後者.

" - - #: TopWidget.cpp:566 - msgid " Changed" -@@ -510,14 +497,14 @@ - - #: TopWidget.cpp:830 - msgid "" --"

Unable to generate a valid sorting number for this position. This means that " --"there was no number available between the two adjacent services, and the " --"service did not fit in lexically.

" --"

Please adjust the sorting numbers manually via the " --"Properties dialog box.

" --msgstr "" --"

抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的編號, 且服務無法符合詞彙.

" --"

請使用內容對話方塊手動調整排列編號.

" -+"

Unable to generate a valid sorting number for this position. This means " -+"that there was no number available between the two adjacent services, and " -+"the service did not fit in lexically.

Please adjust the sorting " -+"numbers manually via the Properties dialog box.

" -+msgstr "" -+"

抱歉, 無法產生適當的排列號碼給這個位置. 這表示在前後相鄰的服務中沒有可用的" -+"編號, 且服務無法符合詞彙.

請使用內容對話方塊手動調整排" -+"列編號.

" - - #: TopWidget.cpp:837 - msgid "Unable to Generate Sorting Number" -@@ -584,8 +571,8 @@ - "Similar to Red Hat's\"tksysv\", but SysV-Init Editor allows\n" - "drag-and-drop, as well as keyboard use." - msgstr "" --"Sys-V 風格的啟動編輯器,與RedHat公司的 tksysv 相似, 但 Sys-V 啟動編輯器" --"允許拖放操作,同時也可以使用鍵盤." -+"Sys-V 風格的啟動編輯器,與RedHat公司的 tksysv 相似, 但 Sys-V 啟動" -+"編輯器允許拖放操作,同時也可以使用鍵盤." - - #: main.cpp:65 - msgid "Main developer" -@@ -625,19 +612,19 @@ - #: rc.cpp:45 rc.cpp:72 - #, no-c-format - msgid "&Other" --msgstr "其他 (&O)" -+msgstr "其他(&O)" - - #. i18n: file configwizard.ui line 157 - #: rc.cpp:48 - #, no-c-format - msgid "Distribution" --msgstr "散佈版本" -+msgstr "散布版本" - - #. i18n: file configwizard.ui line 176 - #: rc.cpp:51 - #, no-c-format - msgid "Choose Your Distribution" --msgstr "選擇您的散佈版本" -+msgstr "選擇您的散布版本" - - #. i18n: file configwizard.ui line 195 - #: rc.cpp:54 -@@ -679,7 +666,7 @@ - #: rc.cpp:78 rc.cpp:211 - #, no-c-format - msgid "&Service path:" --msgstr "服務路徑 (&S):" -+msgstr "服務路徑(&S):" - - #. i18n: file configwizard.ui line 389 - #: rc.cpp:81 rc.cpp:214 -@@ -691,7 +678,7 @@ - #: rc.cpp:84 rc.cpp:217 - #, no-c-format - msgid "&Browse..." --msgstr "瀏覽 (&B)..." -+msgstr "瀏覽(&B)…" - - #. i18n: file configwizard.ui line 404 - #: rc.cpp:87 rc.cpp:220 -@@ -703,7 +690,7 @@ - #: rc.cpp:90 rc.cpp:223 - #, no-c-format - msgid "&Runlevel path:" --msgstr "啟動層級路徑 (&R):" -+msgstr "啟動層級路徑(&R):" - - #. i18n: file configwizard.ui line 511 - #: rc.cpp:93 rc.cpp:226 -@@ -715,7 +702,7 @@ - #: rc.cpp:96 rc.cpp:229 - #, no-c-format - msgid "Br&owse..." --msgstr "瀏覽 (&O)..." -+msgstr "瀏覽(&O)…" - - #. i18n: file configwizard.ui line 526 - #: rc.cpp:99 rc.cpp:232 -@@ -735,20 +722,22 @@ - msgid "" - "

Congratulations!

\n" - "

\n" --"You have finished the initial configuration of SysV-Init Editor. Press " --"the button labeled Finish to start editing your init-configuration.\n" -+"You have finished the initial configuration of SysV-Init Editor. Press the button labeled Finish to start editing your init-" -+"configuration.\n" - "

" - msgstr "" - "

恭喜!

\n" - "

\n" --"您完成了 Sys-V 啟動編輯器的初始化組態. 按下標有完成的按鈕以開始編輯您的啟動組態.\n" -+"您完成了 Sys-V 啟動編輯器的初始化組態. 按下標有完成的按鈕以開始" -+"編輯您的啟動組態.\n" - "

" - - #. i18n: file lookandfeelconfig.ui line 70 - #: rc.cpp:117 - #, no-c-format - msgid "C&hoose..." --msgstr "選擇 (&H)..." -+msgstr "選擇(&H)…" - - #. i18n: file lookandfeelconfig.ui line 98 - #: rc.cpp:120 rc.cpp:123 -@@ -772,7 +761,7 @@ - #: rc.cpp:132 - #, no-c-format - msgid "&Choose..." --msgstr "選擇 (&C)..." -+msgstr "選擇(&C)…" - - #. i18n: file lookandfeelconfig.ui line 203 - #: rc.cpp:135 -@@ -801,14 +790,15 @@ - "name).

\n" - "

Changed service entries will be distinguished by this color.

" - msgstr "" --"

使用選擇顏色對話方塊來選取文字顏色給已變更的服務 (改變順序或名稱).

\n" -+"

使用選擇顏色對話方塊來選取文字顏色給已變更的服務 (改變順序或名稱).

\n" - "

已變更的服務將會用這個顏色標示.

" - - #. i18n: file lookandfeelconfig.ui line 266 - #: rc.cpp:148 - #, no-c-format - msgid "&Changed:" --msgstr "改變的 (&C):" -+msgstr "改變的(&C):" - - #. i18n: file lookandfeelconfig.ui line 302 - #: rc.cpp:154 -@@ -824,14 +814,15 @@ - "services new to a runlevel.

\n" - "

New service entries will be distinguished by this color.

" - msgstr "" --"

使用選擇顏色對話方塊來選取文字顏色給新增到啟動層級的服務.

\n" -+"

使用選擇顏色對話方塊來選取文字顏色給新增到啟動層級的" -+"服務.

\n" - "

新的服務將會用這個顏色標示.

" - - #. i18n: file lookandfeelconfig.ui line 314 - #: rc.cpp:161 - #, no-c-format - msgid "&New:" --msgstr "新增 (&N):" -+msgstr "新增(&N):" - - #. i18n: file lookandfeelconfig.ui line 350 - #: rc.cpp:167 -@@ -844,12 +835,13 @@ - #, no-c-format - msgid "" - "

Use the Select Color dialog box to pick a selected text " --"color for services that have been changed (either order/sorting number " --"or name).

\n" --"

Changed service entries will be distinguished by this color while they are " --"selected.

" -+"color for services that have been changed (either order/sorting " -+"number or name).

\n" -+"

Changed service entries will be distinguished by this color while they " -+"are selected.

" - msgstr "" --"

使用選擇顏色對話方塊來選取一個選定的文字顏色給已變更的服務 (改變順序或名稱).

\n" -+"

使用選擇顏色對話方塊來選取一個選定的文字顏色給已變更" -+"的服務 (改變順序或名稱).

\n" - "

已變更的服務被選取時將會用這個顏色標示.

" - - #. i18n: file lookandfeelconfig.ui line 382 -@@ -867,20 +859,21 @@ - "

New service entries will be distinguished by this color while they are " - "selected.

" - msgstr "" --"

使用選擇顏色對話方塊來選取一個選定的文字顏色給新增到啟動層級的服務.

\n" -+"

使用選擇顏色對話方塊來選取一個選定的文字顏色給新增到" -+"啟動層級的服務.

\n" - "

新的服務被選取時將會用這個顏色標示.

" - - #. i18n: file lookandfeelconfig.ui line 394 - #: rc.cpp:184 - #, no-c-format - msgid "New && &selected:" --msgstr "新增與選擇的 (&S):" -+msgstr "新增與選擇的(&S):" - - #. i18n: file lookandfeelconfig.ui line 410 - #: rc.cpp:187 - #, no-c-format - msgid "Changed && s&elected:" --msgstr "變更與選擇的 (&E):" -+msgstr "變更與選擇的(&E):" - - #. i18n: file miscconfig.ui line 38 - #: rc.cpp:193 -@@ -898,13 +891,13 @@ - #: rc.cpp:199 - #, no-c-format - msgid "&Show All" --msgstr "顯示全部 (&S)" -+msgstr "顯示全部(&S)" - - #. i18n: file miscconfig.ui line 108 - #: rc.cpp:202 - #, no-c-format - msgid "&Warn if not allowed to write configuration" --msgstr "如果無法寫入組態時提出警告 (&W)" -+msgstr "如果無法寫入組態時提出警告(&W)" - - #. i18n: file miscconfig.ui line 116 - #: rc.cpp:205 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kuser.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kuser.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/kuser.po 2008-08-19 20:43:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/kuser.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,7 +11,8 @@ - "Project-Id-Version: kuser\n" - "POT-Creation-Date: 2008-07-08 01:20+0200\n" - "PO-Revision-Date: 2006-06-19 09:12+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" -+"tw>\n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,8 +30,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"shyue@sonoma.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv dot " --"tw" -+"shyue@sonoma.com.tw,pesder.liao@msa.hinet.net,franklin at goodhorse dot idv " -+"dot tw" - - #: addUser.cpp:45 - msgid "New Account Options" -@@ -647,8 +648,8 @@ - - #: mainView.cpp:307 - msgid "" --"You have selected %1 users. Do you really want to change the password for all " --"the selected users?" -+"You have selected %1 users. Do you really want to change the password for " -+"all the selected users?" - msgstr "您已經選擇 %1 個使用者。您確定要變更這些使用者的密碼嗎？" - - #: mainView.cpp:308 propdlg.cpp:510 -@@ -683,23 +684,23 @@ - - #: mainWidget.cpp:78 mainWidget.cpp:90 - msgid "&Add..." --msgstr "增加(&A)..." -+msgstr "增加(&A)…" - - #: mainWidget.cpp:81 mainWidget.cpp:93 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: mainWidget.cpp:84 - msgid "&Delete..." --msgstr "刪除(&D)..." -+msgstr "刪除(&D)…" - - #: mainWidget.cpp:87 - msgid "&Set Password..." --msgstr "設定密碼(&S)..." -+msgstr "設定密碼(&S)…" - - #: mainWidget.cpp:104 - msgid "&Select Connection..." --msgstr "設定連線(&S)..." -+msgstr "設定連線(&S)…" - - #: mainWidget.cpp:108 - msgid "Show System Users/Groups" -@@ -756,7 +757,7 @@ - - #: propdlg.cpp:125 - msgid "Set &Password..." --msgstr "設定密碼(&P)..." -+msgstr "設定密碼(&P)…" - - #: propdlg.cpp:133 - msgid "Full &name:" -@@ -925,9 +926,10 @@ - #: propdlg.cpp:968 - msgid "" - "

The shell %1 is not yet listed in the file %2. In order to use this shell " --"you must add it to this file first." --"

Do you want to add it now?" --msgstr "

shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔案。

您要現在加入它嗎？" -+"you must add it to this file first.

Do you want to add it now?" -+msgstr "" -+"

shell %1 尚未列於檔案 %2。為了要使用這個 shell 您必須先將它加入到這個檔" -+"案。

您要現在加入它嗎？" - - #: propdlg.cpp:972 - msgid "Unlisted Shell" -@@ -1326,19 +1328,19 @@ - #, no-c-format - msgid "" - "This option allows you to select where the user/group data stored. Currently " --"three storage backends are supported.
Files " --"stores user/group data in traditional /etc/passwd and /etc/group flat files. " --"
LDAP stores data in a directory server using the posixAccount and " --"posixGroup object classes; this backend allows the management of Samba " --"users/groups via the sambaSamAccount object class.
System " --"provides a read-only access to all users and groups which your installation " --"knows about." -+"three storage backends are supported.
Files stores user/group " -+"data in traditional /etc/passwd and /etc/group flat files.
LDAP " -+"stores data in a directory server using the posixAccount and posixGroup " -+"object classes; this backend allows the management of Samba users/groups via " -+"the sambaSamAccount object class.
System provides a read-only " -+"access to all users and groups which your installation knows about." - msgstr "" - "這個選項讓您選擇使用者與群組的資料要儲存在哪裡。目前有三種後端型態可以選擇。" --"
選擇檔案會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/group 檔案中。" --"
選擇LDAP會將這些資料用 posixAccount 與 posixGroup object classes " --"放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組，此時是使用 sambaSamAccount object class。" --"
選擇系統則會提供一種讓所有使用者與群組只能唯讀的方式。" -+"
選擇檔案會將使用者與群組資料存放在傳統的 /etc/passwd 與 /etc/" -+"group 檔案中。
選擇LDAP會將這些資料用 posixAccount 與 posixGroup " -+"object classes 放在目錄伺服器中。這個選項也可以用來管理 Samba 使用者與群組，" -+"此時是使用 sambaSamAccount object class。
選擇系統則會提供一種讓所" -+"有使用者與群組只能唯讀的方式。" - - #. i18n: file kuser.kcfg line 36 - #: rc.cpp:240 -@@ -1364,8 +1366,8 @@ - #: rc.cpp:249 - #, no-c-format - msgid "" --"This option specifies the UNIX home path template for new users. The '%U' macro " --"will replaced with the actual user name." -+"This option specifies the UNIX home path template for new users. The '%U' " -+"macro will replaced with the actual user name." - msgstr "這個選項指定 UNIX 家路徑的樣板。%U 會被換成實際的使用者名稱。" - - #. i18n: file kuser.kcfg line 45 -@@ -1378,9 +1380,10 @@ - #: rc.cpp:255 - #, no-c-format - msgid "" --"This options specifies the first user ID where searching for an available UID " --"starts." --msgstr "這個選項指定第一個使用者代碼 (UID)，在尋找可用的 UID 時會從這個 UID 開始找。" -+"This options specifies the first user ID where searching for an available " -+"UID starts." -+msgstr "" -+"這個選項指定第一個使用者代碼 (UID)，在尋找可用的 UID 時會從這個 UID 開始找。" - - #. i18n: file kuser.kcfg line 50 - #: rc.cpp:258 -@@ -1392,33 +1395,37 @@ - #: rc.cpp:261 - #, no-c-format - msgid "" --"This options specifies the first group ID where searching for an available GID " --"starts." --msgstr "這個選項指定第一個群組代碼 (GID)，在尋找可用的 GID 時會從這個 GID 開始找。" -+"This options specifies the first group ID where searching for an available " -+"GID starts." -+msgstr "" -+"這個選項指定第一個群組代碼 (GID)，在尋找可用的 GID 時會從這個 GID 開始找。" - - #. i18n: file kuser.kcfg line 56 - #: rc.cpp:267 - #, no-c-format - msgid "" --"If this option is checked then a home directory will created for the new user." -+"If this option is checked then a home directory will created for the new " -+"user." - msgstr "勾選這個選項的話，會為新使用者建立家目錄。" - - #. i18n: file kuser.kcfg line 61 - #: rc.cpp:273 - #, no-c-format - msgid "" --"If this option is checked then the contents of the skeleton folder will copied " --"to the new user's home directory" -+"If this option is checked then the contents of the skeleton folder will " -+"copied to the new user's home directory" - msgstr "這個選項被勾選的話，會將架構(skeleton)目錄中的內容複製到新的家目錄中。" - - #. i18n: file kuser.kcfg line 66 - #: rc.cpp:279 - #, no-c-format - msgid "" --"If this option is enabled, new user creation will create a private group named " --"as the user, and the primary group of the user will assigned to this private " --"group." --msgstr "打開這個選項的話，會為新使用者建立一個私密群組，名稱跟使用者一樣，而使用者的主要群組會設定為此新的群組。" -+"If this option is enabled, new user creation will create a private group " -+"named as the user, and the primary group of the user will assigned to this " -+"private group." -+msgstr "" -+"打開這個選項的話，會為新使用者建立一個私密群組，名稱跟使用者一樣，而使用者的" -+"主要群組會設定為此新的群組。" - - #. i18n: file kuser.kcfg line 70 - #: rc.cpp:282 -@@ -1516,8 +1523,8 @@ - #: rc.cpp:327 - #, no-c-format - msgid "" --"Check this if you want the passwords in the shadow file MD5 hashed. Leave this " --"unchecked if DES encryption should be used." -+"Check this if you want the passwords in the shadow file MD5 hashed. Leave " -+"this unchecked if DES encryption should be used." - msgstr "如果您要用 MD5 加密密碼就勾選這個選項。否則會用 DES 加密。" - - #. i18n: file kuser.kcfg line 117 -@@ -1530,9 +1537,11 @@ - #: rc.cpp:333 - #, no-c-format - msgid "" --"Specifies the shadow password file (usually /etc/shadow). Leave this empty if " --"your system does not use a shadow password file." --msgstr "這裡指定 shadow 密碼檔（通常都是 /etc/shadow）。如果您的系統沒有使用 shadow 密碼檔，就請留白。" -+"Specifies the shadow password file (usually /etc/shadow). Leave this empty " -+"if your system does not use a shadow password file." -+msgstr "" -+"這裡指定 shadow 密碼檔（通常都是 /etc/shadow）。如果您的系統沒有使用 shadow " -+"密碼檔，就請留白。" - - #. i18n: file kuser.kcfg line 122 - #: rc.cpp:336 -@@ -1546,7 +1555,9 @@ - msgid "" - "Specifies the shadow group file (usually /etc/gshadow). Leave this empty if " - "your system does not use a shadow group file." --msgstr "這裡指定群組 shadow 檔（通常都是 /etc/gshadow）。如果您的系統沒有使用群組 shadow 密碼檔，就請留白。" -+msgstr "" -+"這裡指定群組 shadow 檔（通常都是 /etc/gshadow）。如果您的系統沒有使用群組 " -+"shadow 密碼檔，就請留白。" - - #. i18n: file kuser.kcfg line 127 - #: rc.cpp:342 -@@ -1600,7 +1611,7 @@ - #: rc.cpp:366 - #, no-c-format - msgid "LDAP Host" --msgstr "LDAP 站台" -+msgstr "LDAP 站臺" - - #. i18n: file kuser.kcfg line 155 - #: rc.cpp:369 -@@ -1746,8 +1757,8 @@ - #: rc.cpp:441 - #, no-c-format - msgid "" --"Check this if the user's full name should be stored in the cn (Canonical Name) " --"attribute." -+"Check this if the user's full name should be stored in the cn (Canonical " -+"Name) attribute." - msgstr "勾選這個選項的話，會將使用者全名存在 cn (Canonical Name) 屬性裡。" - - #. i18n: file kuser.kcfg line 238 -@@ -1772,9 +1783,11 @@ - #: rc.cpp:453 - #, no-c-format - msgid "" --"Check this if the shadowAccount object should be used in the users' entries. It " --"allows to enforce password change/expiration policies." --msgstr "勾選這個選項的話，shadowAccount object 會用於使用者資料中。這樣可以強制使用者遵循使用密碼更換與逾期的原則。" -+"Check this if the shadowAccount object should be used in the users' entries. " -+"It allows to enforce password change/expiration policies." -+msgstr "" -+"勾選這個選項的話，shadowAccount object 會用於使用者資料中。這樣可以強制使用者" -+"遵循使用密碼更換與逾期的原則。" - - #. i18n: file kuser.kcfg line 248 - #: rc.cpp:456 -@@ -1787,11 +1800,11 @@ - #, no-c-format - msgid "" - "This option allows to specify the structural objectclass used with users' " --"entries. If you want to use these entries not just for authentication, but for " --"an addressbook, too, then choose inetOrgPerson." -+"entries. If you want to use these entries not just for authentication, but " -+"for an addressbook, too, then choose inetOrgPerson." - msgstr "" --"這個選項用於指定使用者資料中的 structural objectclass。如果您不只是使用這些資料來認證，也要用於通訊錄時，請選擇 " --"inetOrgPerson。" -+"這個選項用於指定使用者資料中的 structural objectclass。如果您不只是使用這些資" -+"料來認證，也要用於通訊錄時，請選擇 inetOrgPerson。" - - #. i18n: file kuser.kcfg line 257 - #: rc.cpp:462 -@@ -1827,12 +1840,13 @@ - #: rc.cpp:477 - #, no-c-format - msgid "" --"Check this if you want to use the user/group entries in a Samba domain. KUser " --"will create sambaSamAccount objectclass for each entry which is usable with the " --"ldapsam passdb backend with Samba version greater than 3.0." --msgstr "" --"如果您要使用使用者/群組資料於 Samba 網域中。KUser 會幫每個資料產生 sambaSamAccount objectclass，可以用於 " --"ldapsam passdb 後端資料庫（Samba 版本必須大於 3.0）。" -+"Check this if you want to use the user/group entries in a Samba domain. " -+"KUser will create sambaSamAccount objectclass for each entry which is usable " -+"with the ldapsam passdb backend with Samba version greater than 3.0." -+msgstr "" -+"如果您要使用使用者/群組資料於 Samba 網域中。KUser 會幫每個資料產生 " -+"sambaSamAccount objectclass，可以用於 ldapsam passdb 後端資料庫（Samba 版本必" -+"須大於 3.0）。" - - #. i18n: file kuser.kcfg line 283 - #: rc.cpp:480 -@@ -1856,11 +1870,12 @@ - #: rc.cpp:489 - #, no-c-format - msgid "" --"This specifies the domain Security IDentifier. It is unique in a single domain. " --"You can query the value of the domain SID with 'net getlocalsid domain_name'." -+"This specifies the domain Security IDentifier. It is unique in a single " -+"domain. You can query the value of the domain SID with 'net getlocalsid " -+"domain_name'." - msgstr "" --"這裡指定 Samba 網域的安全代碼（Security ID）。每一個網域都要不同。您可以用 \"net getlocalsid domain_name\" " --"來查詢網域的 SID。" -+"這裡指定 Samba 網域的安全代碼（Security ID）。每一個網域都要不同。您可以用 " -+"\"net getlocalsid domain_name\" 來查詢網域的 SID。" - - #. i18n: file kuser.kcfg line 291 - #: rc.cpp:492 -@@ -1872,11 +1887,12 @@ - #: rc.cpp:495 - #, no-c-format - msgid "" --"This value is an offset for the algorithmic mapping from uids and gids to rids. " --"The default (and minimum) value is 1000, it must be even, and the LDAP database " --"and smb.conf must store the same values." -+"This value is an offset for the algorithmic mapping from uids and gids to " -+"rids. The default (and minimum) value is 1000, it must be even, and the LDAP " -+"database and smb.conf must store the same values." - msgstr "" --"這個值是將 uid 與 gid 映射到 rid 的偏移值。預設（也是最小）值是 1000。必須是雙數，LDAP 資料庫與 smb.conf 必須存同樣的值。" -+"這個值是將 uid 與 gid 映射到 rid 的偏移值。預設（也是最小）值是 1000。必須是" -+"雙數，LDAP 資料庫與 smb.conf 必須存同樣的值。" - - #. i18n: file kuser.kcfg line 296 - #: rc.cpp:498 -@@ -1888,9 +1904,11 @@ - #: rc.cpp:501 - #, no-c-format - msgid "" --"This specifies a name of a login script (in the `Netlogon` share) which will be " --"executed as the user logs in to a Windows machine." --msgstr "這裡指定登入命令稿名稱（在 Netlogon 的地方），使用者登入 Windows 機器時會執行。" -+"This specifies a name of a login script (in the `Netlogon` share) which will " -+"be executed as the user logs in to a Windows machine." -+msgstr "" -+"這裡指定登入命令稿名稱（在 Netlogon 的地方），使用者登入 Windows 機器時會執" -+"行。" - - #. i18n: file kuser.kcfg line 300 - #: rc.cpp:504 -@@ -1916,8 +1934,8 @@ - #: rc.cpp:513 - #, no-c-format - msgid "" --"This specifies the location of the roaming profile of the user. The '%U' macro " --"will be replaced with the actual user name." -+"This specifies the location of the roaming profile of the user. The '%U' " -+"macro will be replaced with the actual user name." - msgstr "指定使用者設定檔的位置。%U 會被取代為實際的使用者名稱。" - - #. i18n: file kuser.kcfg line 308 -@@ -1931,9 +1949,11 @@ - #, no-c-format - msgid "" - "This specifies the location of the home directory of the user. This field is " --"meaningful only for Windows machines. The '%U' macro will be replaced with the " --"actual user name." --msgstr "指定使用者家目錄的位置。這個欄位只對 Windows 機器有意義。%U 會被取代為實際使用者名稱。" -+"meaningful only for Windows machines. The '%U' macro will be replaced with " -+"the actual user name." -+msgstr "" -+"指定使用者家目錄的位置。這個欄位只對 Windows 機器有意義。%U 會被取代為實際使" -+"用者名稱。" - - #. i18n: file kuser.kcfg line 313 - #: rc.cpp:525 -@@ -1942,7 +1962,8 @@ - "Store the LanManager hashed password in the sambaLMPassword attribute. Check " - "this if you have older clients (Win9x series and before) on your network." - msgstr "" --"在 sambaLMPassword 屬性中儲存 LanManager hash 密碼。如果您使用較舊的（Win9x 系列或更早的）客戶端軟體，請勾選此項。" -+"在 sambaLMPassword 屬性中儲存 LanManager hash 密碼。如果您使用較舊的（Win9x " -+"系列或更早的）客戶端軟體，請勾選此項。" - - #: selectconn.cpp:38 - msgid "Connection Selection" -@@ -1950,7 +1971,7 @@ - - #: selectconn.cpp:42 - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #: selectconn.cpp:48 - msgid "Defined connections:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/secpolicy.po kde-i18n-zh_TW-3.5.10/messages/kdeadmin/secpolicy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeadmin/secpolicy.po 2006-07-22 10:04:31.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeadmin/secpolicy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: secpolicy\n" - "POT-Creation-Date: 2005-02-06 01:20+0100\n" - "PO-Revision-Date: 2001-08-29 10:03+CST\n" --"Last-Translator: Shell Hung \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/klock.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/klock.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/klock.po 2008-08-19 20:43:19.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/klock.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: klock\n" - "POT-Creation-Date: 2008-07-08 01:23+0200\n" - "PO-Revision-Date: 2006-06-05 13:17+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -74,15 +73,13 @@ - #: kdesavers/Euphoria.cpp:1040 - msgid "" - "

Euphoria 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

Ported to KDE by Karl Robillard

" - msgstr "" - "

Euphoria 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

由Karl Robillard移植到KDE

" -@@ -118,15 +115,13 @@ - #: kdesavers/Flux.cpp:921 - msgid "" - "

Flux 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

Ported to KDE by Karl Robillard

" - msgstr "" - "

Flux 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

由Karl Robillard移植到KDE

" -@@ -162,15 +157,13 @@ - #: kdesavers/SolarWinds.cpp:733 - msgid "" - "

Solar Winds 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

Ported to KDE by Karl Robillard

" - msgstr "" - "

太陽風 1.0

\n" --"

Copyright (c) 2002 Terence M. Welsh" --"
\n" -+"

Copyright (c) 2002 Terence M. Welsh
\n" - "http://www.reallyslick.com/

\n" - "\n" - "

由Karl Robillard移植到KDE

" -@@ -329,7 +322,7 @@ - - #: kdesavers/firesaver.cpp:526 - msgid "Gimme your eyes..." --msgstr "看過來..." -+msgstr "看過來…" - - #: kdesavers/firesaver.cpp:527 - msgid "Thank you for using KDE" -@@ -351,19 +344,17 @@ - msgid "" - "

Particle Fountain

\n" - "

Particle Fountain Screen Saver for KDE

\n" --"Copyright (c) Ian Reinhart Geiser 2001" --"
\n" -+"Copyright (c) Ian Reinhart Geiser 2001
\n" - "\n" - "

KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher " - " 2001

" - msgstr "" - "

粒子噴泉

\n" - "

KDE的粒子噴泉螢幕保護程式

\n" --"Copyright (c) Ian Reinhart Geiser 2001" --"
\n" -+"Copyright (c) Ian Reinhart Geiser 2001
\n" - "\n" --"

KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher " --"所改進 2001

" -+"

KConfig code 和 KScreenSaver \"Setup...\" 由 Nick Betcher 所改進" -+" 2001

" - - #: kdesavers/gravity.cpp:40 - msgid "Particle Gravity Screen Saver" -@@ -373,19 +364,17 @@ - msgid "" - "

Gravity

\n" - "

Particle Gravity Screen Saver for KDE

\n" --"Copyright (c) Ian Reinhart Geiser 2001" --"
\n" -+"Copyright (c) Ian Reinhart Geiser 2001
\n" - "\n" - "

KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher " - " 2001

" - msgstr "" - "

重力

\n" - "

KDE的螢幕粒子重力保護程式

\n" --"Copyright (c) Ian Reinhart Geiser 2001" --"
\n" -+"Copyright (c) Ian Reinhart Geiser 2001
\n" - "\n" --"

KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher " --"所改進 2001

" -+"

KConfig code 和 KScreenSaver \"Setup...\" 由Nick Betcher 所改進" -+" 2001

" - - #: kdesavers/kclock.cpp:54 - msgid "Clock" -@@ -443,9 +432,7 @@ - - #: kdesavers/kclock.cpp:228 - msgid "" --"Clock Screen Saver" --"
Version 1.0" --"
Melchior FRANZ (c) 2003" -+"Clock Screen Saver
Version 1.0
Melchior FRANZ (c) 2003" - msgstr "時鐘螢幕保護程式
版本 1.0
Melchior FRANZ (c) 2003" - - #: kdesavers/kvm.cpp:65 -@@ -600,15 +587,12 @@ - - #: kdesavers/pendulum.cpp:788 - msgid "" --"

KPendulum Screen Saver for KDE

" --"

Simulation of a two-part pendulum

" --"

Copyright (c) Georg Drenkhahn 2004

" --"

georg-d@users.sourceforge.net

" --msgstr "" --"

KPendulum 螢幕保護程式

" --"

模擬一個兩部份鐘擺

" --"

Copyright (c) Georg Drenkhahn 2004

" --"

georg-d@users.sourceforge.net

" -+"

KPendulum Screen Saver for KDE

Simulation of a two-part pendulum

Copyright (c) Georg Drenkhahn 2004

georg-d@users." -+"sourceforge.net

" -+msgstr "" -+"

KPendulum 螢幕保護程式

模擬一個兩部份鐘擺

Copyright (c) " -+"Georg Drenkhahn 2004

georg-d@users.sourceforge.net

" - - #: kdesavers/polygon.cpp:35 - msgid "KPolygon" -@@ -656,15 +640,13 @@ - - #: kdesavers/rotation.cpp:782 - msgid "" --"

KRotation Screen Saver for KDE

" --"

Simulation of a force free rotating asymmetric body

" --"

Copyright (c) Georg Drenkhahn 2004

" --"

georg-d@users.sourceforge.net

" --msgstr "" --"

KRotation 螢幕保護程式

" --"

模擬不對稱主體的自由旋轉。

" --"

Copyright (c) Georg Drenkhahn 2004

" --"

georg-d@users.sourceforge.net

" -+"

KRotation Screen Saver for KDE

Simulation of a force free " -+"rotating asymmetric body

Copyright (c) Georg Drenkhahn 2004

georg-d@users.sourceforge.net

" -+msgstr "" -+"

KRotation 螢幕保護程式

模擬不對稱主體的自由旋轉。

" -+"

Copyright (c) Georg Drenkhahn 2004

georg-d@users." -+"sourceforge.net

" - - #: kdesavers/science.cpp:58 - msgid "Science Screen Saver" -@@ -787,10 +769,8 @@ - msgstr "KLock" - - #: xsavers/space.cpp:426 --msgid "" --"GL can not render with root visual\n" --msgstr "" --"GL不能用root visual表現\n" -+msgid "GL can not render with root visual\n" -+msgstr "GL不能用root visual表現\n" - - #: xsavers/space.cpp:579 - msgid "Setup Space Screen Saver" -@@ -1462,18 +1442,14 @@ - #, no-c-format - msgid "" - "

\n" --"m2" --"
\n" --"-----------" --"
\n" -+"m2
\n" -+"-----------
\n" - "m1+m2\n" - "

" - msgstr "" - "

\n" --"m2" --"
\n" --"-----------" --"
\n" -+"m2
\n" -+"-----------
\n" - "m1+m2\n" - "

" - -@@ -1482,18 +1458,14 @@ - #, no-c-format - msgid "" - "

\n" --"l2" --"
\n" --"------" --"
\n" -+"l2
\n" -+"------
\n" - "l1+l2\n" - "

" - msgstr "" - "

\n" --"l2" --"
\n" --"------" --"
\n" -+"l2
\n" -+"------
\n" - "l1+l2\n" - "

" - -@@ -1513,12 +1485,10 @@ - #: rc.cpp:422 - #, no-c-format - msgid "" --"Perspective" --"
\n" -+"Perspective
\n" - "Change [s]" - msgstr "" --"部份" --"
\n" -+"部份
\n" - "改變" - - #. i18n: file kdesavers/pendulumcfg.ui line 264 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kpartsaver.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kpartsaver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kpartsaver.po 2007-05-14 12:23:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kpartsaver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kpartsaver\n" - "POT-Creation-Date: 2007-02-26 02:46+0100\n" - "PO-Revision-Date: 2006-06-05 11:36+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kstyle_phase_config.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kstyle_phase_config.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kstyle_phase_config.po 2006-07-22 10:04:34.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kstyle_phase_config.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kstyle_phase_config\n" - "POT-Creation-Date: 2005-01-31 01:35+0100\n" - "PO-Revision-Date: 2006-06-05 13:20+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kwin_art_clients.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kwin_art_clients.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kwin_art_clients.po 2006-07-22 10:04:34.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kwin_art_clients.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kwin_art_clients\n" - "POT-Creation-Date: 2005-12-17 03:14+0100\n" - "PO-Revision-Date: 2006-06-05 13:29+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -58,7 +57,8 @@ - msgid "" - "When selected, the window decoration borders are drawn using the titlebar " - "colors. Otherwise, they are drawn using normal border colors instead." --msgstr "選取此項的話，視窗裝飾邊框會以標題列的顏色來繪製。否則，會用一般的邊框顏色。" -+msgstr "" -+"選取此項的話，視窗裝飾邊框會以標題列的顏色來繪製。否則，會用一般的邊框顏色。" - - #: cde/config/config.cpp:48 - msgid "" -@@ -88,7 +88,7 @@ - - #: glow/config/glowconfigdialog.cpp:69 - msgid "Theme" --msgstr "佈景主題" -+msgstr "布景主題" - - #: glow/config/glowconfigdialog.cpp:70 - msgid "Button Size" -@@ -144,9 +144,11 @@ - - #: icewm/config/config.cpp:75 - msgid "" --"When selected, titlebar colors will follow those set in the IceWM theme. If not " --"selected, the current KDE titlebar colors will be used instead." --msgstr "選取此項的話，標題列顏色會依 IceWM 主題設定。反之會使用目前 KDE 標題列的顏色。" -+"When selected, titlebar colors will follow those set in the IceWM theme. If " -+"not selected, the current KDE titlebar colors will be used instead." -+msgstr "" -+"選取此項的話，標題列顏色會依 IceWM 主題設定。反之會使用目前 KDE 標題列的顏" -+"色。" - - #: icewm/config/config.cpp:80 - msgid "&Show title bar on top of windows" -@@ -164,9 +166,11 @@ - - #: icewm/config/config.cpp:91 - msgid "" --"When selected, all titlebar menu buttons will have the application icon shown. " --"If not selected, the current theme's defaults are used instead." --msgstr "選取此項的話，所有的標題列選單按鍵會顯示應用程式的小圖示。反之，則使用目前主題的預設選項。" -+"When selected, all titlebar menu buttons will have the application icon " -+"shown. If not selected, the current theme's defaults are used instead." -+msgstr "" -+"選取此項的話，所有的標題列選單按鍵會顯示應用程式的小圖示。反之，則使用目前主" -+"題的預設選項。" - - #: icewm/config/config.cpp:96 - msgid "Open KDE's IceWM theme folder" -@@ -174,13 +178,14 @@ - - #: icewm/config/config.cpp:99 - msgid "" --"Clicking on the link above will cause a window to appear showing the KDE IceWM " --"theme folder. You can add or remove native IceWM themes by uncompressing " --"http://icewm.themes.org/ theme files into this folder, or by creating " --"folder symlinks to existing IceWM themes on your system." -+"Clicking on the link above will cause a window to appear showing the KDE " -+"IceWM theme folder. You can add or remove native IceWM themes by " -+"uncompressing http://icewm.themes.org/ theme files into this folder, " -+"or by creating folder symlinks to existing IceWM themes on your system." - msgstr "" --"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 http://icewm.themes.org/ " --"的主題檔案解壓到此資料夾，或是建立連到目前 IceWM 主題的符號連結以新增或移除原始的 IceWM 主題。" -+"點選上方的連結讓視窗顯示 KDE IceWM 主題資料夾。您可以將 http://icewm." -+"themes.org/ 的主題檔案解壓到此資料夾，或是建立連到目前 IceWM 主題的符號連" -+"結以新增或移除原始的 IceWM 主題。" - - #: icewm/config/config.cpp:166 icewm/config/config.cpp:208 - #: icewm/config/config.cpp:252 icewm/config/config.cpp:267 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kxsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kxsconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeartwork/kxsconfig.po 2007-07-12 10:27:50.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeartwork/kxsconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kxsconfig\n" - "POT-Creation-Date: 2007-05-22 02:17+0200\n" - "PO-Revision-Date: 2006-06-07 12:50+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -57,13 +56,13 @@ - #: hacks/config/ant.xml.h:1 - msgid "" - "A cellular automaton that is really a two-dimensional Turing machine: as the " --"heads (``ants'') walk along the screen, they change pixel values in their path. " --"Then, as they pass over changed pixels, their behavior is influenced. Written " --"by David Bagley." -+"heads (``ants'') walk along the screen, they change pixel values in their " -+"path. Then, as they pass over changed pixels, their behavior is influenced. " -+"Written by David Bagley." - msgstr "" - "一個「細胞自動機」（cellular automaton），事實上是一個二維的杜靈機（Turing " --"machine）：當那些「螞蟻」走過螢幕時，會改變牠們路徑的像素顏色。而當牠們爬過其他已改變顏色的路徑時，牠們的行為也會被影響到。由 David Bagley " --"撰寫。" -+"machine）：當那些「螞蟻」走過螢幕時，會改變牠們路徑的像素顏色。而當牠們爬過其" -+"他已改變顏色的路徑時，牠們的行為也會被影響到。由 David Bagley 撰寫。" - - #: hacks/config/ant.xml.h:2 - msgid "Ant" -@@ -456,9 +455,11 @@ - - #: hacks/config/apollonian.xml.h:9 - msgid "" --"Packs a large circle with smaller circles, demonstrating the Descartes Circle " --"Theorem. Written by Allan R. Wilks and David Bagley." --msgstr "以小圈圈將大圈圈包起來，展示笛卡兒圓形理論。由 Allan R. Wilks 與 David Bagley 撰寫。" -+"Packs a large circle with smaller circles, demonstrating the Descartes " -+"Circle Theorem. Written by Allan R. Wilks and David Bagley." -+msgstr "" -+"以小圈圈將大圈圈包起來，展示笛卡兒圓形理論。由 Allan R. Wilks 與 David " -+"Bagley 撰寫。" - - #: hacks/config/apollonian.xml.h:10 - msgid "Shallow" -@@ -537,9 +538,12 @@ - - #: hacks/config/atlantis.xml.h:15 - msgid "" --"This is xfishtank writ large: a GL animation of a number of sharks, dolphins, " --"and whales. The swimming motions are great. Originally written by Mark Kilgard." --msgstr "這是 xfishtank：許多海底生物如鯊魚、海豚與鯨魚的 GL 動畫。做得很棒。原始程式由 Mark Kilgard 撰寫。" -+"This is xfishtank writ large: a GL animation of a number of sharks, " -+"dolphins, and whales. The swimming motions are great. Originally written by " -+"Mark Kilgard." -+msgstr "" -+"這是 xfishtank：許多海底生物如鯊魚、海豚與鯨魚的 GL 動畫。做得很棒。原始程式" -+"由 Mark Kilgard 撰寫。" - - #: hacks/config/atlantis.xml.h:16 - msgid "Whale Speed" -@@ -620,19 +624,22 @@ - #: hacks/config/attraction.xml.h:14 - msgid "" - "Like qix, this uses a simple simple motion model to generate many different " --"display modes. The control points attract each other up to a certain distance, " --"and then begin to repel each other. The attraction/repulsion is proportional to " --"the distance between any two particles, similar to the strong and weak nuclear " --"forces. One of the most interesting ways to watch this hack is simply as " --"bouncing balls, because their motions and interactions with each other are so " --"odd. Sometimes two balls will get into a tight orbit around each other, to be " --"interrupted later by a third, or by the edge of the screen. It looks quite " --"chaotic. Written by Jamie Zawinski, based on Lisp code by John Pezaris." --msgstr "" --"就像 " --"qix，這個程式使用很簡單的移動模型來產生不同的顯示模式。控制點吸引彼此到一定距離，然後再驅離彼此。這個吸引/驅離的因子是與任兩個粒子的距離比例有關，就像是核子" --"力的強弱。要觀察這個最簡單的方法就像是看彈力球，因為它們的動作受彼此牽制所以顯得很怪異。有時兩顆球會變成在一個軌道上跑，直到第三者來打斷它們，或是跑到螢幕的邊緣" --"去。由 Jamie Zawinski 撰寫，根據 John Pezaris 的 Lisp 程式碼。" -+"display modes. The control points attract each other up to a certain " -+"distance, and then begin to repel each other. The attraction/repulsion is " -+"proportional to the distance between any two particles, similar to the " -+"strong and weak nuclear forces. One of the most interesting ways to watch " -+"this hack is simply as bouncing balls, because their motions and " -+"interactions with each other are so odd. Sometimes two balls will get into a " -+"tight orbit around each other, to be interrupted later by a third, or by the " -+"edge of the screen. It looks quite chaotic. Written by Jamie Zawinski, based " -+"on Lisp code by John Pezaris." -+msgstr "" -+"就像 qix，這個程式使用很簡單的移動模型來產生不同的顯示模式。控制點吸引彼此到" -+"一定距離，然後再驅離彼此。這個吸引/驅離的因子是與任兩個粒子的距離比例有關，就" -+"像是核子力的強弱。要觀察這個最簡單的方法就像是看彈力球，因為它們的動作受彼此" -+"牽制所以顯得很怪異。有時兩顆球會變成在一個軌道上跑，直到第三者來打斷它們，或" -+"是跑到螢幕的邊緣去。由 Jamie Zawinski 撰寫，根據 John Pezaris 的 Lisp 程式" -+"碼。" - - #: hacks/config/attraction.xml.h:15 hacks/config/deluxe.xml.h:5 - #: hacks/config/lmorph.xml.h:7 hacks/config/pedal.xml.h:5 -@@ -719,9 +726,11 @@ - - #: hacks/config/blaster.xml.h:2 - msgid "" --"Draws a simulation of flying space-combat robots (cleverly disguised as colored " --"circles) doing battle in front of a moving star field. Written by Jonathan Lin." --msgstr "模擬飛行中的太空戰鬥機器人，在移動的星球背景前戰鬥。由 Jonathan Lin 撰寫。" -+"Draws a simulation of flying space-combat robots (cleverly disguised as " -+"colored circles) doing battle in front of a moving star field. Written by " -+"Jonathan Lin." -+msgstr "" -+"模擬飛行中的太空戰鬥機器人，在移動的星球背景前戰鬥。由 Jonathan Lin 撰寫。" - - #: hacks/config/blaster.xml.h:4 hacks/config/bouboule.xml.h:4 - #: hacks/config/coral.xml.h:8 hacks/config/cubenetic.xml.h:9 -@@ -769,17 +778,19 @@ - #: hacks/config/blitspin.xml.h:8 - msgid "" - "The ``blitspin'' hack repeatedly rotates a bitmap by 90 degrees by using " --"logical operations: the bitmap is divided into quadrants, and the quadrants are " --"shifted clockwise. Then the same thing is done again with progressively smaller " --"quadrants, except that all sub-quadrants of a given size are rotated in " --"parallel. Written by Jamie Zawinski based on some cool SmallTalk code seen in " --"in Byte Magazine in 1981. As you watch it, the image appears to dissolve into " --"static and then reconstitute itself, but rotated. You can provide the image to " --"use, as an XBM or XPM file, or tell it to grab a screen image and rotate that." --msgstr "" --"「旋轉拼圖」會將點陣圖做 90 度旋轉：它會將點陣圖切割成四塊，每一塊再順時針旋轉。然後再切更小的四塊，再做旋轉。由 Jamie Zawinski " --"撰寫，根據一些在 1981 年的 Byte 雜誌中發表的很酷的 SmallTalk 程式碼。您可以自己提供影像，以 XMB 或 XPM " --"格式，或是告訴它去抓取螢幕的影像並旋轉。" -+"logical operations: the bitmap is divided into quadrants, and the quadrants " -+"are shifted clockwise. Then the same thing is done again with progressively " -+"smaller quadrants, except that all sub-quadrants of a given size are rotated " -+"in parallel. Written by Jamie Zawinski based on some cool SmallTalk code " -+"seen in in Byte Magazine in 1981. As you watch it, the image appears to " -+"dissolve into static and then reconstitute itself, but rotated. You can " -+"provide the image to use, as an XBM or XPM file, or tell it to grab a screen " -+"image and rotate that." -+msgstr "" -+"「旋轉拼圖」會將點陣圖做 90 度旋轉：它會將點陣圖切割成四塊，每一塊再順時針旋" -+"轉。然後再切更小的四塊，再做旋轉。由 Jamie Zawinski 撰寫，根據一些在 1981 年" -+"的 Byte 雜誌中發表的很酷的 SmallTalk 程式碼。您可以自己提供影像，以 XMB 或 " -+"XPM 格式，或是告訴它去抓取螢幕的影像並旋轉。" - - #: hacks/config/bouboule.xml.h:1 - msgid "Bouboule" -@@ -797,7 +808,9 @@ - msgid "" - "This draws what looks like a spinning, deforming baloon with varying-sized " - "spots painted on its invisible surface. Written by Jeremie Petit." --msgstr "這會畫出像是一個旋轉的、變形的汽球，由不同大小的點畫在它看不見的表面上呈現。由 Jeremie Petit 撰寫。" -+msgstr "" -+"這會畫出像是一個旋轉的、變形的汽球，由不同大小的點畫在它看不見的表面上呈現。" -+"由 Jeremie Petit 撰寫。" - - #: hacks/config/boxed.xml.h:1 hacks/config/gears.xml.h:1 - #: hacks/config/gflux.xml.h:1 hacks/config/pyro.xml.h:1 -@@ -886,8 +899,8 @@ - "emulation, this hack simulates popular screen savers from a number of less " - "robust operating systems. Written by Jamie Zawinski." - msgstr "" --"BSOD 是 Blue Screen of Death 的縮寫。模擬個人電腦上一些比較爛的作業系統中最常見的「螢幕保護程式」。由 Jamie Zawinski " --"撰寫。" -+"BSOD 是 Blue Screen of Death 的縮寫。模擬個人電腦上一些比較爛的作業系統中最常" -+"見的「螢幕保護程式」。由 Jamie Zawinski 撰寫。" - - #: hacks/config/bsod.xml.h:9 - msgid "Mac Bomb" -@@ -935,9 +948,11 @@ - - #: hacks/config/bubble3d.xml.h:2 - msgid "" --"Draws a stream of rising, undulating 3D bubbles, rising toward the top of the " --"screen, with nice specular reflections. Written by Richard Jones." --msgstr "畫出一串上升波動的立體泡泡，升到螢幕的頂端。會有一些很漂亮的反射。由 Richard Jones 撰寫。" -+"Draws a stream of rising, undulating 3D bubbles, rising toward the top of " -+"the screen, with nice specular reflections. Written by Richard Jones." -+msgstr "" -+"畫出一串上升波動的立體泡泡，升到螢幕的頂端。會有一些很漂亮的反射。由 Richard " -+"Jones 撰寫。" - - #: hacks/config/bubbles.xml.h:1 hacks/config/xfishtank.xml.h:2 - msgid "Bubbles" -@@ -973,19 +988,22 @@ - - #: hacks/config/bubbles.xml.h:12 - msgid "" --"This simulates the kind of bubble formation that happens when water boils:small " --"bubbles appear, and as they get closer to each other, they combine to form " --"larger bubbles, which eventually pop. Written by James Macnicol." --msgstr "這會模擬水在沸騰時產生泡泡的樣子：小的泡泡出現，然後彼此接近、連結成一個更大的泡泡，然後可能會破掉。由 James Macnicol 撰寫。" -+"This simulates the kind of bubble formation that happens when water boils:" -+"small bubbles appear, and as they get closer to each other, they combine to " -+"form larger bubbles, which eventually pop. Written by James Macnicol." -+msgstr "" -+"這會模擬水在沸騰時產生泡泡的樣子：小的泡泡出現，然後彼此接近、連結成一個更大" -+"的泡泡，然後可能會破掉。由 James Macnicol 撰寫。" - - #: hacks/config/bumps.xml.h:1 - msgid "" - "A bit like `Spotlight', except that instead of merely exposing part of your " --"desktop, it creates a bump map from it. Basically, it 3D-izes a roaming section " --"of your desktop, based on color intensity. Written by Shane Smit." -+"desktop, it creates a bump map from it. Basically, it 3D-izes a roaming " -+"section of your desktop, based on color intensity. Written by Shane Smit." - msgstr "" --"有點像「聚光燈」，除了它不只是照射您的桌面，而且會產生「凹凸貼圖」（Bump map）。基本上它會將在您桌面漫遊的區域，依據顏色的緊密度立體化。由 Shane " --"Smit 撰寫。" -+"有點像「聚光燈」，除了它不只是照射您的桌面，而且會產生「凹凸貼圖」（Bump " -+"map）。基本上它會將在您桌面漫遊的區域，依據顏色的緊密度立體化。由 Shane Smit " -+"撰寫。" - - #: hacks/config/bumps.xml.h:2 - msgid "Bumps" -@@ -1000,8 +1018,8 @@ - "This draws Escher's ``Impossible Cage,'' a 3d analog of a moebius strip, and " - "rotates it in three dimensions. Written by Marcelo Vianna." - msgstr "" --"這會畫出 Escher 的「不可能的籠子」（Impossible Cage），一個由莫比斯帶（Moebius " --"strip）組成的立體圖，並以三個維度來翻轉它。由 Marcelo Vianna 撰寫。" -+"這會畫出 Escher 的「不可能的籠子」（Impossible Cage），一個由莫比斯帶" -+"（Moebius strip）組成的立體圖，並以三個維度來翻轉它。由 Marcelo Vianna 撰寫。" - - #: hacks/config/ccurve.xml.h:1 - msgid "0 seconds" -@@ -1084,7 +1102,9 @@ - msgid "" - "This draws a compass, with all elements spinning about randomly, for that " - "``lost and nauseous'' feeling. Written by Jamie Zawinski." --msgstr "畫出一個羅盤，所有的元素隨機旋轉，製造「失落與噁心」的感覺。由 Jamie Zawinski 撰寫。" -+msgstr "" -+"畫出一個羅盤，所有的元素隨機旋轉，製造「失落與噁心」的感覺。由 Jamie " -+"Zawinski 撰寫。" - - #: hacks/config/coral.xml.h:1 hacks/config/deco.xml.h:1 - #: hacks/config/helix.xml.h:1 hacks/config/imsmap.xml.h:1 -@@ -1120,9 +1140,10 @@ - - #: hacks/config/coral.xml.h:11 - msgid "" --"Simulates coral growth, albeit somewhat slowly. This image doesn't really do it " --"justice. Written by Frederick Roeber." --msgstr "模擬珊瑚成長，雖然有點慢。這個影像不是那麼的正確。由 Frederick Roeber 撰寫。" -+"Simulates coral growth, albeit somewhat slowly. This image doesn't really do " -+"it justice. Written by Frederick Roeber." -+msgstr "" -+"模擬珊瑚成長，雖然有點慢。這個影像不是那麼的正確。由 Frederick Roeber 撰寫。" - - #: hacks/config/coral.xml.h:13 hacks/config/gflux.xml.h:13 - #: hacks/config/imsmap.xml.h:13 hacks/config/pyro.xml.h:14 -@@ -1137,10 +1158,11 @@ - - #: hacks/config/cosmos.xml.h:2 - msgid "" --"Draws fireworks and zooming, fading flares. By Tom Campbell. You can find it at " --"<http://cosmos.dnsalias.net/cosmos/>" -+"Draws fireworks and zooming, fading flares. By Tom Campbell. You can find it " -+"at <http://cosmos.dnsalias.net/cosmos/>" - msgstr "" --"畫出煙火與放大、淡出的火燄。由 Tom Campbell 撰寫。您可以在 http://cosmos.dnsalias.net/cosmos/ 中找到。" -+"畫出煙火與放大、淡出的火燄。由 Tom Campbell 撰寫。您可以在 http://cosmos." -+"dnsalias.net/cosmos/ 中找到。" - - #: hacks/config/critical.xml.h:1 - msgid "Critical" -@@ -1148,9 +1170,11 @@ - - #: hacks/config/critical.xml.h:2 - msgid "" --"Draws a system of self-organizing lines. It starts out as random squiggles, but " --"after a few iterations, order begins to appear. Written by Martin Pool." --msgstr "畫出一個自我組織的線條系統。由隨機的曲線開始，但是在幾次循環之後，會開始出現一個系統的秩序。由 Martin Pool 撰寫。" -+"Draws a system of self-organizing lines. It starts out as random squiggles, " -+"but after a few iterations, order begins to appear. Written by Martin Pool." -+msgstr "" -+"畫出一個自我組織的線條系統。由隨機的曲線開始，但是在幾次循環之後，會開始出現" -+"一個系統的秩序。由 Martin Pool 撰寫。" - - #: hacks/config/crystal.xml.h:1 - msgid "Center on Screen" -@@ -1191,8 +1215,8 @@ - - #: hacks/config/crystal.xml.h:9 - msgid "" --"Moving polygons, similar to a kaleidescope (more like a kaleidescope than the " --"hack called `kaleid,' actually.) This one by Jouk Jansen." -+"Moving polygons, similar to a kaleidescope (more like a kaleidescope than " -+"the hack called `kaleid,' actually.) This one by Jouk Jansen." - msgstr "移動多邊形，類似萬花筒。由 Jouk Jansen 撰寫。" - - #: hacks/config/crystal.xml.h:14 -@@ -1230,7 +1254,9 @@ - "Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns " - "undulating across their surfaces. It's sort of a cubist Lavalite. Written by " - "Jamie Zawinski." --msgstr "畫出許多重疊的、跳動的盒子，許多千變萬化的小小花樣在它們的表面起伏。由 Jamie Zawinski 撰寫。" -+msgstr "" -+"畫出許多重疊的、跳動的盒子，許多千變萬化的小小花樣在它們的表面起伏。由 Jamie " -+"Zawinski 撰寫。" - - #: hacks/config/cubenetic.xml.h:14 hacks/config/gltext.xml.h:5 - #: hacks/config/menger.xml.h:7 hacks/config/molecule.xml.h:14 -@@ -1296,13 +1322,14 @@ - - #: hacks/config/cynosure.xml.h:1 - msgid "" --"A hack similar to `greynetic', but less frenetic. The first implementation was " --"by Stephen Linhart; then Ozymandias G. Desiderata wrote a Java applet clone. " --"That clone was discovered by Jamie Zawinski, and ported to C for inclusion " --"here." --msgstr "" --"有點像是 Greynetic，但沒那麼瘋狂。最開始是由 Stephen Linhart 所撰寫，接著 Ozymandias G. Desiderata 用 " --"Java applet 也寫了一個。後來 Jamie Zawinski 發現了 Java applet 的版本，將它用 C 改寫成現在的版本。" -+"A hack similar to `greynetic', but less frenetic. The first implementation " -+"was by Stephen Linhart; then Ozymandias G. Desiderata wrote a Java applet " -+"clone. That clone was discovered by Jamie Zawinski, and ported to C for " -+"inclusion here." -+msgstr "" -+"有點像是 Greynetic，但沒那麼瘋狂。最開始是由 Stephen Linhart 所撰寫，接著 " -+"Ozymandias G. Desiderata 用 Java applet 也寫了一個。後來 Jamie Zawinski 發現" -+"了 Java applet 的版本，將它用 C 改寫成現在的版本。" - - #: hacks/config/cynosure.xml.h:2 - msgid "Cynosure" -@@ -1392,14 +1419,15 @@ - - #: hacks/config/decayscreen.xml.h:20 - msgid "" --"This takes an image and makes it melt. You've no doubt seen this effect before, " --"but no screensaver would really be complete without it. It works best if " --"there's something colorful visible. Warning, if the effect continues after the " --"screen saver is off, seek medical attention. Written by David Wald and Vivek " --"Khera." --msgstr "" --"將一張圖片熔化。您以前應該看過這個效果，但是沒有螢幕保護程式可以做得跟這個一樣好，尤其是在彩色效果之下。注意，如果在螢幕保護程式關閉後您還看得到這個效果，請儘速" --"找醫生。由 David Wald 與 Vivek Khera 撰寫。" -+"This takes an image and makes it melt. You've no doubt seen this effect " -+"before, but no screensaver would really be complete without it. It works " -+"best if there's something colorful visible. Warning, if the effect continues " -+"after the screen saver is off, seek medical attention. Written by David Wald " -+"and Vivek Khera." -+msgstr "" -+"將一張圖片熔化。您以前應該看過這個效果，但是沒有螢幕保護程式可以做得跟這個一" -+"樣好，尤其是在彩色效果之下。注意，如果在螢幕保護程式關閉後您還看得到這個效" -+"果，請儘速找醫生。由 David Wald 與 Vivek Khera 撰寫。" - - #: hacks/config/deco.xml.h:3 - msgid "Deco" -@@ -1417,12 +1445,12 @@ - #: hacks/config/deco.xml.h:9 - msgid "" - "This one subdivides and colors rectangles randomly. It looks kind of like " --"Brady-Bunch-era rec-room wall paneling. (Raven says: ``this screensaver is ugly " --"enough to peel paint.'') Written by Jamie Zawinski, inspired by Java code by " --"Michael Bayne." -+"Brady-Bunch-era rec-room wall paneling. (Raven says: ``this screensaver is " -+"ugly enough to peel paint.'') Written by Jamie Zawinski, inspired by Java " -+"code by Michael Bayne." - msgstr "" --"這個程式隨機分割矩形並著色。看來有點像 Brady-Bunch-era rec-room 的牆壁鑲板畫。由 Jamie Zawinski 參考 Michael " --"Bayne 的 Java 程式碼所撰寫，" -+"這個程式隨機分割矩形並著色。看來有點像 Brady-Bunch-era rec-room 的牆壁鑲板" -+"畫。由 Jamie Zawinski 參考 Michael Bayne 的 Java 程式碼所撰寫，" - - #: hacks/config/deco.xml.h:11 hacks/config/rd-bomb.xml.h:23 - #: hacks/config/whirlygig.xml.h:7 hacks/config/xearth.xml.h:33 -@@ -1447,11 +1475,12 @@ - #: hacks/config/deluxe.xml.h:12 - msgid "" - "This draws a pulsing sequence of stars, circles, and lines. It would look " --"better if it was faster, but as far as I can tell, there is no way to make this " --"be both: fast, and flicker-free. Yet another reason X sucks. Written by Jamie " --"Zawinski." -+"better if it was faster, but as far as I can tell, there is no way to make " -+"this be both: fast, and flicker-free. Yet another reason X sucks. Written by " -+"Jamie Zawinski." - msgstr "" --"依序畫出跳動的星星、圓圈與線條。速度快的話看起來會比較好，但是放得快的話就容易顫抖。其中一個原因是 X 的問題。由 Jamie Zawinski 撰寫。" -+"依序畫出跳動的星星、圓圈與線條。速度快的話看起來會比較好，但是放得快的話就容" -+"易顫抖。其中一個原因是 X 的問題。由 Jamie Zawinski 撰寫。" - - #: hacks/config/deluxe.xml.h:13 - msgid "Transparency" -@@ -1461,7 +1490,9 @@ - msgid "" - "A cellular automaton that starts with a random field, and organizes it into " - "stripes and spirals. Written by David Bagley." --msgstr "一個「細胞自動機」，由隨機的背景開始，並逐漸組織為條紋與螺旋。由 David Bagley 撰寫。" -+msgstr "" -+"一個「細胞自動機」，由隨機的背景開始，並逐漸組織為條紋與螺旋。由 David " -+"Bagley 撰寫。" - - #: hacks/config/demon.xml.h:2 hacks/config/petri.xml.h:1 - msgid "Cell Size" -@@ -1483,7 +1514,9 @@ - msgid "" - "More ``discrete map'' systems, including new variants of Hopalong and Julia, " - "and a few others. Written by Tim Auckland." --msgstr "更多的「分離地圖」（discrete map）系統，包括 Hopalong 與 Julia 的新版本。由 Tim Auckland 撰寫。" -+msgstr "" -+"更多的「分離地圖」（discrete map）系統，包括 Hopalong 與 Julia 的新版本。由 " -+"Tim Auckland 撰寫。" - - #: hacks/config/distort.xml.h:1 - msgid "Black Hole" -@@ -1524,9 +1557,12 @@ - - #: hacks/config/distort.xml.h:15 - msgid "" --"This hack grabs an image of the screen, and then lets a transparent lens wander " --"around the screen, magnifying whatever is underneath. Written by Jonas Munsin." --msgstr "從螢幕中抓一張圖片，並讓一個透明鏡頭繞著螢幕漫遊，將所經過之處放大。由 Jonas Munsin 撰寫。" -+"This hack grabs an image of the screen, and then lets a transparent lens " -+"wander around the screen, magnifying whatever is underneath. Written by " -+"Jonas Munsin." -+msgstr "" -+"從螢幕中抓一張圖片，並讓一個透明鏡頭繞著螢幕漫遊，將所經過之處放大。由 Jonas " -+"Munsin 撰寫。" - - #: hacks/config/distort.xml.h:16 hacks/config/moire.xml.h:12 - #: hacks/config/rd-bomb.xml.h:21 hacks/config/ripples.xml.h:15 -@@ -1568,21 +1604,22 @@ - - #: hacks/config/electricsheep.xml.h:2 - msgid "" --"ElectricSheep is an xscreensaver module that displays mpeg video of an animated " --"fractal flame. In the background, it contributes render cycles to the next " --"animation. Periodically it uploades completed frames to the server, where they " --"are compressed for distribution to all clients. This program is recommended " --"only if you have a high bandwidth connection to the Internet. By Scott Draves. " --"You can find it at <http://www.electricsheep.org/>. See that web site for " --"configuration information." --msgstr "" --"ElectricSheep 顯示動畫火燄的 mpeg 影像。它定期會上傳完整的影像到伺服器，並壓縮後再散佈給所有客戶端，因此建議在網路頻寬夠大的時候使用。由 " --"Scott Draves 撰寫，您可以在 http://www.electricsheep.org/ 上找到，並參考它的設定資訊。" -+"ElectricSheep is an xscreensaver module that displays mpeg video of an " -+"animated fractal flame. In the background, it contributes render cycles to " -+"the next animation. Periodically it uploades completed frames to the server, " -+"where they are compressed for distribution to all clients. This program is " -+"recommended only if you have a high bandwidth connection to the Internet. By " -+"Scott Draves. You can find it at <http://www.electricsheep.org/>. See " -+"that web site for configuration information." -+msgstr "" -+"ElectricSheep 顯示動畫火燄的 mpeg 影像。它定期會上傳完整的影像到伺服器，並壓" -+"縮後再散布給所有客戶端，因此建議在網路頻寬夠大的時候使用。由 Scott Draves 撰" -+"寫，您可以在 http://www.electricsheep.org/ 上找到，並參考它的設定資訊。" - - #: hacks/config/engine.xml.h:1 - msgid "" --"Draws a simple four-stroke engine that floats around the screen. Written by Ben " --"Buxton." -+"Draws a simple four-stroke engine that floats around the screen. Written by " -+"Ben Buxton." - msgstr "畫一個簡單的四行程引擎，在螢幕上浮動。由 Ben Buxton 撰寫。" - - #: hacks/config/engine.xml.h:2 -@@ -1599,11 +1636,13 @@ - - #: hacks/config/epicycle.xml.h:12 - msgid "" --"This program draws the path traced out by a point on the edge of a circle. That " --"circle rotates around a point on the rim of another circle, and so on, several " --"times. These were the basis for the pre-heliocentric model of planetary motion. " --"Written by James Youngman." --msgstr "畫出一個圓的週邊的軌跡輪廓。圓會隨著另一個圓的圓周旋轉。這是太陽系行星運動模式的基礎。由 James Youngman 撰寫。" -+"This program draws the path traced out by a point on the edge of a circle. " -+"That circle rotates around a point on the rim of another circle, and so on, " -+"several times. These were the basis for the pre-heliocentric model of " -+"planetary motion. Written by James Youngman." -+msgstr "" -+"畫出一個圓的週邊的軌跡輪廓。圓會隨著另一個圓的圓周旋轉。這是太陽系行星運動模" -+"式的基礎。由 James Youngman 撰寫。" - - #: hacks/config/euler2d.xml.h:2 - msgid "Euler2d" -@@ -1626,11 +1665,11 @@ - #: hacks/config/extrusion.xml.h:1 - msgid "" - "Draws various rotating extruded shapes that twist around, lengthen, and turn " --"inside out. Created by David Konerding from the samples that come with the GL " --"Extrusion library by Linas Vepstas." -+"inside out. Created by David Konerding from the samples that come with the " -+"GL Extrusion library by Linas Vepstas." - msgstr "" --"畫出不同的型狀，彼此擠壓、伸展與旋轉。由 David Konerding 根據 Linas Vepstas 的 GL Extrusion " --"函式庫中的範例撰寫而成。" -+"畫出不同的型狀，彼此擠壓、伸展與旋轉。由 David Konerding 根據 Linas Vepstas " -+"的 GL Extrusion 函式庫中的範例撰寫而成。" - - #: hacks/config/extrusion.xml.h:2 - msgid "Extrusion" -@@ -1683,9 +1722,10 @@ - - #: hacks/config/fadeplot.xml.h:2 - msgid "" --"Draws what looks like a waving ribbon following a sinusoidal path. Written by " --"Bas van Gaalen and Charles Vidal." --msgstr "畫出一個正弦路徑，像是波動中的絲帶。由 Bas van Gaalen 與 Charles Vidal 撰寫。" -+"Draws what looks like a waving ribbon following a sinusoidal path. Written " -+"by Bas van Gaalen and Charles Vidal." -+msgstr "" -+"畫出一個正弦路徑，像是波動中的絲帶。由 Bas van Gaalen 與 Charles Vidal 撰寫。" - - #: hacks/config/fadeplot.xml.h:3 - msgid "FadePlot" -@@ -1705,14 +1745,15 @@ - - #: hacks/config/flag.xml.h:11 - msgid "" --"This draws a waving colored flag, that undulates its way around the screen. The " --"trick is the flag can contain arbitrary text and images. By default, it " --"displays either the current system name and OS type, or a picture of ``Bob,'' " --"but you can replace the text or the image with a command-line option. Written " --"by Charles Vidal and Jamie Zawinski." --msgstr "" --"畫出彩色的旗幟，在螢幕中飄動。有趣的地方在旗子裡可以放任何字眼或圖片。預設是顯示目前系統的名稱與作業系統的型態，或是 Bob " --"的圖片，不過您可以用命令列參數指定任何文字或圖片來取代。由 Charles Vidal 與 Jamie Zawinski 撰寫。" -+"This draws a waving colored flag, that undulates its way around the screen. " -+"The trick is the flag can contain arbitrary text and images. By default, it " -+"displays either the current system name and OS type, or a picture of " -+"``Bob,'' but you can replace the text or the image with a command-line " -+"option. Written by Charles Vidal and Jamie Zawinski." -+msgstr "" -+"畫出彩色的旗幟，在螢幕中飄動。有趣的地方在旗子裡可以放任何字眼或圖片。預設是" -+"顯示目前系統的名稱與作業系統的型態，或是 Bob 的圖片，不過您可以用命令列參數指" -+"定任何文字或圖片來取代。由 Charles Vidal 與 Jamie Zawinski 撰寫。" - - #: hacks/config/flame.xml.h:1 hacks/config/jigsaw.xml.h:1 - #: hacks/config/maze.xml.h:1 hacks/config/rotzoomer.xml.h:1 -@@ -1748,7 +1789,9 @@ - msgid "" - "Grabs an image of the desktop, turns it into a GL texture map, and spins it " - "around and deforms it in various ways. Written by Ben Buxton." --msgstr "從桌面上抓取畫面，轉換成 GL 組織圖，並以不同的方式旋轉與變形。由 Ben Buxton 撰寫。" -+msgstr "" -+"從桌面上抓取畫面，轉換成 GL 組織圖，並以不同的方式旋轉與變形。由 Ben Buxton " -+"撰寫。" - - #: hacks/config/flow.xml.h:1 - msgid "Allow 2D Attractors" -@@ -1827,7 +1870,9 @@ - "depending on the settings. If \"Shake Box\" is selected, then every now and " - "then, the box will be rotated, changing which direction is down (in order to " - "keep the settled balls in motion.)" --msgstr "根據設定模擬彈跳球或是氣體或流體的粒子。如果選擇「搖晃盒子」，則盒子會旋轉、改變方向等等。" -+msgstr "" -+"根據設定模擬彈跳球或是氣體或流體的粒子。如果選擇「搖晃盒子」，則盒子會旋轉、" -+"改變方向等等。" - - #: hacks/config/fluidballs.xml.h:15 - msgid "Sandpaper" -@@ -1855,8 +1900,8 @@ - - #: hacks/config/forest.xml.h:7 - msgid "" --"This draws fractal trees. Written by Peter Baumung. Everybody loves fractals, " --"right?" -+"This draws fractal trees. Written by Peter Baumung. Everybody loves " -+"fractals, right?" - msgstr "畫出分形的樹。由 Peter Baumung 撰寫。" - - #: hacks/config/galaxy.xml.h:4 -@@ -1874,8 +1919,10 @@ - #: hacks/config/galaxy.xml.h:12 - msgid "" - "This draws spinning galaxies, which then collide and scatter their stars to " --"the, uh, four winds or something. Originally an Amiga program by Uli Siegmund." --msgstr "畫出旋轉的天體，碰撞並擴散到四方。根據 Uli Siegmund 的 Amiga 程式而來。" -+"the, uh, four winds or something. Originally an Amiga program by Uli " -+"Siegmund." -+msgstr "" -+"畫出旋轉的天體，碰撞並擴散到四方。根據 Uli Siegmund 的 Amiga 程式而來。" - - #: hacks/config/gears.xml.h:3 - msgid "Gears" -@@ -1891,10 +1938,12 @@ - - #: hacks/config/gears.xml.h:9 - msgid "" --"This draws sets of turning, interlocking gears, rotating in three dimensions. " --"Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and Jamie Zawinski." -+"This draws sets of turning, interlocking gears, rotating in three " -+"dimensions. Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and Jamie " -+"Zawinski." - msgstr "" --"畫出旋轉中，互相咬合的齒輪，在三個維度上旋轉。由 Danny Sung，Brian Paul，Ed Mackey 與 Jamie Zawinski 撰寫。" -+"畫出旋轉中，互相咬合的齒輪，在三個維度上旋轉。由 Danny Sung，Brian Paul，Ed " -+"Mackey 與 Jamie Zawinski 撰寫。" - - #: hacks/config/gears.xml.h:10 - msgid "Three Gear System" -@@ -1944,12 +1993,12 @@ - - #: hacks/config/glforestfire.xml.h:3 - msgid "" --"Draws an animation of sprinkling fire-like 3D triangles in a landscape filled " --"with trees. Requires OpenGL, and a machine with fast hardware support for " --"texture maps. Written by Eric Lassauge <lassauge@mail.dotcom.fr>." -+"Draws an animation of sprinkling fire-like 3D triangles in a landscape " -+"filled with trees. Requires OpenGL, and a machine with fast hardware support " -+"for texture maps. Written by Eric Lassauge <lassauge@mail.dotcom.fr>." - msgstr "" --"畫出在充滿樹的風景中，立體三角形像煙火一樣撒落。需要 OpenGL，還有夠快的硬體支援。由 Eric Lassauge " --"<lassauge@mail.dotcom.fr> 撰寫。" -+"畫出在充滿樹的風景中，立體三角形像煙火一樣撒落。需要 OpenGL，還有夠快的硬體支" -+"援。由 Eric Lassauge <lassauge@mail.dotcom.fr> 撰寫。" - - #: hacks/config/glforestfire.xml.h:5 - msgid "Fog" -@@ -1988,10 +2037,11 @@ - msgid "" - "Draws a planet bouncing around in space. Written by David Konerding. The " - "built-in image is a map of the earth (extracted from `xearth'), but you can " --"wrap any texture around the sphere, e.g., the planetary textures that come with " --"`ssystem'." -+"wrap any texture around the sphere, e.g., the planetary textures that come " -+"with `ssystem'." - msgstr "" --"畫出一個星球在太空中彈跳。由 David Konerding 撰寫。內建的影像為地球的地圖（由 xearth 弄出來的），不過您可以用任何圖片包在球體上。" -+"畫出一個星球在太空中彈跳。由 David Konerding 撰寫。內建的影像為地球的地圖" -+"（由 xearth 弄出來的），不過您可以用任何圖片包在球體上。" - - #: hacks/config/glplanet.xml.h:3 - msgid "GLPlanet" -@@ -2014,8 +2064,8 @@ - "Draws a simulation of the Rubik's Snake puzzle. Written by Jamie Wilkinson, " - "Andrew Bennetts, and Peter Aylett." - msgstr "" --"模擬盧比克的蛇形魔術方塊（Rubik's Snake Puzzle）。由 Jamie Wilkinson，Andrew Bennetts 與 Peter " --"Aylett 撰寫。" -+"模擬盧比克的蛇形魔術方塊（Rubik's Snake Puzzle）。由 Jamie Wilkinson，Andrew " -+"Bennetts 與 Peter Aylett 撰寫。" - - #: hacks/config/glsnake.xml.h:6 - msgid "GlSnake" -@@ -2073,9 +2123,11 @@ - - #: hacks/config/goban.xml.h:2 - msgid "" --"Replays historical games of go (aka wei-chi and baduk) on the screen. By Scott " --"Draves. You can find it at <http://www.draves.org/goban/>." --msgstr "重現歷史上的圍棋棋局。由 Scott Draves 撰寫。您可以在 http://www.draves.org/goban/ 找到。" -+"Replays historical games of go (aka wei-chi and baduk) on the screen. By " -+"Scott Draves. You can find it at <http://www.draves.org/goban/>." -+msgstr "" -+"重現歷史上的圍棋棋局。由 Scott Draves 撰寫。您可以在 http://www.draves.org/" -+"goban/ 找到。" - - #: hacks/config/goop.xml.h:1 - msgid "Additive Colors (reflected light)" -@@ -2107,16 +2159,17 @@ - - #: hacks/config/goop.xml.h:14 - msgid "" --"This draws set of animating, transparent, amoeba-like blobs. The blobs change " --"shape as they wander around the screen, and they are translucent, so you can " --"see the lower blobs through the higher ones, and when one passes over another, " --"their colors merge. Written by Jamie Zawinski. I got the idea for this from a " --"cool mouse pad I have, which achieves the same kind of effect in real life by " --"having several layers plastic with colored oil between them. Written by Jamie " --"Zawinski." --msgstr "" --"畫出一些像阿米巴原蟲的，透明、蠕動的小點。小點在螢幕上漫遊時會改變形狀，因為它們是半透明的，所以您可以看到其中一隻小蟲越過另一隻身上，此時它們的顏色會合併。由 " --"Jamie Zawinski 撰寫。" -+"This draws set of animating, transparent, amoeba-like blobs. The blobs " -+"change shape as they wander around the screen, and they are translucent, so " -+"you can see the lower blobs through the higher ones, and when one passes " -+"over another, their colors merge. Written by Jamie Zawinski. I got the idea " -+"for this from a cool mouse pad I have, which achieves the same kind of " -+"effect in real life by having several layers plastic with colored oil " -+"between them. Written by Jamie Zawinski." -+msgstr "" -+"畫出一些像阿米巴原蟲的，透明、蠕動的小點。小點在螢幕上漫遊時會改變形狀，因為" -+"它們是半透明的，所以您可以看到其中一隻小蟲越過另一隻身上，此時它們的顏色會合" -+"併。由 Jamie Zawinski 撰寫。" - - #: hacks/config/goop.xml.h:15 - msgid "Transparent Blobs" -@@ -2140,9 +2193,11 @@ - - #: hacks/config/grav.xml.h:10 - msgid "" --"This program draws a simple orbital simulation. If you turn on trails, it looks " --"kind of like a cloud-chamber photograph. Written by Greg Bowering." --msgstr "畫出簡單的軌道模擬。如果將軌跡打開，會看起來像是個「雲室」的圖片。由 Greg Bowering 撰寫。" -+"This program draws a simple orbital simulation. If you turn on trails, it " -+"looks kind of like a cloud-chamber photograph. Written by Greg Bowering." -+msgstr "" -+"畫出簡單的軌道模擬。如果將軌跡打開，會看起來像是個「雲室」的圖片。由 Greg " -+"Bowering 撰寫。" - - #: hacks/config/greynetic.xml.h:2 - msgid "Greynetic" -@@ -2178,7 +2233,9 @@ - "This draws trippy psychedelic circular patterns that hurt to look at. It can " - "also animate the control-points, but that takes a lot of CPU and bandwidth. " - "Written by Jamie Zawinski." --msgstr "畫出很迷幻的圓形圖樣，盯著看會昏頭。它也可以移動控制點，不過會花很多的 CPU 時間與頻寬。由 Jamie Zawinski 撰寫。" -+msgstr "" -+"畫出很迷幻的圓形圖樣，盯著看會昏頭。它也可以移動控制點，不過會花很多的 CPU 時" -+"間與頻寬。由 Jamie Zawinski 撰寫。" - - #: hacks/config/helix.xml.h:4 - msgid "Helix" -@@ -2243,8 +2300,8 @@ - "This draws lacy fractal patterns, based on iteration in the imaginary plane, " - "from a 1986 Scientific American article. Mostly written by Patrick Naughton." - msgstr "" --"用假想的平面循環畫出有花邊的分形圖樣。這是從 1986 年的 Scientific American 中的文章而來，大部份由 Patrick Naughton " --"撰寫。" -+"用假想的平面循環畫出有花邊的分形圖樣。這是從 1986 年的 Scientific American 中" -+"的文章而來，大部份由 Patrick Naughton 撰寫。" - - #: hacks/config/hyperball.xml.h:1 hacks/config/hypercube.xml.h:1 - msgid "Far" -@@ -2260,8 +2317,8 @@ - "projection of the sequence of 3D objects which are the projections of the 4D " - "analog to the dodecahedron. Written by Joe Keane." - msgstr "" --"Hyperball 與超立方體的關係就如同十二面體與立方體的關係：它會模擬的四維的十二面體的三維投影物件，再顯示此物件投影到二維的圖樣。由 Joe Keane " --"撰寫。" -+"Hyperball 與超立方體的關係就如同十二面體與立方體的關係：它會模擬的四維的十二" -+"面體的三維投影物件，再顯示此物件投影到二維的圖樣。由 Joe Keane 撰寫。" - - #: hacks/config/hyperball.xml.h:7 hacks/config/hypercube.xml.h:6 - msgid "Near" -@@ -2305,15 +2362,16 @@ - "This displays 2D projections of the sequence of 3D objects which are the " - "projections of the 4D analog to the cube: as a square is composed of four " - "lines, each touching two others; and a cube is composed of six squares, each " --"touching four others; a hypercube is composed of eight cubes, each touching six " --"others. To make it easier to visualize the rotation, it uses a different color " --"for the edges of each face. Don't think about it too long, or your brain will " --"melt. Written by Joe Keane, Fritz Mueller, and Jamie Zawinski." --msgstr "" --"顯示模擬的 4D 立方體的 3D 投影物件，再投影到 2D " --"的圖樣：如同正方形是由四條線組成，每條線都與其他兩條線相接，立方體是由六個正方形組成，每個正方形都與其他四個相接；而超立方體是由八個立方體組成，每個立方體都與其" --"他六個立方體相接。為了方便看清它的旋轉，每一面的邊都用不同的顏色。不要思考太多，不然您的腦筋會打結。由 Joe Keane，Fritz Mueller 與 " --"Jamie Zawinski 撰寫。" -+"touching four others; a hypercube is composed of eight cubes, each touching " -+"six others. To make it easier to visualize the rotation, it uses a different " -+"color for the edges of each face. Don't think about it too long, or your " -+"brain will melt. Written by Joe Keane, Fritz Mueller, and Jamie Zawinski." -+msgstr "" -+"顯示模擬的 4D 立方體的 3D 投影物件，再投影到 2D 的圖樣：如同正方形是由四條線" -+"組成，每條線都與其他兩條線相接，立方體是由六個正方形組成，每個正方形都與其他" -+"四個相接；而超立方體是由八個立方體組成，每個立方體都與其他六個立方體相接。為" -+"了方便看清它的旋轉，每一面的邊都用不同的顏色。不要思考太多，不然您的腦筋會打" -+"結。由 Joe Keane，Fritz Mueller 與 Jamie Zawinski 撰寫。" - - #: hacks/config/ifs.xml.h:2 - msgid "IFS" -@@ -2321,8 +2379,8 @@ - - #: hacks/config/ifs.xml.h:7 - msgid "" --"This one draws spinning, colliding iterated-function-system images. Written by " --"Massimino Pascal." -+"This one draws spinning, colliding iterated-function-system images. Written " -+"by Massimino Pascal." - msgstr "畫出旋轉、碰撞的重覆功能系統的圖樣。由 Massimino Pascal 撰寫。" - - #: hacks/config/imsmap.xml.h:3 -@@ -2344,19 +2402,21 @@ - #: hacks/config/imsmap.xml.h:14 - msgid "" - "This generates random cloud-like patterns. It looks quite different in " --"monochrome and color. The basic idea is to take four points on the edge of the " --"image, and assign each a random ``elevation''. Then find the point between " --"them, and give it a value which is the average of the other four, plus some " --"small random offset. Then coloration is done based on elevation. The color " --"selection is done by binding the elevation to either hue, saturation, or " --"brightness, and assigning random values to the others. The ``brightness'' mode " --"tends to yield cloudlike patterns, and the others tend to generate images that " --"look like heat-maps or CAT-scans. Written by Juergen Nickelsen and Jamie " --"Zawinski." --msgstr "" --"產生隨機的像雲的圖樣。這在單色與彩色下顯示是相當不同的。基本的想法是取一張圖邊緣的四個點，並指定每個點一個隨機的高度。接著尋找它們之間的點，給它其他四個點的平均" --"值，再加上一點小小的隨機的偏移值。著色則是以高度為基礎，根據高度、亮度、色調、飽和度及一些隨機的數值的組合來選取使用的顏色。由 Juergen " --"Nickelsen 與 Jamie Zawinski 撰寫。" -+"monochrome and color. The basic idea is to take four points on the edge of " -+"the image, and assign each a random ``elevation''. Then find the point " -+"between them, and give it a value which is the average of the other four, " -+"plus some small random offset. Then coloration is done based on elevation. " -+"The color selection is done by binding the elevation to either hue, " -+"saturation, or brightness, and assigning random values to the others. The " -+"``brightness'' mode tends to yield cloudlike patterns, and the others tend " -+"to generate images that look like heat-maps or CAT-scans. Written by Juergen " -+"Nickelsen and Jamie Zawinski." -+msgstr "" -+"產生隨機的像雲的圖樣。這在單色與彩色下顯示是相當不同的。基本的想法是取一張圖" -+"邊緣的四個點，並指定每個點一個隨機的高度。接著尋找它們之間的點，給它其他四個" -+"點的平均值，再加上一點小小的隨機的偏移值。著色則是以高度為基礎，根據高度、亮" -+"度、色調、飽和度及一些隨機的數值的組合來選取使用的顏色。由 Juergen Nickelsen " -+"與 Jamie Zawinski 撰寫。" - - #: hacks/config/interference.xml.h:1 - msgid "Anim Speed" -@@ -2396,15 +2456,16 @@ - - #: hacks/config/jigsaw.xml.h:8 - msgid "" --"This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, and " --"then solves the puzzle. This works especially well when you feed it an external " --"video signal instead of letting it grab the screen image (actually, I guess " --"this is generally true...) When it is grabbing a video image, it is sometimes " --"pretty hard to guess what the image is going to look like once the puzzle is " --"solved. Written by Jamie Zawinski." --msgstr "" --"這個程式會抓取螢幕上的影像，切割成拼圖的樣子，將它洗牌後開始拼圖。如果您給它外部影像信號而不是讓它自己抓螢幕的圖像，效果更好。當它抓取影像時，有時會很難去猜測拼" --"好後會是什麼樣子。由 Jamie Zawinski 撰寫。" -+"This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, " -+"and then solves the puzzle. This works especially well when you feed it an " -+"external video signal instead of letting it grab the screen image (actually, " -+"I guess this is generally true...) When it is grabbing a video image, it is " -+"sometimes pretty hard to guess what the image is going to look like once the " -+"puzzle is solved. Written by Jamie Zawinski." -+msgstr "" -+"這個程式會抓取螢幕上的影像，切割成拼圖的樣子，將它洗牌後開始拼圖。如果您給它" -+"外部影像信號而不是讓它自己抓螢幕的圖像，效果更好。當它抓取影像時，有時會很難" -+"去猜測拼好後會是什麼樣子。由 Jamie Zawinski 撰寫。" - - #: hacks/config/juggle.xml.h:1 - msgid "Checkered Balls" -@@ -2435,20 +2496,20 @@ - "This one draws spinning, animating (are you detecting a pattern here yet?) " - "explorations of the Julia set. You've probably seen static images of this " - "fractal form before, but it's a lot of fun to watch in motion as well. One " --"interesting thing is that there is a small swinging dot passing in front of the " --"image, which indicates the control point from which the rest of the image was " --"generated. Written by Sean McCullough." --msgstr "" --"畫出一個旋轉的、動畫的朱利亞集合（Julia " --"set）圖樣。您也許看過靜態版的圖樣，不過看動態版的也是很好玩。一個有趣的地方在於會有一個小的活躍的點，指出由圖片其他地方產生的控制點。由 Sean " --"McCullough 撰寫。" -+"interesting thing is that there is a small swinging dot passing in front of " -+"the image, which indicates the control point from which the rest of the " -+"image was generated. Written by Sean McCullough." -+msgstr "" -+"畫出一個旋轉的、動畫的朱利亞集合（Julia set）圖樣。您也許看過靜態版的圖樣，不" -+"過看動態版的也是很好玩。一個有趣的地方在於會有一個小的活躍的點，指出由圖片其" -+"他地方產生的控制點。由 Sean McCullough 撰寫。" - - #: hacks/config/kaleidescope.xml.h:1 - msgid "" - "Another clone of an ancient meme, consisting largely of frenetic rotational " - "motion of colored lines. This one is by Ron Tapia. The motion is nice, but I " --"think it needs more solids, or perhaps just brighter colors. More variations in " --"the rotational speed might help, too." -+"think it needs more solids, or perhaps just brighter colors. More variations " -+"in the rotational speed might help, too." - msgstr "畫出許多有顏色的線條不斷地轉動。由 Ron Tapia 撰寫。" - - #: hacks/config/kaleidescope.xml.h:4 -@@ -2483,10 +2544,12 @@ - - #: hacks/config/lament.xml.h:1 - msgid "" --"Animates a simulation of Lemarchand's Box, repeatedly solving itself. Requires " --"OpenGL, and a machine with fast hardware support for texture maps. Warning: " --"occasionally opens doors. Written by Jamie Zawinski." --msgstr "模擬 Lemarchand Box 的動畫，重複自我解謎。需要 OpenGL，及夠快的硬體。由 Jamie Zawinski 撰寫。" -+"Animates a simulation of Lemarchand's Box, repeatedly solving itself. " -+"Requires OpenGL, and a machine with fast hardware support for texture maps. " -+"Warning: occasionally opens doors. Written by Jamie Zawinski." -+msgstr "" -+"模擬 Lemarchand Box 的動畫，重複自我解謎。需要 OpenGL，及夠快的硬體。由 " -+"Jamie Zawinski 撰寫。" - - #: hacks/config/lament.xml.h:3 - msgid "Lament" -@@ -2498,8 +2561,8 @@ - - #: hacks/config/laser.xml.h:7 - msgid "" --"Moving radiating lines, that look vaguely like scanning laser beams. Written by " --"Pascal Pensa. (Frankie say: relax.)" -+"Moving radiating lines, that look vaguely like scanning laser beams. Written " -+"by Pascal Pensa. (Frankie say: relax.)" - msgstr "移動的放射狀線條，有點像掃描雷射光束。由 Pascal Pensa 撰寫。" - - #: hacks/config/lightning.xml.h:2 -@@ -2508,9 +2571,10 @@ - - #: hacks/config/lightning.xml.h:7 - msgid "" --"This one draws crackling fractal lightning bolts. It's simple, direct, and to " --"the point. If only it had sound... Written by Keith Romberg." --msgstr "畫出閃電爆裂的圖形。簡單，直接。有聲音的話就更......由 Keith Romberg 撰寫。" -+"This one draws crackling fractal lightning bolts. It's simple, direct, and " -+"to the point. If only it had sound... Written by Keith Romberg." -+msgstr "" -+"畫出閃電爆裂的圖形。簡單，直接。有聲音的話就更......由 Keith Romberg 撰寫。" - - #: hacks/config/lisa.xml.h:4 - msgid "Lisa" -@@ -2522,16 +2586,17 @@ - - #: hacks/config/lisa.xml.h:11 - msgid "" --"This draws Lisajous loops, by Caleb Cullen. Remember that device they had the " --"Phantom Zone prisoners in during their trial in Superman? I think that was one " --"of these." -+"This draws Lisajous loops, by Caleb Cullen. Remember that device they had " -+"the Phantom Zone prisoners in during their trial in Superman? I think that " -+"was one of these." - msgstr "畫出 Lisajous loops。由 Caleb Cullen 撰寫。" - - #: hacks/config/lissie.xml.h:1 - msgid "" --"Another Lissajous figure. This one draws the progress of circular shapes along " --"a path. Written by Alexander Jolk." --msgstr "另一個 Lissajous 圖形。畫出一個圓形隨著一條路徑前進。由 Alexander Jolk 撰寫。" -+"Another Lissajous figure. This one draws the progress of circular shapes " -+"along a path. Written by Alexander Jolk." -+msgstr "" -+"另一個 Lissajous 圖形。畫出一個圓形隨著一條路徑前進。由 Alexander Jolk 撰寫。" - - #: hacks/config/lissie.xml.h:5 - msgid "Lissie" -@@ -2571,9 +2636,11 @@ - - #: hacks/config/lmorph.xml.h:15 - msgid "" --"This generates random spline-ish line drawings and morphs between them. Written " --"by Sverre H. Huseby and Glenn T. Lines." --msgstr "產生隨機的 spline 曲線及它們之間的形態。由 Sverre H. Huseby 與 Glenn T. Lines 撰寫。" -+"This generates random spline-ish line drawings and morphs between them. " -+"Written by Sverre H. Huseby and Glenn T. Lines." -+msgstr "" -+"產生隨機的 spline 曲線及它們之間的形態。由 Sverre H. Huseby 與 Glenn T. " -+"Lines 撰寫。" - - #: hacks/config/loop.xml.h:3 - msgid "Loop" -@@ -2632,11 +2699,11 @@ - #: hacks/config/maze.xml.h:16 - msgid "" - "This is the ancient X maze demo, modified to work with xscreensaver. It " --"generates a random maze, then solves it with visual feedback. Originally by Jim " --"Randell; modified by a cast of thousands." -+"generates a random maze, then solves it with visual feedback. Originally by " -+"Jim Randell; modified by a cast of thousands." - msgstr "" --"這是個古老的 X 迷宮展示，修改以適用於 xscreensaver。它會隨機產生一個迷宮，並找到出口路徑。原始由 Jim Randell " --"撰寫，後來由許多人修改。" -+"這是個古老的 X 迷宮展示，修改以適用於 xscreensaver。它會隨機產生一個迷宮，並" -+"找到出口路徑。原始由 Jim Randell 撰寫，後來由許多人修改。" - - #: hacks/config/menger.xml.h:6 - msgid "Menger" -@@ -2645,11 +2712,11 @@ - #: hacks/config/menger.xml.h:19 - msgid "" - "This draws the three-dimensional variant of the recursive Menger Gasket, a " --"cube-based fractal object analagous to the Sierpinski Tetrahedron. Written by " --"Jamie Zawinski." -+"cube-based fractal object analagous to the Sierpinski Tetrahedron. Written " -+"by Jamie Zawinski." - msgstr "" --"畫出一個立體的、遞迴的 Menger Gasket，以立方體組成的物件，類似 Sierpinski Tetrahedron。由 Jamie Zawinski " --"撰寫。" -+"畫出一個立體的、遞迴的 Menger Gasket，以立方體組成的物件，類似 Sierpinski " -+"Tetrahedron。由 Jamie Zawinski 撰寫。" - - #: hacks/config/moebius.xml.h:1 - msgid "" -@@ -2687,24 +2754,27 @@ - - #: hacks/config/moire.xml.h:10 - msgid "" --"This one draws cool circular interference patterns. Most of the circles you see " --"aren't explicitly rendered, but show up as a result of interactions between the " --"other pixels that were drawn. Written by Jamie Zawinski, inspired by Java code " --"by Michael Bayne. As he pointed out, the beauty of this one is that the heart " --"of the display algorithm can be expressed with just a pair of loops and a " --"handful of arithmetic, giving it a high ``display hack metric''." -+"This one draws cool circular interference patterns. Most of the circles you " -+"see aren't explicitly rendered, but show up as a result of interactions " -+"between the other pixels that were drawn. Written by Jamie Zawinski, " -+"inspired by Java code by Michael Bayne. As he pointed out, the beauty of " -+"this one is that the heart of the display algorithm can be expressed with " -+"just a pair of loops and a handful of arithmetic, giving it a high ``display " -+"hack metric''." - msgstr "" --"畫出圓圈彼此之間影響的圖樣。大部份看到的圓都不是很明確的，而是顯示出彼此互動的結果。由 Jamie Zawinski 撰寫，參考 Michael Bayne " --"的 Java 程式碼。" -+"畫出圓圈彼此之間影響的圖樣。大部份看到的圓都不是很明確的，而是顯示出彼此互動" -+"的結果。由 Jamie Zawinski 撰寫，參考 Michael Bayne 的 Java 程式碼。" - - #: hacks/config/moire2.xml.h:1 - msgid "" --"Another example of the fun you can have with moire interference patterns; this " --"hack generates fields of concentric circles or ovals, and combines the planes " --"with various operations. The planes are moving independently of one another, " --"causing the interference lines to ``spray.'' Written by Jamie Zawinski." -+"Another example of the fun you can have with moire interference patterns; " -+"this hack generates fields of concentric circles or ovals, and combines the " -+"planes with various operations. The planes are moving independently of one " -+"another, causing the interference lines to ``spray.'' Written by Jamie " -+"Zawinski." - msgstr "" --"另一個波紋圖樣的範例。產生許多同心圓或橢圓，用不同的操作將這些平面組合。平面彼此獨立移動，產生與其他平面的衝突線。由 Jamie Zawinski 撰寫。" -+"另一個波紋圖樣的範例。產生許多同心圓或橢圓，用不同的操作將這些平面組合。平面" -+"彼此獨立移動，產生與其他平面的衝突線。由 Jamie Zawinski 撰寫。" - - #: hacks/config/moire2.xml.h:4 - msgid "Moire2" -@@ -2732,11 +2802,12 @@ - - #: hacks/config/molecule.xml.h:8 - msgid "" --"Draws several different representations of molecules. Some common molecules are " --"built in, and it can also read PDB (Protein Data Base) files as input. Written " --"by Jamie Zawinski." -+"Draws several different representations of molecules. Some common molecules " -+"are built in, and it can also read PDB (Protein Data Base) files as input. " -+"Written by Jamie Zawinski." - msgstr "" --"畫出幾個不同的分子圖。有些是內建，不過您也可以讀取 PDB 檔（Protein Data Base，蛋白資料庫）。由 Jamie Zawinski 撰寫。" -+"畫出幾個不同的分子圖。有些是內建，不過您也可以讀取 PDB 檔（Protein Data " -+"Base，蛋白資料庫）。由 Jamie Zawinski 撰寫。" - - #: hacks/config/molecule.xml.h:11 - msgid "Label Atoms" -@@ -2752,8 +2823,8 @@ - - #: hacks/config/morph3d.xml.h:1 - msgid "" --"Another 3d shape-changing GL hack, by Marcelo Vianna. It has the same " --"shiny-plastic feel as Superquadrics, as many computer-generated objects do..." -+"Another 3d shape-changing GL hack, by Marcelo Vianna. It has the same shiny-" -+"plastic feel as Superquadrics, as many computer-generated objects do..." - msgstr "另一個立體的形狀變化的 GL 圖形。由 Marcelo Vianna 撰寫。" - - #: hacks/config/morph3d.xml.h:4 -@@ -2782,8 +2853,8 @@ - "ROTC 2,-22\n" - "XOR 1,2\n" - "JRST .-4\n" --"如同 HAKMEM 在 1962 年所報告的，上面的 PDP-1 程式碼由 Jackson Wright 撰寫。這些程式碼在 44 " --"年後還活在這個螢幕保護程式中。由 Tim Showalter 撰寫。" -+"如同 HAKMEM 在 1962 年所報告的，上面的 PDP-1 程式碼由 Jackson Wright 撰寫。這" -+"些程式碼在 44 年後還活在這個螢幕保護程式中。由 Tim Showalter 撰寫。" - - #: hacks/config/munch.xml.h:5 - msgid "Munch" -@@ -2817,7 +2888,9 @@ - msgid "" - "Draws different shapes composed of nervously vibrating squiggles, as if seen " - "through a camera operated by a monkey on crack. By Dan Bornstein." --msgstr "由不同形狀所組成的震動的波紋，就好像一隻猴子拿著照相機。由 Dan Bornstein 撰寫。" -+msgstr "" -+"由不同形狀所組成的震動的波紋，就好像一隻猴子拿著照相機。由 Dan Bornstein 撰" -+"寫。" - - #: hacks/config/nerverot.xml.h:10 - msgid "Frequent" -@@ -2843,11 +2916,12 @@ - msgid "" - "A little man with a big nose wanders around your screen saying things. The " - "things which he says can come from a file, or from an external program like " --"`zippy' or `fortune'. This was extracted from `xnlock' by Dan Heller. Colorized " --"by Jamie Zawinski." -+"`zippy' or `fortune'. This was extracted from `xnlock' by Dan Heller. " -+"Colorized by Jamie Zawinski." - msgstr "" --"一個大鼻子的小人在螢幕上亂跑，然後講話。小人說的話可以從檔案讀出，或是從類似 zippy 或 fortune 的程式產生。這是由 Dan Heller 從 " --"xnlock 弄出來，由 Jamie Zawinski 著色。" -+"一個大鼻子的小人在螢幕上亂跑，然後講話。小人說的話可以從檔案讀出，或是從類似 " -+"zippy 或 fortune 的程式產生。這是由 Dan Heller 從 xnlock 弄出來，由 Jamie " -+"Zawinski 著色。" - - #: hacks/config/noseguy.xml.h:2 - msgid "Get Text from File" -@@ -2881,11 +2955,12 @@ - #: hacks/config/pedal.xml.h:8 - msgid "" - "This is sort of a combination spirograph/string-art. It generates a large, " --"complex polygon, and lets the X server do the bulk of the work by giving it an " --"even/odd winding rule. Written by Dale Moore, based on some ancient PDP-11 " --"code." -+"complex polygon, and lets the X server do the bulk of the work by giving it " -+"an even/odd winding rule. Written by Dale Moore, based on some ancient PDP-" -+"11 code." - msgstr "" --"產生一個很大的、很複雜的多邊形，給它一個盤繞的規則，讓 X 伺服器做剩下的工作。由 Dale Moore 根據一些古老的 PDP-11 撰寫。" -+"產生一個很大的、很複雜的多邊形，給它一個盤繞的規則，讓 X 伺服器做剩下的工作。" -+"由 Dale Moore 根據一些古老的 PDP-11 撰寫。" - - #: hacks/config/penetrate.xml.h:1 - msgid "Always play well" -@@ -2918,19 +2993,21 @@ - "Draws quasiperiodic tilings; think of the implications on modern formica " - "technology. Written by Timo Korvola. In April 1997, Sir Roger Penrose, a " - "British math professor who has worked with Stephen Hawking on such topics as " --"relativity, black holes, and whether time has a beginning, filed a " --"copyright-infringement lawsuit against the Kimberly-Clark Corporation, which " --"Penrose said copied a pattern he created (a pattern demonstrating that ``a " -+"relativity, black holes, and whether time has a beginning, filed a copyright-" -+"infringement lawsuit against the Kimberly-Clark Corporation, which Penrose " -+"said copied a pattern he created (a pattern demonstrating that ``a " - "nonrepeating pattern could exist in nature'') for its Kleenex quilted toilet " - "paper. Penrose said he doesn't like litigation but, ``When it comes to the " - "population of Great Britain being invited by a multinational to wipe their " - "bottoms on what appears to be the work of a Knight of the Realm, then a last " - "stand must be taken.'' As reported by News of the Weird #491, 4-jul-1997." - msgstr "" --"畫出半週期的磚狀。由 Timo Korvola 撰寫。根據 News of the Wierd 第 491 期，1997 年七月四日的報導，在 1997 " --"年四月，Roger Penrose，一位英國的數學教授，控告 Kimberly-Clark 公司所生產的 Kleenex " --"牌衛生紙上的圖案抄襲自一種他所創造的圖案，這個圖案展示「自然界存在的不重覆的樣式」。Penrose " --"表示他並不喜歡訴訟，但是「這個產品來到大不列顛後，此地的人民可能被這間跨國公司推薦用他們國家的爵士辛勤工作出來的結果擦屁股，一想到這一點就不得不採取行動。」" -+"畫出半週期的磚狀。由 Timo Korvola 撰寫。根據 News of the Wierd 第 491 期，" -+"1997 年七月四日的報導，在 1997 年四月，Roger Penrose，一位英國的數學教授，控" -+"告 Kimberly-Clark 公司所生產的 Kleenex 牌衛生紙上的圖案抄襲自一種他所創造的圖" -+"案，這個圖案展示「自然界存在的不重覆的樣式」。Penrose 表示他並不喜歡訴訟，但" -+"是「這個產品來到大不列顛後，此地的人民可能被這間跨國公司推薦用他們國家的爵士" -+"辛勤工作出來的結果擦屁股，一想到這一點就不得不採取行動。」" - - #: hacks/config/penrose.xml.h:9 - msgid "Penrose" -@@ -3005,14 +3082,18 @@ - "This simulates colonies of mold growing in a petri dish. Growing colored " - "circles overlap and leave spiral interference in their wake. Written by Dan " - "Bornstein." --msgstr "模擬一群霉菌在培養皿中生長的樣子。彩色的圈圈成長、重疊，然後彼此碰撞產生螺旋狀的線條。由 Dan Bornstein 撰寫。" -+msgstr "" -+"模擬一群霉菌在培養皿中生長的樣子。彩色的圈圈成長、重疊，然後彼此碰撞產生螺旋" -+"狀的線條。由 Dan Bornstein 撰寫。" - - #: hacks/config/phosphor.xml.h:1 - msgid "" - "Draws a simulation of an old terminal, with large pixels and long-sustain " --"phosphor. It can run any program as a source of the text it displays. Written " --"by Jamie Zawinski." --msgstr "模擬古老的終端機輸出，有大顆的像素與磷光體。可以接受任何程式的輸出做為顯示。由 Jamie Zawinski 撰寫。" -+"phosphor. It can run any program as a source of the text it displays. " -+"Written by Jamie Zawinski." -+msgstr "" -+"模擬古老的終端機輸出，有大顆的像素與磷光體。可以接受任何程式的輸出做為顯示。" -+"由 Jamie Zawinski 撰寫。" - - #: hacks/config/phosphor.xml.h:2 - msgid "Fade" -@@ -3048,9 +3129,11 @@ - - #: hacks/config/pipes.xml.h:8 - msgid "" --"If you've ever been in the same room with a Windows NT machine, you've probably " --"seen this GL hack. This version is by Marcelo Vianna." --msgstr "如果您曾經與 Windows NT 共處一室，您應該看過這個螢幕保護程式。這個版本由 Marcelo Vianna 撰寫。" -+"If you've ever been in the same room with a Windows NT machine, you've " -+"probably seen this GL hack. This version is by Marcelo Vianna." -+msgstr "" -+"如果您曾經與 Windows NT 共處一室，您應該看過這個螢幕保護程式。這個版本由 " -+"Marcelo Vianna 撰寫。" - - #: hacks/config/pipes.xml.h:9 - msgid "Lots" -@@ -3084,7 +3167,8 @@ - msgid "" - "Repeatedly attempts to completely fill a rectangle with irregularly-shaped " - "puzzle pieces. Written by Stephen Montgomery-Smith." --msgstr "不斷重覆試圖用不規則形來填入一個矩形。由 Stephen Montgomery-Smith 撰寫。" -+msgstr "" -+"不斷重覆試圖用不規則形來填入一個矩形。由 Stephen Montgomery-Smith 撰寫。" - - #: hacks/config/pulsar.xml.h:1 - msgid "Anti-alias Lines" -@@ -3093,11 +3177,12 @@ - #: hacks/config/pulsar.xml.h:3 - msgid "" - "Draws some intersecting planes, making use of alpha blending, fog, textures, " --"and mipmaps, plus a ``frames per second'' meter so that you can tell how fast " --"your graphics card is... Requires OpenGL. Written by David Konerding." -+"and mipmaps, plus a ``frames per second'' meter so that you can tell how " -+"fast your graphics card is... Requires OpenGL. Written by David Konerding." - msgstr "" --"畫出一些交錯的平面，應用透明度混合、霧狀、紋理組合與位圖，加上一個「每秒幾張」的量度讓您知道您的顯示卡速度有多快。需要 OpenGL，由 David " --"Konerding 撰寫。" -+"畫出一些交錯的平面，應用透明度混合、霧狀、紋理組合與位圖，加上一個「每秒幾" -+"張」的量度讓您知道您的顯示卡速度有多快。需要 OpenGL，由 David Konerding 撰" -+"寫。" - - #: hacks/config/pulsar.xml.h:4 - msgid "Enable Blending" -@@ -3166,7 +3251,7 @@ - #: hacks/config/pyro.xml.h:11 - msgid "" - "Pyro draws exploding fireworks. Blah blah blah. Written by Jamie Zawinski." --msgstr "畫出爆炸的煙火...等等。由 Jamie Zawinski 撰寫。" -+msgstr "畫出爆炸的煙火…等等。由 Jamie Zawinski 撰寫。" - - #: hacks/config/qix.xml.h:1 - msgid "Additive Colors" -@@ -3203,11 +3288,12 @@ - #: hacks/config/qix.xml.h:24 - msgid "" - "This is the swiss army chainsaw of qix programs. It bounces a series of line " --"segments around the screen, and uses variations on this basic motion pattern to " --"produce all sorts of different presentations: line segments, filled polygons, " --"overlapping translucent areas... Written by Jamie Zawinski." -+"segments around the screen, and uses variations on this basic motion pattern " -+"to produce all sorts of different presentations: line segments, filled " -+"polygons, overlapping translucent areas... Written by Jamie Zawinski." - msgstr "" --"讓一系列線段在螢幕裡彈跳，使用多種基本的移動樣式來產生各種不同的表現：線段、多邊形與重疊半透明區域等等。由 Jamie Zawinski 撰寫。" -+"讓一系列線段在螢幕裡彈跳，使用多種基本的移動樣式來產生各種不同的表現：線段、" -+"多邊形與重疊半透明區域等等。由 Jamie Zawinski 撰寫。" - - #: hacks/config/qix.xml.h:25 - msgid "Transparent" -@@ -3229,12 +3315,12 @@ - - #: hacks/config/rd-bomb.xml.h:7 - msgid "" --"Another variation of the `Bomb' program by Scott Draves. This draws a grid of " --"growing square-like shapes that, once they overtake each other, react in " -+"Another variation of the `Bomb' program by Scott Draves. This draws a grid " -+"of growing square-like shapes that, once they overtake each other, react in " - "unpredictable ways. ``RD'' stands for reaction-diffusion." - msgstr "" --"由 Scott Draves 所撰寫的 Bomb 程式的變形。畫出成長的方格狀，一但重疊則會以不可預測的方式反應。RD " --"指的是反應擴散（Reaction-Diffusion）。" -+"由 Scott Draves 所撰寫的 Bomb 程式的變形。畫出成長的方格狀，一但重疊則會以不" -+"可預測的方式反應。RD 指的是反應擴散（Reaction-Diffusion）。" - - #: hacks/config/rd-bomb.xml.h:8 - msgid "Epoch" -@@ -3306,10 +3392,12 @@ - - #: hacks/config/ripples.xml.h:14 - msgid "" --"This draws rippling interference patterns like splashing water. With the -water " --"option, it manipulates your desktop image to look like something is dripping " --"into it. Written by Tom Hammersley." --msgstr "畫出水花濺起，漣漪相互交錯的圖樣。使用 -water 選項的話，它會用您的桌面圖樣來「滴水」下去。由 Tom Hammersley 撰寫。" -+"This draws rippling interference patterns like splashing water. With the -" -+"water option, it manipulates your desktop image to look like something is " -+"dripping into it. Written by Tom Hammersley." -+msgstr "" -+"畫出水花濺起，漣漪相互交錯的圖樣。使用 -water 選項的話，它會用您的桌面圖樣來" -+"「滴水」下去。由 Tom Hammersley 撰寫。" - - #: hacks/config/rocks.xml.h:7 - msgid "Rocks" -@@ -3328,7 +3416,9 @@ - "This draws an animation of flight through an asteroid field, with changes in " - "rotation and direction. It can also display 3D separations for red/blue " - "glasses! Mostly written by Jamie Zawinski." --msgstr "飛越小行星群的動畫，並且會旋轉與改變方向。它也可以顯示透過紅/藍眼鏡呈現的立體圖樣。大部份由 Jamie Zawinski 撰寫。" -+msgstr "" -+"飛越小行星群的動畫，並且會旋轉與改變方向。它也可以顯示透過紅/藍眼鏡呈現的立體" -+"圖樣。大部份由 Jamie Zawinski 撰寫。" - - #: hacks/config/rorschach.xml.h:7 - msgid "Rorschach" -@@ -3336,14 +3426,14 @@ - - #: hacks/config/rorschach.xml.h:9 - msgid "" --"This generates random inkblot patterns. The algorithm is deceptively simple for " --"how well it works; it merely walks a dot around the screen randomly, and then " --"reflects the image horizontally, vertically, or both. Any deep-seated neurotic " --"tendencies which this program reveals are your own problem. Written by Jamie " --"Zawinski." -+"This generates random inkblot patterns. The algorithm is deceptively simple " -+"for how well it works; it merely walks a dot around the screen randomly, and " -+"then reflects the image horizontally, vertically, or both. Any deep-seated " -+"neurotic tendencies which this program reveals are your own problem. Written " -+"by Jamie Zawinski." - msgstr "" --"產生隨機的墨水斑點圖樣。這個演算法看來很小，但實際上卻運作得很好：它只是讓一個點在螢幕上隨機走動，然後水平、垂直反射圖像。由 Jamie Zawinski " --"撰寫。" -+"產生隨機的墨水斑點圖樣。這個演算法看來很小，但實際上卻運作得很好：它只是讓一" -+"個點在螢幕上隨機走動，然後水平、垂直反射圖像。由 Jamie Zawinski 撰寫。" - - #: hacks/config/rorschach.xml.h:10 - msgid "With X Symmetry" -@@ -3355,10 +3445,12 @@ - - #: hacks/config/rotor.xml.h:1 - msgid "" --"Another ancient xlock demo, this one by Tom Lawrence. It draws a line segment " --"moving along a complex spiraling curve. I tweaked this to generate curvier " --"lines, but still frames of it don't look like much." --msgstr "古老的 xlock 的展示範例，由 Tom Lawrence 撰寫。畫出一條線段，沿著一個複雜的螺旋曲線移動。" -+"Another ancient xlock demo, this one by Tom Lawrence. It draws a line " -+"segment moving along a complex spiraling curve. I tweaked this to generate " -+"curvier lines, but still frames of it don't look like much." -+msgstr "" -+"古老的 xlock 的展示範例，由 Tom Lawrence 撰寫。畫出一條線段，沿著一個複雜的螺" -+"旋曲線移動。" - - #: hacks/config/rotor.xml.h:4 hacks/config/wander.xml.h:9 - msgid "Length" -@@ -3376,7 +3468,8 @@ - msgid "" - "Creates a collage of rotated and scaled portions of the screen. Written by " - "Claudio Matsuoka." --msgstr "用螢幕的某部份去旋轉與調整大小來產生一幅拼貼畫。由 Claudio Matsuoka 撰寫。" -+msgstr "" -+"用螢幕的某部份去旋轉與調整大小來產生一幅拼貼畫。由 Claudio Matsuoka 撰寫。" - - #: hacks/config/rotzoomer.xml.h:6 - msgid "Rectangle Count" -@@ -3400,8 +3493,8 @@ - - #: hacks/config/rubik.xml.h:2 - msgid "" --"Draws a Rubik's Cube that rotates in three dimensions and repeatedly shuffles " --"and solves itself. Another fine GL hack by Marcelo Vianna." -+"Draws a Rubik's Cube that rotates in three dimensions and repeatedly " -+"shuffles and solves itself. Another fine GL hack by Marcelo Vianna." - msgstr "畫出立體的魔術方塊，重覆打亂然後解開。由 Marcelo Vianna。" - - #: hacks/config/rubik.xml.h:5 -@@ -3423,11 +3516,11 @@ - #: hacks/config/sballs.xml.h:3 - msgid "" - "Draws an animation of textured balls spinning like crazy in GL. Requires " --"OpenGL, and a machine with fast hardware support for texture maps. Written by " --"Eric Lassauge <lassauge@mail.dotcom.fr>." -+"OpenGL, and a machine with fast hardware support for texture maps. Written " -+"by Eric Lassauge <lassauge@mail.dotcom.fr>." - msgstr "" --"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL，及夠快的硬體。由 Eric Lassauge <lassauge@mail.dotcom.fr> " --"撰寫。" -+"畫出一些有花紋的球瘋狂地旋轉。需要 OpenGL，及夠快的硬體。由 Eric Lassauge " -+"<lassauge@mail.dotcom.fr> 撰寫。" - - #: hacks/config/sballs.xml.h:5 - msgid "Icosahedron" -@@ -3467,8 +3560,8 @@ - - #: hacks/config/shadebobs.xml.h:11 - msgid "" --"This draws smoothly-shaded oscilating oval patterns, that look something like " --"vapor trails or neon tubes. Written by Shane Smit." -+"This draws smoothly-shaded oscilating oval patterns, that look something " -+"like vapor trails or neon tubes. Written by Shane Smit." - msgstr "畫出一些看起來像是霓虹燈管或是飛機雲那樣的圖樣。由 Shane Smit 撰寫。" - - #: hacks/config/sierpinski.xml.h:6 -@@ -3487,9 +3580,11 @@ - - #: hacks/config/sierpinski3d.xml.h:11 - msgid "" --"This draws the three-dimensional variant of the recursive Sierpinski triangle " --"fractal, using GL. Written by Tim Robinson and Jamie Zawinski." --msgstr "使用 GL 畫出三維的遞迴 Sierpinski 三角形圖樣。由 Tim Robinson 與 Jamie Zawinski 撰寫。" -+"This draws the three-dimensional variant of the recursive Sierpinski " -+"triangle fractal, using GL. Written by Tim Robinson and Jamie Zawinski." -+msgstr "" -+"使用 GL 畫出三維的遞迴 Sierpinski 三角形圖樣。由 Tim Robinson 與 Jamie " -+"Zawinski 撰寫。" - - #: hacks/config/slidescreen.xml.h:1 hacks/config/twang.xml.h:1 - #: hacks/config/zoom.xml.h:1 -@@ -3512,8 +3607,9 @@ - "those puzzles, but watching one permute itself is more amusing. Written by " - "Jamie Zawinski." - msgstr "" --"取得一張圖片，切成小格，然後打亂，做成像是 Fifteen " --"之類的遊戲，也就是將其中一個小格拿掉，讓其它的來拼湊。解這種謎是很討厭的，不過看它自己在那裡排列組合比較好玩。由 Jamie Zawinski 撰寫。" -+"取得一張圖片，切成小格，然後打亂，做成像是 Fifteen 之類的遊戲，也就是將其中一" -+"個小格拿掉，讓其它的來拼湊。解這種謎是很討厭的，不過看它自己在那裡排列組合比" -+"較好玩。由 Jamie Zawinski 撰寫。" - - #: hacks/config/slip.xml.h:6 - msgid "Slip" -@@ -3521,15 +3617,18 @@ - - #: hacks/config/slip.xml.h:10 - msgid "" --"This program throws some random bits on the screen, then sucks them through a " --"jet engine and spews them out the other side. To avoid turning the image " -+"This program throws some random bits on the screen, then sucks them through " -+"a jet engine and spews them out the other side. To avoid turning the image " - "completely to mush, every now and then it will and then it interjects some " --"splashes of color into the scene, or go into a spin cycle, or stretch the image " --"like taffy, or (this is my addition) grab an image of your current desktop to " --"chew on. Originally written by Scott Draves; whacked on by Jamie Zawinski." -+"splashes of color into the scene, or go into a spin cycle, or stretch the " -+"image like taffy, or (this is my addition) grab an image of your current " -+"desktop to chew on. Originally written by Scott Draves; whacked on by Jamie " -+"Zawinski." - msgstr "" --"這個程式隨機丟一些小點在螢幕上，然後用一個噴射引擎開始將它們吸入，再吐到另一邊。要避免影像會完全變糊掉，它偶而會插入一些顏色斑點在裡面，或是進入一個旋轉的循環，" --"或是將影像延展成像個太妃糖那樣，或是重新從您的桌面抓影像來玩。原始由 Scott Draves 撰寫，並由 Jamie Zawinski 改寫。" -+"這個程式隨機丟一些小點在螢幕上，然後用一個噴射引擎開始將它們吸入，再吐到另一" -+"邊。要避免影像會完全變糊掉，它偶而會插入一些顏色斑點在裡面，或是進入一個旋轉" -+"的循環，或是將影像延展成像個太妃糖那樣，或是重新從您的桌面抓影像來玩。原始由 " -+"Scott Draves 撰寫，並由 Jamie Zawinski 改寫。" - - #: hacks/config/sonar.xml.h:1 - msgid "Ping Subnet" -@@ -3555,13 +3654,15 @@ - msgid "" - "This program draws a simulation of a sonar screen. Written by default, it " - "displays a random assortment of ``bogies'' on the screen, but if compiled " --"properly, it can ping (pun intended) your local network, and actually plot the " --"proximity of the other hosts on your network to you. It would be easy to make " --"it monitor other sources of data, too. (Processes? Active network connections? " --"CPU usage per user?) Written by Stephen Martin." --msgstr "" --"這個程式模擬一個聲納螢幕。預設會在螢幕上隨機顯示一些「怪物」，但是如果編譯時有加入一些選項，可以測試您的子網，將網路上其他鄰近您的主機畫在螢幕上。這也可以很容易" --"地用來監測其他來源的資料。（像是行程啦，網路連線啦，CPU 使用率啦之類的......吧？）由 Stephen Martin 撰寫。" -+"properly, it can ping (pun intended) your local network, and actually plot " -+"the proximity of the other hosts on your network to you. It would be easy to " -+"make it monitor other sources of data, too. (Processes? Active network " -+"connections? CPU usage per user?) Written by Stephen Martin." -+msgstr "" -+"這個程式模擬一個聲納螢幕。預設會在螢幕上隨機顯示一些「怪物」，但是如果編譯時" -+"有加入一些選項，可以測試您的子網，將網路上其他鄰近您的主機畫在螢幕上。這也可" -+"以很容易地用來監測其他來源的資料。（像是行程啦，網路連線啦，CPU 使用率啦之類" -+"的......吧？）由 Stephen Martin 撰寫。" - - #: hacks/config/sonar.xml.h:7 - msgid "vs." -@@ -3593,8 +3694,8 @@ - - #: hacks/config/speedmine.xml.h:12 - msgid "" --"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written by " --"Conrad Parker." -+"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written " -+"by Conrad Parker." - msgstr "模擬快速通過許多岩礦，或是一條跳舞的蟲。由 Conrad Parker 撰寫。" - - #: hacks/config/speedmine.xml.h:16 -@@ -3611,10 +3712,12 @@ - - #: hacks/config/sphere.xml.h:1 - msgid "" --"Another of the classic screenhacks of the distant past, this one draws shaded " --"spheres in multiple colors. This hack traces its lineage back to Tom Duff in " --"1982." --msgstr "傳統的螢幕保護程式。畫出許多不同顏色的遮蔽球體。這個螢幕保護程式可以追溯到 1982 年，由 Tom Duff 所撰寫。" -+"Another of the classic screenhacks of the distant past, this one draws " -+"shaded spheres in multiple colors. This hack traces its lineage back to Tom " -+"Duff in 1982." -+msgstr "" -+"傳統的螢幕保護程式。畫出許多不同顏色的遮蔽球體。這個螢幕保護程式可以追溯到 " -+"1982 年，由 Tom Duff 所撰寫。" - - #: hacks/config/sphere.xml.h:7 - msgid "Sphere" -@@ -3626,16 +3729,17 @@ - - #: hacks/config/sphereEversion.xml.h:2 - msgid "" --"SphereEversion draws an animation of a sphere being turned inside out. A sphere " --"can be turned inside out, without any tears, sharp creases or discontinuities, " --"if the surface of the sphere is allowed to intersect itself. This program " --"animates what is known as the Thurston Eversion. Written by Nathaniel Thurston " --"and Michael McGuffin. This program is not included with the XScreenSaver " --"package, but if you don't have it already, you can find it at " --"<http://www.dgp.utoronto.ca/~mjmcguff/eversion/>." --msgstr "" --"SphereEversion 畫出內外翻轉的球體。如果球體表面可以與它自己交錯，那它可以自由翻轉，不會有皺折或不連續的狀況。這個程式將所謂的 Thurston " --"Eversion 動畫化，由 Nathaniel Thurston 與 Michael McGuffin 撰寫。這個程式不含在 XScreenSaver " -+"SphereEversion draws an animation of a sphere being turned inside out. A " -+"sphere can be turned inside out, without any tears, sharp creases or " -+"discontinuities, if the surface of the sphere is allowed to intersect " -+"itself. This program animates what is known as the Thurston Eversion. " -+"Written by Nathaniel Thurston and Michael McGuffin. This program is not " -+"included with the XScreenSaver package, but if you don't have it already, " -+"you can find it at <http://www.dgp.utoronto.ca/~mjmcguff/eversion/>." -+msgstr "" -+"SphereEversion 畫出內外翻轉的球體。如果球體表面可以與它自己交錯，那它可以自由" -+"翻轉，不會有皺折或不連續的狀況。這個程式將所謂的 Thurston Eversion 動畫化，" -+"由 Nathaniel Thurston 與 Michael McGuffin 撰寫。這個程式不含在 XScreenSaver " - "中，但是您可以在 http://www.dgp.utoronto.ca/~mjmcguff/eversion/ 中找到。" - - #: hacks/config/spheremonics.xml.h:9 -@@ -3652,14 +3756,14 @@ - - #: hacks/config/spheremonics.xml.h:24 - msgid "" --"These closed objects are commonly called spherical harmonics, although they are " --"only remotely related to the mathematical definition found in the solution to " --"certain wave functions, most notable the eigenfunctions of angular momentum " --"operators. Written by Paul Bourke and Jamie Zawinski." --msgstr "" --"這個封閉的物體通常又叫做「球函數」（spherical " --"harmonics），雖然它們跟數學定義上一些特定的波形函數，如處理角動量的特征函數（eigenfunction）只有一點點關係而已。由 Paul " --"Bourke 與 Jamie Zawinski 撰寫。" -+"These closed objects are commonly called spherical harmonics, although they " -+"are only remotely related to the mathematical definition found in the " -+"solution to certain wave functions, most notable the eigenfunctions of " -+"angular momentum operators. Written by Paul Bourke and Jamie Zawinski." -+msgstr "" -+"這個封閉的物體通常又叫做「球函數」（spherical harmonics），雖然它們跟數學定義" -+"上一些特定的波形函數，如處理角動量的特征函數（eigenfunction）只有一點點關係而" -+"已。由 Paul Bourke 與 Jamie Zawinski 撰寫。" - - #: hacks/config/spiral.xml.h:2 - msgid "Cycles" -@@ -3679,7 +3783,8 @@ - msgid "" - "Draws a spotlight scanning across a black screen, illumnating the underlying " - "desktop when it passes. Written by Rick Schultz." --msgstr "在黑色螢幕上打出探照光，並畫出光照射到的桌面圖樣。由 Rick Schultz 撰寫。" -+msgstr "" -+"在黑色螢幕上打出探照光，並畫出光照射到的桌面圖樣。由 Rick Schultz 撰寫。" - - #: hacks/config/spotlight.xml.h:6 - msgid "Spotlight" -@@ -3695,10 +3800,12 @@ - - #: hacks/config/squiral.xml.h:3 - msgid "" --"Draws a set of interacting, square-spiral-producing automata. The spirals grow " --"outward until they hit something, then they go around it. Written by Jeff " --"Epler." --msgstr "畫出一些互動的方形螺旋自動機。螺旋會往外生長，直到碰到東西，然後繞著它移動。由 Jeff Epler 撰寫。" -+"Draws a set of interacting, square-spiral-producing automata. The spirals " -+"grow outward until they hit something, then they go around it. Written by " -+"Jeff Epler." -+msgstr "" -+"畫出一些互動的方形螺旋自動機。螺旋會往外生長，直到碰到東西，然後繞著它移動。" -+"由 Jeff Epler 撰寫。" - - #: hacks/config/squiral.xml.h:5 - msgid "Handedness" -@@ -3730,23 +3837,24 @@ - "planets and a few major satellites, with four camera modes. Written by Raul " - "Alonso. This is not included with the XScreenSaver package, but is packaged " - "separately. Note: SSystem does not work as a screen saver on all systems, " --"because it doesn't communicate with xscreensaver properly. It happens to work " --"with some window managers, but not with others, so your mileage may vary. " --"SSystem was once available at <http://www1.las.es/~amil/ssystem/>, but is " --"now gone. You may still be able to find copies elsewhere. SSystem has since " --"evolved into two different programs: OpenUniverse " --"(http://openuniverse.sourceforge.net/) and Celestia " --"(http://www.shatters.net/celestia/). Sadly, neither of these programs work with " --"xscreensaver at all. You are encouraged to nag their authors into adding " --"xscreensaver support!" --msgstr "" --"S 系統是一個 GL 太陽系模擬器。它用四支攝影機的模式模擬飛越太陽與九大行星及一些小衛星。由 Raul Alonso 撰寫。這個程式不在 " --"XScreenSaver 中。注意：S 系統在一些系統上可能沒辦法做螢幕保護程式，因為它無法與 xscreensaver " --"溝通得很好。它只能在某些視窗管理員之下運作。S 系統本來在 http://www1.las.es/~amil/ssystem/ " --"可以取得，不過現在找不到了。您可能可以在其他地方找到。後來 S 系統發展成兩個不同的程式：OpenUniverse " --"（http://openuniverse.sourceforge.net/）及 " --"Celestia（http://www.shatters.net/celestia/）。可惜的是，這些程式也不能跟 xscreensaver " --"合作得很好。您可以幫忙去「嘮叨」這些程式的作者，讓它們加入 xscreensaver 的支援！" -+"because it doesn't communicate with xscreensaver properly. It happens to " -+"work with some window managers, but not with others, so your mileage may " -+"vary. SSystem was once available at <http://www1.las.es/~amil/ssystem/" -+">, but is now gone. You may still be able to find copies elsewhere. " -+"SSystem has since evolved into two different programs: OpenUniverse (http://" -+"openuniverse.sourceforge.net/) and Celestia (http://www.shatters.net/" -+"celestia/). Sadly, neither of these programs work with xscreensaver at all. " -+"You are encouraged to nag their authors into adding xscreensaver support!" -+msgstr "" -+"S 系統是一個 GL 太陽系模擬器。它用四支攝影機的模式模擬飛越太陽與九大行星及一" -+"些小衛星。由 Raul Alonso 撰寫。這個程式不在 XScreenSaver 中。注意：S 系統在一" -+"些系統上可能沒辦法做螢幕保護程式，因為它無法與 xscreensaver 溝通得很好。它只" -+"能在某些視窗管理員之下運作。S 系統本來在 http://www1.las.es/~amil/ssystem/ 可" -+"以取得，不過現在找不到了。您可能可以在其他地方找到。後來 S 系統發展成兩個不同" -+"的程式：OpenUniverse （http://openuniverse.sourceforge.net/）及 Celestia" -+"（http://www.shatters.net/celestia/）。可惜的是，這些程式也不能跟 " -+"xscreensaver 合作得很好。您可以幫忙去「嘮叨」這些程式的作者，讓它們加入 " -+"xscreensaver 的支援！" - - #: hacks/config/stairs.xml.h:6 - msgid "Stairs" -@@ -3773,11 +3881,12 @@ - #: hacks/config/starfish.xml.h:13 - msgid "" - "This generates a sequence of undulating, throbbing, star-like patterns which " --"pulsate, rotate, and turn inside out. Another display mode uses these shapes to " --"lay down a field of colors, which are then cycled. The motion is very organic. " --"Written by Jamie Zawinski." -+"pulsate, rotate, and turn inside out. Another display mode uses these shapes " -+"to lay down a field of colors, which are then cycled. The motion is very " -+"organic. Written by Jamie Zawinski." - msgstr "" --"產生一系列波浪狀、跳動的星形圖樣，並旋轉與內外翻轉。另一個顯示模式則是使用這些形狀來著色，然後循環。動作非常自然。由 Jamie Zawinski 撰寫。" -+"產生一系列波浪狀、跳動的星形圖樣，並旋轉與內外翻轉。另一個顯示模式則是使用這" -+"些形狀來著色，然後循環。動作非常自然。由 Jamie Zawinski 撰寫。" - - #: hacks/config/starwars.xml.h:2 - msgid "Anti-aliased Lines" -@@ -3789,11 +3898,12 @@ - - #: hacks/config/starwars.xml.h:4 - msgid "" --"Draws a stream of text slowly scrolling into the distance at an angle, over a " --"star field, like at the beginning of the movie of the same name. Written by " --"Jamie Zawinski and Claudio Matauoka." -+"Draws a stream of text slowly scrolling into the distance at an angle, over " -+"a star field, like at the beginning of the movie of the same name. Written " -+"by Jamie Zawinski and Claudio Matauoka." - msgstr "" --"畫出一串文字，慢慢地以一個角度捲到螢幕中的星空深處，像是電影星際大戰的開頭一樣。由 Jamie Zawinski 與 Claudio Matauoka 撰寫。" -+"畫出一串文字，慢慢地以一個角度捲到螢幕中的星空深處，像是電影星際大戰的開頭一" -+"樣。由 Jamie Zawinski 與 Claudio Matauoka 撰寫。" - - #: hacks/config/starwars.xml.h:5 - msgid "Fade Out" -@@ -3837,13 +3947,16 @@ - - #: hacks/config/starwars.xml.h:19 - msgid "Wrap Long Lines" --msgstr "換行" -+msgstr "換列" - - #: hacks/config/stonerview.xml.h:1 - msgid "" --"Chains of colorful squares dance around each other in complex spiral patterns. " --"Written by Andrew Plotkin, based on SGI's `electropaint' screensaver." --msgstr "許多串彩色方塊形成複雜的螺旋狀圖樣，然後一起跳舞。由 Andrew Plotkin 參考 electropaint 螢幕保護程式撰寫。" -+"Chains of colorful squares dance around each other in complex spiral " -+"patterns. Written by Andrew Plotkin, based on SGI's `electropaint' " -+"screensaver." -+msgstr "" -+"許多串彩色方塊形成複雜的螺旋狀圖樣，然後一起跳舞。由 Andrew Plotkin 參考 " -+"electropaint 螢幕保護程式撰寫。" - - #: hacks/config/stonerview.xml.h:3 - msgid "StonerView" -@@ -3859,18 +3972,21 @@ - - #: hacks/config/strange.xml.h:10 - msgid "" --"This draws strange attractors: it's a colorful, unpredictably-animating field " --"of dots that swoops and twists around. The motion is very nice. Written by " --"Massimino Pascal." --msgstr "許多彩色的，有生命的，無法預測的點飛撲、扭轉。動作做得很棒。由 Massimino Pascal 撰寫。" -+"This draws strange attractors: it's a colorful, unpredictably-animating " -+"field of dots that swoops and twists around. The motion is very nice. " -+"Written by Massimino Pascal." -+msgstr "" -+"許多彩色的，有生命的，無法預測的點飛撲、扭轉。動作做得很棒。由 Massimino " -+"Pascal 撰寫。" - - #: hacks/config/superquadrics.xml.h:2 - msgid "" --"Ed Mackey reports that he wrote the first version of this program in BASIC on a " --"Commodore 64 in 1987, as a 320x200 black and white wireframe. Now it is GL and " --"has specular reflections." -+"Ed Mackey reports that he wrote the first version of this program in BASIC " -+"on a Commodore 64 in 1987, as a 320x200 black and white wireframe. Now it is " -+"GL and has specular reflections." - msgstr "" --"立體形狀。Ed Mackey 在 1987 年用 Commodore 64 上的 BASIC 寫出第一版，這一版使用 GL 並且加入鏡面反射的效果。" -+"立體形狀。Ed Mackey 在 1987 年用 Commodore 64 上的 BASIC 寫出第一版，這一版使" -+"用 GL 並且加入鏡面反射的效果。" - - #: hacks/config/superquadrics.xml.h:10 - msgid "Superquadrics" -@@ -3878,12 +3994,12 @@ - - #: hacks/config/swirl.xml.h:4 - msgid "" --"More flowing, swirly patterns. This version is by M. Dobie and R. Taylor, but " --"you might have seen a Mac program similar to this called FlowFazer. There is " --"also a cool Java applet of a similar concept." -+"More flowing, swirly patterns. This version is by M. Dobie and R. Taylor, " -+"but you might have seen a Mac program similar to this called FlowFazer. " -+"There is also a cool Java applet of a similar concept." - msgstr "" --"流動的漩渦狀的圖樣。這個版本由 M. Dobie 與 R. Taylor 撰寫，但您可能看過 Mac 上有一個類似的程式叫 FlowFazer。此外也有 " --"Java applet 的版本。" -+"流動的漩渦狀的圖樣。這個版本由 M. Dobie 與 R. Taylor 撰寫，但您可能看過 Mac " -+"上有一個類似的程式叫 FlowFazer。此外也有 Java applet 的版本。" - - #: hacks/config/swirl.xml.h:8 - msgid "Swirl" -@@ -3939,7 +4055,8 @@ - msgid "" - "Displays a view of the ``Bird in a Thornbush'' fractal. Written by Tim " - "Auckland." --msgstr "顯示「高灌叢中的鳥」（Bird in a Thornbush）的圖形。由 Tim Auckland 撰寫。" -+msgstr "" -+"顯示「高灌叢中的鳥」（Bird in a Thornbush）的圖形。由 Tim Auckland 撰寫。" - - #: hacks/config/thornbird.xml.h:6 - msgid "Points" -@@ -3961,9 +4078,10 @@ - - #: hacks/config/truchet.xml.h:4 - msgid "" --"This draws line- and arc-based Truchet patterns that tile the screen. Written " --"by Adrian Likins." --msgstr "畫出以線與弧形為基礎的 Truchet 圖樣，排列在螢幕上。由 Adrian Likins 撰寫。" -+"This draws line- and arc-based Truchet patterns that tile the screen. " -+"Written by Adrian Likins." -+msgstr "" -+"畫出以線與弧形為基礎的 Truchet 圖樣，排列在螢幕上。由 Adrian Likins 撰寫。" - - #: hacks/config/truchet.xml.h:5 - msgid "Truchet" -@@ -3972,7 +4090,7 @@ - #: hacks/config/twang.xml.h:2 - msgid "" - "Divides the screen into a grid, and plucks them. Written by Dan Bornstein." --msgstr "將螢幕切割成小格，然後......。由 Dan Bornstein 撰寫。" -+msgstr "將螢幕切割成小格，然後…...。由 Dan Bornstein 撰寫。" - - #: hacks/config/twang.xml.h:6 - msgid "Jumpy" -@@ -4011,10 +4129,12 @@ - "This is actually just a shell script that grabs a frame of video from the " - "system's video input, and then uses some PBM filters (chosen at random) to " - "manipulate and recombine the video frame in various ways (edge detection, " --"subtracting the image from a rotated version of itself, etc.) Then it displays " --"that image for a few seconds, and does it again. This works really well if you " --"just feed broadcast television into it." --msgstr "這實際上只是文稿，從系統的影像輸入中抓取影像，然後用隨機選取的 PBM 過濾器以各種方式產生與重組影像。顯示幾秒鐘之後，再重新來過。" -+"subtracting the image from a rotated version of itself, etc.) Then it " -+"displays that image for a few seconds, and does it again. This works really " -+"well if you just feed broadcast television into it." -+msgstr "" -+"這實際上只是文稿，從系統的影像輸入中抓取影像，然後用隨機選取的 PBM 過濾器以各" -+"種方式產生與重組影像。顯示幾秒鐘之後，再重新來過。" - - #: hacks/config/vidwhacker.xml.h:6 - msgid "VidWhacker" -@@ -4022,11 +4142,12 @@ - - #: hacks/config/vines.xml.h:6 - msgid "" --"This one generates a continuous sequence of small, curvy geometric patterns. It " --"scatters them around your screen until it fills up, then it clears the screen " --"and starts over. Written by Tracy Camp and David Hansen." -+"This one generates a continuous sequence of small, curvy geometric patterns. " -+"It scatters them around your screen until it fills up, then it clears the " -+"screen and starts over. Written by Tracy Camp and David Hansen." - msgstr "" --"產生一串小而彎曲的幾何圖形，將它們散佈在螢幕上直到放滿，然後將螢幕清掉再重新開始。由 Tracy Camp 與 David Hansen 撰寫。" -+"產生一串小而彎曲的幾何圖形，將它們散布在螢幕上直到放滿，然後將螢幕清掉再重新" -+"開始。由 Tracy Camp 與 David Hansen 撰寫。" - - #: hacks/config/vines.xml.h:8 - msgid "Vines" -@@ -4059,15 +4180,18 @@ - - #: hacks/config/webcollage.xml.h:9 - msgid "" --"This program makes collages out of random images pulled off of the World Wide " --"Web. It finds these images by doing random web searches, and then extracting " --"images from the returned pages. It can also be set up to filter the images " --"through the `VidWhacker' program, above, which looks really great. (Note that " --"most of the images it finds are text, and not pictures. This is because most of " --"the web is pictures of text. Which is pretty sad.) Written by Jamie Zawinski." -+"This program makes collages out of random images pulled off of the World " -+"Wide Web. It finds these images by doing random web searches, and then " -+"extracting images from the returned pages. It can also be set up to filter " -+"the images through the `VidWhacker' program, above, which looks really " -+"great. (Note that most of the images it finds are text, and not pictures. " -+"This is because most of the web is pictures of text. Which is pretty sad.) " -+"Written by Jamie Zawinski." - msgstr "" --"這個程式由將網頁上的影像做成拼貼畫。它會用隨機搜尋的方式找網頁，然後取出圖片。它也可以設定成從 VidWhacker " --"程式中抓取圖片。不過注意，大部份它抓到的「影像」其實只是文字，而不是圖片，因為大部份的網頁只是「文字的圖片」。由 Jamie Zawinski 撰寫。" -+"這個程式由將網頁上的影像做成拼貼畫。它會用隨機搜尋的方式找網頁，然後取出圖" -+"片。它也可以設定成從 VidWhacker 程式中抓取圖片。不過注意，大部份它抓到的「影" -+"像」其實只是文字，而不是圖片，因為大部份的網頁只是「文字的圖片」。由 Jamie " -+"Zawinski 撰寫。" - - #: hacks/config/webcollage.xml.h:10 - msgid "URL Timeout" -@@ -4082,7 +4206,9 @@ - "Floating stars are acted upon by a mixture of simple 2D forcefields. The " - "strength of each forcefield changes continuously, and it is also switched on " - "and off at random. By Paul 'Joey' Clark." --msgstr "星星在混合的二維力場中動作。彼此的引力持續改變，也可以隨機開關。由 Paul 'Joey' Clark 撰寫。" -+msgstr "" -+"星星在混合的二維力場中動作。彼此的引力持續改變，也可以隨機開關。由 Paul " -+"'Joey' Clark 撰寫。" - - #: hacks/config/whirlwindwarp.xml.h:7 - msgid "Trail Size" -@@ -4111,10 +4237,11 @@ - #: hacks/config/worm.xml.h:1 - msgid "" - "An ancient xlock hack that draws multicolored worms that crawl around the " --"screen. Written by Brad Taylor, Dave Lemke, Boris Putanec, and Henrik Theiling." -+"screen. Written by Brad Taylor, Dave Lemke, Boris Putanec, and Henrik " -+"Theiling." - msgstr "" --"古老的 xlock 螢幕保護程式，畫出不同顏色的蟲，在螢幕上爬行。由 Brad Taylor，Dave Lemke，Boris Putanec 與 " --"Henrik Theiling 撰寫。" -+"古老的 xlock 螢幕保護程式，畫出不同顏色的蟲，在螢幕上爬行。由 Brad Taylor，" -+"Dave Lemke，Boris Putanec 與 Henrik Theiling 撰寫。" - - #: hacks/config/xaos.xml.h:1 - msgid "XaoS" -@@ -4122,13 +4249,14 @@ - - #: hacks/config/xaos.xml.h:2 - msgid "" --"XaoS generates fast fly-through animations of the Mandelbrot and other fractal " --"sets. Written by Thomas Marsh and Jan Hubicka. This is not included with the " --"XScreenSaver package, but if you don't have it already, you can find it at " --"<http://limax.paru.cas.cz/~hubicka/XaoS/>." --msgstr "" --"XaoS 畫出一個快速飛過 Mandelbrot set 的動畫。由 Thomas Marsh 與 Jan Hubicka 撰寫。這個程式不含在 " --"XScreenSaver 中，但是您可以在 http://limax.paru.cas.cz/~hubicka/XaoS/ 中找到。" -+"XaoS generates fast fly-through animations of the Mandelbrot and other " -+"fractal sets. Written by Thomas Marsh and Jan Hubicka. This is not included " -+"with the XScreenSaver package, but if you don't have it already, you can " -+"find it at <http://limax.paru.cas.cz/~hubicka/XaoS/>." -+msgstr "" -+"XaoS 畫出一個快速飛過 Mandelbrot set 的動畫。由 Thomas Marsh 與 Jan Hubicka " -+"撰寫。這個程式不含在 XScreenSaver 中，但是您可以在 http://limax.paru.cas.cz/" -+"~hubicka/XaoS/ 中找到。" - - #: hacks/config/xdaliclock.xml.h:1 - msgid "12-Hour Time" -@@ -4170,11 +4298,12 @@ - msgid "" - "XDaliClock draws a large digital clock, the numbers of which change by " - "``melting'' into their new shapes. Written by Jamie Zawinski. This is not " --"included with the XScreenSaver package, but if you don't have it already, you " --"can find it at <http://www.jwz.org/xdaliclock/>." -+"included with the XScreenSaver package, but if you don't have it already, " -+"you can find it at <http://www.jwz.org/xdaliclock/>." - msgstr "" --"XDaliClock 畫出一個巨大的數位時鐘，數字改變時會「熔化」成新的形狀。由 Jamie Zawinski 撰寫。這個程式不含在 XScreenSaver " --"中，但是您可以在 http://www.jwz.org/xdaliclock/ 中找到。" -+"XDaliClock 畫出一個巨大的數位時鐘，數字改變時會「熔化」成新的形狀。由 Jamie " -+"Zawinski 撰寫。這個程式不含在 XScreenSaver 中，但是您可以在 http://www.jwz." -+"org/xdaliclock/ 中找到。" - - #: hacks/config/xearth.xml.h:1 - msgid "Bright" -@@ -4258,14 +4387,15 @@ - - #: hacks/config/xearth.xml.h:31 - msgid "" --"XEarth draws an image of the Earth, as seen from your favorite vantage point in " --"space, correctly shaded for the current position of the Sun. Written by Kirk " --"Johnson. This is not included with the XScreenSaver package, but if you don't " --"have it already, you can find it at " --"<http://www.cs.colorado.edu/~tuna/xearth/>." --msgstr "" --"XEarth 畫出一個地球，可以從太空中任何您喜歡的角度來觀察，並會依據目前太陽的位置產生陰影。由 Kirk Johnson 撰寫。這個程式不含在 " --"XScreenSaver 中，但是您可以在 http://www.cs.colorado.edu/~tuna/xearth/ 中找到。" -+"XEarth draws an image of the Earth, as seen from your favorite vantage point " -+"in space, correctly shaded for the current position of the Sun. Written by " -+"Kirk Johnson. This is not included with the XScreenSaver package, but if you " -+"don't have it already, you can find it at <http://www.cs.colorado.edu/" -+"~tuna/xearth/>." -+msgstr "" -+"XEarth 畫出一個地球，可以從太空中任何您喜歡的角度來觀察，並會依據目前太陽的位" -+"置產生陰影。由 Kirk Johnson 撰寫。這個程式不含在 XScreenSaver 中，但是您可以" -+"在 http://www.cs.colorado.edu/~tuna/xearth/ 中找到。" - - #: hacks/config/xearth.xml.h:32 - msgid "Xearth" -@@ -4281,12 +4411,12 @@ - - #: hacks/config/xfishtank.xml.h:7 - msgid "" --"Fish! This is not included with the XScreenSaver package, but if you don't have " --"it already, you can find it at " --"<http://metalab.unc.edu/pub/Linux/X11/demos/>." -+"Fish! This is not included with the XScreenSaver package, but if you don't " -+"have it already, you can find it at <http://metalab.unc.edu/pub/Linux/X11/" -+"demos/>." - msgstr "" --"就是魚嘛！這個程式不含在 XScreenSaver 中，但是您可以在 http://metalab.unc.edu/pub/Linux/X11/demos/ " --"中找到。" -+"就是魚嘛！這個程式不含在 XScreenSaver 中，但是您可以在 http://metalab.unc." -+"edu/pub/Linux/X11/demos/ 中找到。" - - #: hacks/config/xfishtank.xml.h:12 - msgid "XFishTank" -@@ -4298,9 +4428,11 @@ - - #: hacks/config/xflame.xml.h:2 - msgid "" --"Draws a simulation of pulsing fire. It can also take an arbitrary image and set " --"it on fire too. Written by Carsten Haitzler, hacked on by many others." --msgstr "模擬律動的火。它也可以隨機取得影像然後放到火裡。由 Carsten Haitzler 撰寫，其他許多人修改。" -+"Draws a simulation of pulsing fire. It can also take an arbitrary image and " -+"set it on fire too. Written by Carsten Haitzler, hacked on by many others." -+msgstr "" -+"模擬律動的火。它也可以隨機取得影像然後放到火裡。由 Carsten Haitzler 撰寫，其" -+"他許多人修改。" - - #: hacks/config/xflame.xml.h:3 - msgid "Enable Blooming" -@@ -4314,10 +4446,12 @@ - msgid "" - "This program behaves schizophrenically and makes a lot of typos. Written by " - "Jamie Zawinski. If you haven't seen Stanley Kubrick's masterpiece, ``The " --"Shining,'' you won't get it. Those who have describe this hack as ``inspired.''" -+"Shining,'' you won't get it. Those who have describe this hack as " -+"``inspired.''" - msgstr "" --"這個程式會裝瘋賣傻，然後故意打錯很多字。由 Jamie Zawinski 撰寫。如果您沒看過 Stanley Kubrick 導演的著名作品，「鬼店」（The " --"Shining，或譯「閃靈」），您大概就沒辦法瞭解。瞭解的人就會覺得這個程式「超棒」。" -+"這個程式會裝瘋賣傻，然後故意打錯很多字。由 Jamie Zawinski 撰寫。如果您沒看過 " -+"Stanley Kubrick 導演的著名作品，「鬼店」（The Shining，或譯「閃靈」），您大概" -+"就沒辦法瞭解。瞭解的人就會覺得這個程式「超棒」。" - - #: hacks/config/xjack.xml.h:5 - msgid "Xjack" -@@ -4399,14 +4533,15 @@ - #: hacks/config/xmountains.xml.h:7 - msgid "" - "XMountains generates realistic-looking fractal terrains of snow-capped " --"mountains near water, with either a top view or a side view. Written by Stephen " --"Booth. This is not included with the XScreenSaver package, but if you don't " --"have it already, you can find it at " --"<http://www.epcc.ed.ac.uk/~spb/xmountains/>. Be sure to compile it with " --"-DVROOT or it won't work right when launched by the xscreensaver daemon." --msgstr "" --"XMountains 產生逼真的地形圖，有白雪覆蓋的山，傍在流水邊，可以從上俯瞰或從旁邊觀看。由 Stephen Booth 撰寫。這個程式不含在 " --"XScreenSaver 中，但是您可以在 http://www.epcc.ed.ac.uk/~spb/xmountains/ 中找到。" -+"mountains near water, with either a top view or a side view. Written by " -+"Stephen Booth. This is not included with the XScreenSaver package, but if " -+"you don't have it already, you can find it at <http://www.epcc.ed.ac.uk/" -+"~spb/xmountains/>. Be sure to compile it with -DVROOT or it won't work " -+"right when launched by the xscreensaver daemon." -+msgstr "" -+"XMountains 產生逼真的地形圖，有白雪覆蓋的山，傍在流水邊，可以從上俯瞰或從旁邊" -+"觀看。由 Stephen Booth 撰寫。這個程式不含在 XScreenSaver 中，但是您可以在 " -+"http://www.epcc.ed.ac.uk/~spb/xmountains/ 中找到。" - - #: hacks/config/xmountains.xml.h:8 - msgid "Xmountains" -@@ -4424,10 +4559,11 @@ - - #: hacks/config/xsnow.xml.h:1 - msgid "" --"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can find " --"it at <http://www.euronet.nl/~rja/Xsnow/>." -+"Draws falling snow and the occasional tiny Santa. By Rick Jansen. You can " -+"find it at <http://www.euronet.nl/~rja/Xsnow/>." - msgstr "" --"畫出下雪，及小小的聖誕老人。由 Rick Jansen 撰寫，您可以在 http://www.euronet.nl/~rja/Xsnow/ 找到。" -+"畫出下雪，及小小的聖誕老人。由 Rick Jansen 撰寫，您可以在 http://www.euronet." -+"nl/~rja/Xsnow/ 找到。" - - #: hacks/config/xsnow.xml.h:2 - msgid "Xsnow" -@@ -4471,7 +4607,8 @@ - msgid "" - "XTeeVee simulates various television problems, including static, loss of " - "vertical hold, and a test pattern. By Greg Knauss." --msgstr "XTeeVee 模擬許多電視問題，包括靜止畫面，測試圖樣等等。由 Greg Knauss 撰寫。" -+msgstr "" -+"XTeeVee 模擬許多電視問題，包括靜止畫面，測試圖樣等等。由 Greg Knauss 撰寫。" - - #: hacks/config/zoom.xml.h:3 - msgid "Lens Offset" -@@ -4483,7 +4620,9 @@ - - #: hacks/config/zoom.xml.h:9 - msgid "" --"Zooms in on a part of the screen and then moves around. With the -lenses option " --"the result is like looking through many overlapping lenses rather than just a " --"simple zoom. Written by James Macnicol." --msgstr "放大螢幕的某部份，然後移動。加上 -lenses 選項的話，會看起來像是有很多放大鏡重疊在一起。由 James Macnicol 撰寫。" -+"Zooms in on a part of the screen and then moves around. With the -lenses " -+"option the result is like looking through many overlapping lenses rather " -+"than just a simple zoom. Written by James Macnicol." -+msgstr "" -+"放大螢幕的某部份，然後移動。加上 -lenses 選項的話，會看起來像是有很多放大鏡重" -+"疊在一起。由 James Macnicol 撰寫。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/appletproxy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/appletproxy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/appletproxy.po 2006-05-22 20:38:36.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/appletproxy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: appletproxy\n" - "POT-Creation-Date: 2006-04-09 03:51+0200\n" - "PO-Revision-Date: 2005-08-11 20:31+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/clockapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/clockapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/clockapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/clockapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -17,7 +17,7 @@ - "Project-Id-Version: clockapplet\n" - "POT-Creation-Date: 2008-08-19 01:16+0200\n" - "PO-Revision-Date: 2005-08-08 12:20+0800\n" --"Last-Translator: Sheng-Hung Wang \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -317,27 +317,27 @@ - - #: clock.cpp:1537 - msgid "&Configure Timezones..." --msgstr "配置時區(&C)..." -+msgstr "配置時區(&C)…" - - #: clock.cpp:1541 - msgid "&Plain" --msgstr "樸素 (&P)" -+msgstr "樸素(&P)" - - #: clock.cpp:1542 - msgid "&Digital" --msgstr "數位 (&D)" -+msgstr "數位(&D)" - - #: clock.cpp:1543 - msgid "&Analog" --msgstr "類比 (&A)" -+msgstr "類比(&A)" - - #: clock.cpp:1544 - msgid "&Fuzzy" --msgstr "模糊 (&F)" -+msgstr "模糊(&F)" - - #: clock.cpp:1547 - msgid "&Type" --msgstr "類型 (&T)" -+msgstr "類型(&T)" - - #: clock.cpp:1548 - msgid "Show Time&zone" -@@ -345,11 +345,11 @@ - - #: clock.cpp:1551 - msgid "&Adjust Date && Time..." --msgstr "調整日期及時間 (&A)..." -+msgstr "調整日期及時間(&A)…" - - #: clock.cpp:1553 - msgid "Date && Time &Format..." --msgstr "日期及時間格式 (&F)..." -+msgstr "日期及時間格式(&F)…" - - #: clock.cpp:1556 - msgid "C&opy to Clipboard" -@@ -357,7 +357,7 @@ - - #: clock.cpp:1560 - msgid "&Configure Clock..." --msgstr "配置時鐘(&C)..." -+msgstr "配置時鐘(&C)…" - - #: clock.cpp:1813 - #, c-format -@@ -564,9 +564,11 @@ - #: rc.cpp:180 - #, no-c-format - msgid "" --"A list of timezones known to your system. Press the middle mouse button on the " --"clock in the taskbar and it shows you the time in the selected cities." --msgstr "您的系統所知的時區清單。在工作列的時鐘按下滑鼠中鍵，它會顯示所選取城市的時間。" -+"A list of timezones known to your system. Press the middle mouse button on " -+"the clock in the taskbar and it shows you the time in the selected cities." -+msgstr "" -+"您的系統所知的時區清單。在工作列的時鐘按下滑鼠中鍵，它會顯示所選取城市的時" -+"間。" - - #. i18n: file clockapplet.kcfg line 10 - #: rc.cpp:183 -@@ -682,7 +684,9 @@ - #~ msgid "Configure Analog Clock" - #~ msgstr "配置類比時鐘" - --#~ msgid "You can choose either the predefined LCD look or define a custom color set." -+#~ msgid "" -+#~ "You can choose either the predefined LCD look or define a custom color " -+#~ "set." - #~ msgstr "你可以選擇預設的 LCD 外觀或自定顏色。" - - #~ msgid "Dra&w frame" -@@ -701,7 +705,7 @@ - #~ msgstr "12:34" - - #~ msgid "C&hoose Font..." --#~ msgstr "選擇字型(&H)..." -+#~ msgstr "選擇字型(&H)…" - - #~ msgid "&Use custom color" - #~ msgstr "自訂顏色(&U)" -@@ -725,22 +729,26 @@ - #~ msgstr "類比時鐘(&N)" - - #~ msgid "&Apply" --#~ msgstr "套用 (&A)" -+#~ msgstr "套用(&A)" - - #~ msgid "Type" - #~ msgstr "類型" - --#~ msgid "Here you can select the clock type.
digital clock: a LCD-style clock
analog clock: a traditional clock with clock face and hands" --#~ msgstr "在這裡你可以選擇時鐘的類型。
數位時鐘： LCD 風格的時鐘
類比時鐘：傳統有指針的時鐘" -+#~ msgid "" -+#~ "Here you can select the clock type.
digital clock: a LCD-style " -+#~ "clock
analog clock: a traditional clock with clock face and hands" -+#~ msgstr "" -+#~ "在這裡你可以選擇時鐘的類型。
數位時鐘： LCD 風格的時鐘
類比時鐘：" -+#~ "傳統有指針的時鐘" - - #~ msgid "&digital clock" --#~ msgstr "數位時鐘 (&d)" -+#~ msgstr "數位時鐘(&D)" - - #~ msgid "analo&g clock" --#~ msgstr "類比時鐘 (&g)" -+#~ msgstr "類比時鐘(&G)" - - #~ msgid "fuzz&y clock" --#~ msgstr "模糊時鐘 (&y)" -+#~ msgstr "模糊時鐘(&Y)" - - #~ msgid "Here you can set various options for both clock styles." - #~ msgstr "在這裡你可以為兩個時鐘風格設定不同的選項。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/display.po kde-i18n-zh_TW-3.5.10/messages/kdebase/display.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/display.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/display.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: display\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-10-21 19:12+0800\n" --"Last-Translator: Tony Ni \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/dockbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdebase/dockbarextension.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/dockbarextension.po 2005-11-09 07:38:42.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/dockbarextension.po 2011-11-11 15:45:17.000000000 +0100 -@@ -2,13 +2,12 @@ - # Copyright (C) YEAR Free Software Foundation, Inc. - # FIRST AUTHOR , YEAR. - # --#, fuzzy - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: dockbarextension\n" - "POT-Creation-Date: 2005-11-06 02:43+0100\n" - "PO-Revision-Date: 2003-11-07 15:53+1000\n" --"Last-Translator: Tony Ni \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +30,9 @@ - msgid "" - "This applet does not behave correctly and the dockbar was unable to find the " - "command line necessary to launch it the next time KDE starts up" --msgstr "這個程式無法正確執行，dockbar 無法找到正確的指令。下次 KDE 開始時將無法啟動此程式。" -+msgstr "" -+"這個程式無法正確執行，dockbar 無法找到正確的指令。下次 KDE 開始時將無法啟動此" -+"程式。" - - #: dockcontainer.cpp:174 - msgid "Kill This Applet" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/drkonqi.po kde-i18n-zh_TW-3.5.10/messages/kdebase/drkonqi.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/drkonqi.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/drkonqi.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: drkonqi 1.15\n" - "POT-Creation-Date: 2008-01-23 01:15+0100\n" - "PO-Revision-Date: 2005-10-21 19:13+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -81,12 +81,13 @@ - "\n" - msgstr "" - "回溯追踨似乎沒有作用。\n" --"這可能是因為您的套件在編譯時防止建立回溯追蹤，或是堆疊框架已經非常嚴重的損壞。\n" -+"這可能是因為您的套件在編譯時防止建立回溯追蹤，或是堆疊框架已經非常嚴重的損" -+"壞。\n" - "\n" - - #: debugger.cpp:156 - msgid "Loading backtrace..." --msgstr "載入回溯追蹤中..." -+msgstr "載入回溯追蹤中…" - - #: debugger.cpp:179 - msgid "" -@@ -101,11 +102,12 @@ - "\n" - "As the usage of these options is not recommended - because they can, in rare " - "cases, be responsible for KDE problems - a backtrace will not be generated.\n" --"You need to turn these options off and reproduce the problem again in order to " --"get a backtrace.\n" -+"You need to turn these options off and reproduce the problem again in order " -+"to get a backtrace.\n" - msgstr "" - "\n" --"其實這些選項並不建議使用─因為它們在某些情況下可能造成 KDE 的問題─將無法產生反向追踨。\n" -+"其實這些選項並不建議使用─因為它們在某些情況下可能造成 KDE 的問題─將無法產生反" -+"向追踨。\n" - "您需要將這些選項關閉並且再度試著讓問題發生以取得回溯追踨。\n" - - #: debugger.cpp:186 -@@ -114,13 +116,11 @@ - - #: debugger.cpp:194 - msgid "Loading symbols..." --msgstr "載入符號中..." -+msgstr "載入符號中…" - - #: debugger.cpp:216 --msgid "" --"System configuration startup check disabled.\n" --msgstr "" --"已停用系統組態啟始檢查。\n" -+msgid "System configuration startup check disabled.\n" -+msgstr "已停用系統組態啟始檢查。\n" - - #: drbugreport.cpp:54 - msgid "You have to edit the description before the report can be sent." -@@ -212,16 +212,17 @@ - - #: toplevel.cpp:135 - msgid "" --"

Do you want to generate a backtrace? This will help the developers to figure " --"out what went wrong.

\n" --"

Unfortunately this will take some time on slow machines.

" --"

Note: A backtrace is not a substitute for a proper description of the bug " --"and information on how to reproduce it. It is not possible to fix the bug " -+"

Do you want to generate a backtrace? This will help the developers to " -+"figure out what went wrong.

\n" -+"

Unfortunately this will take some time on slow machines.

Note: A " -+"backtrace is not a substitute for a proper description of the bug and " -+"information on how to reproduce it. It is not possible to fix the bug " - "without a proper description.

" - msgstr "" - "

您是否想要產生回溯追蹤？這可以幫助作者找到錯誤。

\n" --"

不幸的是，在較慢的機器上這需要相當的時間。

" --"

注意：回溯追蹤並不包括錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。

" -+"

不幸的是，在較慢的機器上這需要相當的時間。

注意：回溯追蹤並不包括" -+"錯誤的描述與讓臭蟲出現的相關資訊。沒有這些描述資訊是不可能解決問題的。" - - #: toplevel.cpp:147 - msgid "Include Backtrace" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/extensionproxy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/extensionproxy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/extensionproxy.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/extensionproxy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,15 +1,15 @@ - # traditional Chinese translation of extensionproxy - # Copyright (C) 2001, 2005 Free Software Foundation, Inc. - # Eric Cheng , 2001 --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: extensionproxy\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-25 11:05+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/filetypes.po kde-i18n-zh_TW-3.5.10/messages/kdebase/filetypes.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/filetypes.po 2007-05-14 12:22:55.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/filetypes.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: filetypes\n" - "POT-Creation-Date: 2007-02-02 02:29+0100\n" - "PO-Revision-Date: 2005-10-21 19:45+0800\n" --"Last-Translator: Tsung-Chien Ho \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -42,18 +42,20 @@ - - #: filegroupdetails.cpp:42 - msgid "" --"Here you can configure what the Konqueror file manager will do when you click " --"on a file belonging to this group. Konqueror can display the file in an " --"embedded viewer or start up a separate application. You can change this setting " --"for a specific file type in the 'Embedding' tab of the file type configuration." --msgstr "" --"您可以在這邊組態 Konqueror 檔案管理者對於敲擊檔案時的動作. Konqueror 可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. " --"您可以在檔案組態中的 '內嵌' 標籤頁設定這個特性." -+"Here you can configure what the Konqueror file manager will do when you " -+"click on a file belonging to this group. Konqueror can display the file in " -+"an embedded viewer or start up a separate application. You can change this " -+"setting for a specific file type in the 'Embedding' tab of the file type " -+"configuration." -+msgstr "" -+"您可以在這邊組態 Konqueror 檔案管理者對於敲擊檔案時的動作. Konqueror 可以在內" -+"嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. 您可以在檔案組態中的 '內嵌' 標籤" -+"頁設定這個特性." - - #: filetypedetails.cpp:38 - msgid "" --"This button displays the icon associated with the selected file type. Click on " --"it to choose a different icon." -+"This button displays the icon associated with the selected file type. Click " -+"on it to choose a different icon." - msgstr "這個按鈕顯示和選中的文件類型關聯的圖示. 按下它以選擇一個新的圖示." - - #: filetypedetails.cpp:41 -@@ -62,16 +64,17 @@ - - #: filetypedetails.cpp:55 - msgid "" --"This box contains a list of patterns that can be used to identify files of the " --"selected type. For example, the pattern *.txt is associated with the file type " --"'text/plain'; all files ending in '.txt' are recognized as plain text files." -+"This box contains a list of patterns that can be used to identify files of " -+"the selected type. For example, the pattern *.txt is associated with the " -+"file type 'text/plain'; all files ending in '.txt' are recognized as plain " -+"text files." - msgstr "" --"這個方塊中包含了一系列可以用來識別這個檔案類型的樣式. 舉例而言, 樣式 *.txt 關聯於 'text/plain' 類型; 所有以 '.txt' " --"結束的檔名都會被當作純文字文件." -+"這個方塊中包含了一系列可以用來識別這個檔案類型的樣式. 舉例而言, 樣式 *.txt 關" -+"聯於 'text/plain' 類型; 所有以 '.txt' 結束的檔名都會被當作純文字文件." - - #: filetypedetails.cpp:60 filetypesview.cpp:95 kservicelistwidget.cpp:123 - msgid "Add..." --msgstr "增加..." -+msgstr "增加…" - - #: filetypedetails.cpp:66 - msgid "Add a new pattern for the selected file type." -@@ -88,9 +91,11 @@ - #: filetypedetails.cpp:84 - msgid "" - "You can enter a short description for files of the selected file type (e.g. " --"'HTML Page'). This description will be used by applications like Konqueror to " --"display directory content." --msgstr "在這裡輸入選中的文件類型的簡要描述 (例如 'HTML 頁面'). 這個描述會被Konqueror 這樣的應用用來顯示目錄內容." -+"'HTML Page'). This description will be used by applications like Konqueror " -+"to display directory content." -+msgstr "" -+"在這裡輸入選中的文件類型的簡要描述 (例如 'HTML 頁面'). 這個描述會被Konqueror " -+"這樣的應用用來顯示目錄內容." - - #: filetypedetails.cpp:108 filetypedetails.cpp:276 - msgid "Use settings for '%1' group" -@@ -102,14 +107,16 @@ - - #: filetypedetails.cpp:114 - msgid "" --"Here you can configure what the Konqueror file manager will do when you click " --"on a file of this type. Konqueror can display the file in an embedded viewer or " --"start up a separate application. If set to 'Use settings for G group', " --"Konqueror will behave according to the settings of the group G this type " --"belongs to, for instance 'image' if the current file type is image/png." --msgstr "" --"您可以在這邊設定當 Konqueror 檔案管理者在您點選這類型檔案時的動作. Konqueror 可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. " --"如果您選擇了 '使用群組設定', Konqueror 會依據此類型的群組動作. 例如: 將 'image' 的檔案類型設為 'image/png'. " -+"Here you can configure what the Konqueror file manager will do when you " -+"click on a file of this type. Konqueror can display the file in an embedded " -+"viewer or start up a separate application. If set to 'Use settings for G " -+"group', Konqueror will behave according to the settings of the group G this " -+"type belongs to, for instance 'image' if the current file type is image/png." -+msgstr "" -+"您可以在這邊設定當 Konqueror 檔案管理者在您點選這類型檔案時的動作. Konqueror " -+"可以在內嵌檢視器中檢視檔案或開啟獨立的程式檢視檔案. 如果您選擇了 '使用群組設" -+"定', Konqueror 會依據此類型的群組動作. 例如: 將 'image' 的檔案類型設為 " -+"'image/png'. " - - #: filetypedetails.cpp:127 - msgid "&General" -@@ -129,36 +136,33 @@ - - #: filetypesview.cpp:32 - msgid "" --"

File Associations

This module allows you to choose which applications " --"are associated with a given type of file. File types are also referred to MIME " --"types (MIME is an acronym which stands for \"Multipurpose Internet Mail " --"Extensions\".)" --"

A file association consists of the following: " --"

    " --"
  • Rules for determining the MIME-type of a file, for example the filename " --"pattern *.kwd, which means 'all files with names that end in .kwd', is " --"associated with the MIME type \"x-kword\";
    • " --"
  • A short description of the MIME-type, for example the description of the " --"MIME type \"x-kword\" is simply 'KWord document';
    • " --"
  • An icon to be used for displaying files of the given MIME-type, so that you " --"can easily identify the type of file in, say, a Konqueror view (at least for " --"the types you use often);
    • " --"
  • A list of the applications which can be used to open files of the given " --"MIME-type -- if more than one application can be used then the list is ordered " --"by priority.
You may be surprised to find that some MIME types have " --"no associated filename patterns; in these cases, Konqueror is able to determine " --"the MIME-type by directly examining the contents of the file." --msgstr "" --"

檔案關聯

這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類別可以對應到 MIME 類別 (MIME " --"是「多用途網際網路郵件延伸標準」)。" --"

檔案的關聯性依下列決定：" --"

    " --"
  • 檔案的 MIME 類別規則，舉例而言，檔名樣式 *.kwd 表示所有以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME " --"類別。
    • " --"
  • MIME 類別的簡短描述，例如 \"x-kword\" 的描述為 'KWord 文件'；
    • " --"
  • 使用與該 MIME 類別的圖示，您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類型而言)；
    • " --"
  • 可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式可以使用，這個列表會依據優先值排序。
" --"您可能會發現有些 MIME 類別沒有相關的檔名樣式；此時，Konqueror 會依據檔案內容決定 MIME 類別。" -+"

File Associations

This module allows you to choose which " -+"applications are associated with a given type of file. File types are also " -+"referred to MIME types (MIME is an acronym which stands for \"Multipurpose " -+"Internet Mail Extensions\".)

A file association consists of the " -+"following:

  • Rules for determining the MIME-type of a file, for " -+"example the filename pattern *.kwd, which means 'all files with names that " -+"end in .kwd', is associated with the MIME type \"x-kword\";
  • A short " -+"description of the MIME-type, for example the description of the MIME type " -+"\"x-kword\" is simply 'KWord document';
  • An icon to be used for " -+"displaying files of the given MIME-type, so that you can easily identify the " -+"type of file in, say, a Konqueror view (at least for the types you use " -+"often);
  • A list of the applications which can be used to open files " -+"of the given MIME-type -- if more than one application can be used then the " -+"list is ordered by priority.
You may be surprised to find that " -+"some MIME types have no associated filename patterns; in these cases, " -+"Konqueror is able to determine the MIME-type by directly examining the " -+"contents of the file." -+msgstr "" -+"

檔案關聯

這個模組允許您選擇對於指定檔案類別要關聯的應用程式。檔案類" -+"別可以對應到 MIME 類別 (MIME 是「多用途網際網路郵件延伸標準」)。

檔案的關聯" -+"性依下列決定：

  • 檔案的 MIME 類別規則，舉例而言，檔名樣式 *.kwd 表示所有" -+"以 '.kwd' 結尾的檔名, 都是關聯到 \"x-kword\" MIME 類別。
  • MIME 類別的" -+"簡短描述，例如 \"x-kword\" 的描述為 'KWord 文件'；
  • 使用與該 MIME 類別" -+"的圖示，您可以在 Konqueror 的檢視中依據圖示來識別其類型(至少對您經常使用的類" -+"型而言)；
  • 可以用於開啟指定 MIME 類別的程式列表 ── 如果有多於一個程式" -+"可以使用，這個列表會依據優先值排序。
您可能會發現有些 MIME 類別沒有" -+"相關的檔名樣式；此時，Konqueror 會依據檔案內容決定 MIME 類別。" - - #: filetypesview.cpp:62 - msgid "F&ind filename pattern:" -@@ -176,13 +180,13 @@ - - #: filetypesview.cpp:89 - msgid "" --"Here you can see a hierarchical list of the file types which are known on your " --"system. Click on the '+' sign to expand a category, or the '-' sign to collapse " --"it. Select a file type (e.g. text/html for HTML files) to view/edit the " --"information for that file type using the controls on the right." -+"Here you can see a hierarchical list of the file types which are known on " -+"your system. Click on the '+' sign to expand a category, or the '-' sign to " -+"collapse it. Select a file type (e.g. text/html for HTML files) to view/edit " -+"the information for that file type using the controls on the right." - msgstr "" --"你可以看到在你系統上安裝的文件類型的分級列表. 按下 '+' 符號來展開類別, '-' 來收攏. 您選擇一個文件類型 (例如 text/html) " --"用右側的按鈕來編輯." -+"你可以看到在你系統上安裝的文件類型的分級列表. 按下 '+' 符號來展開類別, '-' 來" -+"收攏. 您選擇一個文件類型 (例如 text/html) 用右側的按鈕來編輯." - - #: filetypesview.cpp:99 - msgid "Click here to add a new file type." -@@ -245,14 +249,15 @@ - - #: kservicelistwidget.cpp:83 - msgid "" --"This is a list of applications associated with files of the selected file type. " --"This list is shown in Konqueror's context menus when you select \"Open " --"With...\". If more than one application is associated with this file type, then " --"the list is ordered by priority with the uppermost item taking precedence over " --"the others." -+"This is a list of applications associated with files of the selected file " -+"type. This list is shown in Konqueror's context menus when you select \"Open " -+"With...\". If more than one application is associated with this file type, " -+"then the list is ordered by priority with the uppermost item taking " -+"precedence over the others." - msgstr "" --"這是關聯於檔案類別的應用程式之列表。當您選擇 \"以...開啟\" 時，這個列表會出現在 Konqueror " --"的快顯目錄中。如果有多於一個應用程式，這個列表會依據這邊的順序排列。" -+"這是關聯於檔案類別的應用程式之列表。當您選擇 \"以...開啟\" 時，這個列表會出現" -+"在 Konqueror 的快顯目錄中。如果有多於一個應用程式，這個列表會依據這邊的順序排" -+"列。" - - #: kservicelistwidget.cpp:88 - msgid "" -@@ -262,8 +267,8 @@ - "type, then the list is ordered by priority with the uppermost item taking " - "precedence over the others." - msgstr "" --"這是關聯於檔案類別的服務之列表. 當您選擇 \"以...開啟\" 時, 這個列表會出現在 Konqueror 的內容目錄中如果有多於一個服務, " --"這個列表會依據這邊的順序排列." -+"這是關聯於檔案類別的服務之列表. 當您選擇 \"以...開啟\" 時, 這個列表會出現在 " -+"Konqueror 的內容目錄中如果有多於一個服務, 這個列表會依據這邊的順序排列." - - #: kservicelistwidget.cpp:97 - msgid "Move &Up" -@@ -319,7 +324,7 @@ - - #: kservicelistwidget.cpp:131 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: kservicelistwidget.cpp:136 - msgid "Edit command line of the selected application." -@@ -340,21 +345,23 @@ - #: kservicelistwidget.cpp:353 - msgid "" - "The service is listed here because it has been associated with the %1 " --"(%2) file type and files of type %3 (%4) are per definition also of type " --"%5." -+"(%2) file type and files of type %3 (%4) are per definition also of " -+"type %5." - msgstr "" --"在這裡列出的服務是由於它與 %1 (%2) 檔案類型關聯，而類型 %3 (%4) 的檔案也同時是類型 %5 的定義。" -+"在這裡列出的服務是由於它與 %1 (%2) 檔案類型關聯，而類型 %3 (%" -+"4) 的檔案也同時是類型 %5 的定義。" - - #: kservicelistwidget.cpp:357 - msgid "" --"Either select the %1 file type to remove the service from there or move " --"the service down to deprecate it." --msgstr "您可以選擇 %1 檔案類型將它的服務移除或是把該服務下移以降低其優先權。" -+"Either select the %1 file type to remove the service from there or " -+"move the service down to deprecate it." -+msgstr "" -+"您可以選擇 %1 檔案類型將它的服務移除或是把該服務下移以降低其優先權。" - - #: kservicelistwidget.cpp:360 - msgid "" --"Do you want to remove the service from the %1 file type or from the " --"%2 file type?" -+"Do you want to remove the service from the %1 file type or from the " -+"%2 file type?" - msgstr "您是否想要從檔案類型%1或檔案類型%2中移除這個服務" - - #: kservicelistwidget.cpp:371 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/htmlsearch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/htmlsearch.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/htmlsearch.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/htmlsearch.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: htmlsearch\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-11 21:13+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -152,7 +152,7 @@ - - #: progressdialog.cpp:38 - msgid "Generating index..." --msgstr "產生索引中..." -+msgstr "產生索引中…" - - #: progressdialog.cpp:52 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/joystick.po kde-i18n-zh_TW-3.5.10/messages/kdebase/joystick.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/joystick.po 2006-03-17 11:47:46.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/joystick.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: joystick\n" - "POT-Creation-Date: 2006-03-02 03:42+0100\n" - "PO-Revision-Date: 2005-10-21 21:09+0800\n" --"Last-Translator: Asho Yeh \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -47,49 +47,32 @@ - #: caldialog.cpp:90 - msgid "" - "Calibration is about to check the value range your device delivers." --"
" --"
Please move axis %1 %2 on your device to the minimum " --"position." --"
" --"
Press any button on the device or click on the 'Next' button to continue " --"with the next step." -+"

Please move axis %1 %2 on your device to the minimum " -+"position.

Press any button on the device or click on the 'Next' " -+"button to continue with the next step." - msgstr "" --"準備偵測裝置移動範圍。" --"
" --"
請移動裝置的%1 軸 %2到最小的位置。" --"
" --"
按下搖桿任意鍵或按「下一步」繼續。" -+"準備偵測裝置移動範圍。

請移動裝置的%1 軸 %2到最小的" -+"位置。

按下搖桿任意鍵或按「下一步」繼續。" - - #: caldialog.cpp:107 - msgid "" - "Calibration is about to check the value range your device delivers." --"
" --"
Please move axis %1 %2 on your device to the center position." --"
" --"
Press any button on the device or click on the 'Next' button to continue " --"with the next step." -+"

Please move axis %1 %2 on your device to the center " -+"position.

Press any button on the device or click on the 'Next' " -+"button to continue with the next step." - msgstr "" --"準備偵測裝置移動範圍。" --"
" --"
請移動裝置的%1 軸 %2到中央的位置。" --"
" --"
按下搖桿任意鍵或按「下一步」繼續。" -+"準備偵測裝置移動範圍。

請移動裝置的%1 軸 %2到中央的" -+"位置。

按下搖桿任意鍵或按「下一步」繼續。" - - #: caldialog.cpp:124 - msgid "" - "Calibration is about to check the value range your device delivers." --"
" --"
Please move axis %1 %2 on your device to the maximum " --"position." --"
" --"
Press any button on the device or click on the 'Next' button to continue " --"with the next step." -+"

Please move axis %1 %2 on your device to the maximum " -+"position.

Press any button on the device or click on the 'Next' " -+"button to continue with the next step." - msgstr "" --"準備偵測裝置移動範圍。" --"
" --"
請移動裝置的%1 軸 %2到最大的位置。" --"
" --"
按下搖桿任意鍵或按「下一步」繼續。" -+"準備偵測裝置移動範圍。

請移動裝置的%1 軸 %2到最大的" -+"位置。

按下搖桿任意鍵或按「下一步」繼續。" - - #: caldialog.cpp:147 joywidget.cpp:332 joywidget.cpp:367 - msgid "Communication Error" -@@ -121,8 +104,8 @@ - - #: joydevice.cpp:80 - msgid "" --"The current running kernel driver version (%1.%2.%3) is not the one this module " --"was compiled for (%4.%5.%6)." -+"The current running kernel driver version (%1.%2.%3) is not the one this " -+"module was compiled for (%4.%5.%6)." - msgstr "該模組所編譯的核心(%4.%5.%6)與正執行中的核心驅動程式版本(%1.%2.%3)不符" - - #: joydevice.cpp:87 -@@ -164,34 +147,24 @@ - #: joystick.cpp:77 - msgid "" - "

Joystick

This module helps to check if your joystick is working " --"correctly." --"
If it delivers wrong values for the axes, you can try to solve this with " --"the calibration." --"
This module tries to find all available joystick devices by checking " --"/dev/js[0-4] and /dev/input/js[0-4]" --"
If you have another device file, enter it in the combobox." --"
The Buttons list shows the state of the buttons on your joystick, the Axes " --"list shows the current value for all axes." --"
NOTE: the current Linux device driver (Kernel 2.4, 2.6) can only autodetect" --"
    " --"
  • 2-axis, 4-button joystick
    • " --"
  • 3-axis, 4-button joystick
    • " --"
  • 4-axis, 4-button joystick
    • " --"
  • Saitek Cyborg 'digital' joysticks
(For details you can check your " --"Linux source/Documentation/input/joystick.txt)" --msgstr "" --"

搖桿

該模組能幫您檢查搖桿是否設定正確." --"
如果搖桿送出錯誤的方向, 您可以重新校正搖桿." --"
該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出可使用的搖桿" --"
如果您有其他的裝置檔, 輸入到裝置清單新增." --"
按鍵清單列出搖桿上的所有按鍵, 座標列表列出所有的座標位置." --"
注意: 現在的 Linux (核心 2.4, 2.6) 驅動程式可以自動偵測" --"
    " --"
  • 2-軸, 4-鍵 搖桿
    • " --"
  • 3-軸, 4-鍵 搖桿
    • " --"
  • 4-軸, 4-鍵 搖桿
    • " --"
  • Saitek Cyborg 'digital' 搖桿
(更多的資訊請參閱 Linux 源碼中的 " --"Documentation/input/joystick.txt)" -+"correctly.
If it delivers wrong values for the axes, you can try to solve " -+"this with the calibration.
This module tries to find all available " -+"joystick devices by checking /dev/js[0-4] and /dev/input/js[0-4]
If you " -+"have another device file, enter it in the combobox.
The Buttons list " -+"shows the state of the buttons on your joystick, the Axes list shows the " -+"current value for all axes.
NOTE: the current Linux device driver (Kernel " -+"2.4, 2.6) can only autodetect
  • 2-axis, 4-button joystick
  • 3-" -+"axis, 4-button joystick
  • 4-axis, 4-button joystick
  • Saitek " -+"Cyborg 'digital' joysticks
(For details you can check your Linux " -+"source/Documentation/input/joystick.txt)" -+msgstr "" -+"

搖桿

該模組能幫您檢查搖桿是否設定正確.
如果搖桿送出錯誤的方向, 您" -+"可以重新校正搖桿.
該模組會試著搜尋 /dev/js[0-4] 和 /dev/input/js[0-4] 找出" -+"可使用的搖桿
如果您有其他的裝置檔, 輸入到裝置清單新增.
按鍵清單列出搖桿" -+"上的所有按鍵, 座標列表列出所有的座標位置.
注意: 現在的 Linux (核心 2.4, " -+"2.6) 驅動程式可以自動偵測
  • 2-軸, 4-鍵 搖桿
  • 3-軸, 4-鍵 搖桿
  • 4-軸, 4-鍵 搖桿
  • Saitek Cyborg 'digital' 搖桿
(更多的" -+"資訊請參閱 Linux 原始碼中的 Documentation/input/joystick.txt)" - - #: joywidget.cpp:43 - msgid "PRESSED" -@@ -231,13 +204,11 @@ - - #: joywidget.cpp:190 - msgid "" --"No joystick device automatically found on this computer." --"
Checks were done in /dev/js[0-4] and /dev/input/js[0-4]" --"
If you know that there is one attached, please enter the correct device " --"file." -+"No joystick device automatically found on this computer.
Checks were done " -+"in /dev/js[0-4] and /dev/input/js[0-4]
If you know that there is one " -+"attached, please enter the correct device file." - msgstr "" --"電腦上找不到任何搖桿。" --"
檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常" -+"電腦上找不到任何搖桿。
檢查 /dev/js[0-4] 和 /dev/input/js[0-4] 是否正常" - "
如果已確認連線，請輸入正確的裝置檔案。" - - #: joywidget.cpp:236 -@@ -260,13 +231,12 @@ - - #: joywidget.cpp:337 - msgid "" --"Calibration is about to check the precision." --"
" --"
Please move all axes to their center position and then do not touch the " --"joystick anymore." --"
" --"
Click OK to start the calibration." --msgstr "準備校正準確度.

請將轉軸移到中心然後不要再接觸搖桿.

按下確定開始校正." -+"Calibration is about to check the precision.

Please move all " -+"axes to their center position and then do not touch the joystick anymore.

Click OK to start the calibration." -+msgstr "" -+"準備校正準確度.

請將轉軸移到中心然後不要再接觸搖桿.

" -+"按下確定開始校正." - - #: joywidget.cpp:372 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kaccess.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kaccess.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kaccess.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kaccess.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: kaccess\n" - "POT-Creation-Date: 2006-09-16 02:33+0200\n" - "PO-Revision-Date: 2006-01-12 13:18+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -250,8 +249,8 @@ - - #: kaccess.cpp:704 - msgid "" --"Do you really want to activate \"%1\", and \"%2\" and to deactivate \"%3\" and " --"\"%4\"?" -+"Do you really want to activate \"%1\", and \"%2\" and to deactivate \"%3\" " -+"and \"%4\"?" - msgstr "您確定要使用「%1」與「%2」而停止使用「%3」與「%4」嗎？" - - #: kaccess.cpp:711 -@@ -280,8 +279,8 @@ - - #: kaccess.cpp:734 - msgid "" --"You pressed the Shift key 5 consecutive times or an application has requested " --"to change this setting." -+"You pressed the Shift key 5 consecutive times or an application has " -+"requested to change this setting." - msgstr "您連續按下 Shift 按鍵已達 5 次或者有應用程式要求改變這個設定值。" - - #: kaccess.cpp:738 -@@ -301,13 +300,14 @@ - #: kaccess.cpp:751 - msgid "" - "These AccessX settings are needed for some users with motion impairments and " --"can be configured in the KDE Control Center. You can also turn them on and off " --"with standardized keyboard gestures.\n" -+"can be configured in the KDE 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\"." -+"If you do not need them, you can select \"Deactivate all AccessX features " -+"and gestures\"." - msgstr "" --"這些 AccessX 設定值是某些行動不便的使用者所需要的，而可從 KDE 控制中心來設定。您也可以使用標準化的鍵盤筆勢來開啟或關閉它們。\n" -+"這些 AccessX 設定值是某些行動不便的使用者所需要的，而可從 KDE 控制中心來設" -+"定。您也可以使用標準化的鍵盤筆勢來開啟或關閉它們。\n" - "\n" - "如果您不需要它們，您可以選擇「停止使用所有的 AccessX 功能與筆勢」。" - -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kappfinder.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kappfinder.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kappfinder.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kappfinder.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,7 +10,7 @@ - "Project-Id-Version: kappfinder\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2006-05-08 09:35+0800\n" --"Last-Translator: Tzer-Ming Liu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,11 +31,12 @@ - - #: toplevel.cpp:53 - msgid "" --"The application finder looks for non-KDE applications on your system and adds " --"them to the KDE menu system. Click 'Scan' to begin, select the desired " -+"The application finder looks for non-KDE applications on your system and " -+"adds them to the KDE menu system. Click 'Scan' to begin, select the desired " - "applications and then click 'Apply'." - msgstr "" --"程式搜尋器的功能是要找出系統中非-KDE 的程式並且把它們加入目前的 KDE 選單中。請點選「掃描」開始尋找，選擇「套用」即可把選取的程式項目加入系統內。" -+"程式搜尋器的功能是要找出系統中非-KDE 的程式並且把它們加入目前的 KDE 選單中。" -+"請點選「掃描」開始尋找，選擇「套用」即可把選取的程式項目加入系統內。" - - #: toplevel.cpp:63 - msgid "Application" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kasbarextension.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kasbarextension.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kasbarextension.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kasbarextension.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kasbarextension\n" - "POT-Creation-Date: 2006-08-13 04:04+0200\n" - "PO-Revision-Date: 2006-06-19 09:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -26,20 +25,19 @@ - - #: kasaboutdlg.cpp:164 - msgid "" --"" --"

Kasbar TNG began as a port of the original Kasbar applet to the (then new) " --"extension API, but ended up as a complete rewrite because of the range of " --"features needed by different groups of users. In the process of the rewrite all " --"the standard features provided by the default taskbar were added, along with " --"some more original ones such as thumbnails.

" --"

You can find information about the latest developments in Kasbar at %4, the Kasbar homepage.

" -+"

Kasbar TNG began as a port of the original Kasbar applet to " -+"the (then new) extension API, but ended up as a complete rewrite because of " -+"the range of features needed by different groups of users. In the process of " -+"the rewrite all the standard features provided by the default taskbar were " -+"added, along with some more original ones such as thumbnails.

You can " -+"find information about the latest developments in Kasbar at %" -+"4, the Kasbar homepage.

" - msgstr "" --"" --"

Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API " --"的一部分，但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在本來 taskbar 已有的基本特徵，接著加入一些在舊有 Kasbar " --"所具有的特色，像是視窗縮圖預覽(thumbnails)。

" --"

您可在 Kasbar 的網頁找到關於最新的發展資訊：%4

" -+"

Kasbar TNG 在開始只是在原有的 Kasbar applet(新的) 延伸 API 的" -+"一部分，但是後來為了不同的使用者族群所需要的特色而完全重寫。首先重寫所有已在" -+"本來 taskbar 已有的基本特徵，接著加入一些在舊有 Kasbar 所具有的特色，像是視窗" -+"縮圖預覽(thumbnails)。

您可在 Kasbar 的網頁找到關於最新的發展資訊：%4

" - - #: kasaboutdlg.cpp:184 - msgid "Authors" -@@ -51,29 +49,26 @@ - - #: kasaboutdlg.cpp:190 - msgid "" --"Richard Moore rich@kde.org" --"
Homepage: " --"http://xmelegance.org/" --"

Developer and maintainer of the Kasbar TNG code.

" --"
Daniel M. Duley (Mosfet) " --"mosfet@kde.org" --"
Homepage: " --"http://www.mosfet.org/" --"

Mosfet wrote the original Kasbar applet on which this extension is based. " --"There is little of the original code remaining, but the basic look in opaque " --"mode is almost identical to this first implementation.

" -+"Richard Moore rich@kde.org
Homepage: http://xmelegance." -+"org/

Developer and maintainer of the Kasbar TNG code.

Daniel M. Duley (Mosfet) mosfet@kde.org
Homepage: http://www.mosfet.org/

Mosfet wrote the original Kasbar applet on " -+"which this extension is based. There is little of the original code " -+"remaining, but the basic look in opaque mode is almost identical to this " -+"first implementation.

" - msgstr "" --"Richard Moore rich@kde.org" --"
首頁： http://xmelegance.org/" --"

Kasbar TNG 程式碼的開發及維護者。

" --"
Daniel M. Duley (Mosfet) " --"mosfet@kde.org" --"
首頁： http://www.mosfet.org/" --"

Mosfet 他寫了此延伸功能所的基礎架構─原始 Kasbar applet " --"。雖然這裡只剩下一些些原本的程式碼，但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。

" --"
李健秋(Andrew Lee) " --"andrew@linux.org.tw" --"

Andrew 他替 Kabar 翻譯了繁體中文訊息，若您發現他翻譯的不好或不正確的地方，可用中文直接寫信告訴他。" -+"Richard Moore rich@kde.org
首頁： http://xmelegance.org/" -+"

Kasbar TNG 程式碼的開發及維護者。

Daniel M. Duley (Mosfet)" -+" mosfet@kde.org
首頁： " -+"http://www.mosfet.org/

Mosfet 他寫了" -+"此延伸功能所的基礎架構─原始 Kasbar applet 。雖然這裡只剩下一些些原本的程式" -+"碼，但是在不透明模式的基本外觀上看來還是跟原本的大致上相同。

李健" -+"秋(Andrew Lee) andrew@linux.org." -+"tw

Andrew 他替 Kabar 翻譯了傳統字漢語訊息，若您發現他翻譯的不好或不正確的" -+"地方，可用中文直接寫信告訴他。" - - #: kasaboutdlg.cpp:214 - msgid "BSD License" -@@ -81,8 +76,8 @@ - - #: kasaboutdlg.cpp:216 kasaboutdlg.cpp:242 - msgid "" --"Kasbar may be used under the terms of either the BSD license, or the GNU Public " --"License." -+"Kasbar may be used under the terms of either the BSD license, or the GNU " -+"Public License." - msgstr "Kasbar 可適用於 BSD license 或是 GNU Public License 兩者之一。" - - #: kasaboutdlg.cpp:240 -@@ -150,11 +145,12 @@ - "Specifies the maximum number of items that should be placed in a line before " - "starting a new row or column. If the value is 0 then all the available space " - "will be used." --msgstr "指定在同一行可顯示最大工作項目數量，若設定為 0 則會使用所有可能使用的空間。" -+msgstr "" -+"指定在同一列可顯示最大工作項目數量，若設定為 0 則會使用所有可能使用的空間。" - - #: kasprefsdlg.cpp:165 - msgid "Bo&xes per line: " --msgstr "每行方塊數(&X):" -+msgstr "每列方塊數(&X):" - - #: kasprefsdlg.cpp:181 - msgid "&Detach from screen edge" -@@ -211,12 +207,13 @@ - #: kasprefsdlg.cpp:247 - msgid "" - "Enables the display of a thumbnailed image of the window when you move your " --"mouse pointer over an item. The thumbnails are approximate, and may not reflect " --"the current window contents.\n" -+"mouse pointer over an item. The thumbnails are approximate, and may not " -+"reflect the current window contents.\n" - "\n" - "Using this option on a slow machine may cause performance problems." - msgstr "" --"啟動當滑鼠停留在任一項目上便顯示該項目之視窗縮圖預覽。縮圖預覽只能大約的顯示該視窗的狀態，並不能反映出目前視窗的內容。\n" -+"啟動當滑鼠停留在任一項目上便顯示該項目之視窗縮圖預覽。縮圖預覽只能大約的顯示" -+"該視窗的狀態，並不能反映出目前視窗的內容。\n" - "\n" - "當這個選項使用在緩慢的機器上將可能會造成效能問題。" - -@@ -289,10 +286,12 @@ - - #: kasprefsdlg.cpp:314 - msgid "" --"When this option is checked only minimized windows are shown in the bar. This " --"gives Kasbar similar behavior to the icon handling in older environments like " --"CDE or OpenLook." --msgstr "當核取此選項時只有最小化的視窗會顯示在該列中。這會讓 Kasbar 與舊式的環境如 CDE 或 Openlook 有類似的圖示處理方式。" -+"When this option is checked only minimized windows are shown in the bar. " -+"This gives Kasbar similar behavior to the icon handling in older " -+"environments like CDE or OpenLook." -+msgstr "" -+"當核取此選項時只有最小化的視窗會顯示在該列中。這會讓 Kasbar 與舊式的環境如 " -+"CDE 或 Openlook 有類似的圖示處理方式。" - - #: kasprefsdlg.cpp:326 - msgid "Colors" -@@ -364,8 +363,8 @@ - - #: kasprefsdlg.cpp:421 - msgid "" --"Enables the display of a progress bar in the label of windows show are progress " --"indicators." -+"Enables the display of a progress bar in the label of windows show are " -+"progress indicators." - msgstr "啟用在視窗標籤中顯示進度的指示器。" - - #: kasprefsdlg.cpp:426 -@@ -383,9 +382,11 @@ - - #: kasprefsdlg.cpp:434 - msgid "" --"Enables frames around inactive items, if you want the bar to disappear into the " --"background you should probably uncheck this option." --msgstr "啟用非作用中項目周圍的框架，如果您希望工具列能消失到背景中您可能應該核消這個選項。" -+"Enables frames around inactive items, if you want the bar to disappear into " -+"the background you should probably uncheck this option." -+msgstr "" -+"啟用非作用中項目周圍的框架，如果您希望工具列能消失到背景中您可能應該核消這個" -+"選項。" - - #: kasprefsdlg.cpp:445 - msgid "" -@@ -423,7 +424,7 @@ - - #: kastasker.cpp:201 - msgid "&Configure Kasbar..." --msgstr "設定 Kasbar(&C)..." -+msgstr "設定 Kasbar(&C)…" - - #: kastasker.cpp:205 - msgid "&About Kasbar" -@@ -488,43 +489,22 @@ - - #: kastaskitem.cpp:468 - msgid "" --"Name: $name" --"
Visible name: $visibleName" --"
" --"
Iconified: $iconified" --"
Minimized: $minimized" --"
Maximized: $maximized" --"
Shaded: $shaded" --"
Always on top: $alwaysOnTop" --"
" --"
Desktop: $desktop" --"
All desktops: $onAllDesktops" --"
" --"
Iconic name: $iconicName" --"
Iconic visible name: $visibleIconicName" --"
" --"
Modified: $modified" --"
Demands attention: $demandsAttention" --"
" -+"Name: $name
Visible name: " -+"$visibleName

Iconified: $iconified
Minimized: " -+"$minimized
Maximized: $maximized
Shaded: " -+"$shaded
Always on top: $alwaysOnTop

Desktop: " -+"$desktop
All desktops: $onAllDesktops

Iconic name: " -+"$iconicName
Iconic visible name: " -+"$visibleIconicName

Modified: $modified
Demands " -+"attention: $demandsAttention
" - msgstr "" --"名稱： $name" --"
可視名稱： $visibleName" --"
" --"
圖示化：$iconified" --"
最小化： $minimized" --"
最大化： $maximized" --"
陰影： $shaded" --"
最上層顯示： $alwaysOnTop" --"
" --"
桌面： $desktop" --"
所有桌面： $onAllDesktops" --"
" --"
圖示名稱：$iconicName" --"
圖示可視名稱： $visibleIconicName" --"
" --"
已修改： $modified" --"
伺服程式提示： $demandsAttention" --"
" -+"名稱： $name
可視名稱： $visibleName

" -+"圖示化：$iconified
最小化： $minimized
最大化： " -+"$maximized
陰影： $shaded
最上層顯示： " -+"$alwaysOnTop

桌面： $desktop
所有桌面： " -+"$onAllDesktops

圖示名稱：$iconicName
圖示可視名稱： " -+"$visibleIconicName

已修改： $modified
伺服程式提示： " -+"$demandsAttention
" - - #: kastaskitem.cpp:504 - msgid "NET WM Specification Info" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kate.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kate.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kate.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kate.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kate\n" - "POT-Creation-Date: 2008-08-14 01:15+0200\n" - "PO-Revision-Date: 2006-09-04 09:09+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -45,28 +44,22 @@ - #: app/kateexternaltools.cpp:461 - msgid "" - "

The script to execute to invoke the tool. The script is passed to /bin/sh " --"for execution. The following macros will be expanded:

" --"
    " --"
  • %URL - the URL of the current document." --"
  • %URLs - a list of the URLs of all open documents." --"
  • %directory - the URL of the directory containing the current " --"document." --"
  • %filename - the filename of the current document." --"
  • %line - the current line of the text cursor in the current " --"view." --"
  • %column - the column of the text cursor in the current view." --"
  • %selection - the selected text in the current view." --"
  • %text - the text of the current document.
" --msgstr "" --"

用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會被自動展開：

" --"
    " --"
  • %URL ─ 目前文件的 URL。" --"
  • %URLs ─ 所有開啟文件的 URL。" --"
  • %directory ─ 包含目前文件的目錄 URL。" --"
  • %filename ─ 目前文件的檔案名稱。" --"
  • %line ─ 目前檢視中文字游標所在的行。" --"
  • %column ─ 目前檢視中文字游標所在的欄。" --"
  • %selection ─ 目前檢視中選取的文字。" -+"for execution. The following macros will be expanded:

    • %URL - the URL of the current document.
    • %URLs - a list of " -+"the URLs of all open documents.
    • %directory - the URL of the " -+"directory containing the current document.
    • %filename - the " -+"filename of the current document.
    • %line - the current line " -+"of the text cursor in the current view.
    • %column - the column " -+"of the text cursor in the current view.
    • %selection - the " -+"selected text in the current view.
    • %text - the text of the " -+"current document.
    " -+msgstr "" -+"

    用來執行以呼叫工具的命令稿。此命令稿會傳送到 /bin/sh 以利執行。下列巨集會" -+"被自動展開：

    • %URL ─ 目前文件的 URL。
    • %" -+"URLs ─ 所有開啟文件的 URL。
    • %directory ─ 包含目前文件" -+"的目錄 URL。
    • %filename ─ 目前文件的檔案名稱。
    • %" -+"line ─ 目前檢視中文字游標所在的行。
    • %column ─ 目前檢視" -+"中文字游標所在的欄。
    • %selection ─ 目前檢視中選取的文字。" - "
    • %text ─ 目前文件的文字。
    " - - #: app/kateexternaltools.cpp:479 -@@ -75,9 +68,11 @@ - - #: app/kateexternaltools.cpp:484 - 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 command will be used." --msgstr "該指令所使用的可執行檔。這是用來查核該工具是否應該顯示；如果沒有設定，會使用指令的第一個字。" -+"The executable used by the command. This is used to check if a tool should " -+"be displayed; if not set, the first word of command will be used." -+msgstr "" -+"該指令所使用的可執行檔。這是用來查核該工具是否應該顯示；如果沒有設定，會使用" -+"指令的第一個字。" - - #: app/kateexternaltools.cpp:490 - msgid "&Mime types:" -@@ -86,9 +81,11 @@ - #: app/kateexternaltools.cpp:495 - 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 類型選擇，請按右方的按鈕。" -+"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." -@@ -112,10 +109,12 @@ - - #: 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 客戶端，這會很有幫助。" -+"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:" -@@ -127,8 +126,8 @@ - "lines with exttool-the_name_you_specified_here. Please do not use spaces or " - "tabs in the name." - msgstr "" --"如果您在這裡指定名稱，您可以從檢視命令列中以 exttool-the_name_you_specified_here 呼叫命令。在該名稱中請不要使用空白或 " --"tabs。" -+"如果您在這裡指定名稱，您可以從檢視命令列中以 exttool-" -+"the_name_you_specified_here 呼叫命令。在該名稱中請不要使用空白或 tabs。" - - #: app/kateexternaltools.cpp:539 - msgid "You must specify at least a name and a command" -@@ -144,11 +143,11 @@ - - #: app/kateexternaltools.cpp:568 - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #: app/kateexternaltools.cpp:576 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: app/kateexternaltools.cpp:580 - msgid "Insert &Separator" -@@ -169,7 +168,7 @@ - - #: app/kateviewspace.cpp:351 - msgid " Line: %1 Col: %2 " --msgstr " 行: %1 欄: %2 " -+msgstr " 列: %1 欄: %2 " - - #: app/kateviewspace.cpp:355 - msgid " R/O " -@@ -187,15 +186,17 @@ - msgid "" - "Do you really want to pipe the text to the console? This will execute any " - "contained commands with your user rights." --msgstr "您是否決定要將文字導出至主控台？這樣將會以您的使用者權限來執行任何內含的指令。" -+msgstr "" -+"您是否決定要將文字導出至主控臺？這樣將會以您的使用者權限來執行任何內含的指" -+"令。" - - #: app/kateconsole.cpp:130 - msgid "Pipe to Console?" --msgstr "導出至主控台？" -+msgstr "導出至主控臺？" - - #: app/kateconsole.cpp:131 - msgid "Pipe to Console" --msgstr "導出至主控台" -+msgstr "導出至主控臺" - - #: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152 - msgid "Documents" -@@ -223,8 +224,8 @@ - - #: app/katemainwindow.cpp:246 app/kwritemain.cpp:151 - msgid "" --"This lists files which you have opened recently, and allows you to easily open " --"them again." -+"This lists files which you have opened recently, and allows you to easily " -+"open them again." - msgstr "這是您最近開啟的檔案清單，並且讓您可以很容易的再次開啟它們。" - - #: app/katemainwindow.cpp:248 -@@ -293,7 +294,7 @@ - - #: app/katemainwindow.cpp:288 - msgid "&Pipe to Console" --msgstr "導出至主控台(&P)" -+msgstr "導出至主控臺(&P)" - - #: app/katemainwindow.cpp:291 - msgid "This shows useful tips on the use of this application." -@@ -315,11 +316,11 @@ - - #: app/katemainwindow.cpp:308 - msgid "Save &As..." --msgstr "另存為(&A)..." -+msgstr "另存為(&A)…" - - #: app/katemainwindow.cpp:309 - msgid "&Manage..." --msgstr "管理(&M)..." -+msgstr "管理(&M)…" - - #: app/katemainwindow.cpp:312 - msgid "&Quick Open" -@@ -341,11 +342,11 @@ - - #: app/katemainwindow.cpp:611 - msgid "&Other..." --msgstr "其他(&O)..." -+msgstr "其他(&O)…" - - #: app/katemainwindow.cpp:621 - msgid "Other..." --msgstr "其他..." -+msgstr "其他…" - - #: app/katemainwindow.cpp:638 - msgid "Application '%1' not found!" -@@ -357,10 +358,10 @@ - - #: app/katemainwindow.cpp:666 - msgid "" --"

    The current document has not been saved, and cannot be attached to an email " --"message." --"

    Do you want to save it and proceed?" --msgstr "

    目前的文件尚未儲存，因此不能附加到電子郵件中。

    您是否要將它儲存後繼續？" -+"

    The current document has not been saved, and cannot be attached to an " -+"email message.

    Do you want to save it and proceed?" -+msgstr "" -+"

    目前的文件尚未儲存，因此不能附加到電子郵件中。

    您是否要將它儲存後繼續？" - - #: app/katemainwindow.cpp:669 - msgid "Cannot Send Unsaved File" -@@ -372,15 +373,12 @@ - - #: app/katemainwindow.cpp:688 - msgid "" --"

    The current file:" --"
    %1" --"
    has been modified. Modifications will not be available in the attachment." --"

    Do you want to save it before sending it?" --msgstr "" --"

    目前的檔案：" --"
    %1" --"
    已經被修改過。修改的部分將不會出現在附加檔案中。" --"

    您是否要在寄出它之前把它儲存？" -+"

    The current file:
    %1
    has been modified. " -+"Modifications will not be available in the attachment.

    Do you want to save " -+"it before sending it?" -+msgstr "" -+"

    目前的檔案：
    %1
    已經被修改過。修改的部分將不會出現" -+"在附加檔案中。

    您是否要在寄出它之前把它儲存？" - - #: app/katemainwindow.cpp:691 - msgid "Save Before Sending?" -@@ -400,16 +398,16 @@ - - #: app/katemailfilesdialog.cpp:52 - msgid "&Mail..." --msgstr "電子郵件(&M)..." -+msgstr "電子郵件(&M)…" - - #: app/katemailfilesdialog.cpp:57 - msgid "" --"

    Press Mail... to email the current document." --"

    To select more documents to send, press Show All " --"Documents >>." -+"

    Press Mail... to email the current document.

    To select " -+"more documents to send, press Show All Documents >>." - msgstr "" --"

    按下 郵件... 將目前文件以電子郵件傳送。" --"

    要選擇更多寄送的文件，請按 顯示所有文件 >>哈。" -+"

    按下 郵件... 將目前文件以電子郵件傳送。

    要選擇更多寄送" -+"的文件，請按 顯示所有文件 >>哈。" - - #: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61 - msgid "Name" -@@ -426,7 +424,7 @@ - - #: app/katemailfilesdialog.cpp:105 - msgid "Press Mail... to send selected documents" --msgstr "按下 郵件... 將選擇的文件以電子郵件傳送" -+msgstr "按下 郵件… 將選擇的文件以電子郵件傳送" - - #: app/katemwmodonhddialog.cpp:61 - msgid "Documents Modified on Disk" -@@ -442,28 +440,30 @@ - - #: app/katemwmodonhddialog.cpp:68 - msgid "" --"Removes the modified flag from the selected documents and closes the dialog if " --"there are no more unhandled documents." -+"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 "覆蓋選擇的文件，放棄磁碟的改變並且若沒有其他未處理的文件則關閉此對話盒。" -+"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." -+"Reloads the selected documents from disk and closes the dialog if there are " -+"no more unhandled documents." - msgstr "重新從磁碟載入選擇的文件並且若沒有其他未處理的文件則關閉此對話盒。" - - #: app/katemwmodonhddialog.cpp:87 - msgid "" --"The documents listed below has changed on disk." --"

    Select one or more at the time and press an action button until the list is " --"empty." --msgstr "下面列出的文件已經在磁碟上變更過了。

    選擇一或多個並按下一個動作按鈕直到這個清單清空為止。" -+"The documents listed below has changed on disk.

    Select one or more at " -+"the time and press an action button until the list is empty." -+msgstr "" -+"下面列出的文件已經在磁碟上變更過了。

    選擇一或多個並按下一個動作按鈕直到" -+"這個清單清空為止。" - - #: app/katemwmodonhddialog.cpp:93 - msgid "Filename" -@@ -491,10 +491,12 @@ - - #: 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)。" -+"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/katemwmodonhddialog.cpp:163 - msgid "" -@@ -506,8 +508,8 @@ - - #: app/katemwmodonhddialog.cpp:268 - msgid "" --"The diff command failed. Please make sure that diff(1) is installed and in your " --"PATH." -+"The diff command failed. Please make sure that diff(1) is installed and in " -+"your PATH." - msgstr "diff 指令失敗。請確定已經安裝 diff(1) 並且在您的 PATH 中。" - - #: app/katemwmodonhddialog.cpp:270 -@@ -539,8 +541,8 @@ - - #: app/kateconfigdialog.cpp:112 - msgid "" --"If this option is checked, the full document path will be shown in the window " --"caption." -+"If this option is checked, the full document path will be shown in the " -+"window caption." - msgstr "如果核取此選項，完整的文件路徑會顯示在視窗說明中。" - - #: app/kateconfigdialog.cpp:117 -@@ -553,11 +555,12 @@ - - #: app/kateconfigdialog.cpp:125 - msgid "" --"If this is checked, the built in Konsole will cd " --"to the directory of the active document when started and whenever the active " -+"If this is checked, the built in Konsole will cd to the " -+"directory of the active document when started and whenever the active " - "document changes, if the document is a local file." - msgstr "" --"如果選取這個選項，而文件又是一個本地檔案 (在同一部電腦中) ，每當啟動及轉換當前文件時，內置的終端機將 cd 到當前文件的目錄。" -+"如果選取這個選項，而文件又是一個本地檔案 (在同一部電腦中) ，每當啟動及轉換當" -+"前文件時，內置的終端機將 cd 到當前文件的目錄。" - - #: app/kateconfigdialog.cpp:132 - msgid "Wa&rn about files modified by foreign processes" -@@ -567,11 +570,12 @@ - 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." -+"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/kateconfigdialog.cpp:143 - msgid "Meta-Information" -@@ -583,10 +587,12 @@ - - #: 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 "如果你想要文件組態例如書籤被儲存在過去的編輯器作業階段，請核取此項。當重新開啟該文件時，如果它沒有變更，該組態也會被回存。" -+"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/kateconfigdialog.cpp:159 - msgid "&Delete unused meta-information after:" -@@ -716,46 +722,34 @@ - - #: app/kategrepdialog.cpp:201 - msgid "" --"

    Enter the expression you want to search for here." --"

    If 'regular expression' is unchecked, any non-space letters in your " --"expression will be escaped with a backslash character." --"

    Possible meta characters are:" --"
    . - Matches any character" --"
    ^ - Matches the beginning of a line" --"
    $ - Matches the end of a line" --"
    \\< - Matches the beginning of a word" --"
    \\> - Matches the end of a word" --"

    The following repetition operators exist:" --"
    ? - The preceding item is matched at most once" --"
    * - The preceding item is matched zero or more times" --"
    + - The preceding item is matched one or more times" --"
    {n} - The preceding item is matched exactly n times" --"
    {n,} - The preceding item is matched n or more times" --"
    {,n} - The preceding item is matched at most n times" --"
    {n,m} - The preceding item is matched at least n" --", but at most m times." --"

    Furthermore, backreferences to bracketed subexpressions are available via " --"the notation \\#." -+"

    Enter the expression you want to search for here.

    If 'regular " -+"expression' is unchecked, any non-space letters in your expression will be " -+"escaped with a backslash character.

    Possible meta characters are:
    . - Matches any character
    ^ - Matches the beginning of a " -+"line
    $ - Matches the end of a line
    \\< - Matches the " -+"beginning of a word
    \\> - Matches the end of a word

    The " -+"following repetition operators exist:
    ? - The preceding item is " -+"matched at most once
    * - The preceding item is matched zero or " -+"more times
    + - The preceding item is matched one or more " -+"times
    {n} - The preceding item is matched exactly n " -+"times
    {n,} - The preceding item is matched n or more " -+"times
    {,n} - The preceding item is matched at most n " -+"times
    {n,m} - The preceding item is matched at least " -+"n, but at most m times.

    Furthermore, backreferences to " -+"bracketed subexpressions are available via the notation \\#." - "

    See the grep(1) documentation for the full documentation." - msgstr "" --"

    在此鍵入你想搜尋的正規表示式。" --"

    如果核消「正規表示式」，在您的表示式中的任何非空白字元都會加上反斜線字元。" --"

    可用的特殊字元有：" --"
    . - 符合任何字元" --"
    ^ - 符合行首" --"
    $ - 符合行尾" --"
    \\< - 符合字首" --"
    \\> - 符合字尾" --"

    以下是可用的 repetition operators ：" --"
    ? - 前面的項目最多只可以符合一次" --"
    * - 前面的項目可以符合零至無限次" --"
    + - 前面的項目要符合一或更多次times" --"
    {n} - 前面的項目要符合剛好 n 次times" --"
    {n,} - 前面的項目要符合 n 或更多次 times" --"
    {,n} - 前面的項目最多 n 次times" --"
    {n,m} - 前面的項目最少符合 n 次，但最多 m 次。" --"

    此外，可以用 \\# 來用回括著了的表示式。" --"

    請查閱 grep(1) 文件以獲取完整的資訊。" -+"

    在此鍵入你想搜尋的正規表示式。

    如果核消「正規表示式」，在您的表示式中的" -+"任何非空白字元都會加上反斜線字元。

    可用的特殊字元有：
    . - 符合任" -+"何字元
    ^ - 符合行首
    $ - 符合行尾
    \\< - 符合" -+"字首
    \\> - 符合字尾

    以下是可用的 repetition operators ：" -+"
    ? - 前面的項目最多只可以符合一次
    * - 前面的項目可以符合" -+"零至無限次
    + - 前面的項目要符合一或更多次times
    {n} - 前面的項目要符合剛好 n 次times
    {n,} - 前面的項目" -+"要符合 n 或更多次 times
    {,n} - 前面的項目最多 n 次times
    {n,m} - 前面的項目最少符合 n 次，但" -+"最多 m 次。

    此外，可以用 \\# 來用回括著了的表示式。

    " -+"請查閱 grep(1) 文件以獲取完整的資訊。" - - #: app/kategrepdialog.cpp:224 - msgid "" -@@ -792,13 +786,13 @@ - - #: app/kategrepdialog.cpp:238 - msgid "" --"

    If this is enabled, your pattern will be passed unmodified to " --"grep(1). Otherwise, all characters that are not letters will be escaped " --"using a backslash character to prevent grep from interpreting them as part of " --"the expression." -+"

    If this is enabled, your pattern will be passed unmodified to grep(1)" -+". Otherwise, all characters that are not letters will be escaped using " -+"a backslash character to prevent grep from interpreting them as part of the " -+"expression." - msgstr "" --"

    如果啟用此項，您的樣式將會不經修改傳送給 grep(1)。否則，所有非字母的字元將會被加上反斜線字元以避免 grep " --"將它們視為表示式的一部分。" -+"

    如果啟用此項，您的樣式將會不經修改傳送給 grep(1)。否則，所有非字" -+"母的字元將會被加上反斜線字元以避免 grep 將它們視為表示式的一部分。" - - #: app/kategrepdialog.cpp:243 - msgid "" -@@ -807,7 +801,7 @@ - "on the item to show the respective line in the editor." - msgstr "" - "grep 執行後的結果將在這裡列出。選擇\n" --"一檔名/行號組合並按 Enter 或 doubleclick\n" -+"一檔名/列號組合並按 Enter 或 doubleclick\n" - "該項目會在編輯器顯示有相對的行。" - - #: app/kategrepdialog.cpp:327 -@@ -844,7 +838,7 @@ - - #: app/katemain.cpp:49 app/kwritemain.cpp:533 - msgid "Navigate to this line" --msgstr "導覽至這一行" -+msgstr "導覽至這一列" - - #: app/katemain.cpp:51 app/kwritemain.cpp:534 - msgid "Navigate to this column" -@@ -890,7 +884,7 @@ - - #: app/katemain.cpp:73 app/kwritemain.cpp:560 - msgid "Testing, ..." --msgstr "測試中，..." -+msgstr "測試中，…" - - #: app/katemain.cpp:74 app/kwritemain.cpp:561 - msgid "Former Core Developer" -@@ -982,9 +976,10 @@ - - #: app/katedocmanager.cpp:395 - msgid "" --"

    The document '%1' has been modified, but not saved." --"

    Do you want to save your changes or discard them?" --msgstr "

    此文件「%1」已被修改，但尚未被儲存。

    您想要儲存您的變更或是放棄它們？" -+"

    The document '%1' has been modified, but not saved.

    Do you want to save " -+"your changes or discard them?" -+msgstr "" -+"

    此文件「%1」已被修改，但尚未被儲存。

    您想要儲存您的變更或是放棄它們？" - - #: app/katedocmanager.cpp:397 - msgid "Close Document" -@@ -992,7 +987,7 @@ - - #: app/katedocmanager.cpp:483 - msgid "Reopening files from the last session..." --msgstr "從上一次作業階段重新開啟檔案..." -+msgstr "從上一次作業階段重新開啟檔案…" - - #: app/katedocmanager.cpp:490 - msgid "Starting Up" -@@ -1088,7 +1083,7 @@ - - #: app/katesession.cpp:810 - msgid "&Rename..." --msgstr "重新命名(&R)..." -+msgstr "重新命名(&R)…" - - #: app/katesession.cpp:850 - msgid "Specify New Name for Session" -@@ -1143,10 +1138,12 @@ - - #: app/katefilelist.cpp:585 - 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 "當背景陰影啟用時，在目前作業階段中被檢視和編輯過的文件會顯示具有陰影的背景。而最近一次使用的文件會有最強的陰影。" -+"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 - msgid "Set the color for shading viewed documents." -@@ -1154,9 +1151,11 @@ - - #: app/katefilelist.cpp:591 - 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 "設定修改過文件的色彩。這個色彩會和檢視過的檔案色彩混合。最近一次編輯的文件最可能取得這個色彩。" -+"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 - msgid "Set the sorting method for the documents." -@@ -1192,7 +1191,7 @@ - - #: app/kwritemain.cpp:157 - msgid "Choose Editor..." --msgstr "選擇編輯器..." -+msgstr "選擇編輯器…" - - #: app/kwritemain.cpp:159 - msgid "Override the system wide setting for the default editing component" -@@ -1224,8 +1223,8 @@ - - #: app/kwritemain.cpp:253 - msgid "" --"The given file could not be read, check if it exists or if it is readable for " --"the current user." -+"The given file could not be read, check if it exists or if it is readable " -+"for the current user." - msgstr "無法讀取指定的檔案，請檢查它是否存在或者目前使用者是否可以讀取。" - - #: app/kwritemain.cpp:549 -@@ -1365,14 +1364,15 @@ - - #: app/katemdi.cpp:778 - msgid "" --"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 Window > Tool Views > Show " --"Sidebars in the menu. It is still possible to show/hide the tool views with " --"the assigned shortcuts." --msgstr "" --"您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視，因此如果您需要再次存取邊列請呼叫選單中的 " --"視窗 > 工具檢視 > 顯示邊列。您也可以使用指定的快速鍵來顯示/隱藏工具檢視。" -+"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 Window > Tool Views > Show " -+"Sidebars in the menu. It is still possible to show/hide the tool views " -+"with the assigned shortcuts." -+msgstr "" -+"您即將隱藏邊列。將邊列隱藏後將無法再度使用滑鼠直接存取工具檢視，因此如果" -+"您需要再次存取邊列請呼叫選單中的 視窗 > 工具檢視 > 顯示邊列。您" -+"也可以使用指定的快速鍵來顯示/隱藏工具檢視。" - - #: app/kateconfigplugindialogpage.cpp:82 - msgid "Comment" -@@ -1382,7 +1382,9 @@ - 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 時也會再次載入。" -+msgstr "" -+"在這裡您可以看到所有可用的 Kate 外掛程式。具有核取標記的代表已載入，並且在下" -+"次啟動 Kate 時也會再次載入。" - - #: app/katesavemodifieddialog.cpp:78 - msgid "Save As (%1)" -@@ -1402,8 +1404,8 @@ - - #: app/katesavemodifieddialog.cpp:142 - msgid "" --"The following documents have been modified. Do you want to save them before " --"closing?" -+"The following documents have been modified. Do you want to save them " -+"before closing?" - msgstr "下列文件已被修改過。您想要在關閉前儲存它們嗎？" - - #: app/katesavemodifieddialog.cpp:144 -@@ -1424,8 +1426,8 @@ - - #: app/katesavemodifieddialog.cpp:211 - msgid "" --"Data you requested to be saved could not be written. Please choose how you want " --"to proceed." -+"Data you requested to be saved could not be written. Please choose how you " -+"want to proceed." - msgstr "您要求儲存的資料無法寫入。請選擇您要如何繼續。" - - #: app/katefileselector.cpp:170 -@@ -1434,31 +1436,31 @@ - - #: app/katefileselector.cpp:198 - msgid "" --"

    Here you can enter a path for a folder to display." --"

    To go to a folder previously entered, press the arrow on the right and " --"choose one. " --"

    The entry has folder completion. Right-click to choose how completion should " -+"

    Here you can enter a path for a folder to display.

    To go to a folder " -+"previously entered, press the arrow on the right and choose one.

    The " -+"entry has folder completion. Right-click to choose how completion should " - "behave." - msgstr "" --"

    您可以在這裡輸入要顯示的資料夾路徑。" --"

    要移至前一次輸入的資料夾，請按下右邊的箭頭並且選擇一個。" --"

    該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能要如何運作。" -+"

    您可以在這裡輸入要顯示的資料夾路徑。

    要移至前一次輸入的資料夾，請按下右" -+"邊的箭頭並且選擇一個。

    該項目具有資料夾補齊功能。右擊滑鼠鍵可以選擇補齊功能" -+"要如何運作。" - - #: app/katefileselector.cpp:203 - msgid "" --"

    Here you can enter a name filter to limit which files are displayed." --"

    To clear the filter, toggle off the filter button to the left." --"

    To reapply the last filter used, toggle on the filter button." --msgstr "" --"

    您可以在這裡輸入名稱過濾器來限制要顯示的檔案。" --"

    要清除過濾器，請將過濾器按鈕切換至左方。" --"

    要重新套用上次使用的過濾器，請使用過濾器按鈕切換。" -+"

    Here you can enter a name filter to limit which files are displayed.

    To " -+"clear the filter, toggle off the filter button to the left.

    To reapply the " -+"last filter used, toggle on the filter button." -+msgstr "" -+"

    您可以在這裡輸入名稱過濾器來限制要顯示的檔案。

    要清除過濾器，請將過濾器" -+"按鈕切換至左方。

    要重新套用上次使用的過濾器，請使用過濾器按鈕切換。" - - #: app/katefileselector.cpp:207 - msgid "" --"

    This button clears the name filter when toggled off, or reapplies the last " --"filter used when toggled on." --msgstr "

    當這個按鈕切換到關閉時會清除名稱過濾器，切換到開啟時則會重新套用上次的過濾器。" -+"

    This button clears the name filter when toggled off, or reapplies the " -+"last filter used when toggled on." -+msgstr "" -+"

    當這個按鈕切換到關閉時會清除名稱過濾器，切換到開啟時則會重新套用上次的過濾" -+"器。" - - #: app/katefileselector.cpp:321 - msgid "Apply last filter (\"%1\")" -@@ -1514,7 +1516,8 @@ - - #: app/katefileselector.cpp:592 - msgid "" --"

    Decides how many locations to keep in the history of the location combo box." -+"

    Decides how many locations to keep in the history of the location combo " -+"box." - msgstr "

    決定在位置組合方塊的歷史記錄中要保留多少位置。" - - #: app/katefileselector.cpp:597 -@@ -1525,38 +1528,35 @@ - #: app/katefileselector.cpp:602 - msgid "" - "

    These options allow you to have the File Selector automatically change " --"location to the folder of the active document on certain events." --"

    Auto synchronization is lazy, meaning it will not take effect until " --"the file selector is visible." --"

    None of these are enabled by default, but you can always sync the location " --"by pressing the sync button in the toolbar." -+"location to the folder of the active document on certain events.

    Auto " -+"synchronization is lazy, meaning it will not take effect until the " -+"file selector is visible.

    None of these are enabled by default, but you " -+"can always sync the location by pressing the sync button in the toolbar." - msgstr "" --"

    這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料夾。" --"

    自動同步是很 被動的，代表它只有在檔案選擇器為可視時才會生效。" -+"

    這些選項讓您的檔案選擇器會自動依照某些事件自動變更位置到作用中文件的資料" -+"夾。

    自動同步是很 被動的，代表它只有在檔案選擇器為可視時才會生效。" - "

    這些功能都不是預設啟用的，但是您隨時可以按下工具列中的同步按鈕來同步位置。" - - #: app/katefileselector.cpp:611 - msgid "" --"

    If this option is enabled (default), the location will be restored when you " --"start Kate." --"

    Note that if the session is handled by the KDE session " --"manager, the location is always restored." -+"

    If this option is enabled (default), the location will be restored when " -+"you start Kate.

    Note that if the session is handled by " -+"the KDE session manager, the location is always restored." - msgstr "" --"

    如果啟用此選項(預設)，當您啟動 Kate 時會回存上次的位置。" --"

    注意如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存上次的位置。" -+"

    如果啟用此選項(預設)，當您啟動 Kate 時會回存上次的位置。

    注意如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存上次的位置。" - - #: app/katefileselector.cpp:615 - msgid "" - "

    If this option is enabled (default), the current filter will be restored " --"when you start Kate." --"

    Note that if the session is handled by the KDE session " --"manager, the filter is always restored." --"

    Note that some of the autosync settings may override the " --"restored location if on." --msgstr "" --"

    如果啟用此選項(預設)，當您啟動 Kate 時會回存目前的過濾器。" --"

    注意如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存目前的過濾器。" --"

    注意部分自動同步設定開啟時可能會覆蓋回存的位置。" -+"when you start Kate.

    Note that if the session is handled " -+"by the KDE session manager, the filter is always restored.

    Note that some of the autosync settings may override the restored " -+"location if on." -+msgstr "" -+"

    如果啟用此選項(預設)，當您啟動 Kate 時會回存目前的過濾器。

    注意" -+"如果作業階段是由 KDE 作業階段管理程式掌控，將永遠會回存目前的過濾" -+"器。

    注意部分自動同步設定開啟時可能會覆蓋回存的位置。" - - #. i18n: file ./data/kateui.rc line 43 - #: rc.cpp:9 -@@ -1612,18 +1612,18 @@ - "

    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.

    \n" --"

    Just choose " --"
    View -> Split [ Horizontal | Vertical ]

    \n" -+"

    Just choose
    View -> Split [ Horizontal | Vertical ]

    \n" - msgstr "" - "

    您可以依喜好將 Kate 編輯器分割任意次或任何\n" - "方向。每個框架都會有自己的狀態列並且都可以\n" - "顯示任何開啟的文件。

    \n" --"

    只要選擇 " --"
    檢視 -> 分割 [ 水平 | 垂直 ]

    \n" -+"

    只要選擇
    檢視 -> 分割 [ 水平 | 垂直 ]

    \n" - - #: tips.cpp:32 - msgid "" --"

    You can drag the Tool views (File List and File Selector)\n" -+"

    You can drag the Tool views (File List and File Selector)\n" - "to any side that you want them in Kate, or stack them, or even tear them off " - "the\n" - "main window.

    \n" -@@ -1634,8 +1634,8 @@ - - #: tips.cpp:39 - msgid "" --"

    Kate has a built-in terminal emulator, just click on " --"\"Terminal\" at\n" -+"

    Kate has a built-in terminal emulator, just click on \"Terminal" -+"\" at\n" - "the bottom to show or hide it as you desire.

    \n" - msgstr "" - "

    Kate 有內建的終端機模擬器，只要按 「終端機」 \n" -@@ -1645,25 +1645,22 @@ - msgid "" - "

    Kate can highlight the current line with a\n" - "" --"" --"
    different\n" -+"width=\"100%\">
    different\n" - "background color.|

    \n" - "

    You can set the color in the Colors page of the configuration\n" - "dialog.

    \n" - msgstr "" - "

    Kate 可以將目前所在的行突顯為\n" - "" --"" --"
    不同的\n" -+"width=\"100%\">
    不同的\n" - "背景色彩。|

    \n" - "

    您可以在組態對話盒中的 色彩 頁面\n" - "設定色彩。

    \n" - - #: tips.cpp:54 - msgid "" --"

    You can open the currently edited file in any other application from within\n" -+"

    You can open the currently edited file in any other application from " -+"within\n" - "Kate.

    \n" - "

    Choose File -> Open With for the list of programs\n" - "configured\n" -@@ -1680,19 +1677,21 @@ - #: tips.cpp:64 - msgid "" - "

    You can configure the editor to always display the line numbers and/or\n" --"bookmark panes when started from the View Defaults " --"page of the\n" -+"bookmark panes when started from the View Defaults page of " -+"the\n" - "configuration dialog.

    \n" - msgstr "" --"

    您可以設定編輯器在啟動時永遠顯示行數和/或\n" -+"

    您可以設定編輯器在啟動時永遠顯示列數和/或\n" - "書籤面板，就在組態對話盒的 檢視的預設值\n" - "中。

    \n" - - #: tips.cpp:71 - msgid "" --"

    You can download new or updated Syntax highlight definitions from\n" -+"

    You can download new or updated Syntax highlight definitions " -+"from\n" - "the Highlighting page in the configuration dialog.

    \n" --"

    Just click the Download... button on the Highlight Modes\n" -+"

    Just click the Download... button on the Highlight Modes\n" - "tab (You have to be online, of course...).

    \n" - msgstr "" - "

    您可以從組態對話盒中的 突顯功能 頁面\n" -@@ -1702,23 +1701,25 @@ - - #: tips.cpp:79 - msgid "" --"

    You can cycle through all open documents by pressing " --"Alt+Left\n" --"or Alt+Right. The next/previous document will immediately be " --"displayed\n" -+"

    You can cycle through all open documents by pressing Alt+Left\n" -+"or Alt+Right. The next/previous document will immediately " -+"be displayed\n" - "in the active frame.

    \n" - msgstr "" --"

    您可以按 Alt+Left 或 Alt+Right 來在所有開啟的文件\n" -+"

    您可以按 Alt+Left 或 Alt+Right 來在所有" -+"開啟的文件\n" - "之間循環瀏覽。上一個/下一個文件會立即顯示在作用中\n" - "的框架。

    \n" - - #: tips.cpp:86 - msgid "" --"

    You can do cool sed-like regular expression replacements using " --"Command Line.

    \n" --"

    For example, press F7 and enter " --"s /oldtext/newtext/g\n" --"to replace "oldtext" with "newtext" throughout the current\n" -+"

    You can do cool sed-like regular expression replacements using " -+"Command Line.

    \n" -+"

    For example, press F7 and enter s /oldtext/newtext/" -+"g\n" -+"to replace "oldtext" with "newtext" throughout the " -+"current\n" - "line.

    \n" - msgstr "" - "

    您可以使用 命令列 來進行很酷的 類-sed 正規表示式取代功能。

    \n" -@@ -1736,7 +1737,8 @@ - - #: tips.cpp:100 - msgid "" --"

    You can filter the files displayed in the File Selector tool view.\n" -+"

    You can filter the files displayed in the File Selector tool " -+"view.\n" - "

    \n" - "

    Simply enter your filter in the filter entry at the bottom, for example:\n" - "*.html *.php if you only want to see HTML and PHP files in the\n" -@@ -1755,7 +1757,8 @@ - "

    You can have two views - or even more - of the same document in Kate. " - "Editing\n" - "in either will be reflected in both.

    \n" --"

    So if you find yourself scrolling up and down to look at text at the other\n" -+"

    So if you find yourself scrolling up and down to look at text at the " -+"other\n" - "end of a document, just press Ctrl+Shift+T to split\n" - "horizontally.

    \n" - msgstr "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kay.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kay.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kay.po 2007-05-14 12:22:55.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kay.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-03-30 02:14+0200\n" - "PO-Revision-Date: 2006-01-12 13:19+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -55,7 +54,7 @@ - - #: notificationdialog.cpp:64 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #. i18n: file notificationdialogview.ui line 69 - #: rc.cpp:3 -@@ -67,7 +66,7 @@ - #: rc.cpp:6 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file notificationdialogview.ui line 103 - #: rc.cpp:9 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccessibility.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccessibility.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccessibility.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccessibility.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmaccessibility\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-10-25 17:48+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -63,12 +63,10 @@ - #: rc.cpp:12 - #, no-c-format - msgid "" --"This is the configuration of the Audible Bell." --"
    \n" -+"This is the configuration of the Audible Bell.
    \n" - "It could be the system bell and/or a custom bell." - msgstr "" --"這是有聲響鈴的組態。" --"
    \n" -+"這是有聲響鈴的組態。
    \n" - "它可以是系統響鈴和/或自訂響鈴。" - - #. i18n: file accessibilityconfigwidget.ui line 61 -@@ -82,12 +80,11 @@ - #, no-c-format - msgid "" - "If this option is checked, the default system bell will be used. See the " --"\"System Bell\" control module for how to customize the system bell." --"
    \n" -+"\"System Bell\" control module for how to customize the system bell.
    \n" - "Normally, this is just a \"beep\"." - msgstr "" --"如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴\"控制模組。" --"
    \n" -+"如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴" -+"\"控制模組。
    \n" - "正常情形它就是一聲\"beep\"。" - - #. i18n: file accessibilityconfigwidget.ui line 73 -@@ -100,14 +97,14 @@ - #: rc.cpp:26 - #, no-c-format - msgid "" --"Check this option if you want to use a customized bell, playing a sound file. " --"If you do this, you will probably want to turn off the system bell." -+"Check this option if you want to use a customized bell, playing a sound " -+"file. If you do this, you will probably want to turn off the system bell." - "
    \n" - "Please note that on slow machines this may cause a \"lag\" between the event " - "causing the bell and the sound being played." - msgstr "" --"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系統響鈴。" --"
    \n" -+"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系" -+"統響鈴。
    \n" - "請注意在速度較慢的機器上，響鈴及播放聲音事件間可能造成延滯。" - - #. i18n: file accessibilityconfigwidget.ui line 113 -@@ -120,8 +117,8 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"If the option \"Use customized bell\" is enabled, you can choose a sound file " --"here." -+"If the option \"Use customized bell\" is enabled, you can choose a sound " -+"file here." - msgstr "如果選項\"使用自訂響鈴\"有啟動，您可以在這裡選擇一個聲音檔。" - - #. i18n: file accessibilityconfigwidget.ui line 139 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccess.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccess.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmaccess.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmaccess.po 2011-11-11 15:45:17.000000000 +0100 -@@ -14,8 +14,7 @@ - "Project-Id-Version: kcmaccess\n" - "POT-Creation-Date: 2006-03-27 03:52+0200\n" - "PO-Revision-Date: 2006-06-19 09:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -98,19 +97,21 @@ - #: kcmaccess.cpp:258 - msgid "" - "If this option is checked, the default system bell will be used. See the " --"\"System Bell\" control module for how to customize the system bell. Normally, " --"this is just a \"beep\"." --msgstr "如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴\"控制模組。正常情形它就是一聲\"beep\"。" -+"\"System Bell\" control module for how to customize the system bell. " -+"Normally, this is just a \"beep\"." -+msgstr "" -+"如果這個選項被確認，將會使用預設的系統響鈴。如何自訂系統響鈴則請見\"系統響鈴" -+"\"控制模組。正常情形它就是一聲\"beep\"。" - - #: kcmaccess.cpp:261 - msgid "" --"Check this option if you want to use a customized bell, playing a sound file. " --"If you do this, you will probably want to turn off the system bell." --"

    Please note that on slow machines this may cause a \"lag\" between the " --"event causing the bell and the sound being played." -+"Check this option if you want to use a customized bell, playing a sound " -+"file. If you do this, you will probably want to turn off the system bell.

    " -+"Please note that on slow machines this may cause a \"lag\" between the event " -+"causing the bell and the sound being played." - msgstr "" --"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系統響鈴。" --"

    請注意在速度較慢的機器上，響鈴及播放聲音事件間可能造成\"延滯\"。" -+"如果您要播放聲音檔作為自訂的響鈴，請確認這個選項。如此的話，您大概就要關閉系" -+"統響鈴。

    請注意在速度較慢的機器上，響鈴及播放聲音事件間可能造成\"延滯\"。" - - #: kcmaccess.cpp:268 - msgid "Sound &to play:" -@@ -118,9 +119,11 @@ - - #: kcmaccess.cpp:273 - msgid "" --"If the option \"Use customized bell\" is enabled, you can choose a sound file " --"here. Click \"Browse...\" to choose a sound file using the file dialog." --msgstr "如果選項\"使用自訂響鈴\"有啟動，您可以在這裡選擇一個聲音檔。點擊\"瀏覽...\"可用對話框選擇選擇一個聲音檔。" -+"If the option \"Use customized bell\" is enabled, you can choose a sound " -+"file here. Click \"Browse...\" to choose a sound file using the file dialog." -+msgstr "" -+"如果選項\"使用自訂響鈴\"有啟動，您可以在這裡選擇一個聲音檔。點擊\"瀏覽...\"可" -+"用對話框選擇選擇一個聲音檔。" - - #: kcmaccess.cpp:290 - msgid "Visible Bell" -@@ -135,7 +138,9 @@ - "This option will turn on the \"visible bell\", i.e. a visible notification " - "shown every time that normally just a bell would occur. This is especially " - "useful for deaf people." --msgstr "這個選項會開啟 \"視覺響鈴\"，也就是當鈴聲啟動時以視覺畫面的通知。 對於聽障而言這將很有用。" -+msgstr "" -+"這個選項會開啟 \"視覺響鈴\"，也就是當鈴聲啟動時以視覺畫面的通知。 對於聽障而" -+"言這將很有用。" - - #: kcmaccess.cpp:304 - msgid "I&nvert screen" -@@ -152,7 +157,8 @@ - - #: kcmaccess.cpp:311 - msgid "" --"The screen will turn to a custom color for the amount of time specified below." -+"The screen will turn to a custom color for the amount of time specified " -+"below." - msgstr "畫面將會在下面指定的時間內轉變成自定的顏色。" - - #: kcmaccess.cpp:317 -@@ -170,7 +176,8 @@ - - #: kcmaccess.cpp:327 - msgid "" --"Here you can customize the duration of the \"visible bell\" effect being shown." -+"Here you can customize the duration of the \"visible bell\" effect being " -+"shown." - msgstr "您可以在這邊自訂 \"視覺響鈴\" 的持續時間。" - - #: kcmaccess.cpp:344 -@@ -213,7 +220,7 @@ - - #: kcmaccess.cpp:390 kcmaccess.cpp:538 - msgid "Configure System Notification..." --msgstr "設定系統通知..." -+msgstr "設定系統通知…" - - #: kcmaccess.cpp:407 - msgid "&Modifier Keys" -@@ -273,7 +280,8 @@ - - #: kcmaccess.cpp:500 - msgid "" --"Here you can activate keyboard gestures that turn on the following features: \n" -+"Here you can activate keyboard gestures that turn on the following " -+"features: \n" - "Sticky keys: Press Shift key 5 consecutive times\n" - "Slow keys: Hold down Shift for 8 seconds" - msgstr "" -@@ -283,7 +291,8 @@ - - #: kcmaccess.cpp:504 - msgid "" --"Here you can activate keyboard gestures that turn on the following features: \n" -+"Here you can activate keyboard gestures that turn on the following " -+"features: \n" - "Mouse Keys: %1\n" - "Sticky keys: Press Shift key 5 consecutive times\n" - "Slow keys: Hold down Shift for 8 seconds" -@@ -311,14 +320,14 @@ - - #: kcmaccess.cpp:526 - msgid "" --"Use the system bell whenever a gesture is used to turn an accessibility feature " --"on or off" -+"Use the system bell whenever a gesture is used to turn an accessibility " -+"feature on or off" - msgstr "當使用手勢開啟或關閉無障礙功能時使用系統鈴聲" - - #: kcmaccess.cpp:529 - msgid "" --"Show a confirmation dialog whenever a keyboard accessibility feature is turned " --"on or off" -+"Show a confirmation dialog whenever a keyboard accessibility feature is " -+"turned on or off" - msgstr "當開啟或關閉鍵盤無障礙功能時顯示確認對話盒" - - #: kcmaccess.cpp:531 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmarts.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmarts.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmarts.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmarts.po 2011-11-11 15:45:17.000000000 +0100 -@@ -2,13 +2,13 @@ - # Copyright (C) 2001 Free Software Foundation, Inc. - # Ger, Huang-Bin , 2001 - # Kenduest Lee , 2002 --# -+# - msgid "" - msgstr "" - "Project-Id-Version: kcmarts\n" - "POT-Creation-Date: 2007-07-28 01:12+0200\n" - "PO-Revision-Date: 2005-08-12 09:19+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -25,7 +25,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"hbger@rpgs1.isa.nthu.edu.tw,kenduest@i18n.linux.org.tw,gentamicin5@yahoo.com.tw" -+"hbger@rpgs1.isa.nthu.edu.tw,kenduest@i18n.linux.org.tw,gentamicin5@yahoo.com." -+"tw" - - #: arts.cpp:109 - msgid "" -@@ -43,9 +44,9 @@ - "allows you to apply different effects to your system sounds and provides " - "programmers with an easy way to achieve sound support." - msgstr "" --"您現在正在設定的是" --"

    aRts 聲音伺服器

    ，KDE 的聲音伺服器。這個程式將不僅讓您在播放一些 MP3 " --"檔案或玩遊戲時仍然可以聽到系統聲音，它同時允許您套用不同的效果在系統音源上，並提供程式設計師一個較簡單的方式來達到聲音支援。" -+"您現在正在設定的是

    aRts 聲音伺服器

    ，KDE 的聲音伺服器。這個程式將不僅" -+"讓您在播放一些 MP3 檔案或玩遊戲時仍然可以聽到系統聲音，它同時允許您套用不同的" -+"效果在系統音源上，並提供程式設計師一個較簡單的方式來達到聲音支援。" - - #: arts.cpp:167 - msgid "&General" -@@ -57,42 +58,47 @@ - - #: arts.cpp:182 - msgid "" --"Normally, the sound server defaults to using the device called /dev/dsp " --"for sound output. That should work in most cases. On some systems where devfs " --"is used, however, you may need to use /dev/sound/dsp " --"instead. Other alternatives are things like /dev/dsp0 or /dev/dsp1" --", if you have a soundcard that supports multiple outputs, or you have multiple " -+"Normally, the sound server defaults to using the device called /dev/dsp for sound output. That should work in most cases. On some systems where " -+"devfs is used, however, you may need to use /dev/sound/dsp instead. " -+"Other alternatives are things like /dev/dsp0 or /dev/dsp1, if " -+"you have a soundcard that supports multiple outputs, or you have multiple " - "soundcards." - msgstr "" --"一般而言，聲音伺服器預設使用 /dev/dsp 作為聲音輸出，這在絕大多數的情況下應該都能運作。一個例外的情況是如果您使用 devfs " --"時，則您應該要使用 /dev/sound/dsp作為取代。其他像 /dev/dsp0 或 /dev/dsp1 " --"則是當您的音效卡支援多重輸出或您有多張音效卡時使用。" -+"一般而言，聲音伺服器預設使用 /dev/dsp 作為聲音輸出，這在絕大多數的情況" -+"下應該都能運作。一個例外的情況是如果您使用 devfs 時，則您應該要使用 /dev/" -+"sound/dsp作為取代。其他像 /dev/dsp0 或 /dev/dsp1 則是當您的" -+"音效卡支援多重輸出或您有多張音效卡時使用。" - - #: arts.cpp:184 - msgid "" - "Normally, the sound server defaults to using a sampling rate of 44100 Hz (CD " --"quality), which is supported on almost any hardware. If you are using certain " --"Yamaha soundcards, you might need to configure this to 48000 Hz here, if " --"you are using old SoundBlaster cards, like SoundBlaster Pro, you might " --"need to change this to 22050 Hz. All other values are possible, too, and may " --"make sense in certain contexts (i.e. professional studio equipment)." --msgstr "" --"一般而言，聲音伺服器的預設取樣是採大多數硬體所支援的頻率 44100 Hz (CD 音質)。如果您使用某些 Yamaha 音效卡" --", 您可能必須將頻率設定改為 48000 Hz，如果您使用的是 舊的聲霸卡，例如 SoundBlaster Pro ，則您可能必須將設定改為 " --"22050 Hz。當然其他數值的採用也都是有其可能性，端視環境需求而定(例如專業的錄音設備)。" -+"quality), which is supported on almost any hardware. If you are using " -+"certain Yamaha soundcards, you might need to configure this to 48000 " -+"Hz here, if you are using old SoundBlaster cards, like SoundBlaster " -+"Pro, you might need to change this to 22050 Hz. All other values are " -+"possible, too, and may make sense in certain contexts (i.e. professional " -+"studio equipment)." -+msgstr "" -+"一般而言，聲音伺服器的預設取樣是採大多數硬體所支援的頻率 44100 Hz (CD 音質)。" -+"如果您使用某些 Yamaha 音效卡, 您可能必須將頻率設定改為 48000 Hz，如果" -+"您使用的是 舊的聲霸卡，例如 SoundBlaster Pro ，則您可能必須將設定改為 " -+"22050 Hz。當然其他數值的採用也都是有其可能性，端視環境需求而定(例如專業的錄音" -+"設備)。" - - #: arts.cpp:186 - msgid "" --"This configuration module is intended to cover almost every aspect of the aRts " --"sound server that you can configure. However, there are some things which may " --"not be available here, so you can add command line options " -+"This configuration module is intended to cover almost every aspect of the " -+"aRts sound server that you can configure. However, there are some things " -+"which may not be available here, so you can add command line options " - "here which will be passed directly to artsd. The command line options " --"will override the choices made in the GUI. To see the possible choices, open a " --"Konsole window, and type artsd -h." -+"will override the choices made in the GUI. To see the possible choices, open " -+"a Konsole window, and type artsd -h." - msgstr "" --"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而有些設定並不在這裡，所以您可以在這邊增加 " --"命令行選項 以直接送給 artsd。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選項，請開啟一個 konsole " --"視窗，並輸入 artsd -h。" -+"這個設定模組(configuration module)適用於 aRts 聲音伺服器絕大部分的設定。然而" -+"有些設定並不在這裡，所以您可以在這邊增加 命令行選項 以直接送給 " -+"artsd。這些命令行選項將會蓋掉您原來在圖形介面下的選項。要檢視可能的選" -+"項，請開啟一個 konsole 視窗，並輸入 artsd -h。" - - #: arts.cpp:195 - msgid "Autodetect" -@@ -116,7 +122,8 @@ - - #: arts.cpp:422 - msgid "" --"The settings have changed since the last time you restarted the sound server.\n" -+"The settings have changed since the last time you restarted the sound " -+"server.\n" - "Do you want to save them?" - msgstr "" - "您已經異動了聲音伺服器的設定值。\n" -@@ -136,9 +143,11 @@ - - #: arts.cpp:492 - msgid "" --"Impossible to start aRts with realtime priority because artswrapper is missing " --"or disabled" --msgstr "由於 artswrapper 程式遺失或關閉，所以 aRts 無法開啟使用即時的優先等級模式進行工作" -+"Impossible to start aRts with realtime priority because artswrapper is " -+"missing or disabled" -+msgstr "" -+"由於 artswrapper 程式遺失或關閉，所以 aRts 無法開啟使用即時的優先等級模式進行" -+"工作" - - #: arts.cpp:586 - msgid "Restarting Sound System" -@@ -216,7 +225,9 @@ - msgid "" - "If this option is enabled, the sound system will be loaded on KDE startup.\n" - "Recommended if you want sound." --msgstr "如果啟動這個選項，arts 聲音伺服器將會在 KDE 啟動時自動啟動。如果您希望有聲音播放的功能，建議您啟動。" -+msgstr "" -+"如果啟動這個選項，arts 聲音伺服器將會在 KDE 啟動時自動啟動。如果您希望有聲音" -+"播放的功能，建議您啟動。" - - #. i18n: file generaltab.ui line 64 - #: rc.cpp:10 -@@ -230,7 +241,9 @@ - msgid "" - "Enable this option if you want to play sound on a remote computer or you " - "want to be able to control sound on this system from another computer." --msgstr "如果您要在遠端的電腦播放聲音，或者 您希望可以從其他電腦控制這個系統的聲音，就啟動這個選項。" -+msgstr "" -+"如果您要在遠端的電腦播放聲音，或者 您希望可以從其他電腦控制這個系統的聲" -+"音，就啟動這個選項。" - - #. i18n: file generaltab.ui line 83 - #: rc.cpp:16 -@@ -244,7 +257,8 @@ - msgid "" - "This option allows sound requests coming in from over the network to be " - "accepted, instead of just limiting the server to the local computer." --msgstr "這個選項允許您接受來自網路的聲音播放要求(request)，而不限於只服務本地端電腦。" -+msgstr "" -+"這個選項允許您接受來自網路的聲音播放要求(request)，而不限於只服務本地端電腦。" - - #. i18n: file generaltab.ui line 96 - #: rc.cpp:22 -@@ -258,7 +272,9 @@ - msgid "" - "If your sound is skipping during playback, enable running with highest " - "possible priority. Increasing your sound buffer might also help." --msgstr "如果您的聲音播放時有遺漏，可以使用盡可能高的優先權執行。增加您的聲音緩衝區也許也有幫助。" -+msgstr "" -+"如果您的聲音播放時有遺漏，可以使用盡可能高的優先權執行。增加您的聲音緩衝區" -+"也許也有幫助。" - - #. i18n: file generaltab.ui line 115 - #: rc.cpp:28 -@@ -271,9 +287,11 @@ - #, no-c-format - msgid "" - "On systems which support realtime scheduling, if you have sufficient " --"permissions, this option will enable a very high priority for processing sound " --"requests." --msgstr "對於支援聲音即時播放的系統，如果您有足夠的權限，這個選項可以使聲音播放的要求以最高優先權情況下被處理。" -+"permissions, this option will enable a very high priority for processing " -+"sound requests." -+msgstr "" -+"對於支援聲音即時播放的系統，如果您有足夠的權限，這個選項可以使聲音播放的要求" -+"以最高優先權情況下被處理。" - - #. i18n: file generaltab.ui line 152 - #: rc.cpp:34 -@@ -285,9 +303,11 @@ - #: rc.cpp:37 - #, no-c-format - msgid "" --"

    Huge buffer, for low-end machines, " --"less skipping

    " --msgstr "

    大的緩衝區，給低等級的機器，較少遺漏。

    " -+"

    Huge buffer, for low-end machines, less " -+"skipping

    " -+msgstr "" -+"

    大的緩衝區，給低等級的機器，較少遺漏。

    " - - #. i18n: file generaltab.ui line 173 - #: rc.cpp:40 -@@ -303,8 +323,8 @@ - "blocking programs that may wish to use it directly. If the KDE sound system " - "sits idle it can give up this exclusive control.    " - msgstr "" --"KDE 聲音系統獨家控制了您的音效硬體，blocking programs 也許希望直接使用它。如果 KDE " --"聲音系統處於閑置，它可以放棄獨家控制。" -+"KDE 聲音系統獨家控制了您的音效硬體，blocking programs 也許希望直接使用它。" -+"如果 KDE 聲音系統處於閑置，它可以放棄獨家控制。" - - #. i18n: file generaltab.ui line 203 - #: rc.cpp:46 -@@ -352,10 +372,12 @@ - #: rc.cpp:67 - #, no-c-format - msgid "" --"This enables the soundserver to record and play sound at the same time. If you " --"use applications like Internet telephony, voice recognition or similar, you " --"probably want this." --msgstr "這將允許聲音伺服器同時錄音與放音。如果您使用網路電話、語音辨識等類似的程式，您可能需要啟動這個選項。" -+"This enables the soundserver to record and play sound at the same time. If " -+"you use applications like Internet telephony, voice recognition or similar, " -+"you probably want this." -+msgstr "" -+"這將允許聲音伺服器同時錄音與放音。如果您使用網路電話、語音辨識等類似的程式，" -+"您可能需要啟動這個選項。" - - #. i18n: file hardwaretab.ui line 107 - #: rc.cpp:70 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbackground.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbackground.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbackground.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbackground.po 2011-11-11 15:45:17.000000000 +0100 -@@ -17,7 +17,7 @@ - "Project-Id-Version: kcmbackground\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-10-25 19:05+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -54,8 +54,8 @@ - - #: bgadvanced.cpp:298 - msgid "" --"Unable to remove the program: the program is global and can only be removed by " --"the system administrator." -+"Unable to remove the program: the program is global and can only be removed " -+"by the system administrator." - msgstr "無法移除程式：程式是全域性的，因而只有系統管理者可以移除。" - - #: bgadvanced.cpp:300 -@@ -153,25 +153,27 @@ - #: bgdialog.cpp:368 - msgid "" - "

    Background

    This module allows you to control the appearance of the " --"virtual desktops. KDE offers a variety of options for customization, including " --"the ability to specify different settings for each virtual desktop, or a common " --"background for all of them." --"

    The appearance of the desktop results from the combination of its " --"background colors and patterns, and optionally, wallpaper, which is based on " --"the image from a graphic file." --"

    The background can be made up of a single color, or a pair of colors which " --"can be blended in a variety of patterns. Wallpaper is also customizable, with " --"options for tiling and stretching images. The wallpaper can be overlaid " --"opaquely, or blended in different ways with the background colors and patterns." --"

    KDE 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." --msgstr "" --"

    背景

    這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂，包含對每個虛擬桌面不同的設定或全部使用相同的桌面。" --"

    桌面的外觀是由背景顏色與樣式，選擇性的圖片桌布等所共同形成的。" --"

    背景可以使用單一的顏色或一對顏色來混合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同混合或覆蓋。" --"

    KDE 允許您自動的在指定的時間間隔改變桌布或使用程式動態的改變桌面。例如使用 \"kdeworld\" 程式來週期性的更新世界的日/夜地圖。" -+"virtual desktops. KDE offers a variety of options for customization, " -+"including the ability to specify different settings for each virtual " -+"desktop, or a common background for all of them.

    The appearance of the " -+"desktop results from the combination of its background colors and patterns, " -+"and optionally, wallpaper, which is based on the image from a graphic file." -+"

    The background can be made up of a single color, or a pair of colors " -+"which can be blended in a variety of patterns. Wallpaper is also " -+"customizable, with options for tiling and stretching images. The wallpaper " -+"can be overlaid opaquely, or blended in different ways with the background " -+"colors and patterns.

    KDE 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." -+msgstr "" -+"

    背景

    這個模組可以讓您控制虛擬桌面的外觀。KDE 提供您許多的選項來自訂，" -+"包含對每個虛擬桌面不同的設定或全部使用相同的桌面。

    桌面的外觀是由背景顏色與" -+"樣式，選擇性的圖片桌布等所共同形成的。

    背景可以使用單一的顏色或一對顏色來混" -+"合成不同的樣式。桌面也是可以依據鋪排或放大來自訂的。桌布可以與背景或樣式共同" -+"混合或覆蓋。

    KDE 允許您自動的在指定的時間間隔改變桌布或使用程式動態的改變桌" -+"面。例如使用 \"kdeworld\" 程式來週期性的更新世界的日/夜地圖。" - - #: bgdialog.cpp:424 - #, c-format -@@ -282,8 +284,8 @@ - - #: bgmonitor.cpp:165 - msgid "" --"This picture of a monitor contains a preview of what the current settings will " --"look like on your desktop." -+"This picture of a monitor contains a preview of what the current settings " -+"will look like on your desktop." - msgstr "在這個小螢幕裡的圖片可預覽依現在設定的桌面的樣子。" - - #: bgwallpaper.cpp:99 -@@ -316,26 +318,28 @@ - #: rc.cpp:6 rc.cpp:245 - #, no-c-format - msgid "&Add..." --msgstr "增加(&A)..." -+msgstr "增加(&A)…" - - #. i18n: file bgadvanced_ui.ui line 50 - #: rc.cpp:9 - #, no-c-format - msgid "" - "\n" --"

    Click here if you want to add a program to the listbox. This button opens a " --"dialog where you are asked to give details about the program you want to run. " --"To successfully add a program, you must know if it is compatible, the name of " --"the executable file and, if necessary, its options.

    \n" --"

    You usually can get the available options to a suitable program by typing in " --"a terminal emulator the name of the executable file plus --help (foobar " --"--help).

    \n" -+"

    Click here if you want to add a program to the listbox. This button opens " -+"a dialog where you are asked to give details about the program you want to " -+"run. To successfully add a program, you must know if it is compatible, the " -+"name of the executable file and, if necessary, its options.

    \n" -+"

    You usually can get the available options to a suitable program by typing " -+"in a terminal emulator the name of the executable file plus --help (foobar --" -+"help).

    \n" - "" - msgstr "" - "\n" --"

    如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框，並將要求您提供您所要執行程式的細節。要成功地加入程式, " --"您必須知道它是否相容，可執行檔的名稱以及它的選項(如果必要的話)。

    \n" --"

    您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help)，就可獲得合適程式的可用選項。

    \n" -+"

    如果您要增加程式到這個列框則敲擊這裡。這個按鈕會打開一個對話框，並將要求您" -+"提供您所要執行程式的細節。要成功地加入程式, 您必須知道它是否相容，可執行檔的" -+"名稱以及它的選項(如果必要的話)。

    \n" -+"

    您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help(foobar --help)，就" -+"可獲得合適程式的可用選項。

    \n" - "" - - #. i18n: file bgadvanced_ui.ui line 64 -@@ -345,36 +349,39 @@ - "Click here to remove programs from this list. Please note that it does not " - "remove the program from your system, it only removes it from the available " - "options in the background drawing programs list." --msgstr "按這裡以從清單移除程式。請注意它並沒有把程式從您的系統移除，它只是從背景繪製程式清單裡的可用選項移除。" -+msgstr "" -+"按這裡以從清單移除程式。請注意它並沒有把程式從您的系統移除，它只是從背景繪製" -+"程式清單裡的可用選項移除。" - - #. i18n: file bgadvanced_ui.ui line 75 - #: rc.cpp:21 - #, no-c-format - msgid "&Modify..." --msgstr "變更(&M)..." -+msgstr "變更(&M)…" - - #. i18n: file bgadvanced_ui.ui line 81 - #: rc.cpp:24 - #, no-c-format - msgid "" - "\n" --"

    Click here to modify the programs options. You usually can get the available " --"options to a suitable program by typing in a terminal emulator the name of the " --"executable file plus --help. (example: kwebdesktop --help).

    \n" -+"

    Click here to modify the programs options. You usually can get the " -+"available options to a suitable program by typing in a terminal emulator the " -+"name of the executable file plus --help. (example: kwebdesktop --help).

    \n" - "

    One useful example is the program kwebdesktop. It draws a web page on the " - "background of your desktop. You can use this program by selecting it on the " --"listbox on the right, but it will draw a predefined web page. To change the web " --"page it renders, select the kwebdesktop program on the listbox, then click " --"here. A dialog will appear, allowing you to change the web page by replacing " --"the old address (URL) with a new one.

    \n" -+"listbox on the right, but it will draw a predefined web page. To change the " -+"web page it renders, select the kwebdesktop program on the listbox, then " -+"click here. A dialog will appear, allowing you to change the web page by " -+"replacing the old address (URL) with a new one.

    \n" - "    " - msgstr "" - "\n" --"

    按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --help。(例如: Kwebdesktop " --"--help)，就可獲得合適程式的可用選項。

    \n" --"

    一個有用的例子就是 " --"kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您可以在列框右邊選取使用這個程式，但它將繪製為預設的網頁。要改變它顯示的網頁，選取列框內的 " --"kwebdesktop 程式，然後敲擊這裡。將會出現一個對話框，並允許您用新的網址取代舊有的網址(URL)以改變網頁。

    \n" -+"

    按這裡改變程式選項。您通常可以在終端機模擬視窗鍵入可執行檔名稱並加上 --" -+"help。(例如: Kwebdesktop --help)，就可獲得合適程式的可用選項。

    \n" -+"

    一個有用的例子就是 kwebdesktop這個程式。它在您的桌面背景繪製成一個網頁。您" -+"可以在列框右邊選取使用這個程式，但它將繪製為預設的網頁。要改變它顯示的網頁，" -+"選取列框內的 kwebdesktop 程式，然後敲擊這裡。將會出現一個對話框，並允許您用新" -+"的網址取代舊有的網址(URL)以改變網頁。

    \n" - "    " - - #. i18n: file bgadvanced_ui.ui line 104 -@@ -402,19 +409,16 @@ - "\n" - "

    Select from this listbox the program you want to use to draw your desktop " - "background.

    \n" --"

    The Program column shows the name of the program." --"
    \n" --"The Comment column brings a short description." --"
    \n" -+"

    The Program column shows the name of the program.
    \n" -+"The Comment column brings a short description.
    \n" - "The Refresh column indicates the time interval between redraws of the " - "desktop.

    \n" --"

    The K Web Desktop program (kwebdesktop) is worth noting: it draws a " --"specified page of the web in your desktop. You can modify it, and the webpage " --"it draws by selecting it here, then clicking on the Modify button." --"
    \n" -+"

    The K Web Desktop program (kwebdesktop) is worth noting: it draws " -+"a specified page of the web in your desktop. You can modify it, and the " -+"webpage it draws by selecting it here, then clicking on the Modify " -+"button.
    \n" - "You can also add new compliant programs. To do that, click on the Add " --"button." --"
    \n" -+"button.
    \n" - "You can also remove programs from this list clicking on the Remove " - "button. Please note that it does not remove the program from your system, it " - "only removes it from the available options in this listbox.

    \n" -@@ -422,18 +426,15 @@ - msgstr "" - "\n" - "

    從這個列框選擇您要用來繪製桌面背景的程式。

    \n" --"

    程式這一行顯示程式的名稱。" --"
    \n" --"

    註解這一行提供簡短的描述。" --"
    \n" --"

    重整這一行指示重繪桌面的時間間隔。" --"
    \n" --"

    K Web Desktop 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指定的網頁。在這裡選取它，然後按" --"變更按鈕您就可以修飾它以及它所繪的網頁。" --"
    \n" --"您也可以增加新的相容的程式。要這麼做的話，就按增加按鈕。" -+"

    程式這一列顯示程式的名稱。
    \n" -+"

    註解這一列提供簡短的描述。
    \n" -+"

    重整這一列指示重繪桌面的時間間隔。
    \n" -+"

    K Web Desktop 程式 (kwebdesktop) 是值得注意的: 。它在您的桌面繪製指" -+"定的網頁。在這裡選取它，然後按變更按鈕您就可以修飾它以及它所繪的網頁。" - "
    \n" --"您也可以按移除從清單中移除程式。請注意它並沒有把程式從您的系統移除，它只是從列框內的可用選項移除。

    \n" -+"您也可以增加新的相容的程式。要這麼做的話，就按增加按鈕。
    \n" -+"您也可以按移除從清單中移除程式。請注意它並沒有把程式從您的系統移除，它" -+"只是從列框內的可用選項移除。

    \n" - "    " - - #. i18n: file bgadvanced_ui.ui line 164 -@@ -448,11 +449,12 @@ - msgid "" - "Check here if you want to allow a program to draw your desktop background. " - "Below you can find the list of programs currently available for drawing the " --"background. You may use one of the available programs, add new ones or modify " --"the existing ones to fit your needs." -+"background. You may use one of the available programs, add new ones or " -+"modify the existing ones to fit your needs." - msgstr "" --"點擊這裡，如果您要允許程式繪製您的桌面背景。下面您可以找到目前可以用來繪製桌面的程式清單。您可以使用其中一個可用的程式，增加一個新的程式或者修改已存在的以適合您" --"所需。" -+"點擊這裡，如果您要允許程式繪製您的桌面背景。下面您可以找到目前可以用來繪製桌" -+"面的程式清單。您可以使用其中一個可用的程式，增加一個新的程式或者修改已存在的" -+"以適合您所需。" - - #. i18n: file bgadvanced_ui.ui line 177 - #: rc.cpp:56 -@@ -476,9 +478,10 @@ - #: rc.cpp:68 - #, no-c-format - msgid "" --"Click here to select the solid background color. Choose a different color from " --"the background text color to assure readability." --msgstr "點擊這裡以選擇純粹的背景顏色。從背景的文字顏色，選擇不同的顏色以確定可讀性。" -+"Click here to select the solid background color. Choose a different color " -+"from the background text color to assure readability." -+msgstr "" -+"點擊這裡以選擇純粹的背景顏色。從背景的文字顏色，選擇不同的顏色以確定可讀性。" - - #. i18n: file bgadvanced_ui.ui line 252 - #: rc.cpp:71 -@@ -491,11 +494,12 @@ - #, no-c-format - msgid "" - "Check here if you want to use a solid background color. This is useful to " --"ensure that the desktop text will be identifiable against all background colors " --"and wallpapers, or in other words, that a background or wallpaper will not make " --"a desktop text of a similar color difficult to read." -+"ensure that the desktop text will be identifiable against all background " -+"colors and wallpapers, or in other words, that a background or wallpaper " -+"will not make a desktop text of a similar color difficult to read." - msgstr "" --"點擊這裡如果您要使用純粹的背景顏色。這個能有效地確保桌面文字在所有背景顏色及桌布下能被辨認，換句話說，背景或桌布不會使顏色相近的桌面文字變得難以閱讀。" -+"點擊這裡如果您要使用純粹的背景顏色。這個能有效地確保桌面文字在所有背景顏色及" -+"桌布下能被辨認，換句話說，背景或桌布不會使顏色相近的桌面文字變得難以閱讀。" - - #. i18n: file bgadvanced_ui.ui line 263 - #: rc.cpp:77 -@@ -508,15 +512,17 @@ - #, no-c-format - msgid "" - "Check here to enable a shadow outline around the desktop font. This also " --"improves the readability of the desktop text against backgrounds of a similar " --"color." --msgstr "點擊這裡可以啟用桌面文字外框陰影。這也可以增加桌面文字在相似顏色的背景下的可讀性。" -+"improves the readability of the desktop text against backgrounds of a " -+"similar color." -+msgstr "" -+"點擊這裡可以啟用桌面文字外框陰影。這也可以增加桌面文字在相似顏色的背景下的可" -+"讀性。" - - #. i18n: file bgadvanced_ui.ui line 274 - #: rc.cpp:83 - #, no-c-format - msgid "&Lines for icon text:" --msgstr "圖示文字行數(&L):" -+msgstr "圖示文字列數(&L):" - - #. i18n: file bgadvanced_ui.ui line 280 - #: rc.cpp:86 rc.cpp:89 -@@ -524,7 +530,8 @@ - msgid "" - "Choose here the maximum number of text lines below an icon on the desktop. " - "Longer text will be truncated at the end of the last line." --msgstr "在此選擇桌面上圖示下方文字的最大行數。太長的文字會在最後一行結尾處被縮短。" -+msgstr "" -+"在此選擇桌面上圖示下方文字的最大列數。太長的文字會在最後一列結尾處被縮短。" - - #. i18n: file bgadvanced_ui.ui line 305 - #: rc.cpp:92 -@@ -538,7 +545,9 @@ - msgid "" - "Choose here the maximum width of text lines (in pixel) below an icon on the " - "desktop. If set to 'Auto' a default width based on the current font is used." --msgstr "在此選擇桌面上圖示下方文字的最大寬度(以像素計)。如果設為「自動」則會使用依目前字型為準的預設寬度。" -+msgstr "" -+"在此選擇桌面上圖示下方文字的最大寬度(以像素計)。如果設為「自動」則會使用依目" -+"前字型為準的預設寬度。" - - #. i18n: file bgadvanced_ui.ui line 322 - #: rc.cpp:98 -@@ -566,7 +575,9 @@ - "background(s). If you have different backgrounds for the different desktops " - "caching can make switching desktops smoother at the expense of higher memory " - "use." --msgstr "在這個方塊，您可以輸入 KDE 應該使用多少記憶體來快取背景。如果您在不同的桌面有不同的背景，那使用較多快取記憶體可以使桌面切換的更流暢。" -+msgstr "" -+"在這個方塊，您可以輸入 KDE 應該使用多少記憶體來快取背景。如果您在不同的桌面有" -+"不同的背景，那使用較多快取記憶體可以使桌面切換的更流暢。" - - #. i18n: file bgadvanced_ui.ui line 363 - #: rc.cpp:113 -@@ -584,10 +595,12 @@ - #: rc.cpp:122 rc.cpp:128 - #, no-c-format - msgid "" --"Choose the desktop you wish to configure the background for from this list. If " --"you want the same background settings to be applied to all desktops select the " --"\"All Desktops\" option." --msgstr "從清單選擇您要改變背景的桌面。如果您希望相同的背景套用到所有桌面，請點選 \"所有桌面\"選項。" -+"Choose the desktop you wish to configure the background for from this list. " -+"If you want the same background settings to be applied to all desktops " -+"select the \"All Desktops\" option." -+msgstr "" -+"從清單選擇您要改變背景的桌面。如果您希望相同的背景套用到所有桌面，請點選 \"所" -+"有桌面\"選項。" - - #. i18n: file bgdialog_ui.ui line 48 - #: rc.cpp:125 -@@ -636,9 +649,12 @@ - #: rc.cpp:149 - #, no-c-format - msgid "" --"Click this button to set the icon text colors and shadow, set up a program to " --"run for the background picture or control the size of the background cache." --msgstr "點擊這個按鈕以設定圖示文字顏色及陰影，設定背景圖片執行的程式或者控制背景圖片的快取大小。" -+"Click this button to set the icon text colors and shadow, set up a program " -+"to run for the background picture or control the size of the background " -+"cache." -+msgstr "" -+"點擊這個按鈕以設定圖示文字顏色及陰影，設定背景圖片執行的程式或者控制背景圖片" -+"的快取大小。" - - #. i18n: file bgdialog_ui.ui line 303 - #: rc.cpp:155 -@@ -661,45 +677,50 @@ - "You can choose here how a background picture is shown on the desktop:\n" - "
      \n" - "
    • Centered: Center the picture on the desktop.
      • \n" --" " --"
    • Tiled: Tile the picture beginning at the top left of the desktop, " --"so the desktop is totally covered up.
      • \n" -+"
    • Tiled: Tile the picture beginning at the top left of the " -+"desktop, so the desktop is totally covered up.
      • \n" - "
    • Center Tiled: Center the picture on the desktop and then tile " - "around it so that the background is totally covered up.
      • \n" --"
    • Centered Maxpect: Magnify the picture without distorting it until " --"it fills either the width or height of the desktop, and then center it on the " --"desktop.
      • \n" --"
    • Scaled: Magnify the picture, until the entire desktop is covered. " --"This may result in some distortion of the picture.
      • \n" --"
    • Centered Auto Fit: If the picture fits the desktop this mode works " --"like the Centered option. If the picture is larger than the desktop it is " --"scaled down to fit while keeping the aspect ratio.
      • \n" --"
    • Scale and Crop: Magnify the picture without distorting it until it " --"fills both the width and height of the desktop (cropping the picture if " -+"
    • Centered Maxpect: Magnify the picture without distorting it " -+"until it fills either the width or height of the desktop, and then center it " -+"on the desktop.
      • \n" -+"
    • Scaled: Magnify the picture, until the entire desktop is " -+"covered. This may result in some distortion of the picture.
      • \n" -+"
    • Centered Auto Fit: If the picture fits the desktop this mode " -+"works like the Centered option. If the picture is larger than the desktop it " -+"is scaled down to fit while keeping the aspect ratio.
      • \n" -+"
    • Scale and Crop: Magnify the picture without distorting it until " -+"it fills both the width and height of the desktop (cropping the picture if " - "necessary), and then center it on the desktop.
      • \n" - "
    " - msgstr "" - "這裡您可以選擇背景圖片如何展示在桌面上：\n" --" " --"
      \n" -+"
        \n" - "
      • 置中： 圖片放置在桌面正中央。
        • \n" --" " --"
      • 鋪排： 從桌面左上角開始鋪排，所以桌面會被完整的覆蓋。
        • \n" --"
      • 中央鋪排： 圖片先放置在桌面正中央然後從周圍開始鋪排，所以桌面會完全被完整的覆蓋。
        • \n" --"
      • 置中最大化： 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長或者寬，然後放置在桌面正中央。
        • \n" --"
      • 放大至全螢幕：圖片會最大化直到填滿整個桌面，這有可能造成圖片比例的扭曲。
        • \n" --"
      • 置中自動調適： 如果圖片可放進桌面，這個模式跟置中選項一樣。 如果圖片大於桌面，它將按比例縮小到適合桌面。
        • \n" --"
      • 縮放 & 剪裁： 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長與寬（如果必要會進行剪裁），然後放置在桌面正中央。
        • \n" -+"
      • 鋪排： 從桌面左上角開始鋪排，所以桌面會被完整的覆蓋。
        • \n" -+"
      • 中央鋪排： 圖片先放置在桌面正中央然後從周圍開始鋪排，所以桌面會" -+"完全被完整的覆蓋。
        • \n" -+"
      • 置中最大化： 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長或者" -+"寬，然後放置在桌面正中央。
        • \n" -+"
      • 放大至全螢幕：圖片會最大化直到填滿整個桌面，這有可能造成圖片比例" -+"的扭曲。
        • \n" -+"
      • 置中自動調適： 如果圖片可放進桌面，這個模式跟置中選項一樣。 如果" -+"圖片大於桌面，它將按比例縮小到適合桌面。
        • \n" -+"
      • 縮放 & 剪裁： 不會扭曲圖片比例，圖片會最大化直到填滿桌面的長與寬" -+"（如果必要會進行剪裁），然後放置在桌面正中央。
        • \n" - "
      " - - #. i18n: file bgdialog_ui.ui line 384 - #: rc.cpp:176 - #, 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 "如果您選擇使用背景圖片，您可以選擇其與背景顏色間混合的不同方法。預設選項 \"不混合\"表示桌布是簡單的蓋在背景顏色上。" -+"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 -@@ -713,7 +734,9 @@ - msgid "" - "Click to choose the secondary background color. If no secondary color is " - "required by the pattern selected this button will be disabled." --msgstr "按下這邊以選擇第二個背景顏色。如果所選取的樣式不需要第二個顏色，這個按鈕將會失效。" -+msgstr "" -+"按下這邊以選擇第二個背景顏色。如果所選取的樣式不需要第二個顏色，這個按鈕將會" -+"失效。" - - #. i18n: file bgdialog_ui.ui line 424 - #: rc.cpp:185 -@@ -737,9 +760,12 @@ - #: rc.cpp:194 rc.cpp:197 - #, 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 "您可以用這個滑標控制混合的程度。您可以透過移動滑標測試並在預覽影像中看到其效果。" -+"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 -@@ -751,8 +777,8 @@ - #: rc.cpp:203 - #, no-c-format - msgid "" --"For some types of blending, you can reverse the role of the background and the " --"picture by checking this option." -+"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 -@@ -783,18 +809,20 @@ - #: rc.cpp:230 - #, no-c-format - msgid "Set&up..." --msgstr "設定(&U)..." -+msgstr "設定(&U)…" - - #. i18n: file bgdialog_ui.ui line 631 - #: rc.cpp:233 - #, no-c-format - msgid "" --"Click this button to select a set of images to be used as background pictures. " --"One picture at a time will be shown for a specified amount of time, after which " --"another image from the set will be shown. Images can be shown at random or in " --"the order you specify them." -+"Click this button to select a set of images to be used as background " -+"pictures. One picture at a time will be shown for a specified amount of " -+"time, after which another image from the set will be shown. Images can be " -+"shown at random or in the order you specify them." - msgstr "" --"點擊這個按鈕以選取一組影像當背景圖片。一張圖片會先展示一段指定的時間，然後這一組影像內的另一張圖片會接者展示。影像可以是隨機地或者是依照您指定的順序來展示。" -+"點擊這個按鈕以選取一組影像當背景圖片。一張圖片會先展示一段指定的時間，然後這" -+"一組影像內的另一張圖片會接者展示。影像可以是隨機地或者是依照您指定的順序來展" -+"示。" - - #. i18n: file bgwallpaper_ui.ui line 27 - #: rc.cpp:236 -@@ -812,7 +840,7 @@ - #: rc.cpp:242 - #, no-c-format - msgid "Change &picture after:" --msgstr "在...之後改變圖片(&P):" -+msgstr "在…之後改變圖片(&P):" - - #. i18n: file bgwallpaper_ui.ui line 146 - #: rc.cpp:251 -@@ -833,7 +861,7 @@ - #~ msgstr "Monitor" - - #~ msgid "Advanced Options..." --#~ msgstr "進階選項..." -+#~ msgstr "進階選項…" - - #~ msgid "BGAdvancedBase" - #~ msgstr "進階" -@@ -844,8 +872,13 @@ - #~ msgid "&Secondary color:" - #~ msgstr "第二種顏色(&S):" - --#~ msgid "Click the button to choose the secondary background color. If no secondary color is required by the pattern selected the button will be disabled." --#~ msgstr "按下這邊以選擇第二個背景顏色。如果選取的樣式不需要第二個顏色，這個按鈕將失效。" -+#~ msgid "" -+#~ "Click the button to choose the secondary background color. If no " -+#~ "secondary color is required by the pattern selected the button will be " -+#~ "disabled." -+#~ msgstr "" -+#~ "按下這邊以選擇第二個背景顏色。如果選取的樣式不需要第二個顏色，這個按鈕將失" -+#~ "效。" - - #~ msgid "Click the button to choose the primary background color." - #~ msgstr "按下這邊以選擇主要背景顏色。" -@@ -862,14 +895,32 @@ - #~ msgid "&Common background" - #~ msgstr "相同背景(&C)" - --#~ msgid "Check this option if you want to have the same background settings for all desktops. If this option is not checked, the background settings can be customized for each desktop." --#~ msgstr "選取這個選項如果您希望對所有桌面有相同的背景設定。如果沒有設定這個選項，每個桌面可以有不同的背景。" -+#~ msgid "" -+#~ "Check this option if you want to have the same background settings for " -+#~ "all desktops. If this option is not checked, the background settings can " -+#~ "be customized for each desktop." -+#~ msgstr "" -+#~ "選取這個選項如果您希望對所有桌面有相同的背景設定。如果沒有設定這個選項，每" -+#~ "個桌面可以有不同的背景。" - - #~ msgid "&Mode:" - #~ msgstr "模式(&M):" - --#~ msgid "You can select the manner in which the background is painted. The choices are:
      • Flat: Use a solid color (\"Color 1\").
      • Pattern: Use a two-color pattern. Click \"Setup\" to choose the pattern.
      • Gradients: Blend two colors using a predefined gradient (horizontal, vertical, etc.).
      • Program: Use an application which paints the background, for example, with a day/night map of the world that is refreshed periodically. Click \"Setup\" to select and configure the program.
      " --#~ msgstr "您可以選擇桌面繪製的習慣，選擇為:
      • 單純: 使用固定顏色 (\"顏色 1\")。
      • 花樣: 使用二種顏色的花樣。按下 \"設定\" 以選擇花樣。
      • 漸層: 使用預先定義的方式混合二種顏色 (水平，垂直等)。
      • 程式: 使用繪製背景的程式，例如定期更新的世界日夜圖。按下 \"設定\" 以選擇並設定程式。
          • " -+#~ msgid "" -+#~ "You can select the manner in which the background is painted. The choices " -+#~ "are:
          • Flat: Use a solid color (\"Color 1\").
            • " -+#~ "
          • Pattern: Use a two-color pattern. Click \"Setup\" to choose " -+#~ "the pattern.
          • Gradients: Blend two colors using a " -+#~ "predefined gradient (horizontal, vertical, etc.).
          • Program: Use an application which paints the background, for example, with a " -+#~ "day/night map of the world that is refreshed periodically. Click \"Setup" -+#~ "\" to select and configure the program.
          " -+#~ msgstr "" -+#~ "您可以選擇桌面繪製的習慣，選擇為:
          • 單純: 使用固定顏色 (\"顏" -+#~ "色 1\")。
          • 花樣: 使用二種顏色的花樣。按下 \"設定\" 以選擇" -+#~ "花樣。
          • 漸層: 使用預先定義的方式混合二種顏色 (水平，垂直" -+#~ "等)。
          • 程式: 使用繪製背景的程式，例如定期更新的世界日夜" -+#~ "圖。按下 \"設定\" 以選擇並設定程式。
              • " - - #~ msgid "Color &1:" - #~ msgstr "顏色 &1:" -@@ -877,14 +928,22 @@ - #~ msgid "Color &2:" - #~ msgstr "顏色 &2:" - --#~ msgid "If the background mode you selected has additional options to configure, click here." -+#~ msgid "" -+#~ "If the background mode you selected has additional options to configure, " -+#~ "click here." - #~ msgstr "如果您選擇的背景模式有額外的選項可以設定，就按這裡。" - - #~ msgid "&Wallpaper" - #~ msgstr "桌布(&W)" - --#~ msgid "If you check this option, you can choose a set of graphic files to be used as wallpaper, one at a time, for an interval ranging from 1 minute to 4 hours. You can also choose to have the graphics selected at random or in the order you specified them." --#~ msgstr "如果選擇這個選項，您可以選擇一組要作為桌布的影像，每次一個，並每 1 分鐘到 4 小時自動變更。您也可以選擇要隨機變更或依照您指定的順序變更。" -+#~ msgid "" -+#~ "If you check this option, you can choose a set of graphic files to be " -+#~ "used as wallpaper, one at a time, for an interval ranging from 1 minute " -+#~ "to 4 hours. You can also choose to have the graphics selected at random " -+#~ "or in the order you specified them." -+#~ msgstr "" -+#~ "如果選擇這個選項，您可以選擇一組要作為桌布的影像，每次一個，並每 1 分鐘到 " -+#~ "4 小時自動變更。您也可以選擇要隨機變更或依照您指定的順序變更。" - - #~ msgid "&No wallpaper" - #~ msgstr "沒有桌布(&N)" -@@ -905,28 +964,40 @@ - #~ msgstr "點擊以選擇您要作為桌布的圖片。" - - #~ msgid "&Browse..." --#~ msgstr "瀏覽(&B)..." -+#~ msgstr "瀏覽(&B)…" - --#~ msgid "If the graphic you want is not in a standard directory, you can still find it by clicking here." -+#~ msgid "" -+#~ "If the graphic you want is not in a standard directory, you can still " -+#~ "find it by clicking here." - #~ msgstr "如果您要使用的圖片不在標準目錄中，您可以按下這邊以找到他。" - - #~ msgid "S&etup Multiple..." --#~ msgstr "設定多重(&E)..." -+#~ msgstr "設定多重(&E)…" - --#~ msgid "Click here to select graphics to be used for wallpaper, and to configure other options." -+#~ msgid "" -+#~ "Click here to select graphics to be used for wallpaper, and to configure " -+#~ "other options." - #~ msgstr "按下這邊以選擇要作為桌布的圖片，並設定其他選項。" - - #~ msgid "&Limit pixmap cache" - #~ msgstr "限制點陣圖快取(&L)" - --#~ msgid "Checking this box limits the amount of memory that KDE will use to save pixmap (raster graphics). It is advisable to do this, especially if you do not have a lot of memory." --#~ msgstr "選擇這個選項以限制 KDE 用來儲存圖片的記憶體空間(光柵圖)。這是我們建議使用的，尤其當您沒有很多記憶體時。" -+#~ msgid "" -+#~ "Checking this box limits the amount of memory that KDE will use to save " -+#~ "pixmap (raster graphics). It is advisable to do this, especially if you " -+#~ "do not have a lot of memory." -+#~ msgstr "" -+#~ "選擇這個選項以限制 KDE 用來儲存圖片的記憶體空間(光柵圖)。這是我們建議使用" -+#~ "的，尤其當您沒有很多記憶體時。" - - #~ msgid "Cache &size:" - #~ msgstr "快取大小(&S):" - --#~ msgid "In this box you can enter how much memory KDE should use for caching pixmaps for faster access." --#~ msgstr "在這個方塊，您可以輸入 KDE 應該使用多少記憶體來快取點陣圖以更快地顯示。" -+#~ msgid "" -+#~ "In this box you can enter how much memory KDE should use for caching " -+#~ "pixmaps for faster access." -+#~ msgstr "" -+#~ "在這個方塊，您可以輸入 KDE 應該使用多少記憶體來快取點陣圖以更快地顯示。" - - #~ msgid "Horizontal Blending" - #~ msgstr "水平混合" -@@ -964,7 +1035,9 @@ - #~ msgid "Preview" - #~ msgstr "預覽" - --#~ msgid "Unable to remove the pattern! The pattern is global and can only be removed by the System Administrator." -+#~ msgid "" -+#~ "Unable to remove the pattern! The pattern is global and can only be " -+#~ "removed by the System Administrator." - #~ msgstr "無法移除樣式! 樣式是全域性的，而且只有系統管理者可以移除。" - - #~ msgid "Cannot Remove Pattern" -@@ -1024,7 +1097,7 @@ - #~ msgstr "背景" - - #~ msgid "Add Image..." --#~ msgstr "增加影像..." -+#~ msgstr "增加影像…" - - #~ msgid "&Remove Image" - #~ msgstr "移除影像(&R)" -@@ -1039,10 +1112,10 @@ - #~ msgstr "程式(&G)" - - #~ msgid "Se&tup Background Program..." --#~ msgstr "設定背景程式(&T)..." -+#~ msgstr "設定背景程式(&T)…" - - #~ msgid "Choose Pattern..." --#~ msgstr "選擇樣式..." -+#~ msgstr "選擇樣式…" - - #~ msgid "Advanced Options" - #~ msgstr "進階選項" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbell.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbell.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmbell.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmbell.po 2011-11-11 15:45:17.000000000 +0100 -@@ -15,7 +15,7 @@ - "Project-Id-Version: kcmbell\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-11 20:42+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -34,18 +34,21 @@ - "You can use the standard system bell (PC speaker) or a more sophisticated " - "system notification, see the \"System Notifications\" control module for the " - "\"Something Special Happened in the Program\" event." --msgstr "您可以使用標準的系統響鈴 (PC 喇叭) 或是較複雜的系統通知, 參閱 \"系統通知\" 控制模組中的 \"程式特殊事件\"。" -+msgstr "" -+"您可以使用標準的系統響鈴 (PC 喇叭) 或是較複雜的系統通知, 參閱 \"系統通知\" 控" -+"制模組中的 \"程式特殊事件\"。" - - #: bell.cpp:91 - msgid "" - "

              System Bell

              Here you can customize the sound of the standard system " - "bell, i.e. the \"beep\" you always hear when there is something wrong. Note " --"that you can further customize this sound using the \"Accessibility\" control " --"module; for example, you can choose a sound file to be played instead of the " --"standard bell." -+"that you can further customize this sound using the \"Accessibility\" " -+"control module; for example, you can choose a sound file to be played " -+"instead of the standard bell." - msgstr "" --"

              系統響鈴

              您可以在這邊自訂您系統的標準鈴聲， 也就是當發生錯誤時您所聽到的\"beep\"聲音。 注意您可以在\"輔助工具\" " --"控制模組做更進一步的設定， 例如播放聲音檔案而不是標準鈴聲。" -+"

              系統響鈴

              您可以在這邊自訂您系統的標準鈴聲， 也就是當發生錯誤時您所聽" -+"到的\"beep\"聲音。 注意您可以在\"輔助工具\" 控制模組做更進一步的設定， 例如播" -+"放聲音檔案而不是標準鈴聲。" - - #: bell.cpp:97 - msgid "&Volume:" -@@ -53,9 +56,11 @@ - - #: bell.cpp:102 - msgid "" --"Here you can customize the volume of the system bell. For further customization " --"of the bell, see the \"Accessibility\" control module." --msgstr "您可以在這邊自訂系統鈴聲的音量。 對於更進一步的自訂， 請參照 \"輔助工具\" 控制模組。" -+"Here you can customize the volume of the system bell. For further " -+"customization of the bell, see the \"Accessibility\" control module." -+msgstr "" -+"您可以在這邊自訂系統鈴聲的音量。 對於更進一步的自訂， 請參照 \"輔助工具\" 控" -+"制模組。" - - #: bell.cpp:106 - msgid "&Pitch:" -@@ -67,9 +72,11 @@ - - #: bell.cpp:111 - msgid "" --"Here you can customize the pitch of the system bell. For further customization " --"of the bell, see the \"Accessibility\" control module." --msgstr "您可以在這邊自訂系統鈴聲的音階。 對於更進一步的自訂， 請參照 \"輔助工具\" 控制模組。" -+"Here you can customize the pitch of the system bell. For further " -+"customization of the bell, see the \"Accessibility\" control module." -+msgstr "" -+"您可以在這邊自訂系統鈴聲的音階。 對於更進一步的自訂， 請參照 \"輔助工具\" 控" -+"制模組。" - - #: bell.cpp:115 - msgid "&Duration:" -@@ -83,7 +90,9 @@ - msgid "" - "Here you can customize the duration of the system bell. For further " - "customization of the bell, see the \"Accessibility\" control module." --msgstr "您可以在這邊自訂系統鈴聲的持續時間。 對於更進一步的自訂， 請參照 \"輔助工具\" 控制模組。" -+msgstr "" -+"您可以在這邊自訂系統鈴聲的持續時間。 對於更進一步的自訂， 請參照 \"輔助工具" -+"\" 控制模組。" - - #: bell.cpp:124 - msgid "&Test" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcgi.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcgi.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcgi.po 2005-11-09 07:38:42.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcgi.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmcgi\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-10-25 19:10+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (Traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +31,7 @@ - - #: kcmcgi.cpp:59 - msgid "Add..." --msgstr "新增..." -+msgstr "新增…" - - #: kcmcgi.cpp:71 - msgid "kcmcgi" -@@ -48,8 +48,8 @@ - #: kcmcgi.cpp:147 - msgid "" - "

              CGI Scripts

              The CGI KIO slave lets you execute local CGI programs " --"without the need to run a web server. In this control module you can configure " --"the paths that are searched for CGI scripts." -+"without the need to run a web server. In this control module you can " -+"configure the paths that are searched for CGI scripts." - msgstr "" --"

              CGI 程式

              CGI KIO slave 讓您不需要執行網頁伺服器便可執行本機的 CGI 程式。 在這個控制模組中，您可以 設定欲搜尋 " --"CGI 程式碼的路徑。" -+"

              CGI 程式

              CGI KIO slave 讓您不需要執行網頁伺服器便可執行本機的 CGI 程" -+"式。 在這個控制模組中，您可以 設定欲搜尋 CGI 程式碼的路徑。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcolors.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcolors.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcolors.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcolors.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmcolors\n" - "POT-Creation-Date: 2006-08-22 02:34+0200\n" - "PO-Revision-Date: 2005-10-25 19:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,31 +29,33 @@ - - #: colorscm.cpp:100 - msgid "" --"

              Colors

              This module allows you to choose the color scheme used for the " --"KDE 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." --"

              You can save color settings as complete color schemes, which can also be " --"modified or deleted. KDE comes with several predefined color schemes on which " --"you can base your own." --"

              All KDE applications will obey the selected color scheme. Non-KDE " --"applications may also obey some or all of the color settings, if this option is " --"enabled." --msgstr "" --"

              色彩

              這個模組可以讓您選擇 KDE " --"桌面的色彩主題。桌面上的不同元素，像是標題列、選單文字等等，被稱作「介面工具」。您可以經由在清單中選取，或單擊對應的部分來選取您想要改變色彩的介面工具。" --"

              您可以將色彩設定儲存成完整的色彩主題，而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。" --"

              所有的 KDE 應用程式都會遵循選定的色彩主題。非 KDE 應用程式或許會遵循部份或全部的顏色設定。如果啟用這個選項。" -+"

              Colors

              This module allows you to choose the color scheme used for " -+"the KDE 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.

              You can save color settings as " -+"complete color schemes, which can also be modified or deleted. KDE comes " -+"with several predefined color schemes on which you can base your own.

              All " -+"KDE applications will obey the selected color scheme. Non-KDE applications " -+"may also obey some or all of the color settings, if this option is enabled." -+msgstr "" -+"

              色彩

              這個模組可以讓您選擇 KDE 桌面的色彩主題。桌面上的不同元素，像是" -+"標題列、選單文字等等，被稱作「介面工具」。您可以經由在清單中選取，或單擊對應" -+"的部分來選取您想要改變色彩的介面工具。

              您可以將色彩設定儲存成完整的色彩主" -+"題，而且稍後可以再修改或刪除。KDE 包含數個預先定義好的色彩主題供您使用。

              " -+"所有的 KDE 應用程式都會遵循選定的色彩主題。非 KDE 應用程式或許會遵循部份或全" -+"部的顏色設定。如果啟用這個選項。" - - #: colorscm.cpp:133 - msgid "" - "This is a preview of the color settings which will be applied if you click " - "\"Apply\" or \"OK\". You can click on different parts of this preview image. " --"The widget name in the \"Widget color\" box will change to reflect the part of " --"the preview image you clicked." -+"The widget name in the \"Widget color\" box will change to reflect the part " -+"of the preview image you clicked." - msgstr "" --"這是色彩設定的預覽，您可以單擊「套用」或「確定」套用此設定。您也可以單擊此預覽影像的不同部分。「介面工具色彩」方塊中的介面工具名稱會根據您單擊的部分而改變。" -+"這是色彩設定的預覽，您可以單擊「套用」或「確定」套用此設定。您也可以單擊此預" -+"覽影像的不同部分。「介面工具色彩」方塊中的介面工具名稱會根據您單擊的部分而改" -+"變。" - - #: colorscm.cpp:145 - msgid "Color Scheme" -@@ -63,22 +65,26 @@ - msgid "" - "This is a list of predefined color schemes, including any that you may have " - "created. You can preview an existing color scheme by selecting it from the " --"list. The current scheme will be replaced by the selected color scheme." --"

              Warning: if you have not yet applied any changes you may have made to the " --"current scheme, those changes will be lost if you select another color scheme." -+"list. The current scheme will be replaced by the selected color scheme.

              " -+"Warning: if you have not yet applied any changes you may have made to the " -+"current scheme, those changes will be lost if you select another color " -+"scheme." - msgstr "" --"這是預先定義的色彩主題清單，包含您之前所建立的。您可以經由選擇清單中的主題以預覽之。目前的主題將會被所選擇的主題所取代。" --"

              警告：如果您曾對目前主題進行過任何變更但尚未套用它，這些變更將會在您選擇其他色彩主題後遺失。" -+"這是預先定義的色彩主題清單，包含您之前所建立的。您可以經由選擇清單中的主題以" -+"預覽之。目前的主題將會被所選擇的主題所取代。

              警告：如果您曾對目前主題進行過" -+"任何變更但尚未套用它，這些變更將會在您選擇其他色彩主題後遺失。" - - #: colorscm.cpp:162 - msgid "&Save Scheme..." --msgstr "儲存主題(&S)..." -+msgstr "儲存主題(&S)…" - - #: colorscm.cpp:165 - msgid "" - "Press this button if you want to save the current color settings as a color " - "scheme. You will be prompted for a name." --msgstr "如果您想把目前的顏色設定儲存為一個色彩主題，按下這個按鈕。您將必須提供一個名稱。" -+msgstr "" -+"如果您想把目前的顏色設定儲存為一個色彩主題，按下這個按鈕。您將必須提供一個名" -+"稱。" - - #: colorscm.cpp:169 - msgid "R&emove Scheme" -@@ -86,19 +92,22 @@ - - #: colorscm.cpp:173 - msgid "" --"Press this button to remove the selected color scheme. Note that this button is " --"disabled if you do not have permission to delete the color scheme." --msgstr "按下這個按鈕以移除所選擇的色彩主題。注意如果您沒有刪除此色彩主題的權限時，這個功能將被關閉。" -+"Press this button to remove the selected color scheme. Note that this button " -+"is disabled if you do not have permission to delete the color scheme." -+msgstr "" -+"按下這個按鈕以移除所選擇的色彩主題。注意如果您沒有刪除此色彩主題的權限時，這" -+"個功能將被關閉。" - - #: colorscm.cpp:177 - msgid "I&mport Scheme..." --msgstr "匯入主題(&M)..." -+msgstr "匯入主題(&M)…" - - #: colorscm.cpp:180 - msgid "" --"Press this button to import a new color scheme. Note that the color scheme will " --"only be available for the current user." --msgstr "按下這個按鈕以匯入新的色彩主題。注意此色彩主題只有目前的使用者才能使用。" -+"Press this button to import a new color scheme. Note that the color scheme " -+"will only be available for the current user." -+msgstr "" -+"按下這個按鈕以匯入新的色彩主題。注意此色彩主題只有目前的使用者才能使用。" - - #: colorscm.cpp:188 - msgid "&Widget Color" -@@ -201,7 +210,9 @@ - "Click here to select an element of the KDE desktop whose color you want to " - "change. You may either choose the \"widget\" here, or click on the " - "corresponding part of the preview image above." --msgstr "單擊此處以選擇您要改變色彩的 KDE 桌面元素。您可以在這邊選擇「介面工具」，或單擊上方預覽影像對應的部分。" -+msgstr "" -+"單擊此處以選擇您要改變色彩的 KDE 桌面元素。您可以在這邊選擇「介面工具」，或單" -+"擊上方預覽影像對應的部分。" - - #: colorscm.cpp:238 - msgid "" -@@ -226,7 +237,9 @@ - msgid "" - "Use this slider to change the contrast level of the current color scheme. " - "Contrast does not affect all of the colors, only the edges of 3D objects." --msgstr "使用這個滑動鈕來改變目前色彩主題的對比度。對比不會影響全部的色彩，只會影響 3D 物件的邊界。" -+msgstr "" -+"使用這個滑動鈕來改變目前色彩主題的對比度。對比不會影響全部的色彩，只會影響 " -+"3D 物件的邊界。" - - #: colorscm.cpp:266 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcomponentchooser.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcomponentchooser.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcomponentchooser.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcomponentchooser.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kcmcomponentchooser\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-10-25 19:31+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -46,8 +46,8 @@ - - #: componentchooser.cpp:408 - msgid "" --"You changed the default component of your choice. Do you want to save that " --"change now?" -+"You changed the default component of your choice. Do you want to save " -+"that change now?" - msgstr "您的選擇已經變更預設的元件，您現在要儲存此變更嗎？" - - #: componentchooser.cpp:412 -@@ -56,8 +56,8 @@ - - #: componentchooser.cpp:423 componentchooser.cpp:428 - msgid "" --"Choose from the list below which component should be used by default for the %1 " --"service." -+"Choose from the list below which component should be used by default for the " -+"%1 service." - msgstr "從下列清單中選擇 %1 服務預設使用的元件。" - - #: kcm_componentchooser.cpp:34 -@@ -94,7 +94,7 @@ - #: rc.cpp:12 rc.cpp:39 rc.cpp:72 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file componentchooser_ui.ui line 43 - #: rc.cpp:15 -@@ -106,15 +106,17 @@ - #: rc.cpp:18 - #, no-c-format - msgid "" --"Here you can change the component program. Components are programs that handle " --"basic tasks, like the terminal emulator, the text editor and the email client. " --"Different KDE applications sometimes need to invoke a console emulator, send a " --"mail or display some text. To do so consistently, these applications always " --"call the same components. You can choose here which programs these components " --"are." -+"Here you can change the component program. Components are programs that " -+"handle basic tasks, like the terminal emulator, the text editor and the " -+"email client. Different KDE applications sometimes need to invoke a console " -+"emulator, send a mail or display some text. To do so consistently, these " -+"applications always call the same components. You can choose here which " -+"programs these components are." - msgstr "" --"您將可在此改變元件程式。元件指的是處理基本工作的程式， 例如終端機程式，文字編輯器及電子郵件程式等。眾多的KDE應用程式有時需要 " --"引入終端機程式，寄發電子郵件或者顯示一些文字。為求一致，這些應用程式 都會呼叫同樣的元件。您可在此選擇這些元件所使用的程式。" -+"您將可在此改變元件程式。元件指的是處理基本工作的程式， 例如終端機程式，文字編" -+"輯器及電子郵件程式等。眾多的KDE應用程式有時需要 引入終端機程式，寄發電子郵件" -+"或者顯示一些文字。為求一致，這些應用程式 都會呼叫同樣的元件。您可在此選擇這些" -+"元件所使用的程式。" - - #. i18n: file componentchooser_ui.ui line 75 - #: rc.cpp:21 -@@ -126,10 +128,12 @@ - #: rc.cpp:24 - #, no-c-format - msgid "" --"Here you can read a small description of the currently selected component. To " --"change the selected component, click on the list to the left. To change the " --"component program, please choose it below." --msgstr "您可於此讀到目前所選元件的簡單描述。要改變所選的元件，請點選左方的列表。 要改變元件程式，請在下方選擇。" -+"Here you can read a small description of the currently selected component. " -+"To change the selected component, click on the list to the left. To change " -+"the component program, please choose it below." -+msgstr "" -+"您可於此讀到目前所選元件的簡單描述。要改變所選的元件，請點選左方的列表。 要改" -+"變元件程式，請在下方選擇。" - - #. i18n: file componentchooser_ui.ui line 119 - #: rc.cpp:27 -@@ -139,39 +143,32 @@ - "

              This list shows the configurable component types. Click the component you " - "want to configure.

              \n" - "

              In this dialog you can change KDE default components. Components are " --"programs that handle basic tasks, like the terminal emulator, the text editor " --"and the email client. Different KDE applications sometimes need to invoke a " --"console emulator, send a mail or display some text. To do so consistently, " --"these applications always call the same components. Here you can select which " --"programs these components are.

              \n" -+"programs that handle basic tasks, like the terminal emulator, the text " -+"editor and the email client. Different KDE applications sometimes need to " -+"invoke a console emulator, send a mail or display some text. To do so " -+"consistently, these applications always call the same components. Here you " -+"can select which programs these components are.

              \n" - "" - msgstr "" - "\n" - "

              這個列表顯示可設定元件的類別。請點選您想設定的元件。

              \n" --"

              在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 " --"眾多的KDE應用程式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程式都會呼叫同樣的元件。 " --"您可在此選擇這些元件所使用的程式。

              \n" -+"

              在這個對話框您可改變KDE的預設元件。您將可在此改變元件程式。元件指 的是處理" -+"基本工作的程式，例如終端機程式，文字編輯器及電子郵件程式等。 眾多的KDE應用程" -+"式有時需要引入終端機程式，寄發電子郵件或者顯示一些文 字。為求一致，這些應用程" -+"式都會呼叫同樣的元件。 您可在此選擇這些元件所使用的程式。

              \n" - "              " - - #. i18n: file emailclientconfig_ui.ui line 83 - #: rc.cpp:33 - #, no-c-format - msgid "" --"
                " --"
              • %t: Recipient's address
                • " --"
              • %s: Subject
                • " --"
              • %c: Carbon Copy (CC)
                • " --"
              • %b: Blind Carbon Copy (BCC)
                • " --"
              • %B: Template body text
                • " --"
              • %A: Attachment
              " -+"
              • %t: Recipient's address
              • %s: Subject
              • %c: Carbon " -+"Copy (CC)
              • %b: Blind Carbon Copy (BCC)
              • %B: Template body " -+"text
              • %A: Attachment
              " - msgstr "" --"
                " --"
              • %t: 收件者電子郵件位址
                • " --"
              • %s: 主旨
                • " --"
              • %c: 副本 (CC)
                • " --"
              • %b: 密件副本 (BCC)
                • " --"
              • %B: 本文文字範本
                • " --"
              • %A: 附加檔案
              " -+"
              • %t: 收件者電子郵件位址
              • %s: 主旨
              • %c: 副本 (CC)
              • %b: 密件副本 (BCC)
              • %B: 本文文字範本
              • %A: 附加檔案
              " - - #. i18n: file emailclientconfig_ui.ui line 86 - #: rc.cpp:36 -@@ -179,26 +176,17 @@ - msgid "" - "Press this button to select your favorite email client. Please note that the " - "file you select has to have the executable attribute set in order to be " --"accepted." --"
              You can also use several placeholders which will be replaced with the " --"actual values when the email client is called:" --"
                " --"
              • %t: Recipient's address
                • " --"
              • %s: Subject
                • " --"
              • %c: Carbon Copy (CC)
                • " --"
              • %b: Blind Carbon Copy (BCC)
                • " --"
              • %B: Template body text
                • " --"
              • %A: Attachment
              " -+"accepted.
              You can also use several placeholders which will be replaced " -+"with the actual values when the email client is called:
              • %t: " -+"Recipient's address
              • %s: Subject
              • %c: Carbon Copy (CC)
                • " -+"
              • %b: Blind Carbon Copy (BCC)
              • %B: Template body text
              • %A: " -+"Attachment
              " - msgstr "" --"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之屬性才會被接受。" --"
              您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的占位符" --"
                " --"
              • %t: 收件者電子郵件位址
                • " --"
              • %s: 主旨
                • " --"
              • %c: 副本 (CC)
                • " --"
              • %b: 密件副本 (BCC)
                • " --"
              • %B: 本文文字範本
                • " --"
              • %A: 附加檔案
              " -+"按下這個按鈕以選擇您偏好的電子郵件軟體。 請注意 您選擇的檔案必須具有可執行之" -+"屬性才會被接受。
              您也可以使用數個在電子郵件軟體被呼叫時將以實際數值取代的" -+"占位符
              • %t: 收件者電子郵件位址
              • %s: 主旨
              • %c: 副本 " -+"(CC)
              • %b: 密件副本 (BCC)
              • %B: 本文文字範本
              • %A: 附加" -+"檔案
              " - - #. i18n: file emailclientconfig_ui.ui line 100 - #: rc.cpp:42 -@@ -216,9 +204,11 @@ - #: rc.cpp:48 - #, no-c-format - msgid "" --"Activate this option if you want the selected email client to be executed in a " --"terminal (e.g. Konsole)." --msgstr "如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. Konsole)." -+"Activate this option if you want the selected email client to be executed in " -+"a terminal (e.g. Konsole)." -+msgstr "" -+"如果您想要讓所選擇的電子郵件軟體在終端機中執行，請選擇這個選項 (終端機：e.g. " -+"Konsole)." - - #. i18n: file emailclientconfig_ui.ui line 141 - #: rc.cpp:51 -@@ -236,7 +226,7 @@ - #: rc.cpp:57 - #, no-c-format - msgid "Use a different &email client:" --msgstr "使用其他的電子郵件軟體 (&e):" -+msgstr "使用其他的電子郵件軟體(&E):" - - #. i18n: file emailclientconfig_ui.ui line 155 - #: rc.cpp:60 -@@ -248,7 +238,7 @@ - #: rc.cpp:63 - #, no-c-format - msgid "Use a different &terminal program:" --msgstr "使用其他的終端機軟體 (&t):" -+msgstr "使用其他的終端機軟體(&T):" - - #. i18n: file terminalemulatorconfig_ui.ui line 97 - #: rc.cpp:66 -@@ -260,14 +250,14 @@ - #: rc.cpp:69 - #, no-c-format - msgid "" --"Press this button to select your favorite terminal client. Please note that the " --"file you select has to have the executable attribute set in order to be " --"accepted." --"
              Also note that some programs that utilize Terminal Emulator will not work " --"if you add command line arguments (Example: konsole -ls)." -+"Press this button to select your favorite terminal client. Please note that " -+"the file you select has to have the executable attribute set in order to be " -+"accepted.
              Also note that some programs that utilize Terminal Emulator " -+"will not work if you add command line arguments (Example: konsole -ls)." - msgstr "" --"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才能被接受。" --"
              同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數運作(例如：konsole -ls)。" -+"按這個按鈕來選擇您喜愛的終端機客戶端。請注意您所選的檔案必須設定可執行屬性才" -+"能被接受。
              同時也注意某些使用終端機模擬器的程式可能無法依您下的命令列引數" -+"運作(例如：konsole -ls)。" - - #. i18n: file terminalemulatorconfig_ui.ui line 152 - #: rc.cpp:75 -@@ -280,7 +270,9 @@ - #~ msgstr "使用 KMail 如同偏好的電子郵件軟體(&U)" - - #, fuzzy --#~ msgid "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the KDE desktop." -+#~ msgid "" -+#~ "Kontact is the \"all in one\" Mail/Calendar/Contacts program for the KDE " -+#~ "desktop." - #~ msgstr "Kmail 是 KDE 的標準郵件程式。" - - #~ msgid "Form1" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcrypto.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcrypto.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcrypto.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcrypto.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kcmcrypto\n" - "POT-Creation-Date: 2007-07-30 01:13+0200\n" - "PO-Revision-Date: 2007-09-18 14:29+0800\n" --"Last-Translator: Franklin Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -22,10 +22,12 @@ - - #: crypto.cpp:226 - msgid "" --"

              Crypto

              This module allows you to configure SSL for use with most KDE " --"applications, as well as manage your personal certificates and the known " -+"

              Crypto

              This module allows you to configure SSL for use with most " -+"KDE applications, as well as manage your personal certificates and the known " - "certificate authorities." --msgstr "

              編碼

              這個模組可以讓您設定 SSL 給大多數的 KDE 程式使用，並可以管理您個人憑證與已知的憑證授權。" -+msgstr "" -+"

              編碼

              這個模組可以讓您設定 SSL 給大多數的 KDE 程式使用，並可以管理您" -+"個人憑證與已知的憑證授權。" - - #: crypto.cpp:239 - msgid "kcmcrypto" -@@ -45,28 +47,30 @@ - - #: crypto.cpp:270 - msgid "" --"TLS is the newest revision of the SSL protocol. It integrates better with other " --"protocols and has replaced SSL in protocols such as POP3 and SMTP." --msgstr "TLS 是 SSL 協定的最新版本。它對於其他的通訊協定有更佳的整合性，同時也已取代了像 POP3 與 SMTP 這類協定中的 SSL 。" -+"TLS is the newest revision of the SSL protocol. It integrates better with " -+"other protocols and has replaced SSL in protocols such as POP3 and SMTP." -+msgstr "" -+"TLS 是 SSL 協定的最新版本。它對於其他的通訊協定有更佳的整合性，同時也已取代了" -+"像 POP3 與 SMTP 這類協定中的 SSL 。" - - #: crypto.cpp:275 - msgid "Enable SSLv&2" --msgstr "啟用 SSLv2 (&2)" -+msgstr "啟用 SSLv2(&2)" - - #: crypto.cpp:278 - msgid "" --"SSL v2 is the second revision of the SSL protocol. It is most common to enable " --"v2 and v3." -+"SSL v2 is the second revision of the SSL protocol. It is most common to " -+"enable v2 and v3." - msgstr "SSL v2 是 SSL 的第二版。一般都會啟用 SSLv2 與 SSLv3。" - - #: crypto.cpp:282 - msgid "Enable SSLv&3" --msgstr "啟用 SSLv3 (&3)" -+msgstr "啟用 SSLv3(&3)" - - #: crypto.cpp:285 - msgid "" --"SSL v3 is the third revision of the SSL protocol. It is most common to enable " --"v2 and v3." -+"SSL v3 is the third revision of the SSL protocol. It is most common to " -+"enable v2 and v3." - msgstr "SSL v3 是 SSL 的第三版。一般都會啟用 SSLv2 與 SSLv3。" - - #: crypto.cpp:291 -@@ -77,7 +81,9 @@ - msgid "" - "Select the ciphers you wish to enable when using the SSL v2 protocol. The " - "actual protocol used will be negotiated with the server at connection time." --msgstr "選擇您要用在 SSL v2 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能確定。" -+msgstr "" -+"選擇您要用在 SSL v2 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能" -+"確定。" - - #: crypto.cpp:302 - msgid "" -@@ -93,7 +99,9 @@ - msgid "" - "Select the ciphers you wish to enable when using the SSL v3 protocol. The " - "actual protocol used will be negotiated with the server at connection time." --msgstr "選擇您要用在 SSL v3 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能確定。" -+msgstr "" -+"選擇您要用在 SSL v3 協定上的編碼。實際使用的編碼要在連線時與伺服器協調後才能" -+"確定。" - - #: crypto.cpp:332 - msgid "Cipher Wizard" -@@ -102,9 +110,9 @@ - #: crypto.cpp:335 - msgid "" - "Use these preconfigurations to more easily configure the SSL encryption " --"settings. You can choose among the following modes: " --"
                " --msgstr "使用這些預先設定可以更便利的設置 SSL 加密設定。您可以選擇下列的模式：
                  " -+"settings. You can choose among the following modes:
                    " -+msgstr "" -+"使用這些預先設定可以更便利的設置 SSL 加密設定。您可以選擇下列的模式：
                      " - - #: crypto.cpp:338 - msgid "Most Compatible" -@@ -112,8 +120,8 @@ - - #: crypto.cpp:339 - msgid "" --"
                    • Most Compatible: Select the settings found to be most " --"compatible.
                      • " -+"
                    • Most Compatible: Select the settings found to be most compatible." -+"
                      • " - msgstr "
                    • 最相容的：選擇最具相容性之設定。
                      • " - - #: crypto.cpp:340 -@@ -124,7 +132,9 @@ - msgid "" - "
                    • US Ciphers Only: Select only the US strong (>= 128 bit) " - "encryption ciphers.
                      • " --msgstr "
                    • 只能用在美國境內的編碼：只選取用於美國境內的高度加密編碼 (>= 128位元)。
                      • " -+msgstr "" -+"
                    • 只能用在美國境內的編碼：只選取用於美國境內的高度加密編碼 (>= " -+"128位元)。
                      • " - - #: crypto.cpp:342 - msgid "Export Ciphers Only" -@@ -132,9 +142,10 @@ - - #: crypto.cpp:343 - msgid "" --"
                    • Export Ciphers Only: Select only the weak ciphers (<= 56 " --"bit).
                      • " --msgstr "
                    • 用於美國境外的編碼：只選取最低度加密之編碼 (<= 56位元)。
                      • " -+"
                    • Export Ciphers Only: Select only the weak ciphers (<= 56 bit)." -+"
                      • " -+msgstr "" -+"
                    • 用於美國境外的編碼：只選取最低度加密之編碼 (<= 56位元)。
                      • " - - #: crypto.cpp:344 - msgid "Enable All" -@@ -150,7 +161,7 @@ - - #: crypto.cpp:359 - msgid "If selected, you will be notified when entering an SSL enabled site" --msgstr "如果選擇此選項，在進入啟用 SSL 的站台時將會通知您。" -+msgstr "如果選擇此選項，在進入啟用 SSL 的站臺時將會通知您。" - - #: crypto.cpp:363 - msgid "Warn on &leaving SSL mode" -@@ -158,7 +169,7 @@ - - #: crypto.cpp:366 - msgid "If selected, you will be notified when leaving an SSL based site." --msgstr "如果選擇此選項，在離開支援 SSL 的站台時將會通知您。" -+msgstr "如果選擇此選項，在離開支援 SSL 的站臺時將會通知您。" - - #: crypto.cpp:370 - msgid "Warn on sending &unencrypted data" -@@ -204,13 +215,17 @@ - msgid "" - "If selected, OpenSSL will be asked to use the entropy gathering daemon (EGD) " - "for initializing the pseudo-random number generator." --msgstr "如果選擇此選項， OpenSSL 將會使用 EGD (entropy gathering daemon) 作為啟始的亂數產生器。" -+msgstr "" -+"如果選擇此選項， OpenSSL 將會使用 EGD (entropy gathering daemon) 作為啟始的亂" -+"數產生器。" - - #: crypto.cpp:427 - msgid "" - "If selected, OpenSSL will be asked to use the given file as entropy for " - "initializing the pseudo-random number generator." --msgstr "如果選擇此選項， OpenSSL 將會使用給與的檔案做為啟始亂數產生器時的隨機變化依據。" -+msgstr "" -+"如果選擇此選項， OpenSSL 將會使用給與的檔案做為啟始亂數產生器時的隨機變化依" -+"據。" - - #: crypto.cpp:430 - msgid "" -@@ -224,8 +239,8 @@ - - #: crypto.cpp:451 - msgid "" --"This list box shows which certificates of yours KDE knows about. You can easily " --"manage them from here." -+"This list box shows which certificates of yours KDE knows about. You can " -+"easily manage them from here." - msgstr "這個列表方塊顯示 KDE 認得的憑證。您可以在這邊加以管理。" - - #: crypto.cpp:455 crypto.cpp:615 crypto.cpp:731 -@@ -238,15 +253,15 @@ - - #: crypto.cpp:459 crypto.cpp:734 - msgid "I&mport..." --msgstr "匯入(&M)..." -+msgstr "匯入(&M)…" - - #: crypto.cpp:463 crypto.cpp:618 - msgid "&Export..." --msgstr "匯出(&E)..." -+msgstr "匯出(&E)…" - - #: crypto.cpp:468 crypto.cpp:573 - msgid "Remo&ve" --msgstr "移除(&V)..." -+msgstr "移除(&V)…" - - #: crypto.cpp:473 - msgid "&Unlock" -@@ -258,7 +273,7 @@ - - #: crypto.cpp:483 - msgid "Chan&ge Password..." --msgstr "更改密碼(&G)..." -+msgstr "更改密碼(&G)…" - - #: crypto.cpp:493 crypto.cpp:648 - msgid "This is the information known about the owner of the certificate." -@@ -294,7 +309,7 @@ - - #: crypto.cpp:515 - msgid "On SSL Connection..." --msgstr "當 SSL 連線..." -+msgstr "當 SSL 連線…" - - #: crypto.cpp:516 - msgid "&Use default certificate" -@@ -384,9 +399,10 @@ - - #: crypto.cpp:611 - msgid "" --"This list box shows which site and person certificates KDE knows about. You can " --"easily manage them from here." --msgstr "這個列表方塊顯示 KDE 認得的站台與個人的憑證。您可以在此很容易地管理管理它們。" -+"This list box shows which site and person certificates KDE knows about. You " -+"can easily manage them from here." -+msgstr "" -+"這個列表方塊顯示 KDE 認得的站臺與個人的憑證。您可以在此很容易地管理管理它們。" - - #: crypto.cpp:614 crypto.cpp:729 - msgid "Organization" -@@ -394,8 +410,8 @@ - - #: crypto.cpp:621 - msgid "" --"This button allows you to export the selected certificate to a file of various " --"formats." -+"This button allows you to export the selected certificate to a file of " -+"various formats." - msgstr "這個按鈕可讓您將已選取的憑證匯出為多種格式的檔案。" - - #: crypto.cpp:628 -@@ -473,7 +489,7 @@ - - #: crypto.cpp:753 - msgid "Accept for site signing" --msgstr "接受這個站台簽名" -+msgstr "接受這個站臺簽名" - - #: crypto.cpp:754 - msgid "Accept for email signing" -@@ -497,9 +513,10 @@ - - #: crypto.cpp:801 - msgid "" --"This list box shows which sites you have decided to accept a certificate from " --"even though the certificate might fail the validation procedure." --msgstr "這個列表方塊列出您決定要接受憑證的網站，而這些憑證可能是無效的或未經確認的。" -+"This list box shows which sites you have decided to accept a certificate " -+"from even though the certificate might fail the validation procedure." -+msgstr "" -+"這個列表方塊列出您決定要接受憑證的網站，而這些憑證可能是無效的或未經確認的。" - - #: crypto.cpp:809 - msgid "&Add" -@@ -547,7 +564,9 @@ - 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 將無法運作，而且程式可能被迫使用適合的預設值。" -+msgstr "" -+"如果您沒有選擇至少一種 SSL 演算法，SSL 將無法運作，而且程式可能被迫使用適合的" -+"預設值。" - - #: crypto.cpp:1087 - msgid "If you do not select at least one cipher, SSLv2 will not work." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcss.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcss.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmcss.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmcss.po 2011-11-11 15:45:17.000000000 +0100 -@@ -29,7 +29,7 @@ - "Project-Id-Version: kcmcss\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-11 21:22+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -38,26 +38,29 @@ - - #: kcmcss.cpp:37 - msgid "" --"

                      Konqueror Stylesheets

                      This module allows you to apply your own color " --"and font settings to Konqueror by using stylesheets (CSS). You can either " --"specify options or apply your own self-written stylesheet by pointing to its " --"location." --"
                      Note that these settings will always have precedence before all other " --"settings made by the site author. This can be useful to visually impaired " --"people or for web pages that are unreadable due to bad design." --msgstr "" --"

                      Konqueror 樣式表

                      這些工具可以透過改變樣式表(CSS)的方式來改變 konqueror " --"瀏覽器的顏色及字型設定。在這個地方您可以應用指定的方式，或是提供您自己撰寫好樣式表的方式來完成設定。" --"
                      提示：這些設定會被設定為預設樣式直到您所瀏覽的網頁改變這些設定值為止。這些設定值可以運用在增加一些設計不良的網頁 的可讀性。" -+"

                      Konqueror Stylesheets

                      This module allows you to apply your own " -+"color and font settings to Konqueror by using stylesheets (CSS). You can " -+"either specify options or apply your own self-written stylesheet by pointing " -+"to its location.
                      Note that these settings will always have precedence " -+"before all other settings made by the site author. This can be useful to " -+"visually impaired people or for web pages that are unreadable due to bad " -+"design." -+msgstr "" -+"

                      Konqueror 樣式表

                      這些工具可以透過改變樣式表(CSS)的方式來改變 " -+"konqueror 瀏覽器的顏色及字型設定。在這個地方您可以應用指定的方式，或是提供您" -+"自己撰寫好樣式表的方式來完成設定。
                      提示：這些設定會被設定為預設樣式直到您" -+"所瀏覽的網頁改變這些設定值為止。這些設定值可以運用在增加一些設計不良的網頁 的" -+"可讀性。" - - #. i18n: file cssconfig.ui line 20 - #: rc.cpp:3 rc.cpp:33 - #, no-c-format - msgid "" --"Stylesheets" --"

                      See http://www.w3.org/Style/CSS for further information on cascading style " --"sheets.

                      " --msgstr "樣式表

                      請連線至 http://www.w3.org/Style/CSS 來了解更多有關於樣式表的訊息。

                      " -+"Stylesheets

                      See http://www.w3.org/Style/CSS for further information " -+"on cascading style sheets.

                      " -+msgstr "" -+"樣式表

                      請連線至 http://www.w3.org/Style/CSS 來了解更多有關於樣式表的" -+"訊息。

                      " - - #. i18n: file cssconfig.ui line 45 - #: rc.cpp:6 -@@ -69,8 +72,8 @@ - #: rc.cpp:9 - #, no-c-format - msgid "" --"Stylesheets" --"

                      Use this groupbox to determine how Konqueror will render style sheets.

                      " -+"Stylesheets

                      Use this groupbox to determine how Konqueror will " -+"render style sheets.

                      " - msgstr "樣式表

                      利用這些選項來設定Konqueror 瀏覽器 的預設樣式。

                      " - - #. i18n: file cssconfig.ui line 68 -@@ -83,8 +86,8 @@ - #: rc.cpp:15 - #, no-c-format - msgid "" --"Use default stylesheet" --"

                      Select this option to use the default stylesheet.

                      " -+"Use default stylesheet

                      Select this option to use the default " -+"stylesheet.

                      " - msgstr "使用預設樣式表

                      點選這個選項來使用預設 的樣式表。

                      " - - #. i18n: file cssconfig.ui line 82 -@@ -97,17 +100,17 @@ - #: rc.cpp:21 - #, no-c-format - msgid "" --"Use user-defined stylesheet" --"

                      If this box is checked, Konqueror will try to load a user-defined style " --"sheet as specified in the location below. The style sheet allows you to " --"completely override the way web pages are rendered in your browser. The file " --"specified should contain a valid style sheet (see http://www.w3.org/Style/CSS " --"for further information on cascading style sheets).

                      " --msgstr "" --"使用者自定樣式表" --"

                      如果選了這個選項， konqueror " --"瀏覽器會試著載入下面位置中指定使用者自定的樣式表。樣式表讓您可以完全蓋過網頁在瀏覽器的顯示狀況。這個檔案必需包含了一個完整且正確的樣式表(請連線至 " --"http://www.w3.org/Style/CSS 來了解更多有關於樣式表題的訊息)。

                      " -+"Use user-defined stylesheet

                      If this box is checked, Konqueror will " -+"try to load a user-defined style sheet as specified in the location below. " -+"The style sheet allows you to completely override the way web pages are " -+"rendered in your browser. The file specified should contain a valid style " -+"sheet (see http://www.w3.org/Style/CSS for further information on cascading " -+"style sheets).

                      " -+msgstr "" -+"使用者自定樣式表

                      如果選了這個選項， konqueror 瀏覽器會試著載入下面位" -+"置中指定使用者自定的樣式表。樣式表讓您可以完全蓋過網頁在瀏覽器的顯示狀況。這" -+"個檔案必需包含了一個完整且正確的樣式表(請連線至 http://www.w3.org/Style/CSS " -+"來了解更多有關於樣式表題的訊息)。

                      " - - #. i18n: file cssconfig.ui line 136 - #: rc.cpp:24 -@@ -119,19 +122,19 @@ - #: rc.cpp:27 - #, no-c-format - msgid "" --"Use accessibility stylesheet" --"

                      Selecting this option will allow you to define a default font, font size, " --"and font color with a few simple clicks of the mouse. Simply wander over to the " --"Customize... dialog and pick out your desired options.

                      " -+"Use accessibility stylesheet

                      Selecting this option will allow you " -+"to define a default font, font size, and font color with a few simple clicks " -+"of the mouse. Simply wander over to the Customize... dialog and pick out " -+"your desired options.

                      " - msgstr "" --"使用輔助樣式表" --"

                      只需按幾下滑鼠，選擇這些選項能使您設定成預設的字型、字型大小、及顏色。簡單的按下「自訂...」對話盒並且選擇您所喜好的設定。

                      " -+"使用輔助樣式表

                      只需按幾下滑鼠，選擇這些選項能使您設定成預設的字型、" -+"字型大小、及顏色。簡單的按下「自訂...」對話盒並且選擇您所喜好的設定。

                      " - - #. i18n: file cssconfig.ui line 175 - #: rc.cpp:30 - #, no-c-format - msgid "Custom&ize..." --msgstr "自訂(&I)..." -+msgstr "自訂(&I)…" - - #. i18n: file csscustom.ui line 44 - #: rc.cpp:39 -@@ -227,10 +230,12 @@ - #: rc.cpp:84 - #, no-c-format - msgid "" --"Use same size for all elements" --"

                      Select this option to override custom font sizes in favor of the base font " --"size. All fonts will be displayed in the same size.

                      " --msgstr "全部使用相同字型大小

                      選擇這個選項來設定所有的文字都使用相同字型大小。

                      " -+"Use same size for all elements

                      Select this option to override " -+"custom font sizes in favor of the base font size. All fonts will be " -+"displayed in the same size.

                      " -+msgstr "" -+"全部使用相同字型大小

                      選擇這個選項來設定所有的文字都使用相同字型大" -+"小。

                      " - - #. i18n: file csscustom.ui line 159 - #: rc.cpp:87 -@@ -254,9 +259,11 @@ - #: rc.cpp:96 - #, no-c-format - msgid "" --"Suppress images" --"

                      Selecting this will prevent Konqueror from loading images.

                      " --msgstr "不使用圖型

                      選擇這個選項會使 Konqueror 瀏覽器不從網頁上下 載圖型。

                      " -+"Suppress images

                      Selecting this will prevent Konqueror from loading " -+"images.

                      " -+msgstr "" -+"不使用圖型

                      選擇這個選項會使 Konqueror 瀏覽器不從網頁上下 載圖型。" - - #. i18n: file csscustom.ui line 184 - #: rc.cpp:99 -@@ -268,10 +275,10 @@ - #: rc.cpp:102 - #, no-c-format - msgid "" --"Suppress background images" --"

                      Selecting this option will prevent Konqueror from loading background " --"images.

                      " --msgstr "不使用底圖

                      選擇這個選項會使 Konqueror 瀏覽器不從網頁上下載底圖。

                      " -+"Suppress background images

                      Selecting this option will prevent " -+"Konqueror from loading background images.

                      " -+msgstr "" -+"不使用底圖

                      選擇這個選項會使 Konqueror 瀏覽器不從網頁上下載底圖。

                      " - - #. i18n: file csscustom.ui line 200 - #: rc.cpp:105 -@@ -283,9 +290,9 @@ - #: rc.cpp:108 - #, no-c-format - msgid "" --"Font family" --"

                      A font family is a group of fonts that resemble one another, with family " --"members that are e.g. bold, italic, or any number of the above.

                      " -+"Font family

                      A font family is a group of fonts that resemble one " -+"another, with family members that are e.g. bold, italic, or any number of " -+"the above.

                      " - msgstr "字型

                      一組字型就是一些相似樣式的字集像是粗體、斜體等等。

                      " - - #. i18n: file csscustom.ui line 214 -@@ -310,10 +317,11 @@ - #: rc.cpp:120 - #, no-c-format - msgid "" --"Use same family for all text" --"

                      Select this option to override custom fonts everywhere in favor of the base " --"font.

                      " --msgstr "全部文字使用同一字型

                      選擇這個選項來設定所有的文字都使用同一字型。

                      " -+"Use same family for all text

                      Select this option to override custom " -+"fonts everywhere in favor of the base font.

                      " -+msgstr "" -+"全部文字使用同一字型

                      選擇這個選項來設定所有的文字都使用同一字型。" - - #. i18n: file csscustom.ui line 302 - #: rc.cpp:123 -@@ -325,8 +333,8 @@ - #: rc.cpp:126 - #, no-c-format - msgid "" --"Preview" --"

                      Click on this button to see what your selections look like in action.

                      " -+"Preview

                      Click on this button to see what your selections look like " -+"in action.

                      " - msgstr "預覽

                      按下這按鈕，可以預覽您選擇的結果。

                      " - - #. i18n: file csscustom.ui line 332 -@@ -369,16 +377,16 @@ - #: rc.cpp:147 - #, no-c-format - msgid "" --"Custom" --"

                      Select this option to define a custom color for the default font.

                      " -+"Custom

                      Select this option to define a custom color for the default " -+"font.

                      " - msgstr "使用者自訂

                      選擇這個選項來設定預設的字型顏色。

                      " - - #. i18n: file csscustom.ui line 402 - #: rc.cpp:150 rc.cpp:156 - #, no-c-format - msgid "" --"Foreground color" --"

                      The foreground color is the color that the text is drawn in.

                      " -+"Foreground color

                      The foreground color is the color that the text is " -+"drawn in.

                      " - msgstr "前景色

                      前景就是文字的顏色。

                      " - - #. i18n: file csscustom.ui line 478 -@@ -391,8 +399,8 @@ - #: rc.cpp:159 - #, no-c-format - msgid "" --"Background" --"

                      Behind this door lays the ability to choose a custom default background.

                      " -+"Background

                      Behind this door lays the ability to choose a custom " -+"default background.

                      " - msgstr "背景

                      在其中可設定使用預設的背景。

                      " - - #. i18n: file csscustom.ui line 503 -@@ -405,10 +413,11 @@ - #: rc.cpp:165 - #, no-c-format - msgid "" --"Background" --"

                      This background color is the one displayed behind the text by default. A " --"background image will override this.

                      " --msgstr "背景

                      這個背影色設定是用來設定顯示在文字後面顏色的預設值。一個網頁的底圖可能將此覆寫。

                      " -+"Background

                      This background color is the one displayed behind the " -+"text by default. A background image will override this.

                      " -+msgstr "" -+"背景

                      這個背影色設定是用來設定顯示在文字後面顏色的預設值。一個網頁的" -+"底圖可能將此覆寫。

                      " - - #. i18n: file csscustom.ui line 519 - #: rc.cpp:168 -@@ -420,10 +429,12 @@ - #: rc.cpp:171 - #, no-c-format - msgid "" --"Use same color for all text" --"

                      Select this option to apply your chosen color to the default font as well as " --"any custom fonts as specified in a stylesheet.

                      " --msgstr "所有文字使用同一顏色

                      選擇這一個選項來設定這樣式表中所有文字的顏色者相同。

                      " -+"Use same color for all text

                      Select this option to apply your chosen " -+"color to the default font as well as any custom fonts as specified in a " -+"stylesheet.

                      " -+msgstr "" -+"所有文字使用同一顏色

                      選擇這一個選項來設定這樣式表中所有文字的顏色者" -+"相同。

                      " - - #. i18n: file preview.ui line 16 - #: rc.cpp:174 -@@ -437,12 +448,9 @@ - msgid "" - "\n" - "\n" --"

                      Heading 1

                      " --"
                      \n" --"

                      Heading 2

                      " --"
                      \n" --"

                      Heading 3

                      " --"
                      \n" -+"

                      Heading 1


                      \n" -+"

                      Heading 2


                      \n" -+"

                      Heading 3


                      \n" - "\n" - "

                      User defined stylesheets allow increased\n" - "accessibility for visually handicapped\n" -@@ -452,12 +460,9 @@ - msgstr "" - "\n" - "\n" --"

                      標頭 1

                      " --"
                      \n" --"

                      標頭 2

                      " --"
                      \n" --"

                      標頭 3

                      " --"
                      \n" -+"

                      標頭 1


                      \n" -+"

                      標頭 2


                      \n" -+"

                      標頭 3


                      \n" - "\n" - "

                      使用者自訂的樣式表可以增加\n" - "一些有視覺障礙朋友們使用上的\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmenergy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmenergy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmenergy.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmenergy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmenergy\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-11 20:41+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,18 +16,18 @@ - - #: energy.cpp:145 - msgid "" --"

                      Display Power Control

                      If your display supports power saving features, " --"you can configure them using this module." --"

                      There are three levels of power saving: standby, suspend, and off. The " --"greater the level of power saving, the longer it takes for the display to " --"return to an active state." --"

                      To wake up the display from a power saving mode, you can make a small " --"movement with the mouse, or press a key that is not likely to cause any " --"unintentional side-effects, for example, the \"Shift\" key." -+"

                      Display Power Control

                      If your display supports power saving " -+"features, you can configure them using this module.

                      There are three " -+"levels of power saving: standby, suspend, and off. The greater the level of " -+"power saving, the longer it takes for the display to return to an active " -+"state.

                      To wake up the display from a power saving mode, you can make a " -+"small movement with the mouse, or press a key that is not likely to cause " -+"any unintentional side-effects, for example, the \"Shift\" key." - msgstr "" - "

                      顯示器省電控制

                      如果您的顯示器支援省電功能，您可以用這個模組設定之。" --"

                      這邊共有三階段的省電設定：待命、暫停與關閉。越高階段的省電必須要越長的時間來回復運作。" --"

                      要將顯示器由省電模式中叫醒，您可以略為移動滑鼠，或者按下任何不會造成副作用的按鍵，例如 \"shift\" 鍵。" -+"

                      這邊共有三階段的省電設定：待命、暫停與關閉。越高階段的省電必須要越長的時" -+"間來回復運作。

                      要將顯示器由省電模式中叫醒，您可以略為移動滑鼠，或者按下任" -+"何不會造成副作用的按鍵，例如 \"shift\" 鍵。" - - #: energy.cpp:165 - msgid "&Enable display power management" -@@ -47,7 +47,7 @@ - - #: energy.cpp:187 - msgid "&Standby after:" --msgstr "待命在...後(&S):" -+msgstr "待命在…後(&S):" - - #: energy.cpp:189 energy.cpp:200 energy.cpp:212 - msgid " min" -@@ -65,14 +65,16 @@ - - #: energy.cpp:198 - msgid "S&uspend after:" --msgstr "暫停在...後(&U):" -+msgstr "暫停在…後(&U):" - - #: energy.cpp:204 - 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 "選擇顯示器進入 \"暫停\" 模式前的時間。這是第二階段的省電，但在某些顯示器上也許與第一階段並無不同。" -+msgstr "" -+"選擇顯示器進入 \"暫停\" 模式前的時間。這是第二階段的省電，但在某些顯示器上也" -+"許與第一階段並無不同。" - - #: energy.cpp:210 - msgid "&Power off after:" -@@ -80,7 +82,7 @@ - - #: energy.cpp:216 - 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." -+"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 "選擇顯示器進入 \"關閉\" 模式前的時間. 這是最大階段的省電." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmfonts.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmfonts.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmfonts.po 2007-05-14 12:22:55.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmfonts.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kcmfonts\n" - "POT-Creation-Date: 2007-04-11 02:14+0200\n" - "PO-Revision-Date: 2007-03-27 14:17+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -41,27 +40,22 @@ - #: fonts.cpp:239 - msgid "" - "If you have a TFT or LCD screen you can further improve the quality of " --"displayed fonts by selecting this option." --"
                      Sub-pixel hinting is also known as ClearType(tm)." --"
                      " --"
                      This will not work with CRT monitors." -+"displayed fonts by selecting this option.
                      Sub-pixel hinting is also known " -+"as ClearType(tm).

                      This will not work with CRT monitors." - msgstr "" --"如果您有 TFT 或 LCD 螢幕，你可以選取此項目來增進顯示品質。" --"
                      Sub-pixel hinting 就是 ClearType(tm)。" --"
                      " --"
                      這在 CRT 螢幕將無作用。。" -+"如果您有 TFT 或 LCD 螢幕，你可以選取此項目來增進顯示品質。
                      Sub-pixel " -+"hinting 就是 ClearType(tm)。

                      這在 CRT 螢幕將無作用。。" - - #: fonts.cpp:247 - msgid "" - "In order for sub-pixel hinting to work correctly you need to know how the " --"sub-pixels of your display are aligned." --"
                      On TFT or LCD displays a single pixel is actually composed of three " --"sub-pixels, red, green and blue. Most displays have a linear ordering of RGB " --"sub-pixel, some have BGR." -+"sub-pixels of your display are aligned.
                      On TFT or LCD displays a single " -+"pixel is actually composed of three sub-pixels, red, green and blue. Most " -+"displays have a linear ordering of RGB sub-pixel, some have BGR." - msgstr "" --"為了使 sub-pixel hinting 正常運作，你必需知道 sub-pixels 的顯示方式。" --"
                      在 TFT 或 LCD 顯示一個 pixel，實際是由三個紅、錄、藍的 sub-pixel 所組成。大部份顯示是 RGB sub-pixel " --"三線性排列，但亦有 BGR 的方式。" -+"為了使 sub-pixel hinting 正常運作，你必需知道 sub-pixels 的顯示方式。
                      在 " -+"TFT 或 LCD 顯示一個 pixel，實際是由三個紅、錄、藍的 sub-pixel 所組成。大部份" -+"顯示是 RGB sub-pixel 三線性排列，但亦有 BGR 的方式。" - - #: fonts.cpp:258 - msgid "Hinting style: " -@@ -130,7 +124,7 @@ - - #: fonts.cpp:612 - msgid "Ad&just All Fonts..." --msgstr "調整所有字型...(&J)" -+msgstr "調整所有字型…(&J)" - - #: fonts.cpp:613 - msgid "Click to change all fonts" -@@ -159,7 +153,7 @@ - - #: fonts.cpp:629 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: fonts.cpp:636 - msgid "Force fonts DPI:" -@@ -175,18 +169,18 @@ - - #: fonts.cpp:644 - msgid "" --"

                      This option forces a specific DPI value for fonts. It may be useful when the " --"real DPI of the hardware is not detected properly and it is also often misused " --"when poor quality fonts are used that do not look well with DPI values other " --"than 96 or 120 DPI.

                      " --"

                      The use of this option is generally discouraged. For selecting proper DPI " --"value a better option is explicitly configuring it for the whole X server if " --"possible (e.g. DisplaySize in xorg.conf or adding -dpi value " --"to ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not " --"render properly with real DPI value better fonts should be used or " --"configuration of font hinting should be checked.

                      " -+"

                      This option forces a specific DPI value for fonts. It may be useful when " -+"the real DPI of the hardware is not detected properly and it is also often " -+"misused when poor quality fonts are used that do not look well with DPI " -+"values other than 96 or 120 DPI.

                      The use of this option is generally " -+"discouraged. For selecting proper DPI value a better option is explicitly " -+"configuring it for the whole X server if possible (e.g. DisplaySize in xorg." -+"conf or adding -dpi value to ServerLocalArgs= in $KDEDIR/share/config/" -+"kdm/kdmrc). When fonts do not render properly with real DPI value better " -+"fonts should be used or configuration of font hinting should be checked.

                      " - msgstr "" --"

                      這個選項強制指定字型使用的 DPI 值。這在硬體的實際 DPI 值無法被正確偵測到時，以及字型在 96 或 120 DPI 時看起來品質不好時可以使用。" -+"

                      這個選項強制指定字型使用的 DPI 值。這在硬體的實際 DPI 值無法被正確偵測到" -+"時，以及字型在 96 或 120 DPI 時看起來品質不好時可以使用。" - - #: fonts.cpp:761 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmhtmlsearch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmhtmlsearch.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmhtmlsearch.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmhtmlsearch.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmhtmlsearch\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-11 21:12+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -21,8 +21,8 @@ - - #: kcmhtmlsearch.cpp:50 - msgid "" --"The fulltext search feature makes use of the ht://dig HTML search engine. You " --"can get ht://dig at the" -+"The fulltext search feature makes use of the ht://dig HTML search engine. " -+"You can get ht://dig at the" - msgstr "這個全文檢索功能使用 ht://dig HTML 搜尋引擎。您可以取得 ht://dig 從" - - #: kcmhtmlsearch.cpp:56 -@@ -69,10 +69,13 @@ - - #: kcmhtmlsearch.cpp:106 - msgid "" --"Here you can select which parts of the documentation should be included in the " --"fulltext search index. Available options are the KDE Help pages, the installed " --"man pages, and the installed info pages. You can select any number of these." --msgstr "您可以在這邊選取要列入全文檢索搜尋對象的文件部分。可用的選項是 KDE 說明頁，安裝的手冊頁，以及安裝的資訊頁. 您可以選擇其中的任意部分。" -+"Here you can select which parts of the documentation should be included in " -+"the fulltext search index. Available options are the KDE Help pages, the " -+"installed man pages, and the installed info pages. You can select any number " -+"of these." -+msgstr "" -+"您可以在這邊選取要列入全文檢索搜尋對象的文件部分。可用的選項是 KDE 說明頁，安" -+"裝的手冊頁，以及安裝的資訊頁. 您可以選擇其中的任意部分。" - - #: kcmhtmlsearch.cpp:111 - msgid "&KDE help" -@@ -92,17 +95,17 @@ - - #: kcmhtmlsearch.cpp:127 - msgid "" --"Here you can add additional paths to search for documentation. To add a path, " --"click on the Add... button and select the folder from where additional " --"documentation should be searched. You can remove folders by clicking on the " --"Delete button." -+"Here you can add additional paths to search for documentation. To add a " -+"path, click on the Add... button and select the folder from where " -+"additional documentation should be searched. You can remove folders by " -+"clicking on the Delete button." - msgstr "" --"您可以在這邊增加額外的文件搜尋路徑。要增加路徑，按下 增加... 按鈕並選擇額外文件所在的路徑。您可以經由按下 刪除 " --"按鈕來移除路徑。" -+"您可以在這邊增加額外的文件搜尋路徑。要增加路徑，按下 增加... 按鈕並" -+"選擇額外文件所在的路徑。您可以經由按下 刪除 按鈕來移除路徑。" - - #: kcmhtmlsearch.cpp:132 - msgid "Add..." --msgstr "增加..." -+msgstr "增加…" - - #: kcmhtmlsearch.cpp:142 - msgid "Language Settings" -@@ -118,7 +121,7 @@ - - #: kcmhtmlsearch.cpp:158 - msgid "Generate Index..." --msgstr "產生索引..." -+msgstr "產生索引…" - - #: kcmhtmlsearch.cpp:159 - msgid "Click this button to generate the index for the fulltext search." -@@ -126,10 +129,12 @@ - - #: kcmhtmlsearch.cpp:203 - msgid "" --"

                      Help Index

                      This configuration module lets you configure the ht://dig " --"engine which can be used for fulltext search in the KDE documentation as well " --"as other system documentation like man and info pages." --msgstr "

                      說明索引

                      這個組態模組可以讓您設定 ht://dig 引擎, 並提供 KDE 文件, 系統文件如說明頁與資訊頁的全文檢索。" -+"

                      Help Index

                      This configuration module lets you configure the ht://" -+"dig engine which can be used for fulltext search in the KDE documentation as " -+"well as other system documentation like man and info pages." -+msgstr "" -+"

                      說明索引

                      這個組態模組可以讓您設定 ht://dig 引擎, 並提供 KDE 文件, 系" -+"統文件如說明頁與資訊頁的全文檢索。" - - #: _translatorinfo.cpp:1 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmicons.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmicons.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmicons.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmicons.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,7 +13,7 @@ - "Project-Id-Version: kcmicons\n" - "POT-Creation-Date: 2006-09-03 02:35+0200\n" - "PO-Revision-Date: 2005-10-25 21:04+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -58,7 +58,7 @@ - - #: icons.cpp:117 - msgid "Set Effect..." --msgstr "設定效果..." -+msgstr "設定效果…" - - #: icons.cpp:133 - msgid "Desktop/File Manager" -@@ -154,7 +154,7 @@ - - #: iconthemes.cpp:88 - msgid "Install New Theme..." --msgstr "安裝新主題..." -+msgstr "安裝新主題…" - - #: iconthemes.cpp:91 - msgid "Remove Theme" -@@ -187,8 +187,8 @@ - - #: iconthemes.cpp:187 - msgid "" --"A problem occurred during the installation process; however, most of the themes " --"in the archive have been installed" -+"A problem occurred during the installation process; however, most of the " -+"themes in the archive have been installed" - msgstr "安裝的過程中發生問題；不過主題集中的大部分檔案都已經安裝了。" - - #: iconthemes.cpp:208 -@@ -202,9 +202,10 @@ - #: iconthemes.cpp:286 - msgid "" - "Are you sure you want to remove the %1 icon theme?" --"
                      " --"
                      This will delete the files installed by this theme.                      " --msgstr "您確定要移除 %1 圖示主題？

                      這樣會刪除這個主題所安裝的檔案。                      " -+"

                      This will delete the files installed by this theme.                      " -+msgstr "" -+"您確定要移除 %1 圖示主題？

                      這樣會刪除這個主題所安" -+"裝的檔案。                      " - - #: iconthemes.cpp:294 - msgid "Confirmation" -@@ -233,22 +234,22 @@ - #: main.cpp:93 - msgid "" - "

                      Icons

                      This module allows you to choose the icons for your desktop." --"

                      To choose an icon theme, click on its name and apply your choice by pressing " --"the \"Apply\" button below. If you do not want to apply your choice you can " --"press the \"Reset\" button to discard your changes.

                      " --"

                      By pressing the \"Install New Theme\" button you can install your new icon " --"theme by writing its location in the box or browsing to the location. Press the " --"\"OK\" button to finish the installation.

                      " --"

                      The \"Remove Theme\" button will only be activated if you select a theme " --"that you installed using this module. You are not able to remove globally " --"installed themes here.

                      " --"

                      You can also specify effects that should be applied to the icons.

                      " -+"

                      To choose an icon theme, click on its name and apply your choice by " -+"pressing the \"Apply\" button below. If you do not want to apply your choice " -+"you can press the \"Reset\" button to discard your changes.

                      By " -+"pressing the \"Install New Theme\" button you can install your new icon " -+"theme by writing its location in the box or browsing to the location. Press " -+"the \"OK\" button to finish the installation.

                      The \"Remove Theme\" " -+"button will only be activated if you select a theme that you installed using " -+"this module. You are not able to remove globally installed themes here.

                      You can also specify effects that should be applied to the icons.

                      " - msgstr "" --"

                      圖示

                      這個模組讓您可以選擇桌面的圖示。" --"

                      要選用某個圖示主題，請在該名稱上點一下，並按下下方的「套用」。如果您要反悔您所作的選擇，請按下下方的「重設」來放棄您所作的變更。

                      " --"

                      按下「安裝新主題」讓您可以安裝新的圖示主題，只要輸入其位置或是藉由瀏覽得知其位置，再按下「確定」即可完成安裝

                      " --"

                      「移除主題」按鈕只有在您選擇了一個您利用本模組所安裝的主題時才可以按。您無法在這裡移除全域安裝的主題

                      " --"

                      您也可以指定圖示顯示時的特別效果。

                      " -+"

                      圖示

                      這個模組讓您可以選擇桌面的圖示。

                      要選用某個圖示主題，請在該名" -+"稱上點一下，並按下下方的「套用」。如果您要反悔您所作的選擇，請按下下方的「重" -+"設」來放棄您所作的變更。

                      按下「安裝新主題」讓您可以安裝新的圖示主題，只" -+"要輸入其位置或是藉由瀏覽得知其位置，再按下「確定」即可完成安裝

                      「移除主" -+"題」按鈕只有在您選擇了一個您利用本模組所安裝的主題時才可以按。您無法在這裡移" -+"除全域安裝的主題

                      您也可以指定圖示顯示時的特別效果。

                      " - - #~ msgid "" - #~ "

                      Icons

                      \n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminfo.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminfo.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminfo.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminfo.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: kcminfo\n" - "POT-Creation-Date: 2006-06-16 03:58+0200\n" - "PO-Revision-Date: 2006-06-19 09:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -236,10 +235,12 @@ - #: info.cpp:392 - msgid "" - "

                      System Information

                      All the information modules return information " --"about a certain aspect of your computer hardware or your operating system. Not " --"all modules are available on all hardware architectures and/or operating " -+"about a certain aspect of your computer hardware or your operating system. " -+"Not all modules are available on all hardware architectures and/or operating " - "systems." --msgstr "

                      系統資訊

                      這個資訊模組回報關於您的硬體與作業系統的相關資訊。不是所有的模組都可以在各種不同的硬體或作業系統上使用。" -+msgstr "" -+"

                      系統資訊

                      這個資訊模組回報關於您的硬體與作業系統的相關資訊。不是所有的" -+"模組都可以在各種不同的硬體或作業系統上使用。" - - #: info.cpp:406 memory.cpp:95 - msgid "kcminfo" -@@ -318,8 +319,8 @@ - - #: info_fbsd.cpp:169 - msgid "" --"Your sound system could not be queried. /dev/sndstat does not exist or is not " --"readable." -+"Your sound system could not be queried. /dev/sndstat does not exist or is " -+"not readable." - msgstr "無法查詢您的聲音系統。 /dev/sndstat 不存在或無法讀取。" - - #: info_fbsd.cpp:194 -@@ -901,16 +902,17 @@ - - #: memory.cpp:205 - msgid "" --"This graph gives you an overview of the usage of physical memory " --"in your system." --"

                      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. " --"

                      This means that if you have a small amount of Free Physical Memory " --"and a large amount of Disk Cache Memory, your system is well configured." -+"This graph gives you an overview of the usage of physical memory in " -+"your system.

                      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.

                      This means that if you have a small amount of Free " -+"Physical Memory and a large amount of Disk Cache Memory, your " -+"system is well configured." - msgstr "" --"這個圖表給您系統 實體記憶體的使用 總覽。" --"

                      多數的作業系統 (包括 linux) 都將近可能的使用可用的實體記憶體作為磁碟快取，以提高系統效能。 " --"

                      這表示如果您只有少量的未用實體記憶體以及大量的磁碟快取記憶體，則您的系統 是配置的很好的。" -+"這個圖表給您系統 實體記憶體的使用 總覽。

                      多數的作業系統 (包括 " -+"linux) 都將近可能的使用可用的實體記憶體作為磁碟快取，以提高系統效能。

                      這表" -+"示如果您只有少量的未用實體記憶體以及大量的磁碟快取記憶體，則您" -+"的系統 是配置的很好的。" - - #: memory.cpp:217 - msgid "Swap Space" -@@ -918,17 +920,21 @@ - - #: memory.cpp:218 - msgid "" --"The swap space is the virtual memory available to the system. " --"

                      It will be used on demand and is provided through one or more swap " --"partitions and/or swap files." --msgstr "交換空間是系統可用的 虛擬記憶體。

                      在 有要求時它將被使用，並且是經由一個以上的交換分割區及/或交換檔案所提供。" -+"The swap space is the virtual memory available to the system.

                      It " -+"will be used on demand and is provided through one or more swap partitions " -+"and/or swap files." -+msgstr "" -+"交換空間是系統可用的 虛擬記憶體。

                      在 有要求時它將被使用，並且是經由" -+"一個以上的交換分割區及/或交換檔案所提供。" - - #: memory.cpp:271 - msgid "" --"

                      Memory Information

                      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 "

                      記憶體資訊

                      這些顯示告訴您目前您系統記憶體使用情形。這些數值會規律地更新並給您實體與虛擬記憶體的使用總覽。" -+"

                      Memory Information

                      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 "" -+"

                      記憶體資訊

                      這些顯示告訴您目前您系統記憶體使用情形。這些數值會規律地" -+"更新並給您實體與虛擬記憶體的使用總覽。" - - #: memory.cpp:350 - msgid "%1 free" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminput.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminput.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcminput.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcminput.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kcminput\n" - "POT-Creation-Date: 2006-08-22 02:34+0200\n" - "PO-Revision-Date: 2006-06-19 09:15+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -37,8 +36,8 @@ - - #: logitechmouse.cpp:225 - msgid "" --"RF channel 1 has been set. Please press Connect button on mouse to re-establish " --"link" -+"RF channel 1 has been set. Please press Connect button on mouse to re-" -+"establish link" - msgstr "RF 頻道 1 已經被設定了。請按滑鼠的連線按鈕來重新建立連結" - - #: logitechmouse.cpp:225 logitechmouse.cpp:229 -@@ -47,8 +46,8 @@ - - #: logitechmouse.cpp:229 - msgid "" --"RF channel 2 has been set. Please press Connect button on mouse to re-establish " --"link" -+"RF channel 2 has been set. Please press Connect button on mouse to re-" -+"establish link" - msgstr "RF 頻道 2 已經被設定了。請按滑鼠的連線按鈕來重新建立連結" - - #: logitechmouse.cpp:356 -@@ -117,10 +116,12 @@ - - #: mouse.cpp:82 - msgid "" --"

                      Mouse

                      This module allows you to choose various options for the way in " --"which your pointing device works. Your pointing device may be a mouse, " -+"

                      Mouse

                      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 "

                      滑鼠

                      這個模組可以讓您選擇您指標設備工作的方式。 您的指標設備可能是滑鼠，軌跡球或其他有類似功能的硬體。" -+msgstr "" -+"

                      滑鼠

                      這個模組可以讓您選擇您指標設備工作的方式。 您的指標設備可能是滑" -+"鼠，軌跡球或其他有類似功能的硬體。" - - #: mouse.cpp:101 - msgid "&General" -@@ -129,25 +130,26 @@ - #: mouse.cpp:106 - 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 " --"your pointing device has more than two buttons, only those that function as the " --"left and right buttons are affected. For example, if you have a three-button " --"mouse, the middle button is unaffected." -+"right buttons on your pointing device by choosing the 'left-handed' option. " -+"If your pointing device has more than two buttons, only those that function " -+"as the left and right buttons are affected. For example, if you have a three-" -+"button mouse, the middle button is unaffected." - msgstr "" --"如果您使用左手，您可能希望透過「使用左手」的選項，來交換指標設備左右鍵的功能。 " --"如果您的指標設備有多於二個按鈕，只有左右的二個會交換。例如您有一個三鍵滑鼠，則滑鼠的中間鍵將不受影響。" -+"如果您使用左手，您可能希望透過「使用左手」的選項，來交換指標設備左右鍵的功" -+"能。 如果您的指標設備有多於二個按鈕，只有左右的二個會交換。例如您有一個三鍵滑" -+"鼠，則滑鼠的中間鍵將不受影響。" - - #: mouse.cpp:116 - msgid "" --"The default behavior in KDE is to select and activate icons with a single click " --"of the left button on your pointing device. This behavior is consistent with " --"what you would expect when you click links in most web browsers. If you would " --"prefer to select with a single click, and activate with a double click, check " --"this option." --msgstr "" --"KDE " --"點選並啟動圖示的預設動作，是使用指標的設備左鍵，並以單擊圖示的方式來進行。這個動作就如同您在瀏覽器中，點選超連結的方式是相同的。如果您希望在單擊的時候進行選取，" --"而雙擊的時候進行啟動，那麼請選取這個選項。" -+"The default behavior in KDE is to select and activate icons with a single " -+"click of the left button on your pointing device. This behavior is " -+"consistent with what you would expect when you click links in most web " -+"browsers. If you would prefer to select with a single click, and activate " -+"with a double click, check this option." -+msgstr "" -+"KDE 點選並啟動圖示的預設動作，是使用指標的設備左鍵，並以單擊圖示的方式來進" -+"行。這個動作就如同您在瀏覽器中，點選超連結的方式是相同的。如果您希望在單擊的" -+"時候進行選取，而雙擊的時候進行啟動，那麼請選取這個選項。" - - #: mouse.cpp:124 - msgid "Activates and opens a file or folder with a single click." -@@ -155,19 +157,23 @@ - - #: mouse.cpp:130 - 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." -+"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 - 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 "如果您選擇了自動選取圖示的功能，這個滾軸可以讓您設定，滑鼠指標應該停留在圖示上多久的時間，才會選取這個圖示。" -+msgstr "" -+"如果您選擇了自動選取圖示的功能，這個滾軸可以讓您設定，滑鼠指標應該停留在圖示" -+"上多久的時間，才會選取這個圖示。" - - #: mouse.cpp:147 - msgid "Show feedback when clicking an icon" -@@ -175,7 +181,7 @@ - - #: mouse.cpp:179 - msgid "&Cursor Theme" --msgstr "游標佈景主題(&C)" -+msgstr "游標布景主題(&C)" - - #: mouse.cpp:183 - msgid "Advanced" -@@ -187,16 +193,18 @@ - - #: mouse.cpp:194 - 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 " --"device itself (which may be a mouse, trackball, or some other pointing device.)" --"

                      A high value for the acceleration will lead to large movements of the mouse " --"pointer on the screen even when you only make a small movement with the " --"physical device. Selecting very high values may result in the mouse pointer " --"flying across the screen, making it hard to control." -+"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 device itself (which may be a mouse, trackball, or some other " -+"pointing device.)

                      A high value for the acceleration will lead to large " -+"movements of the mouse pointer on the screen even when you only make a small " -+"movement with the physical device. Selecting very high values may result in " -+"the mouse pointer flying across the screen, making it hard to control." - msgstr "" --"這個選項可以讓您改變滑鼠指標在螢幕上移動與設備本身移動間的相對關係 (移動設備可能是滑鼠，軌跡球或其他指標設備)。" --"

                      即使是您只是稍微的移動，在較高的加速值下，仍將使滑鼠在畫面上有較大的移動。選擇一個很高的加速值可能會讓您的指標飛快的在畫面上移動，並且難以控制。<" -+"這個選項可以讓您改變滑鼠指標在螢幕上移動與設備本身移動間的相對關係 (移動設備" -+"可能是滑鼠，軌跡球或其他指標設備)。

                      即使是您只是稍微的移動，在較高的加速值" -+"下，仍將使滑鼠在畫面上有較大的移動。選擇一個很高的加速值可能會讓您的指標飛快" -+"的在畫面上移動，並且難以控制。<" - - #: mouse.cpp:207 - msgid "Pointer threshold:" -@@ -204,16 +212,17 @@ - - #: mouse.cpp:215 - 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 " --"threshold, the mouse pointer moves as if the acceleration was set to 1X;" --"

                      thus, when you make small movements with the physical device, there is no " --"acceleration at all, giving you a greater degree of control over the mouse " --"pointer. With larger movements of the physical device, you can move the mouse " --"pointer rapidly to different areas on the screen." -+"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 threshold, the mouse pointer moves as if the acceleration was set " -+"to 1X;

                      thus, when you make small movements with the physical device, " -+"there is no acceleration at all, giving you a greater degree of control over " -+"the mouse pointer. With larger movements of the physical device, you can " -+"move the mouse pointer rapidly to different areas on the screen." - msgstr "" --"這個界限是游標開始加速前必須移動的距離。 如果移動小於這個界限，游標將用正常速度移動( 1X)；" --"

                      也就是說，當您只有移動設備一小段距離，則不會加速，讓您更容易控制游標。而移動較大距離，則會加速，讓您可以在畫面上快速移動。" -+"這個界限是游標開始加速前必須移動的距離。 如果移動小於這個界限，游標將用正常速" -+"度移動( 1X)；

                      也就是說，當您只有移動設備一小段距離，則不會加速，讓您更容易" -+"控制游標。而移動較大距離，則會加速，讓您可以在畫面上快速移動。" - - #: mouse.cpp:229 - msgid "Double click interval:" -@@ -226,10 +235,12 @@ - #: mouse.cpp:236 - msgid "" - "The double click interval is the maximal time (in milliseconds) between two " --"mouse clicks which turns them into a double click. If the second click happens " --"later than this time interval after the first click, they are recognized as two " --"separate clicks." --msgstr "雙敲擊的間隔，是兩次滑鼠按鍵敲擊的最大間隔時間 (以微秒為單位)。如果第二次在經過這段時間之後才發生，就會被視為二次獨立的敲擊。" -+"mouse clicks which turns them into a double click. If the second click " -+"happens later than this time interval after the first click, they are " -+"recognized as two separate clicks." -+msgstr "" -+"雙敲擊的間隔，是兩次滑鼠按鍵敲擊的最大間隔時間 (以微秒為單位)。如果第二次在經" -+"過這段時間之後才發生，就會被視為二次獨立的敲擊。" - - #: mouse.cpp:247 - msgid "Drag start time:" -@@ -237,8 +248,8 @@ - - #: mouse.cpp:254 - 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." -+"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 -@@ -247,8 +258,8 @@ - - #: mouse.cpp:268 - 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." -+"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 -@@ -257,12 +268,13 @@ - - #: mouse.cpp:282 - 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 " --"visible lines, it will be ignored and the wheel movement will be handled as a " --"page up/down movement." -+"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 visible lines, it will be ignored and the wheel movement will be " -+"handled as a page up/down movement." - msgstr "" --"如果你使用滑鼠滾輪，這個數值就是你每次滾動滾輪將移動的行距。注意若是這個數值超過了可以顯示的行數，那麼這項設定將會被忽略，並改為切換上／下頁的功能。" -+"如果你使用滑鼠滾輪，這個數值就是你每次滾動滾輪將移動的列距。注意若是這個數值" -+"超過了可以顯示的列數，那麼這項設定將會被忽略，並改為切換上／下頁的功能。" - - #: mouse.cpp:288 - msgid "Mouse Navigation" -@@ -294,7 +306,7 @@ - - #: mouse.cpp:334 - msgid "Acceleration &profile:" --msgstr "加速度設定(&p)" -+msgstr "加速度設定(&P)" - - #: mouse.cpp:407 - msgid "Mouse" -@@ -314,7 +326,7 @@ - msgid "" - "_n: line\n" - " lines" --msgstr " 行" -+msgstr " 列" - - #. i18n: file kmousedlg.ui line 38 - #: rc.cpp:3 -@@ -338,14 +350,14 @@ - #: rc.cpp:12 - #, no-c-format - msgid "Re&verse scroll direction" --msgstr "反相捲動(&V)" -+msgstr "反向捲動(&V)" - - #. i18n: file kmousedlg.ui line 135 - #: rc.cpp:15 - #, no-c-format - msgid "" --"Change the direction of scrolling for the mouse wheel or the 4th and 5th mouse " --"buttons." -+"Change the direction of scrolling for the mouse wheel or the 4th and 5th " -+"mouse buttons." - msgstr "改變滑鼠滾輪捲動的方向或是第四鍵和第五鍵。" - - #. i18n: file kmousedlg.ui line 143 -@@ -412,10 +424,12 @@ - #: rc.cpp:48 - #, no-c-format - msgid "" --"You have a Logitech Mouse connected, and libusb was found at compile time, but " --"it was not possible to access this mouse. This is probably caused by a " -+"You have a Logitech Mouse connected, and libusb was found at compile time, " -+"but it was not possible to access this mouse. This is probably caused by a " - "permissions problem - you should consult the manual on how to fix this." --msgstr "您連接了羅技滑鼠，而且也在編譯時找到 libusb，但是仍無法使用這個滑鼠。這可能是權限的問題 - 您應該參考手冊以了解如何修正它。" -+msgstr "" -+"您連接了羅技滑鼠，而且也在編譯時找到 libusb，但是仍無法使用這個滑鼠。這可能是" -+"權限的問題 - 您應該參考手冊以了解如何修正它。" - - #. i18n: file logitechmouse_base.ui line 46 - #: rc.cpp:51 -@@ -461,7 +475,7 @@ - - #: core/themepage.cpp:60 - msgid "Select the cursor theme you want to use:" --msgstr "請選取你想使用的滑鼠游標佈景主題:" -+msgstr "請選取你想使用的滑鼠游標布景主題:" - - #: core/themepage.cpp:66 xcursor/themepage.cpp:93 - msgid "Name" -@@ -513,40 +527,42 @@ - - #: xcursor/themepage.cpp:84 - msgid "Select the cursor theme you want to use (hover preview to test cursor):" --msgstr "請選取你想使用的滑鼠游標佈景主題(可以在預覽測試游標)：" -+msgstr "請選取你想使用的滑鼠游標布景主題(可以在預覽測試游標)：" - - #: xcursor/themepage.cpp:104 - msgid "Install New Theme..." --msgstr "安裝新佈置主題" -+msgstr "安裝新布置主題" - - #: xcursor/themepage.cpp:105 - msgid "Remove Theme" --msgstr "移除佈景主題" -+msgstr "移除布景主題" - - #: xcursor/themepage.cpp:212 - msgid "Drag or Type Theme URL" --msgstr "把佈景主題的網址拖拉到此，或是手動輸入" -+msgstr "把布景主題的網址拖拉到此，或是手動輸入" - - #: xcursor/themepage.cpp:221 - #, c-format - msgid "Unable to find the cursor theme archive %1." --msgstr "無法找到這個游標佈景主題的檔案庫 %1。" -+msgstr "無法找到這個游標布景主題的檔案庫 %1。" - - #: xcursor/themepage.cpp:223 - msgid "" --"Unable to download the cursor theme archive; please check that the address %1 " --"is correct." --msgstr "無法下載游標佈景主題的檔案庫；請確定網址 %1 是否正確。" -+"Unable to download the cursor theme archive; please check that the address %" -+"1 is correct." -+msgstr "無法下載游標布景主題的檔案庫；請確定網址 %1 是否正確。" - - #: xcursor/themepage.cpp:231 - msgid "The file %1 does not appear to be a valid cursor theme archive." --msgstr "檔案 %1 並不是一個游標佈景主題" -+msgstr "檔案 %1 並不是一個游標布景主題" - - #: xcursor/themepage.cpp:240 - msgid "" - "Are you sure you want to remove the %1 cursor theme?" - "
                      This will delete all the files installed by this theme.                      " --msgstr "你確定要移除 %1 佈景主題嗎？
                      這個動作會刪除所有和這個佈景主題相關的檔案。                      " -+msgstr "" -+"你確定要移除 %1 布景主題嗎？
                      這個動作會刪除所有和這個" -+"布景主題相關的檔案。                      " - - #: xcursor/themepage.cpp:246 - msgid "Confirmation" -@@ -554,13 +570,13 @@ - - #: xcursor/themepage.cpp:300 - msgid "" --"A theme named %1 already exists in your icon theme folder. Do you want replace " --"it with this one?" --msgstr "一個叫做 %1 的佈景主題已經存在於系統中。請問您要取代它嗎？" -+"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 - msgid "Overwrite Theme?" --msgstr "覆蓋這個佈景主題？" -+msgstr "覆蓋這個布景主題？" - - #: xcursor/themepage.cpp:336 xcursor/themepage.cpp:483 - msgid "No description available" -@@ -568,7 +584,7 @@ - - #: xcursor/themepage.cpp:537 - msgid "No theme" --msgstr "無佈景主題" -+msgstr "無布景主題" - - #: xcursor/themepage.cpp:537 - msgid "The old classic X cursors" -@@ -576,7 +592,7 @@ - - #: xcursor/themepage.cpp:539 - msgid "System theme" --msgstr "系統佈景主題" -+msgstr "系統布景主題" - - #: xcursor/themepage.cpp:539 - msgid "Do not change cursor theme" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmioslaveinfo.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmioslaveinfo.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmioslaveinfo.po 2006-03-17 11:47:46.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmioslaveinfo.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,7 +13,7 @@ - "Project-Id-Version: kcmioslaveinfo\n" - "POT-Creation-Date: 2006-02-20 03:45+0100\n" - "PO-Revision-Date: 2003-12-04 23:28+0800\n" --"Last-Translator: 林耕宇 \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -54,7 +54,9 @@ - - #: kcmioslaveinfo.cpp:137 - msgid "Some info about protocol %1:/ ..." --msgstr "一些資訊關於協定: %1:/ ..." -+msgstr "一些資訊關於協定: %1:/…" - --#~ msgid "Gives you an overview of the installed ioslaves and allows you to configure the network timeout values for those slaves." -+#~ msgid "" -+#~ "Gives you an overview of the installed ioslaves and allows you to " -+#~ "configure the network timeout values for those slaves." - #~ msgstr "讓您檢視已安裝的 ioslaves 並允許您設定其網路逾時值" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkclock.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkclock.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkclock.po 2006-01-19 18:50:04.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkclock.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmkclock\n" - "POT-Creation-Date: 2005-12-17 03:07+0100\n" - "PO-Revision-Date: 2005-10-27 19:44+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -23,20 +23,20 @@ - - #: dtime.cpp:147 - msgid "" --"Here you can change the system time. Click into the hours, minutes or seconds " --"field to change the relevant value, either using the up and down buttons to the " --"right or by entering a new value." --msgstr "你可以在這裡改變系統時刻。點選進入時，分，秒欄位來改變相對映的值， 也可以使用右邊的上下按鈕或直接輸入一個新的值。" -+"Here you can change the system time. Click into the hours, minutes or " -+"seconds field to change the relevant value, either using the up and down " -+"buttons to the right or by entering a new value." -+msgstr "" -+"你可以在這裡改變系統時刻。點選進入時，分，秒欄位來改變相對映的值， 也可以使用" -+"右邊的上下按鈕或直接輸入一個新的值。" - - #: dtime.cpp:246 - msgid "" --"Public Time Server " --"(pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org," --"oceania.pool.ntp.org" -+"Public Time Server (pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org," -+"north-america.pool.ntp.org,oceania.pool.ntp.org" - msgstr "" --"公用時刻伺服器 " --"(pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-america.pool.ntp.org," --"oceania.pool.ntp.org" -+"公用時刻伺服器 (pool.ntp.org),asia.pool.ntp.org,europe.pool.ntp.org,north-" -+"america.pool.ntp.org,oceania.pool.ntp.org" - - #: dtime.cpp:331 - msgid "Can not set date." -@@ -44,14 +44,15 @@ - - #: dtime.cpp:361 main.cpp:54 - msgid "" --"

                      Date & Time

                      This control module can be used to set the system date and " --"time. As these settings do not only affect you as a user, but rather the whole " --"system, you can only change these settings when you start the Control Center as " --"root. If you do not have the root password, but feel the system time should be " --"corrected, please contact your system administrator." -+"

                      Date & Time

                      This control module can be used to set the system date " -+"and time. As these settings do not only affect you as a user, but rather the " -+"whole system, you can only change these settings when you start the Control " -+"Center as root. If you do not have the root password, but feel the system " -+"time should be corrected, please contact your system administrator." - msgstr "" --"

                      日期及時刻

                      這個控制模組可被用來設定系統日期及時剖。 這些設定不僅影響使用者，也會影響整個系統，只有當你用 root 身份 " --"啟動控制中心時才能改變這些設定。假如你沒有 root 密碼，但覺得系統 時刻需要修正，請聯絡你的系統管理者。" -+"

                      日期及時刻

                      這個控制模組可被用來設定系統日期及時剖。 這些設定不僅影響" -+"使用者，也會影響整個系統，只有當你用 root 身分 啟動控制中心時才能改變這些設" -+"定。假如你沒有 root 密碼，但覺得系統 時刻需要修正，請聯絡你的系統管理者。" - - #: tzone.cpp:52 - msgid "To change the timezone, select your area from the list below" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkded.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkded.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkded.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkded.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmkded\n" - "POT-Creation-Date: 2006-08-22 02:34+0200\n" - "PO-Revision-Date: 2005-08-11 20:38+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,25 +39,21 @@ - - #: kcmkded.cpp:59 - msgid "" --"

                      Service Manager

                      " --"

                      This module allows you to have an overview of all plugins of the KDE Daemon, " --"also referred to as KDE Services. Generally, there are two types of service:

                      " --"
                        " --"
                      • Services invoked at startup
                        • " --"
                      • Services called on demand
                      " --"

                      The latter are only listed for convenience. The startup services can be " --"started and stopped. In Administrator mode, you can also define whether " --"services should be loaded at startup.

                      " --"

                      Use this with care: some services are vital for KDE; do not deactivate " --"services if you do not know what you are doing.

                      " -+"

                      Service Manager

                      This module allows you to have an overview of all " -+"plugins of the KDE Daemon, also referred to as KDE Services. Generally, " -+"there are two types of service:

                      • Services invoked at startup
                      • Services called on demand

                      The latter are only listed for " -+"convenience. The startup services can be started and stopped. In " -+"Administrator mode, you can also define whether services should be loaded at " -+"startup.

                      Use this with care: some services are vital for KDE; do " -+"not deactivate services if you do not know what you are doing.

                      " - msgstr "" --"

                      服務管理程式

                      " --"

                      這模組讓您能夠概覽 KDE 伺服程式的所有外掛程式，也就是所謂 KDE 服務。一般來說，有兩種類型的服務：

                      " --"
                        " --"
                      • 在啟動時呼叫服務
                        • " --"
                      • 依需求呼叫服務
                      " --"

                      這些順序只是方便列舉而已。在啟動時呼叫的服務可以啟動也可以停止。在管理員模式，您也可以定義何種服務要在啟動時載入。

                      " --"

                      請小心使用這個功能：某些服務對於 KDE 來說是必要的：如果您不知道您在做什麼，請不要停止服務。

                      " -+"

                      服務管理程式

                      這模組讓您能夠概覽 KDE 伺服程式的所有外掛程式，也就是" -+"所謂 KDE 服務。一般來說，有兩種類型的服務：

                      • 在啟動時呼叫服務
                      • 依需求呼叫服務

                      這些順序只是方便列舉而已。在啟動時呼叫的服" -+"務可以啟動也可以停止。在管理員模式，您也可以定義何種服務要在啟動時載入。

                      請小心使用這個功能：某些服務對於 KDE 來說是必要的：如果您不知道您在" -+"做什麼，請不要停止服務。

                      " - - #: kcmkded.cpp:67 - msgid "Running" -@@ -73,9 +69,12 @@ - - #: kcmkded.cpp:73 - msgid "" --"This is a list of available KDE services which will be started on demand. They " --"are only listed for convenience, as you cannot manipulate these services." --msgstr "這是在 KDE 中在你需要時會自動載入的服務。在此列出僅供參考，你並不能調整這些服務。" -+"This is a list of available KDE services which will be started on demand. " -+"They are only listed for convenience, as you cannot manipulate these " -+"services." -+msgstr "" -+"這是在 KDE 中在你需要時會自動載入的服務。在此列出僅供參考，你並不能調整這些服" -+"務。" - - #: kcmkded.cpp:79 kcmkded.cpp:93 - msgid "Service" -@@ -95,10 +94,12 @@ - - #: kcmkded.cpp:86 - msgid "" --"This shows all KDE services that can be loaded on KDE startup. Checked services " --"will be invoked on next startup. Be careful with deactivation of unknown " --"services." --msgstr "此表為 KDE 啟動時會載入的所有 KDE 服務。被選取的服務將會在下次啟動時被載入。請不要隨意關閉那些你不清楚功能的服務" -+"This shows all KDE services that can be loaded on KDE startup. Checked " -+"services will be invoked on next startup. Be careful with deactivation of " -+"unknown services." -+msgstr "" -+"此表為 KDE 啟動時會載入的所有 KDE 服務。被選取的服務將會在下次啟動時被載入。" -+"請不要隨意關閉那些你不清楚功能的服務" - - #: kcmkded.cpp:92 - msgid "Use" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkdnssd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkdnssd.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkdnssd.po 2006-01-19 18:50:04.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkdnssd.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: kcmkdnssd VERSION\n" - "POT-Creation-Date: 2005-10-13 02:37+0200\n" - "PO-Revision-Date: 2005-10-27 19:51+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional> \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -62,8 +62,8 @@ - #: rc.cpp:18 rc.cpp:70 - #, no-c-format - msgid "" --"List of Internet domains that will be browsed for services. Do not put .local " --"here - it\n" -+"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 "" - "用來瀏覽服務的網際網路網域清單。不要在這裡放入 .local - \n" -@@ -73,7 +73,7 @@ - #: rc.cpp:22 rc.cpp:74 - #, no-c-format - msgid "Publishing Mode" --msgstr "發佈模式" -+msgstr "發布模式" - - #. i18n: file configdialog.ui line 110 - #: rc.cpp:25 rc.cpp:77 -@@ -100,7 +100,9 @@ - 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 於網際網路網域的廣告服務。要讓這個選項運作您須使用管理者模式設定廣域作業" -+msgstr "" -+"使用公開 IP 於網際網路網域的廣告服務。要讓這個選項運作您須使用管理者模式設定" -+"廣域作業" - - #. i18n: file configdialog.ui line 149 - #: rc.cpp:37 rc.cpp:89 -@@ -155,7 +157,8 @@ - #~ msgstr "發現更多網域" - - #~ msgid "" --#~ "If selected every configured domain will be queried for list of domain to browse. This \n" -+#~ "If selected every configured domain will be queried for list of domain to " -+#~ "browse. This \n" - #~ "process will be recursive." - #~ msgstr "" - #~ "如果選擇，每個設定的網域都會被查詢做為要瀏覽的網域清單。\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkeys.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkeys.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkeys.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkeys.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kcmkeys\n" - "POT-Creation-Date: 2006-08-22 02:34+0200\n" - "PO-Revision-Date: 2006-01-12 13:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -20,25 +19,29 @@ - - #: shortcuts.cpp:93 - msgid "" --"

                      Key Bindings

                      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 " --"normally bound to 'Copy'. KDE allows you to store more than one 'scheme' of key " --"bindings, so you might want to experiment a little setting up your own scheme " --"while you can still change back to the KDE defaults." --"

                      In the tab 'Global Shortcuts' you can configure non-application specific " --"bindings like how to switch desktops or maximize a window. In the tab " --"'Application Shortcuts' you will find bindings typically used in applications, " --"such as copy and paste." --msgstr "" --"

                      按鍵對應

                      使用按鍵對應您可以設定按下按鍵後觸發特定動作。例如 Ctrl+C 一般會對應到「複製」。 KDE " --"允許您儲存多個按鍵對應「架構」，所以您可以試著改變您的系統設定，而且您隨時可以回復 KDE 預設值。" --"

                      在「全域捷徑」標籤中，您可以組態非特定應用程式的設定，像切換桌面或最大化視窗。在「應用程式捷徑」標籤中，您可以找到一般用在程式的按鍵對應，例如複製與貼上。" -+"

                      Key Bindings

                      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 normally bound to 'Copy'. KDE allows you to store more than one 'scheme' " -+"of key bindings, so you might want to experiment a little setting up your " -+"own scheme while you can still change back to the KDE defaults.

                      In the " -+"tab 'Global Shortcuts' you can configure non-application specific bindings " -+"like how to switch desktops or maximize a window. In the tab 'Application " -+"Shortcuts' you will find bindings typically used in applications, such as " -+"copy and paste." -+msgstr "" -+"

                      按鍵對應

                      使用按鍵對應您可以設定按下按鍵後觸發特定動作。例如 Ctrl+C 一" -+"般會對應到「複製」。 KDE 允許您儲存多個按鍵對應「架構」，所以您可以試著改變您" -+"的系統設定，而且您隨時可以回復 KDE 預設值。

                      在「全域捷徑」標籤中，您可以組" -+"態非特定應用程式的設定，像切換桌面或最大化視窗。在「應用程式捷徑」標籤中，您" -+"可以找到一般用在程式的按鍵對應，例如複製與貼上。" - - #: shortcuts.cpp:152 - msgid "" - "Click here to remove the selected key bindings scheme. You cannot remove the " - "standard system-wide schemes 'Current scheme' and 'KDE default'." --msgstr "按下這邊以移除選擇的按鍵對應結構。您不能移除標準系統結構，「目前結構」或是「KDE 預設」。" -+msgstr "" -+"按下這邊以移除選擇的按鍵對應結構。您不能移除標準系統結構，「目前結構」或是" -+"「KDE 預設」。" - - #: shortcuts.cpp:158 - msgid "New scheme" -@@ -63,7 +66,7 @@ - - #: shortcuts.cpp:187 - msgid "App&lication Shortcuts" --msgstr "應用程式捷徑 (&A)" -+msgstr "應用程式捷徑(&A)" - - #: shortcuts.cpp:248 - msgid "User-Defined Scheme" -@@ -75,15 +78,18 @@ - - #: shortcuts.cpp:292 - msgid "" --"Your current changes will be lost if you load another scheme before saving this " --"one." --msgstr "在您儲存目前的修改前，載入其他的組合鍵表，那麼您目前所做的改變將會遺失。" -+"Your current changes will be lost if you load another scheme before saving " -+"this one." -+msgstr "" -+"在您儲存目前的修改前，載入其他的組合鍵表，那麼您目前所做的改變將會遺失。" - - #: shortcuts.cpp:312 - 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\" 這個按鍵，不過它並不在您的鍵盤上。您要看到底是哪些按鍵定義嗎？" -+msgstr "" -+"這個組合鍵定義需要 \"%1\" 這個按鍵，不過它並不在您的鍵盤上。您要看到底是哪些" -+"按鍵定義嗎？" - - #: modifiers.cpp:194 modifiers.cpp:290 shortcuts.cpp:314 - msgid "Win" -@@ -138,15 +144,16 @@ - #: modifiers.cpp:215 - msgid "" - "Checking this box will change your X Modifier Mapping to better reflect the " --"standard MacOS modifier key usage. It allows you to use Command+C for " --"Copy, for instance, instead of the PC standard of Ctrl+C. " --"Command will be used for application and console commands, Option " --"as a command modifier and for navigating menus and dialogs, and Control " --"for window manager commands." --msgstr "" --"選取這個選項，將會改變您的 X 組合鍵對映到標準的 MacOS 組合鍵設定。這將允許您使用 Command+C 來執行 Copy " --"的動作，就如同在 PC 上使用 CTRL+C 一樣。Command 將同時被用在應用程式與 Console 的指令上，" --"Option 用於選單的操作，而 Control 則用於視窗管理的指令上。" -+"standard MacOS modifier key usage. It allows you to use Command+C for " -+"Copy, for instance, instead of the PC standard of Ctrl+C. " -+"Command will be used for application and console commands, Option as a command modifier and for navigating menus and dialogs, and " -+"Control for window manager commands." -+msgstr "" -+"選取這個選項，將會改變您的 X 組合鍵對映到標準的 MacOS 組合鍵設定。這將允許您" -+"使用 Command+C 來執行 Copy 的動作，就如同在 PC 上使用 CTRL" -+"+C 一樣。Command 將同時被用在應用程式與 Console 的指令上，" -+"Option 用於選單的操作，而 Control 則用於視窗管理的指令上。" - - #: modifiers.cpp:228 - msgid "X Modifier Mapping" -@@ -175,25 +182,28 @@ - - #: modifiers.cpp:343 - msgid "" --"You can only activate this option if your X keyboard layout has the 'Super' or " --"'Meta' keys properly configured as modifier keys." --msgstr "當你的 X 鍵盤配置有設定 'Super' 和 'Meta' 的組合鍵時，您才能夠開啟這個選項。" -+"You can only activate this option if your X keyboard layout has the 'Super' " -+"or 'Meta' keys properly configured as modifier keys." -+msgstr "" -+"當你的 X 鍵盤配置有設定 'Super' 和 'Meta' 的組合鍵時，您才能夠開啟這個選項。" - - #: main.cpp:54 - msgid "" --"

                      Keyboard Shortcuts

                      Using shortcuts you can configure certain actions " --"to be triggered when you press a key or a combination of keys, e.g. Ctrl+C is " --"normally bound to 'Copy'. KDE allows you to store more than one 'scheme' of " --"shortcuts, so you might want to experiment a little setting up your own scheme, " --"although you can still change back to the KDE defaults." --"

                      In the 'Global Shortcuts' tab you can configure non-application-specific " --"bindings, like how to switch desktops or maximize a window; in the 'Application " --"Shortcuts' tab you will find bindings typically used in applications, such as " --"copy and paste." -+"

                      Keyboard Shortcuts

                      Using shortcuts you can configure certain " -+"actions to be triggered when you press a key or a combination of keys, e.g. " -+"Ctrl+C is normally bound to 'Copy'. KDE allows you to store more than one " -+"'scheme' of shortcuts, so you might want to experiment a little setting up " -+"your own scheme, although you can still change back to the KDE defaults.

                      " -+"In the 'Global Shortcuts' tab you can configure non-application-specific " -+"bindings, like how to switch desktops or maximize a window; in the " -+"'Application Shortcuts' tab you will find bindings typically used in " -+"applications, such as copy and paste." - msgstr "" --"

                      鍵盤捷徑

                      使用捷徑您可以組態按下按鍵後的動作。例如 Ctrl+C 通常是對應到「複製」。 KDE " --"允許您儲存多個按鍵對應組合，所以您可以試著改變您的系統設定，您隨時可以回復 KDE 預設值。 " --"

                      在「全域捷徑」標籤中，您可以設定非特定程式的設定，例如切換桌面或最大化視窗。在「應用程式」標籤中，您可以找到一般用在程式的按鍵對應，例如複製與貼上。" -+"

                      鍵盤捷徑

                      使用捷徑您可以組態按下按鍵後的動作。例如 Ctrl+C 通常是對應到" -+"「複製」。 KDE 允許您儲存多個按鍵對應組合，所以您可以試著改變您的系統設定，您" -+"隨時可以回復 KDE 預設值。

                      在「全域捷徑」標籤中，您可以設定非特定程式的設" -+"定，例如切換桌面或最大化視窗。在「應用程式」標籤中，您可以找到一般用在程式的" -+"按鍵對應，例如複製與貼上。" - - #: main.cpp:77 - msgid "Shortcut Schemes" -@@ -219,23 +229,28 @@ - msgid "" - "

                      Command Shortcuts

                      Using key bindings you can configure applications " - "and commands to be triggered when you press a key or a combination of keys." --msgstr "

                      指令捷徑

                      你可以設定當按下某個鍵（或是某些鍵）時， 就執行某個指令或是程式。" -+msgstr "" -+"

                      指令捷徑

                      你可以設定當按下某個鍵（或是某些鍵）時， 就執行某個指令或是" -+"程式。" - - #: commandShortcuts.cpp:83 - msgid "" --"Below is a list of known commands which you may assign keyboard shortcuts " --"to. To edit, add or remove entries from this list use the KDE menu editor." -+"Below is a list of known commands which you may assign keyboard " -+"shortcuts to. To edit, add or remove entries from this list use the KDE menu editor." - msgstr "" --"下面是一些已知的指令，你可以指定一些鍵盤捷徑給它們。 請使用 KDE 選單編輯器 " --"來編輯、新增或是 移除項目" -+"下面是一些已知的指令，你可以指定一些鍵盤捷徑給它們。 請使用 KDE 選單編輯器 來編輯、新增或是 移除項目" - - #: commandShortcuts.cpp:96 - msgid "" --"This is a list of all the desktop applications and commands currently defined " --"on this system. Click to select a command to assign a keyboard shortcut to. " --"Complete management of these entries can be done via the menu editor program." --msgstr "這是目前系統上所有的桌面程式和指令。按一下選擇一個想要建立鍵盤捷徑的指令。更完整的管理介面請使用選單編輯器程式。" -+"This is a list of all the desktop applications and commands currently " -+"defined on this system. Click to select a command to assign a keyboard " -+"shortcut to. Complete management of these entries can be done via the menu " -+"editor program." -+msgstr "" -+"這是目前系統上所有的桌面程式和指令。按一下選擇一個想要建立鍵盤捷徑的指令。更" -+"完整的管理介面請使用選單編輯器程式。" - - #: commandShortcuts.cpp:104 - msgid "Shortcut for Selected Command" -@@ -253,7 +268,7 @@ - - #: commandShortcuts.cpp:112 - msgid "C&ustom" --msgstr "自訂(&u)" -+msgstr "自訂(&U)" - - #: commandShortcuts.cpp:114 - msgid "" -@@ -263,10 +278,12 @@ - - #: commandShortcuts.cpp:119 - msgid "" --"Use this button to choose a new shortcut key. Once you click it, you can press " --"the key-combination which you would like to be assigned to the currently " --"selected command." --msgstr "用這個按鍵來選取一個新的捷徑鍵。用滑鼠點它，你可以按下組合鍵，並且將目前 選取的指令指令給它。" -+"Use this button to choose a new shortcut key. Once you click it, you can " -+"press the key-combination which you would like to be assigned to the " -+"currently selected command." -+msgstr "" -+"用這個按鍵來選取一個新的捷徑鍵。用滑鼠點它，你可以按下組合鍵，並且將目前 選取" -+"的指令指令給它。" - - #: commandShortcuts.cpp:142 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkicker.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkicker.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkicker.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kcmkicker\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2007-02-27 09:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -35,61 +34,68 @@ - - #: applettab_impl.cpp:59 - msgid "" --"Panel applets can be started in two different ways: internally or externally. " --"While 'internally' is the preferred way to load applets, this can raise " --"stability or security problems when you are using poorly-programmed third-party " --"applets. To address these problems, applets can be marked 'trusted'. You might " --"want to configure Kicker to treat trusted applets differently to untrusted " --"ones; your options are: " --"
                        " --"
                      • Load only trusted applets internally: All applets but the ones " --"marked 'trusted' will be loaded using an external wrapper application.
                        • " --"
                      • Load startup config applets internally: " --"The applets shown on KDE startup will be loaded internally, others will be " --"loaded using an external wrapper application.
                        • " --"
                      • Load all applets internally
                      " --msgstr "" --"面板小程式可以用兩種不同的方式啟動：內部和外部啟動。內部啟動是比較被偏好用來載入小程式的方式，但是卻可能有系統穩定性和安全性上的疑慮，尤其是一些 " --"外來的、沒被好好設計的程式。為了解決這個問題，小程式可以被標記成「可靠的」。 你可能會把 Kicker " --"設定為以不同的方式來對待「可靠的」和「非可靠的」小程式。 你的選項有：" --"
                        " --"
                      • 只有可靠的小程式可被內部載入： 除了被標記為「可靠的」的小程式之外所有的小程式會被用外部的包裝應用程式 載入。
                        • " --"
                      • 啟動時設定的小程式可被內部載入： 出現在「KDE " --"啟動時執行」中的小程式會被用內部啟動的方式載入，其它的會被用外部的包裝應用程式載入。
                        • " --"
                      • 所有的小程式都使用內部啟動載入
                      " -+"Panel applets can be started in two different ways: internally or " -+"externally. While 'internally' is the preferred way to load applets, this " -+"can raise stability or security problems when you are using poorly-" -+"programmed third-party applets. To address these problems, applets can be " -+"marked 'trusted'. You might want to configure Kicker to treat trusted " -+"applets differently to untrusted ones; your options are:
                      • Load " -+"only trusted applets internally: All applets but the ones marked " -+"'trusted' will be loaded using an external wrapper application.
                        • " -+"
                      • Load startup config applets internally: The applets shown on " -+"KDE startup will be loaded internally, others will be loaded using an " -+"external wrapper application.
                      • Load all applets internally
                      " -+msgstr "" -+"面板小程式可以用兩種不同的方式啟動：內部和外部啟動。內部啟動是比較被偏好用來" -+"載入小程式的方式，但是卻可能有系統穩定性和安全性上的疑慮，尤其是一些 外來的、" -+"沒被好好設計的程式。為了解決這個問題，小程式可以被標記成「可靠的」。 你可能會" -+"把 Kicker 設定為以不同的方式來對待「可靠的」和「非可靠的」小程式。 你的選項" -+"有：
                      • 只有可靠的小程式可被內部載入： 除了被標記為「可靠的」的" -+"小程式之外所有的小程式會被用外部的包裝應用程式 載入。
                      • 啟動時設" -+"定的小程式可被內部載入： 出現在「KDE 啟動時執行」中的小程式會被用內部啟" -+"動的方式載入，其它的會被用外部的包裝應用程式載入。
                      • 所有的小程式" -+"都使用內部啟動載入
                      " - - #: applettab_impl.cpp:70 - msgid "" - "Here you can see a list of applets that are marked 'trusted', i.e. will be " - "loaded internally by Kicker in any case. To move an applet from the list of " --"available applets to the trusted ones, or vice versa, select it and press the " --"left or right buttons." -+"available applets to the trusted ones, or vice versa, select it and press " -+"the left or right buttons." - msgstr "" --"這裡你可以看到被標記為「可靠的」的小程式列表，例如，在任何情況下都會 被 Kicker 用內部啟動的方式載入。要將一個小程式從「所有的小程式列表」 " --"移動到「可靠的小程式列表」（或是類似的動作），請選取它，然後按左鍵或右鍵。" -+"這裡你可以看到被標記為「可靠的」的小程式列表，例如，在任何情況下都會 被 " -+"Kicker 用內部啟動的方式載入。要將一個小程式從「所有的小程式列表」 移動到「可" -+"靠的小程式列表」（或是類似的動作），請選取它，然後按左鍵或右鍵。" - - #: applettab_impl.cpp:75 - msgid "" - "Click here to add the selected applet from the list of available, untrusted " - "applets to the list of trusted applets." --msgstr "按這裡將已選取的小程式從「所有可得的、非可靠的小程式列表」移動到 「可靠的小程式列表」。" -+msgstr "" -+"按這裡將已選取的小程式從「所有可得的、非可靠的小程式列表」移動到 「可靠的小程" -+"式列表」。" - - #: applettab_impl.cpp:78 - msgid "" - "Click here to remove the selected applet from the list of trusted applets to " - "the list of available, untrusted applets." --msgstr "按這裡將已選取的小程式從「可靠的小程式列表」移除到 「所有可得的、非可靠的小程式列表」。" -+msgstr "" -+"按這裡將已選取的小程式從「可靠的小程式列表」移除到 「所有可得的、非可靠的小程" -+"式列表」。" - - #: applettab_impl.cpp:81 - msgid "" --"Here you can see a list of available applets that you currently do not trust. " --"This does not mean you cannot use those applets, but rather that the panel's " --"policy using them depends on your applet security level. To move an applet from " --"the list of available applets to the trusted ones or vice versa, select it and " --"press the left or right buttons." -+"Here you can see a list of available applets that you currently do not " -+"trust. This does not mean you cannot use those applets, but rather that the " -+"panel's policy using them depends on your applet security level. To move an " -+"applet from the list of available applets to the trusted ones or vice versa, " -+"select it and press the left or right buttons." - msgstr "" --"這裡你可以看到在目前可得的小程式中，不可靠小程式的列表。 但並不代表你不能使用這些小程式，而是使用它們的方式和你的安全性顧慮有關。 " --"要將一個小程式從「可得的小程式列表」移動到「可靠的小程式列表」（或類似的 動作），請選取它，然後按左鍵或右鍵。" -+"這裡你可以看到在目前可得的小程式中，不可靠小程式的列表。 但並不代表你不能使用" -+"這些小程式，而是使用它們的方式和你的安全性顧慮有關。 要將一個小程式從「可得的" -+"小程式列表」移動到「可靠的小程式列表」（或類似的 動作），請選取它，然後按左鍵" -+"或右鍵。" - - #: extensionInfo.cpp:45 - msgid "Main Panel" -@@ -149,14 +155,16 @@ - msgid "" - "

                      Panel

                      Here you can configure the KDE panel (also referred to as " - "'kicker'). This includes options like the position and size of the panel, as " --"well as its hiding behavior and its looks." --"

                      Note that you can also access some of these options directly by clicking on " --"the panel, e.g. dragging it with the left mouse button or using the context " --"menu on right mouse button click. This context menu also offers you " --"manipulation of the panel's buttons and applets." -+"well as its hiding behavior and its looks.

                      Note that you can also access " -+"some of these options directly by clicking on the panel, e.g. dragging it " -+"with the left mouse button or using the context menu on right mouse button " -+"click. This context menu also offers you manipulation of the panel's buttons " -+"and applets." - msgstr "" --"

                      面板

                      您可以在這邊設定 KDE 面板（或是 'kicker'）。 這包含了像是位置大小等等選項，以及隱藏的方式與外觀。" --"

                      注意您也可以經由直接點選面板來存取部分的選項，例如用滑鼠左鍵拖曳或是用內容選單。內容選單也提供您許多的面板按鈕與小程式。" -+"

                      面板

                      您可以在這邊設定 KDE 面板（或是 'kicker'）。 這包含了像是位置大" -+"小等等選項，以及隱藏的方式與外觀。

                      注意您也可以經由直接點選面板來存取部分的" -+"選項，例如用滑鼠左鍵拖曳或是用內容選單。內容選單也提供您許多的面板按鈕與小程" -+"式。" - - #: main.cpp:349 - msgid "" -@@ -284,12 +292,14 @@ - msgid "" - "\n" - "

                      Select this option to always show the Applet Handles.

                      \n" --"

                      Applet Handles let you move, remove and configure applets in the panel.

                      \n" -+"

                      Applet Handles let you move, remove and configure applets in the panel.\n" - "" - msgstr "" - "\n" - "

                      Select this option to always show the Applet Handles.

                      \n" --"

                      Applet Handles let you move, remove and configure applets in the panel.

                      \n" -+"

                      Applet Handles let you move, remove and configure applets in the panel.\n" - "" - - #. i18n: file advancedOptions.ui line 116 -@@ -303,8 +313,10 @@ - #, no-c-format - msgid "" - "\n" --"

                      Select this option to make Applet Handles visible only on mouse hover.

                      \n" --"

                      Applet Handles let you move, remove and configure applets in the panel.

                      \n" -+"

                      Select this option to make Applet Handles visible only on mouse hover.\n" -+"

                      Applet Handles let you move, remove and configure applets in the panel.\n" - "" - msgstr "" - "\n" -@@ -323,14 +335,13 @@ - #, no-c-format - msgid "" - "\n" --"

                      " --"

                      Select this option to always hide the Applet Handles. Beware that this " -+"

                      Select this option to always hide the Applet Handles. Beware that this " - "option can disable removing, moving or configuring some applets.

                      \n" - "" - msgstr "" - "\n" --"

                      " --"

                      選取這個選項可以永遠隱藏小程式的 Handle。注意，這個選項可能會讓你 無法移除、移動、或是設定一些小程式。

                      \n" -+"

                      選取這個選項可以永遠隱藏小程式的 Handle。注意，這個選項可能會讓你 無法" -+"移除、移動、或是設定一些小程式。

                      \n" - "                      " - - #. i18n: file advancedOptions.ui line 162 -@@ -356,8 +367,8 @@ - #: rc.cpp:56 rc.cpp:59 rc.cpp:65 rc.cpp:71 - #, no-c-format - msgid "" --"Use this slider to set how much transparent panels should be tinted using the " --"tint color." -+"Use this slider to set how much transparent panels should be tinted using " -+"the tint color." - msgstr "設定面板的透明度" - - #. i18n: file advancedOptions.ui line 251 -@@ -370,13 +381,13 @@ - #: rc.cpp:68 - #, no-c-format - msgid "Ti&nt amount:" --msgstr "半透明度(&n)" -+msgstr "半透明度(&N)" - - #. i18n: file advancedOptions.ui line 279 - #: rc.cpp:74 - #, no-c-format - msgid "Tint c&olor:" --msgstr "半透明色(&o)" -+msgstr "半透明色(&O)" - - #. i18n: file advancedOptions.ui line 293 - #: rc.cpp:80 -@@ -388,12 +399,13 @@ - #: rc.cpp:83 - #, no-c-format - msgid "" --"Normally if you have the desktop's or current application's menu bar displayed " --"in a panel at the top of the screen (MacOS-style), transparency is disabled for " --"this panel to avoid the desktop background clashing with the menu bar. Set this " --"option to make it transparent anyways." -+"Normally if you have the desktop's or current application's menu bar " -+"displayed in a panel at the top of the screen (MacOS-style), transparency is " -+"disabled for this panel to avoid the desktop background clashing with the " -+"menu bar. Set this option to make it transparent anyways." - msgstr "" --"通常如果您有桌面或目前應用程式的選單列顯示在螢幕頂端的面板時(MacOS-風格)，此面板的透明效果會停用以避免桌面背景與該選單列混淆。設定此選項可強迫它使用透明" -+"通常如果您有桌面或目前應用程式的選單列顯示在螢幕頂端的面板時(MacOS-風格)，此" -+"面板的透明效果會停用以避免桌面背景與該選單列混淆。設定此選項可強迫它使用透明" - "效果。" - - #. i18n: file applettab.ui line 24 -@@ -472,9 +484,10 @@ - #: rc.cpp:122 - #, no-c-format - msgid "" --"If this option is selected, the only way to hide the panel will be to click on " --"the hide buttons that appear on either end of it." --msgstr "如果這個選項被選取，那麼隱藏面板的方式，只能由面板左右兩側的隱藏按鈕來執行。" -+"If this option is selected, the only way to hide the panel will be to click " -+"on the hide buttons that appear on either end of it." -+msgstr "" -+"如果這個選項被選取，那麼隱藏面板的方式，只能由面板左右兩側的隱藏按鈕來執行。" - - #. i18n: file hidingtab.ui line 138 - #: rc.cpp:125 -@@ -492,7 +505,8 @@ - #: rc.cpp:131 rc.cpp:137 - #, no-c-format - msgid "" --"Here you can change the delay after which the panel will disappear if not used." -+"Here you can change the delay after which the panel will disappear if not " -+"used." - msgstr "您可以在這邊設定，當面板不使用時自動隱藏的時間。" - - #. i18n: file hidingtab.ui line 163 -@@ -511,8 +525,8 @@ - #: rc.cpp:143 - #, no-c-format - msgid "" --"If this option is selected, the panel will allow itself to be covered by other " --"windows." -+"If this option is selected, the panel will allow itself to be covered by " -+"other windows." - msgstr "當這個選項被選取時，面板允許其他視窗覆蓋在它上面。" - - #. i18n: file hidingtab.ui line 213 -@@ -525,12 +539,14 @@ - #: rc.cpp:149 - #, no-c-format - msgid "" --"If this option is selected, the panel will automatically hide after a period of " --"time and reappear when you move the mouse to the screen edge where the panel is " --"hidden. This is particularly useful for small screen resolutions, such as on " --"laptops." -+"If this option is selected, the panel will automatically hide after a period " -+"of time and reappear when you move the mouse to the screen edge where the " -+"panel is hidden. This is particularly useful for small screen resolutions, " -+"such as on laptops." - msgstr "" --"如果您啟動這個選項，那麼面板將會在一段時間後自動隱藏，並且在滑鼠經過時重新出現。這是一個很有用的功能，特別是使用於只有低解析度螢幕的設備上，例如筆記型電腦等。" -+"如果您啟動這個選項，那麼面板將會在一段時間後自動隱藏，並且在滑鼠經過時重新出" -+"現。這是一個很有用的功能，特別是使用於只有低解析度螢幕的設備上，例如筆記型電" -+"腦等。" - - #. i18n: file hidingtab.ui line 235 - #: rc.cpp:152 -@@ -542,10 +558,12 @@ - #: rc.cpp:155 - #, no-c-format - msgid "" --"When this option is selected, moving the pointer to the specified edge of the " --"screen will cause the panel to appear on top of any windows that may be " -+"When this option is selected, moving the pointer to the specified edge of " -+"the screen will cause the panel to appear on top of any windows that may be " - "covering it." --msgstr "當您選取了這個選項，如果您的滑鼠移到了畫面中的指定範圍時，面板將會被提至畫面的最上方，同時覆蓋原本在它上面的所有視窗。" -+msgstr "" -+"當您選取了這個選項，如果您的滑鼠移到了畫面中的指定範圍時，面板將會被提至畫面" -+"的最上方，同時覆蓋原本在它上面的所有視窗。" - - #. i18n: file hidingtab.ui line 244 - #: rc.cpp:158 -@@ -599,8 +617,8 @@ - #: rc.cpp:182 - #, no-c-format - msgid "" --"Here you can set the location on the screen's edge that will bring the panel to " --"the front." -+"Here you can set the location on the screen's edge that will bring the panel " -+"to the front." - msgstr "您可以在這裡設定會將面板提至桌面最上方的畫面範圍。" - - #. i18n: file hidingtab.ui line 319 -@@ -613,10 +631,12 @@ - #: rc.cpp:188 - #, no-c-format - msgid "" --"If this option is enabled, the panel will automatically show itself for a brief " --"period of time when the desktop is switched so you can see which desktop you " --"are on." --msgstr "如果啟動這個選項，那麼當您切換桌面時，面板將會在一段時間後自動顯示出來，以便於您能夠看到現在您正在那一個桌面上。" -+"If this option is enabled, the panel will automatically show itself for a " -+"brief period of time when the desktop is switched so you can see which " -+"desktop you are on." -+msgstr "" -+"如果啟動這個選項，那麼當您切換桌面時，面板將會在一段時間後自動顯示出來，以便" -+"於您能夠看到現在您正在那一個桌面上。" - - #. i18n: file hidingtab.ui line 357 - #: rc.cpp:191 -@@ -628,17 +648,20 @@ - #: rc.cpp:194 - #, no-c-format - msgid "" --"This option controls the panel-hiding buttons, which are buttons with a small " --"triangle found at the ends of the panel. You can place a button at either end " --"of the panel, or both. Clicking on one of these buttons will hide the panel." --msgstr "這個選項用於設定位於面板兩側，有著三角型符號的隱藏按鈕。您可以選擇將隱藏按鈕放在面板的任一側，同時在您需要的時候，按下按鈕來隱藏面板。" -+"This option controls the panel-hiding buttons, which are buttons with a " -+"small triangle found at the ends of the panel. You can place a button at " -+"either end 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 - #, no-c-format - msgid "" --"When this option is selected, a panel-hiding button appears on the left end of " --"the panel." -+"When this option is selected, a panel-hiding button appears on the left end " -+"of the panel." - msgstr "當這個選項被選取的時候，面板隱藏按鈕將會顯示在面板的左邊。" - - #. i18n: file hidingtab.ui line 385 -@@ -651,8 +674,8 @@ - #: rc.cpp:206 - #, no-c-format - msgid "" --"When this option is selected, a panel-hiding button appears on the right end of " --"the panel." -+"When this option is selected, a panel-hiding button appears on the right end " -+"of the panel." - msgstr "當這個選項被選取的時候，面板隱藏按鈕將會顯示在面板的右邊。" - - #. i18n: file hidingtab.ui line 426 -@@ -672,8 +695,11 @@ - #, 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 "當這個選項被選取的時候，面板在隱藏的時候，將會以動畫的方式隱藏在畫面的邊界上。而動畫執行的速度，您可以透過下面的卷軸來進行設定。" -+"hiding. The speed of the animation is controlled by the slider directly " -+"below." -+msgstr "" -+"當這個選項被選取的時候，面板在隱藏的時候，將會以動畫的方式隱藏在畫面的邊界" -+"上。而動畫執行的速度，您可以透過下面的卷軸來進行設定。" - - #. i18n: file hidingtab.ui line 522 - #: rc.cpp:218 -@@ -703,9 +729,11 @@ - #: rc.cpp:230 - #, no-c-format - msgid "" --"If this option is selected, informational tooltips will appear when the mouse " --"cursor moves over the icons, buttons and applets in the panel." --msgstr "如果這個選項被選取的時候，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 Applet 上時顯示。" -+"If this option is selected, informational tooltips will appear when the " -+"mouse cursor moves over the icons, buttons and applets in the panel." -+msgstr "" -+"如果這個選項被選取的時候，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 " -+"Applet 上時顯示。" - - #. i18n: file lookandfeeltab.ui line 30 - #: rc.cpp:233 -@@ -723,8 +751,8 @@ - #: rc.cpp:239 - #, no-c-format - msgid "" --"When this option is selected a mouseover effect appears when the mouse cursor " --"is moved over panel buttons" -+"When this option is selected a mouseover effect appears when the mouse " -+"cursor is moved over panel buttons" - msgstr "如果啟動這個選項，那麼當滑鼠游標經過這個面板按鈕時會產生特殊效果" - - #. i18n: file lookandfeeltab.ui line 52 -@@ -737,9 +765,11 @@ - #: rc.cpp:245 - #, 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 "當這個選項被選取時，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 Applet 上時顯示。" -+"When this option is selected informational tooltips will appear when the " -+"mouse cursor moves over the icons, buttons and applets in the panel." -+msgstr "" -+"當這個選項被選取時，提示訊息將會在滑鼠游標移到面板上的圖示、按鈕，以及 " -+"Applet 上時顯示。" - - #. i18n: file lookandfeeltab.ui line 65 - #: rc.cpp:248 -@@ -781,16 +811,17 @@ - #: rc.cpp:281 - #, no-c-format - msgid "" --"When the Custom Color option is selected, use this button to pick a color for " --"quick browser tile backgrounds" --msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作快速瀏覽的背景。" -+"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 - #, no-c-format - msgid "" --"When the Custom Color option is selected, use this button to pick a color for " --"the K menu tile background" -+"When the Custom Color option is selected, use this button to pick a color " -+"for the K menu tile background" - msgstr "當選擇自訂色彩選項時，使用這個按鈕來挑選用於 K 選單拼貼背景的色彩" - - #. i18n: file lookandfeeltab.ui line 205 -@@ -803,9 +834,10 @@ - #: rc.cpp:296 - #, no-c-format - msgid "" --"When the Custom Color option is selected, use this button to pick a color for " --"window list tile backgrounds" --msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作視窗列表的背景。" -+"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 -@@ -823,8 +855,8 @@ - #: rc.cpp:314 - #, no-c-format - msgid "" --"When the Custom Color option is selected, use this button to pick a color for " --"the desktop tile background" -+"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 -@@ -837,9 +869,10 @@ - #: rc.cpp:323 - #, no-c-format - msgid "" --"When the Custom Color option is selected, use this button to pick a color for " --"application tile backgrounds" --msgstr "當「自訂顏色」選項被選取時，使用這個按鍵來選擇一個顏色當作應用程式的背景。" -+"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 -@@ -863,16 +896,18 @@ - #: rc.cpp:344 - #, no-c-format - msgid "Colorize to &match the desktop color scheme" --msgstr "使用符合顏色設定的方法來著色(&m)" -+msgstr "使用符合顏色設定的方法來著色(&M)" - - #. i18n: file lookandfeeltab.ui line 402 - #: rc.cpp:347 - #, no-c-format - msgid "" --"If this option is selected, the panel background image will be colored to match " --"the default colors. To change the default colors, go to the 'Colors' control " --"module." --msgstr "如果選擇這個選項，面板背景圖片會塗上預設的顏色。要改變預設顏色，請到「顏色」控制模組。" -+"If this option is selected, the panel background image will be colored to " -+"match the default colors. To change the default colors, go to the 'Colors' " -+"control module." -+msgstr "" -+"如果選擇這個選項，面板背景圖片會塗上預設的顏色。要改變預設顏色，請到「顏色」" -+"控制模組。" - - #. i18n: file lookandfeeltab.ui line 449 - #: rc.cpp:350 -@@ -901,7 +936,7 @@ - #: rc.cpp:360 - #, no-c-format - msgid "Enable &transparency" --msgstr "使用透明度(&t)" -+msgstr "使用透明度(&T)" - - #. i18n: file lookandfeeltab.ui line 503 - #: rc.cpp:363 -@@ -915,7 +950,8 @@ - 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 "按這裡打開進階選項對話方塊。你可以設定小程式 Handle 的外觀、半透明色...等等。" -+msgstr "" -+"按這裡打開進階選項對話方塊。你可以設定小程式 Handle 的外觀、半透明色...等等。" - - #. i18n: file menutab.ui line 27 - #: rc.cpp:369 -@@ -947,7 +983,8 @@ - msgid "" - "When this option is selected, items in the K Menu will appear with the " - "application's name next to the icon." --msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名字。" -+msgstr "" -+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名字。" - - #. i18n: file menutab.ui line 77 - #: rc.cpp:384 -@@ -961,7 +998,9 @@ - msgid "" - "When this option is selected, items in the K Menu will appear with the " - "application's name and a brief description next to the icon." --msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名稱及以程式的說明。" -+msgstr "" -+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的名稱及" -+"以程式的說明。" - - #. i18n: file menutab.ui line 91 - #: rc.cpp:390 -@@ -975,7 +1014,9 @@ - msgid "" - "When this option is selected, items in the K Menu will appear with the " - "application's brief description next to the icon." --msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的簡短描述。" -+msgstr "" -+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的簡短描" -+"述。" - - #. i18n: file menutab.ui line 105 - #: rc.cpp:396 -@@ -989,7 +1030,9 @@ - msgid "" - "When this option is selected, items in the K Menu will appear with a brief " - "description and the application's name in brackets next to the icon." --msgstr "如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的說明及以程式的名字。" -+msgstr "" -+"如果這個選項被選取，那麼 K 選單將會在應用程式的圖示之後，同時顯示程式的說明及" -+"以程式的名字。" - - #. i18n: file menutab.ui line 118 - #: rc.cpp:402 -@@ -1001,19 +1044,21 @@ - #: rc.cpp:405 - #, no-c-format - msgid "" --"When this option is selected an image will appear down the left-hand side " --"of the K Menu. The image will be tinted according to your color settings.\n" -+"When this option is selected an image will appear down the left-hand " -+"side of the K Menu. The image will be tinted according to your color " -+"settings.\n" - " \n" --" " --"

                      Tip: You can customize the image that appears in the K Menu by " --"putting an image file called kside.png and a tileable image file called " --"kside_tile.png in $KDEHOME/share/apps/kicker/pics." -+"

                      Tip: You can customize the " -+"image that appears in the K Menu by putting an image file called kside.png " -+"and a tileable image file called kside_tile.png in $KDEHOME/share/apps/" -+"kicker/pics." - msgstr "" --"當這個選項被選取時，一個影像會出現在 K 選單的左邊。並且會依據你的顏色設定來顯示半透明色彩。\n" -+"當這個選項被選取時，一個影像會出現在 K 選單的左邊。並且會依據你的顏色設定" -+"來顯示半透明色彩。\n" - " \n" --" " --"

                      提示: 你可以自訂這個出現在 K 選單的影像。只要把叫 kside.png 和 kside_tile.png 的檔案放在 " --"$KDEHOME/share/apps/kicker/pics 中。" -+"

                      提示: 你可以自訂這個出現在 K 選" -+"單的影像。只要把叫 kside.png 和 kside_tile.png 的檔案放在 $KDEHOME/share/" -+"apps/kicker/pics 中。" - - #. i18n: file menutab.ui line 151 - #: rc.cpp:410 -@@ -1040,8 +1085,11 @@ - #, no-c-format - msgid "" - "This is a list of the dynamic menus that can be displayed in the KDE menu in " --"addition to the normal applications. Use the checkboxes to add or remove menus." --msgstr "這些存在的動態選單可以被插入到 KDE 的選單之中。你可以使用 CheckBox 來加入或移除項目。" -+"addition to the normal applications. Use the checkboxes to add or remove " -+"menus." -+msgstr "" -+"這些存在的動態選單可以被插入到 KDE 的選單之中。你可以使用 CheckBox 來加入或移" -+"除項目。" - - #. i18n: file menutab.ui line 202 - #: rc.cpp:422 -@@ -1061,9 +1109,11 @@ - msgid "" - "When browsing directories that contain a lot of files, the QuickBrowser can " - "sometimes hide your whole desktop. Here you can limit the number of entries " --"shown at a time in the QuickBrowser. This is particularly useful for low screen " --"resolutions." --msgstr "當瀏覽幫含許多檔案的目錄時，快速瀏覽器可以隱藏您整個桌面。您可以在這邊限制每次要顯示的項目數目。在低螢幕解析度時這是有用的。" -+"shown at a time in the QuickBrowser. This is particularly useful for low " -+"screen resolutions." -+msgstr "" -+"當瀏覽幫含許多檔案的目錄時，快速瀏覽器可以隱藏您整個桌面。您可以在這邊限制每" -+"次要顯示的項目數目。在低螢幕解析度時這是有用的。" - - #. i18n: file menutab.ui line 254 - #: rc.cpp:434 -@@ -1075,9 +1125,10 @@ - #: rc.cpp:437 - #, 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 "如果設定這個選項，隱藏檔案（檔名以 '.' 開始檔案）將會在快速瀏覽器中被顯示。" -+"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 -@@ -1095,16 +1146,16 @@ - #: rc.cpp:446 - #, no-c-format - msgid "" --"This option allows you to define the maximum number of applications that should " --"be displayed in the QuickStart menu area." -+"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 - #, no-c-format - msgid "" --"This option allows you to define how many applications should be displayed at " --"most in the QuickStart menu area." -+"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 -@@ -1117,8 +1168,8 @@ - #: rc.cpp:455 - #, no-c-format - msgid "" --"When this option is selected the QuickStart menu area will be filled with the " --"applications you have used most recently." -+"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 -@@ -1131,16 +1182,16 @@ - #: rc.cpp:461 - #, no-c-format - msgid "" --"When this option is selected the QuickStart menu area will be filled with the " --"applications you use most frequently." -+"When this option is selected the QuickStart menu area will be filled with " -+"the applications you use most frequently." - msgstr "當這個選項被選取時，「快速啟動」選單將列出您最常使用的應用程式。" - - #. i18n: file positiontab.ui line 17 - #: rc.cpp:464 - #, no-c-format - msgid "" --"This is a list of all the panels currently active on your desktop. Select one " --"to configure." -+"This is a list of all the panels currently active on your desktop. Select " -+"one to configure." - msgstr "這個清單列出了所有目前在您桌面上的所有面板，請選擇一個以進行設定。" - - #. i18n: file positiontab.ui line 83 -@@ -1154,10 +1205,12 @@ - #, no-c-format - msgid "" - "This preview image shows how the panel will appear on your screen with the " --"settings you have chosen. Clicking the buttons around the image will move the " --"position of the panel, while moving the length slider and choosing different " --"sizes will change the dimensions of the panel." --msgstr "這個影像是依照您的設定的面板預覽。點擊影像周圍的按鈕，可以移動面板的位置，而移動長度滑動鈕並選擇不同的大小則可以改變面板的尺寸。" -+"settings you have chosen. Clicking the buttons around the image will move " -+"the position of the panel, while moving the length slider and choosing " -+"different sizes will change the dimensions of the panel." -+msgstr "" -+"這個影像是依照您的設定的面板預覽。點擊影像周圍的按鈕，可以移動面板的位置，而" -+"移動長度滑動鈕並選擇不同的大小則可以改變面板的尺寸。" - - #. i18n: file positiontab.ui line 191 - #: rc.cpp:476 -@@ -1181,15 +1234,15 @@ - #: rc.cpp:485 - #, no-c-format - msgid "" --"This menu selects which screen the Panel will be displayed on in a " --"multiple-monitor system" -+"This menu selects which screen the Panel will be displayed on in a multiple-" -+"monitor system" - msgstr "這個選單用於決定在多監視器的系統中，面板將顯示在哪一個監視器上。" - - #. i18n: file positiontab.ui line 260 - #: rc.cpp:488 - #, no-c-format - msgid "Len>h" --msgstr "長度(&g)" -+msgstr "長度(&G)" - - #. i18n: file positiontab.ui line 264 - #: rc.cpp:491 -@@ -1233,8 +1286,8 @@ - #: rc.cpp:507 - #, no-c-format - msgid "" --"When this option is selected, the panel will grow as necessary to accommodate " --"the buttons and applets on it." -+"When this option is selected, the panel will grow as necessary to " -+"accommodate the buttons and applets on it." - msgstr "當這個選項被選取時，面板將會依照按鈕的多寡來改變它的大小。" - - #. i18n: file positiontab.ui line 380 -@@ -1296,10 +1349,12 @@ - #, no-c-format - msgid "" - "Here you can set the position of the panel highlighted on the left side. You " --"can put any panel on top or bottom of the screen and on the left or right side " --"of the screen. There you can put it into the center or into either corner of " --"the screen." --msgstr "這裡你可以設定左邊反白面板的位置。你可以把任何面板放在螢幕的上下左右， 並且可以置中、或是靠邊對齊。" -+"can put any panel on top or bottom of the screen and on the left or right " -+"side of the screen. There you can put it into the center or into either " -+"corner of the screen." -+msgstr "" -+"這裡你可以設定左邊反白面板的位置。你可以把任何面板放在螢幕的上下左右， 並且可" -+"以置中、或是靠邊對齊。" - - #. i18n: file positiontab.ui line 609 - #: rc.cpp:546 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkio.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkio.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkio.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkio.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kcmkio\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-08 12:01+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,17 +31,15 @@ - - #: cache.cpp:105 - msgid "" --"

                      Cache

                      " --"

                      This module lets you configure your cache settings.

                      " --"

                      The cache is an internal memory in Konqueror where recently read web pages " --"are stored. If you want to retrieve a web page again that you have recently " --"read, it will not be downloaded from the Internet, but rather retrieved from " --"the cache, which is a lot faster.

                      " --msgstr "" --"

                      快取

                      " --"

                      這個模組讓您設定您的快取設定。

                      " --"

                      此快取區域是在 Konqueror " --"裡存放剛讀取過的網頁的內部記憶體。如果您要再次接收剛剛讀過的網頁，就不會從網際網路下載，而是從快取中接收，這將會快得多。

                      " -+"

                      Cache

                      This module lets you configure your cache settings.

                      The cache is an internal memory in Konqueror where recently read web " -+"pages are stored. If you want to retrieve a web page again that you have " -+"recently read, it will not be downloaded from the Internet, but rather " -+"retrieved from the cache, which is a lot faster.

                      " -+msgstr "" -+"

                      快取

                      這個模組讓您設定您的快取設定。

                      此快取區域是在 " -+"Konqueror 裡存放剛讀取過的網頁的內部記憶體。如果您要再次接收剛剛讀過的網頁，" -+"就不會從網際網路下載，而是從快取中接收，這將會快得多。

                      " - - #: kcookiesmain.cpp:32 - msgid "" -@@ -62,28 +60,29 @@ - #: kcookiesmain.cpp:83 - msgid "" - "

                      Cookies

                      Cookies contain information that Konqueror (or other KDE " --"applications using the HTTP protocol) stores on your computer, initiated by a " --"remote Internet server. This means that a web server can store information " --"about you and your browsing activities on your machine for later use. You might " --"consider this an invasion of privacy. " --"

                      However, cookies are useful in certain situations. For example, they are " --"often used by Internet shops, so you can 'put things into a shopping basket'. " --"Some sites require you have a browser that supports cookies. " --"

                      Because most people want a compromise between privacy and the benefits " --"cookies offer, KDE offers you the ability to customize the way it handles " --"cookies. So you might want to set KDE's default policy to ask you whenever a " --"server wants to set a cookie, allowing you to decide. For your favorite " --"shopping web sites that you trust, you might want to set the policy to accept, " --"then you can access the web sites without being prompted every time KDE " --"receives a cookie." --msgstr "" --"

                      Cookies

                      Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 協定的 KDE 程式) " --"儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。" --"

                      然而，在某些狀況下 Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有些站台要求您必須要有一個支援 Cookies " --"的瀏覽器。" --"

                      由於大多數的人希望在方便與隱私之間取得一個平衡點， KDE 提供您一個自訂的處理 Cookies 方式。您可能希望 KDE 在伺服器要求設定 " --"Cookie 時，預設要先徵求您的同意，讓您有決定的機會，對於您偏好而且可信任的購物網站，您可以設定政策為接受 " --"Cookie，如此您在使用該網站時不需要一直被詢問。" -+"applications using the HTTP protocol) stores on your computer, initiated by " -+"a remote Internet server. This means that a web server can store information " -+"about you and your browsing activities on your machine for later use. You " -+"might consider this an invasion of privacy.

                      However, cookies are useful " -+"in certain situations. For example, they are often used by Internet shops, " -+"so you can 'put things into a shopping basket'. Some sites require you have " -+"a browser that supports cookies.

                      Because most people want a compromise " -+"between privacy and the benefits cookies offer, KDE offers you the ability " -+"to customize the way it handles cookies. So you might want to set KDE's " -+"default policy to ask you whenever a server wants to set a cookie, allowing " -+"you to decide. For your favorite shopping web sites that you trust, you " -+"might want to set the policy to accept, then you can access the web sites " -+"without being prompted every time KDE receives a cookie." -+msgstr "" -+"

                      Cookies

                      Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 協定" -+"的 KDE 程式) 儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊" -+"與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。

                      然而，在某些狀況下 " -+"Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有" -+"些站臺要求您必須要有一個支援 Cookies 的瀏覽器。

                      由於大多數的人希望在方便與" -+"隱私之間取得一個平衡點， KDE 提供您一個自訂的處理 Cookies 方式。您可能希望 " -+"KDE 在伺服器要求設定 Cookie 時，預設要先徵求您的同意，讓您有決定的機會，對於" -+"您偏好而且可信任的購物網站，您可以設定政策為接受 Cookie，如此您在使用該網站時" -+"不需要一直被詢問。" - - #: kcookiesmanagement.cpp:150 kcookiesmanagement.cpp:170 - msgid "DCOP Communication Error" -@@ -124,9 +123,10 @@ - - #: kcookiespolicies.cpp:176 - msgid "" --"A policy already exists for" --"

                      %1
                      Do you want to replace it?                      " --msgstr "關於
                      %1
                      的政策已經存在，您確定要覆蓋它嗎？                      " -+"A policy already exists for
                      %1
                      Do you want to " -+"replace it?                      " -+msgstr "" -+"關於
                      %1
                      的政策已經存在，您確定要覆蓋它嗎？                      " - - #: kcookiespolicies.cpp:180 - msgid "Duplicate Policy" -@@ -142,34 +142,38 @@ - - #: kcookiespolicies.cpp:449 - msgid "" --"

                      Cookies

                      Cookies contain information that Konqueror (or any other KDE " --"application using the HTTP protocol) stores on your computer from a remote " --"Internet server. This means that a web server can store information about you " --"and your browsing activities on your machine for later use. You might consider " --"this an invasion of privacy." --"

                      However, cookies are useful in certain situations. For example, they are " --"often used by Internet shops, so you can 'put things into a shopping basket'. " --"Some sites require you have a browser that supports cookies." --"

                      Because most people want a compromise between privacy and the benefits " --"cookies offer, KDE offers you the ability to customize the way it handles " --"cookies. You might, for example want to set KDE's default policy to ask you " --"whenever a server wants to set a cookie or simply reject or accept everything. " --"For example, you might choose to accept all cookies from your favorite shopping " --"web site. For this all you have to do is either browse to that particular site " --"and when you are presented with the cookie dialog box, click on " --"This domain under the 'apply to' tab and choose accept or simply specify " --"the name of the site in the Domain Specific Policy " --"tab and set it to accept. This enables you to receive cookies from trusted web " --"sites without being asked every time KDE receives a cookie." --msgstr "" --"

                      Cookies

                      Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 拹定的 KDE 程式) " --"儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。" --"

                      然而，在某些狀況下 Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有些站台要求您必須要有一個支援 Cookies " --"的瀏覽器。" --"

                      由於大多數的人希望在方便與隱私之間取得一個平衡點，KDE 提供您一個自訂的處理 Cookies 方式。例如您可能想要設定 KDE " --"的預設政策為每次有伺服器要設定cookie 或單純地拒絕或接受任何事都要詢問您。您也可能選擇接受所有來自您喜愛的購物網站的 cookies " --"。要做這些事您可以瀏覽該特定網站，在出現 cookie 對話方塊時單擊「套用到」標籤下的此網域並選擇接受，或者也可以在特定網域政策" --"標籤中指定網站的名稱並設定為接受。這樣使您可以接收來自信任網站的 cookies 而不會在每次 KDE 收到 cookie 的時候都來問您。" -+"

                      Cookies

                      Cookies contain information that Konqueror (or any other " -+"KDE application using the HTTP protocol) stores on your computer from a " -+"remote Internet server. This means that a web server can store information " -+"about you and your browsing activities on your machine for later use. You " -+"might consider this an invasion of privacy.

                      However, cookies are useful in " -+"certain situations. For example, they are often used by Internet shops, so " -+"you can 'put things into a shopping basket'. Some sites require you have a " -+"browser that supports cookies.

                      Because most people want a compromise " -+"between privacy and the benefits cookies offer, KDE offers you the ability " -+"to customize the way it handles cookies. You might, for example want to set " -+"KDE's default policy to ask you whenever a server wants to set a cookie or " -+"simply reject or accept everything. For example, you might choose to accept " -+"all cookies from your favorite shopping web site. For this all you have to " -+"do is either browse to that particular site and when you are presented with " -+"the cookie dialog box, click on This domain under the 'apply to' " -+"tab and choose accept or simply specify the name of the site in the " -+"Domain Specific Policy tab and set it to accept. This enables you to " -+"receive cookies from trusted web sites without being asked every time KDE " -+"receives a cookie." -+msgstr "" -+"

                      Cookies

                      Cookies 包含了遠端伺服器要求 Konqueror (或其他使用 HTTP 拹定" -+"的 KDE 程式) 儲存在您電腦的資訊。這讓網頁伺服器可以在您的電腦儲存關於您的資訊" -+"與瀏覽動作以備後續使用。您可能會認為這侵犯您的隱私權。

                      然而，在某些狀況下 " -+"Cookies 是非常有用的。例如在網路購物時，您可以「把貨品放入您的購物車中」。有" -+"些站臺要求您必須要有一個支援 Cookies 的瀏覽器。

                      由於大多數的人希望在方便與" -+"隱私之間取得一個平衡點，KDE 提供您一個自訂的處理 Cookies 方式。例如您可能想要" -+"設定 KDE 的預設政策為每次有伺服器要設定cookie 或單純地拒絕或接受任何事都要詢" -+"問您。您也可能選擇接受所有來自您喜愛的購物網站的 cookies 。要做這些事您可以瀏" -+"覽該特定網站，在出現 cookie 對話方塊時單擊「套用到」標籤下的此網域並選" -+"擇接受，或者也可以在特定網域政策標籤中指定網站的名稱並設定為接受。這樣" -+"使您可以接收來自信任網站的 cookies 而不會在每次 KDE 收到 cookie 的時候都來問" -+"您。" - - #: kenvvarproxydlg.cpp:70 - msgid "Variable Proxy Configuration" -@@ -181,15 +185,15 @@ - - #: kenvvarproxydlg.cpp:139 kenvvarproxydlg.cpp:288 - msgid "" --"Make sure you entered the actual environment variable name rather than its " --"value. For example, if the environment variable is " --"
                      HTTP_PROXY=http://localhost:3128" --"
                      you need to enter HTTP_PROXY here instead of the actual value " --"http://localhost:3128.                      " -+"Make sure you entered the actual environment variable name rather than " -+"its value. For example, if the environment variable is " -+"
                      HTTP_PROXY=http://localhost:3128
                      you need to enter " -+"HTTP_PROXY here instead of the actual value http://localhost:3128." - msgstr "" - "請確定您輸入的是真實的環境變數名稱而非它的數值。例如環境變數為" --"
                      HTTP_PROXY=http://localhost:3128" --"
                      則您需要在此輸入HTTP_PROXY而不是此變數的實際數值 http://localhost:3128。                      " -+"
                      HTTP_PROXY=http://localhost:3128
                      則您需要在此輸入" -+"HTTP_PROXY而不是此變數的實際數值 http://localhost:3128。                      " - - #: kenvvarproxydlg.cpp:147 kenvvarproxydlg.cpp:296 kproxydlg.cpp:372 - msgid "Invalid Proxy Setup" -@@ -205,16 +209,19 @@ - - #: kenvvarproxydlg.cpp:179 - msgid "" --"Did not detect any environment variables commonly used to set system wide proxy " --"information." -+"Did not detect any environment variables commonly used to set system wide " -+"proxy information." - msgstr "無法找到任何常用於設定系統代理伺服器資訊的環境變數。" - - #: kenvvarproxydlg.cpp:183 - msgid "" --"To learn about the variable names the automatic detection process searches " --"for, press OK, click on the quick help button on the window title bar of the " --"previous dialog and then click on the \"Auto Detect\" button." --msgstr "如果想要知道自動偵測之參數名稱，請按定，單擊前一個對話盒視窗標題列的快速說明按鈕，接著單擊「自動偵測」按鈕。" -+"To learn about the variable names the automatic detection process " -+"searches for, press OK, click on the quick help button on the window title " -+"bar of the previous dialog and then click on the \"Auto Detect\" " -+"button." -+msgstr "" -+"如果想要知道自動偵測之參數名稱，請按定，單擊前一個對話盒視窗標題列的快速" -+"說明按鈕，接著單擊「自動偵測」按鈕。" - - #: kenvvarproxydlg.cpp:191 - msgid "Automatic Proxy Variable Detection" -@@ -230,8 +237,8 @@ - - #: kmanualproxydlg.cpp:272 - msgid "" --"One or more of the specified proxy settings are invalid. The incorrect entries " --"are highlighted." -+"One or more of the specified proxy settings are invalid. The incorrect " -+"entries are highlighted." - msgstr "一或多個指定的代理伺服器程式設定值無效。錯誤的項目已經標示出來。" - - #: kmanualproxydlg.cpp:343 -@@ -266,20 +273,16 @@ - msgid "" - "Make sure none of the addresses or URLs you specified contain invalid or " - "wildcard characters such as spaces, asterisks (*), or question marks(?)." --"

                      Examples of VALID entries:" --"
                      http://mycompany.com, 192.168.10.1, mycompany.com, localhost, " --"http://localhost" --"

                      Examples of INVALID entries:" --"
                      http://my company.com, http:/mycompany,com file:/localhost" --"" --msgstr "" --"請確定您所指定的位址或網址沒有包含無效或萬用字元如空白、星號(*)或問號(?)。" --"

                      有效的項目範例：" --"
                      http://mycompany.com, 192.168.10.1, mycompany.com, localhost, " --"http://localhost" --"

                      無效的項目範例：" --"
                      http://my company.com, http:/mycompany,com file:/localhost" --"" -+"

                      Examples of VALID entries:
                      http://mycompany.com, " -+"192.168.10.1, mycompany.com, localhost, http://localhost

                      Examples of INVALID entries:
                      http://my company.com, " -+"http:/mycompany,com file:/localhost" -+msgstr "" -+"請確定您所指定的位址或網址沒有包含無效或萬用字元如空白、星號(*)或問號" -+"(?)。

                      有效的項目範例：
                      http://mycompany.com, " -+"192.168.10.1, mycompany.com, localhost, http://localhost

                      無效的項" -+"目範例：
                      http://my company.com, http:/mycompany,com file:/" -+"localhost" - - #: kmanualproxydlg.cpp:468 - msgid "Enter the URL or address that should use the above proxy settings:" -@@ -293,16 +296,15 @@ - - #: kmanualproxydlg.cpp:474 - msgid "" --"Enter a valid address or url." --"

                      NOTE: Wildcard matching such as *.kde.org " --"is not supported. If you want to match any host in the .kde.org " --"domain, e.g. printing.kde.org, then simply enter " --".kde.org" --msgstr "" --"輸入有效的位址或網址。" --"

                      注意：萬用字元例如 *.kde.org 是不支援的。如果您想要使用任何符合 " --".kde.org 網域的主機，如 printing.kde.org，只要輸入 .kde.org " --"即可" -+"Enter a valid address or url.

                      NOTE: Wildcard matching " -+"such as *.kde.org is not supported. If you want to match any " -+"host in the .kde.org domain, e.g. printing.kde.org, then simply enter .kde.org" -+msgstr "" -+"輸入有效的位址或網址。

                      注意：萬用字元例如 *.kde." -+"org 是不支援的。如果您想要使用任何符合 .kde.org 網域的主" -+"機，如 printing.kde.org，只要輸入 .kde.org 即可" - - #: kproxydlg.cpp:54 - msgid "&Proxy" -@@ -317,34 +319,34 @@ - "The address of the automatic proxy configuration script is invalid. Please " - "correct this problem before proceeding. Otherwise, your changes you will be " - "ignored." --msgstr "自動代理伺服器設定命令稿的位址是無效的。請修正後再執行。否則將忽略您的所做的變更。" -+msgstr "" -+"自動代理伺服器設定命令稿的位址是無效的。請修正後再執行。否則將忽略您的所做的" -+"變更。" - - #: kproxydlg.cpp:348 - msgid "" --"

                      Proxy

                      " --"

                      A proxy server is an intermediate program that sits between your machine and " --"the Internet and provides services such as web page caching and/or " --"filtering.

                      " --"

                      Caching proxy servers give you faster access to sites you have already " --"visited by locally storing or caching the content of those pages; filtering " --"proxy servers, on the other hand, provide the ability to block out requests for " --"ads, spam, or anything else you want to block.

                      " --"

                      Note: Some proxy servers provide both services.

                      " --msgstr "" --"

                      代理伺服器

                      " --"

                      代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。

                      " --"

                      快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東西的能" --"力。

                      " --"

                      注意：有些代理伺服器同時提供這兩種服務。

                      " -+"

                      Proxy

                      A proxy server is an intermediate program that sits between " -+"your machine and the Internet and provides services such as web page caching " -+"and/or filtering.

                      Caching proxy servers give you faster access to " -+"sites you have already visited by locally storing or caching the content of " -+"those pages; filtering proxy servers, on the other hand, provide the ability " -+"to block out requests for ads, spam, or anything else you want to block.

                      Note: Some proxy servers provide both services.

                      " -+msgstr "" -+"

                      代理伺服器

                      代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁" -+"快取和/或過濾的服務。

                      快取式代理伺服器會將您曾經參訪過的網站內容儲存起" -+"來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以" -+"及其他任何你想要阻擋的東西的能力。

                      注意：有些代理伺服器同時提供" -+"這兩種服務。

                      " - - #: kproxydlg.cpp:367 - msgid "" --"The proxy settings you specified are invalid." --"

                      Please click on the Setup... button and correct the problem before " --"proceeding; otherwise your changes will be ignored." -+"The proxy settings you specified are invalid.

                      Please click on the " -+"Setup... button and correct the problem before proceeding; otherwise " -+"your changes will be ignored." - msgstr "" --"您所指定的代理伺服器資訊設定無效。" --"

                      請單擊設定...按鈕以便在處理前修正這個問題；否則將忽略您的所做的變更。" -+"您所指定的代理伺服器資訊設定無效。

                      請單擊設定...按鈕以便在處理" -+"前修正這個問題；否則將忽略您的所做的變更。" - - #: ksaveioconfig.cpp:239 ksaveioconfig.cpp:253 - msgid "Update Failed" -@@ -352,7 +354,8 @@ - - #: ksaveioconfig.cpp:240 - msgid "" --"You have to restart the running applications for these changes to take effect." -+"You have to restart the running applications for these changes to take " -+"effect." - msgstr "您必須重新啟動執行中的程式才能讓這些改變生效。" - - #: ksaveioconfig.cpp:254 -@@ -361,35 +364,29 @@ - - #: main.cpp:85 - msgid "" --"

                      Local Network Browsing

                      Here you setup your " --"\"Network Neighborhood\". You can use either the LISa daemon and the lan:/ " --"ioslave, or the ResLISa daemon and the rlan:/ ioslave." --"
                      " --"
                      About the LAN ioslave configuration:" --"
                      If you select it, the ioslave, if available" --", will check whether the host supports this service when you open this host. " --"Please note that paranoid people might consider even this to be an attack." -+"

                      Local Network Browsing

                      Here you setup your \"Network Neighborhood" -+"\". You can use either the LISa daemon and the lan:/ ioslave, or the " -+"ResLISa daemon and the rlan:/ ioslave.

                      About the LAN ioslave " -+"configuration:
                      If you select it, the ioslave, if available, will " -+"check whether the host supports this service when you open this host. Please " -+"note that paranoid people might consider even this to be an attack." - "
                      Always means that you will always see the links for the services, " - "regardless of whether they are actually offered by the host. Never " - "means that you will never have the links to the services. In both cases you " - "will not contact the host, so nobody will ever regard you as an attacker." --"
                      " --"
                      More information about LISa can be found at the LISa Homepage " --"or contact Alexander Neundorf <" --"neundorf@kde.org>." --msgstr "" --"

                      本地網路瀏覽

                      您在此設定您的「網路芳鄰」。您可以使用 LISa 伺服程式與 lan:/ ioslave ，或 ResLISa " --"伺服程式與 rlan:/ ioslave 。" --"
                      " --"
                      關於LAN ioslave設定：" --"
                      如果您選擇它，當 ioslave 可用時會在您開啟主機時檢查該主機是否支援此服務。請注意多疑的人們甚至可能認為這是一種攻擊。" --"
                      總是代表您會一直看到該服務的連結，不管它們是否真的是由該主機所提供。永遠不" --"代表您不會有該服務的連結。在這兩種情形您將不會連接到主機，因此沒有人會認為您是攻擊者。" --"
                      " --"
                      更多關於LISa的資訊可以在" --"LISa 首頁找到，或者連絡 Alexander Neundorf <" --"neundorf@kde.org>。" -+"

                      More information about LISa can be found at the LISa Homepage or contact Alexander " -+"Neundorf <neundorf@kde.org>." -+msgstr "" -+"

                      本地網路瀏覽

                      您在此設定您的「網路芳鄰」。您可以使用 LISa 伺服" -+"程式與 lan:/ ioslave ，或 ResLISa 伺服程式與 rlan:/ ioslave 。

                      關於" -+"LAN ioslave設定：
                      如果您選擇它，當 ioslave 可用時會在您開啟" -+"主機時檢查該主機是否支援此服務。請注意多疑的人們甚至可能認為這是一種攻擊。" -+"
                      總是代表您會一直看到該服務的連結，不管它們是否真的是由該主機所提" -+"供。永遠不代表您不會有該服務的連結。在這兩種情形您將不會連接到主機，因" -+"此沒有人會認為您是攻擊者。

                      更多關於LISa的資訊可以在LISa 首頁找到，或者連絡 Alexander " -+"Neundorf <neundorf@kde.org>。" - - #: main.cpp:105 - msgid "&Windows Shares" -@@ -411,7 +408,9 @@ - msgid "" - "Here you can set timeout values. You might want to tweak them if your " - "connection is very slow. The maximum allowed value is %1 seconds." --msgstr "您可以在此設定逾時時間。當連線速度很慢時，您可能會想調整它。 最大的允許值是 %1 秒。" -+msgstr "" -+"您可以在此設定逾時時間。當連線速度很慢時，您可能會想調整它。 最大的允許值是 %" -+"1 秒。" - - #: netpref.cpp:30 netpref.cpp:37 netpref.cpp:44 netpref.cpp:51 - msgid " sec" -@@ -453,19 +452,22 @@ - - #: netpref.cpp:60 - msgid "" --"

                      Marks partially uploaded FTP files.

                      " --"

                      When this option is enabled, partially uploaded files will have a \".part\" " --"extension. This extension will be removed once the transfer is complete.

                      " -+"

                      Marks partially uploaded FTP files.

                      When this option is enabled, " -+"partially uploaded files will have a \".part\" extension. This extension " -+"will be removed once the transfer is complete.

                      " - msgstr "" --"

                      標記已經部分上傳的 FTP 檔案。

                      " --"

                      當此啟用選項時，只上傳部分的檔案會加上「.part」的延伸檔名。這個延伸檔名會在傳輸全部完成後移除。

                      " -+"

                      標記已經部分上傳的 FTP 檔案。

                      當此啟用選項時，只上傳部分的檔案會加上" -+"「.part」的延伸檔名。這個延伸檔名會在傳輸全部完成後移除。

                      " - - #: netpref.cpp:131 - msgid "" - "

                      Network Preferences

                      Here you can define the behavior of KDE programs " --"when using Internet and network connections. If you experience timeouts or use " --"a modem to connect to the Internet, you might want to adjust these settings." --msgstr "

                      網路設定

                      您可以在這裡設定KDE程式使用網際網路及區域網路的行為。若您有逾時問題或使用數據機，您或許會想調整這些設定。" -+"when using Internet and network connections. If you experience timeouts or " -+"use a modem to connect to the Internet, you might want to adjust these " -+"settings." -+msgstr "" -+"

                      網路設定

                      您可以在這裡設定KDE程式使用網際網路及區域網路的行為。若您有" -+"逾時問題或使用數據機，您或許會想調整這些設定。" - - #. i18n: file cache_ui.ui line 47 - #: rc.cpp:3 -@@ -497,11 +499,12 @@ - msgid "" - "Check this box if you want the web pages you visit to be stored on your hard " - "disk for quicker access. The stored pages will only be updated as needed " --"instead of on every visit to that site. This is especially useful if you have a " --"slow connection to the Internet." -+"instead of on every visit to that site. This is especially useful if you " -+"have a slow connection to the Internet." - msgstr "" --"如果您希望瀏覽過的資料能夠儲存在硬碟上，以便於能快速存取，您可以核取這個方塊。儲存的網頁只有在必要時才會下載而非在你每次參訪該網站時。如果您的網路連線速度很慢，" --"此功能將會特別有用。" -+"如果您希望瀏覽過的資料能夠儲存在硬碟上，以便於能快速存取，您可以核取這個方" -+"塊。儲存的網頁只有在必要時才會下載而非在你每次參訪該網站時。如果您的網路連線" -+"速度很慢，此功能將會特別有用。" - - #. i18n: file cache_ui.ui line 117 - #: rc.cpp:18 rc.cpp:246 -@@ -519,8 +522,8 @@ - #: rc.cpp:24 - #, no-c-format - msgid "" --"Verify whether the cached web page is valid before attempting to fetch the web " --"page again." -+"Verify whether the cached web page is valid before attempting to fetch the " -+"web page again." - msgstr "直到要把一個網頁抓回來時，才確認快取的網頁是否還有效。" - - #. i18n: file cache_ui.ui line 139 -@@ -535,7 +538,9 @@ - msgid "" - "Always use documents from the cache when available. You can still use the " - "reload button to synchronize the cache with the remote host." --msgstr "在可能的情形下永遠使用快取中的文件。您仍然可以使用重新整理按鈕來讓快取與遠端主機保持同步。" -+msgstr "" -+"在可能的情形下永遠使用快取中的文件。您仍然可以使用重新整理按鈕來讓快取與遠端" -+"主機保持同步。" - - #. i18n: file cache_ui.ui line 150 - #: rc.cpp:33 -@@ -547,25 +552,25 @@ - #: rc.cpp:36 - #, no-c-format - msgid "" --"Do not fetch web pages that are not already stored in the cache. Offline mode " --"prevents you from viewing pages that you have not previously visited." --msgstr "既使網頁不在快取資料中，也不抓取。離線模式會使你只能瀏覽之前看過的網頁。" -+"Do not fetch web pages that are not already stored in the cache. Offline " -+"mode prevents you from viewing pages that you have not previously visited." -+msgstr "" -+"既使網頁不在快取資料中，也不抓取。離線模式會使你只能瀏覽之前看過的網頁。" - - #. i18n: file envvarproxy_ui.ui line 30 - #: rc.cpp:39 rc.cpp:54 - #, no-c-format - msgid "" - "\n" --"Enter the name of the environment variable, e.g. FTP_PROXY" --", used to store the address of the FTP proxy server." --"

                      \n" --"Alternatively, you can click on the \"Auto Detect\" " --"button to attempt an automatic discovery of this variable.\n" -+"Enter the name of the environment variable, e.g. FTP_PROXY, used to " -+"store the address of the FTP proxy server.

                      \n" -+"Alternatively, you can click on the \"Auto Detect\" button to attempt " -+"an automatic discovery of this variable.\n" - "" - msgstr "" - "\n" --"請輸入環境變數名稱，例如 FTP_PROXY，這是用來儲存 FTP 代理伺服器的位址。" --"

                      \n" -+"請輸入環境變數名稱，例如 FTP_PROXY，這是用來儲存 FTP 代理伺服器的位" -+"址。

                      \n" - "或者，您也可以單擊 「自動偵測」 按鈕試著自動取得此變數。\n" - "" - -@@ -574,16 +579,15 @@ - #, no-c-format - msgid "" - "\n" --"Enter the name of the environment variable, e.g. HTTP_PROXY" --", used to store the address of the HTTP proxy server." --"

                      \n" --"Alternatively, you can click on the \"Auto Detect\" " --"button to attempt automatic discovery of this variable.\n" -+"Enter the name of the environment variable, e.g. HTTP_PROXY, used to " -+"store the address of the HTTP proxy server.

                      \n" -+"Alternatively, you can click on the \"Auto Detect\" button to attempt " -+"automatic discovery of this variable.\n" - "" - msgstr "" - "\n" --"請輸入環境變數名稱，例如 HTTP_PROXY，這是用來儲存 HTTP 代理伺服器的位址。" --"

                      \n" -+"請輸入環境變數名稱，例如 HTTP_PROXY，這是用來儲存 HTTP 代理伺服器的" -+"位址。

                      \n" - "或者，您也可以單擊 「自動偵測」 按鈕試著自動取得此變數。\n" - "" - -@@ -604,16 +608,15 @@ - #, no-c-format - msgid "" - "\n" --"Enter the name of the environment variable, e.g. HTTPS_PROXY" --", used to store the address of the HTTPS proxy server." --"

                      \n" --"Alternatively, you can click on the \"Auto Detect\" " --"button to attempt an automatic discovery of this variable.\n" -+"Enter the name of the environment variable, e.g. HTTPS_PROXY, used to " -+"store the address of the HTTPS proxy server.

                      \n" -+"Alternatively, you can click on the \"Auto Detect\" button to attempt " -+"an automatic discovery of this variable.\n" - "" - msgstr "" - "\n" --"請輸入環境變數名稱，例如 HTTPS_PROXY，這是用來儲存 HTTPS 代理伺服器的位址。" --"

                      \n" -+"請輸入環境變數名稱，例如 HTTPS_PROXY，這是用來儲存 HTTPS 代理伺服器" -+"的位址。

                      \n" - "或者，您也可以單擊 「自動偵測」 按鈕試著自動取得此變數。\n" - "" - -@@ -634,9 +637,11 @@ - #, no-c-format - msgid "" - "Verify whether or not the environment variable names you supplied are " --"valid. If an environment variable is not found, the associated labels will be " --"highlighted to indicate that they are invalid." --msgstr "單擊此按鈕以快速檢查您提供的環境變數名稱是否正確。如果找不到環境變數，相關的標籤會以反白來指出不正確的設定。" -+"valid. If an environment variable is not found, the associated labels will " -+"be highlighted to indicate that they are invalid." -+msgstr "" -+"單擊此按鈕以快速檢查您提供的環境變數名稱是否正確。如果找不到環境變數，相" -+"關的標籤會以反白來指出不正確的設定。" - - #. i18n: file envvarproxy_ui.ui line 102 - #: rc.cpp:78 -@@ -648,13 +653,13 @@ - #: rc.cpp:81 - #, no-c-format - msgid "" --"Attempt automatic discovery of the environment variables used for setting " --"system wide proxy information." --"

                      This feature works by searching for commonly used variable names such as " --"HTTP_PROXY, FTP_PROXY and NO_PROXY." -+"Attempt automatic discovery of the environment variables used for " -+"setting system wide proxy information.

                      This feature works by searching " -+"for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY." -+"" - msgstr "" --"自動尋找系統中可能是用來設定 proxy 的環境變數。" --"

                      尋找方法是搜尋一些可能的變數名稱，像是 HTTP_PROXY, FTP_PROXY 和 NO_PROXY." -+"自動尋找系統中可能是用來設定 proxy 的環境變數。

                      尋找方法是搜尋一些可能" -+"的變數名稱，像是 HTTP_PROXY, FTP_PROXY 和 NO_PROXY." - - #. i18n: file envvarproxy_ui.ui line 113 - #: rc.cpp:84 rc.cpp:381 -@@ -667,17 +672,15 @@ - #, no-c-format - msgid "" - "\n" --"Enter the environment variable, e.g. NO_PROXY" --", used to store the addresses of sites for which the proxy server should not be " --"used." --"

                      \n" --"Alternatively, you can click on the \"Auto Detect\" " --"button to attempt an automatic discovery of this variable.\n" -+"Enter the environment variable, e.g. NO_PROXY, used to store the " -+"addresses of sites for which the proxy server should not be used.

                      \n" -+"Alternatively, you can click on the \"Auto Detect\" button to attempt " -+"an automatic discovery of this variable.\n" - "" - msgstr "" - "\n" --"請輸入環境變數名稱，例如 FTP_PROXY，這是用來儲存 FTP 代理伺服器的位址。" --"

                      \n" -+"請輸入環境變數名稱，例如 FTP_PROXY，這是用來儲存 FTP 代理伺服器的位" -+"址。

                      \n" - "或者，您也可以單擊 「自動偵測」 按鈕試著自動取得此變數。\n" - "" - -@@ -715,7 +718,7 @@ - #: rc.cpp:126 - #, no-c-format - msgid "Change &Policy..." --msgstr "變更政策(&P)..." -+msgstr "變更政策(&P)…" - - #. i18n: file kcookiesmanagementdlg_ui.ui line 109 - #: rc.cpp:129 -@@ -727,7 +730,7 @@ - #: rc.cpp:132 rc.cpp:254 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file kcookiesmanagementdlg_ui.ui line 147 - #: rc.cpp:135 rc.cpp:257 -@@ -801,15 +804,14 @@ - msgid "" - "\n" - "Enable cookie support. Normally you will want to have cookie support enabled " --"and customize it to suit your privacy needs." --"

                      \n" -+"and customize it to suit your privacy needs.

                      \n" - "Please note that disabling cookie support might make many web sites " - "unbrowsable.\n" - "" - msgstr "" - "\n" --"這個選項將啟動 cookie 支援。一般您會希望啟用 cookie 支援並調整 它以符合您的隱私需求。" --"

                      \n" -+"這個選項將啟動 cookie 支援。一般您會希望啟用 cookie 支援並調整 它以符合您的隱" -+"私需求。

                      \n" - "請注意停用 cookie 支援可能造成許多網站無法瀏覽。\n" - "" - -@@ -824,18 +826,19 @@ - #, no-c-format - msgid "" - "\n" --"Reject the so called third-party cookies. These are cookies that originate from " --"a site other than the one you are currently browsing. For example, if you visit " --"www.foobar.com while this option is on, only cookies that originate from " --"www.foobar.com will be processed per your settings. Cookies from any other site " --"will be rejected. This reduces the chances of site operators compiling a " --"profile about your daily browsing habits.\n" -+"Reject the so called third-party cookies. These are cookies that originate " -+"from a site other than the one you are currently browsing. For example, if " -+"you visit www.foobar.com while this option is on, only cookies that " -+"originate from www.foobar.com will be processed per your settings. Cookies " -+"from any other site will be rejected. This reduces the chances of site " -+"operators compiling a profile about your daily browsing habits.\n" - "" - msgstr "" - "\n" --"拒絕所謂的第三方 cookies。這些 cookies 是由您正在瀏覽的網站以外的網站所產生的。比方說當您參觀 www.foobar.com " --"時選取了這個選項，只有來自 www.foobar.com 的 cookies 才會被處理。所有其他的 cookies " --"會被自動拒絕。這減少了網站管理者收集您每日瀏覽習慣的機會。\n" -+"拒絕所謂的第三方 cookies。這些 cookies 是由您正在瀏覽的網站以外的網站所產生" -+"的。比方說當您參觀 www.foobar.com 時選取了這個選項，只有來自 www." -+"foobar.com 的 cookies 才會被處理。所有其他的 cookies 會被自動拒絕。這減少了網" -+"站管理者收集您每日瀏覽習慣的機會。\n" - "" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 62 -@@ -850,10 +853,9 @@ - msgid "" - "\n" - "Automatically accept temporary cookies meant to expire at the end of the " --"current session. Such cookies will not be stored in your computer's hard drive " --"or storage device. Instead, they are deleted when you close all applications " --"(e.g. your browser) that use them." --"

                      \n" -+"current session. Such cookies will not be stored in your computer's hard " -+"drive or storage device. Instead, they are deleted when you close all " -+"applications (e.g. your browser) that use them.

                      \n" - "NOTE: Checking this option along with the next one will override your " - "default as well as site specific cookie policies. However, doing so also " - "increases your privacy since all cookies will be removed when the current " -@@ -861,11 +863,11 @@ - "" - msgstr "" - "\n" --"自動接收暫存 cookies 代表它輔導報導們會在目前的工作階段結束時過期。。這類 cookies " --"不會儲存在您電腦的硬碟或儲存裝置裡。因為當您關閉所有使用它們的應用程式（例如您的瀏覽器）時，它們就被刪除了。" --"

                      \n" --"注意：選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增進您的隱私，因為所有的 cookies " --"會在目前工作階段結束時移除。\n" -+"自動接收暫存 cookies 代表它輔導報導們會在目前的工作階段結束時過期。。這類 " -+"cookies 不會儲存在您電腦的硬碟或儲存裝置裡。因為當您關閉所有使用它們的應用程" -+"式（例如您的瀏覽器）時，它們就被刪除了。

                      \n" -+"注意：選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增" -+"進您的隱私，因為所有的 cookies 會在目前工作階段結束時移除。\n" - "" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 76 -@@ -879,24 +881,24 @@ - #, no-c-format - msgid "" - "\n" --"Treat all cookies as session cookies. Session cookies are small pieces of data " --"that are temporarily stored in your computer's memory until you quit or close " --"all applications (e.g. your browser) that use them. Unlike regular cookies, " --"session cookies are never stored on your hard drive or other storage medium." --"

                      \n" -+"Treat all cookies as session cookies. Session cookies are small pieces of " -+"data that are temporarily stored in your computer's memory until you quit or " -+"close all applications (e.g. your browser) that use them. Unlike regular " -+"cookies, session cookies are never stored on your hard drive or other " -+"storage medium.

                      \n" - "NOTE: Checking this option along with the previous one will override " --"your default as well as site specific cookie policies. However, doing so also " --"increases your privacy since all cookies will be removed when the current " --"session ends.\n" -+"your default as well as site specific cookie policies. However, doing so " -+"also increases your privacy since all cookies will be removed when the " -+"current session ends.\n" - "" - msgstr "" - "\n" --"把所有 cookies 當做工作階段 cookies。工作階段 cookies " --"是一小段資料，它們暫時儲存在電腦的記憶體中，直到您離開或關閉所有使用它們的應用程式（例如您的瀏覽器）。不同於一般的 cookies ，工作階段 cookies " --"不會儲存在您的硬碟或本地端的儲存裝置上。" --"

                      \n" --"注意：選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增進您的隱私，因為所有的cookies " --"會在目前工作階段結束時移除。\n" -+"把所有 cookies 當做工作階段 cookies。工作階段 cookies 是一小段資料，它們暫時" -+"儲存在電腦的記憶體中，直到您離開或關閉所有使用它們的應用程式（例如您的瀏覽" -+"器）。不同於一般的 cookies ，工作階段 cookies 不會儲存在您的硬碟或本地端的儲" -+"存裝置上。

                      \n" -+"注意：選取此選項連帶地會覆蓋您的特定網站 cookie 政策。然而，這麼做會增" -+"進您的隱私，因為所有的cookies 會在目前工作階段結束時移除。\n" - "" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 92 -@@ -914,12 +916,11 @@ - "

                        \n" - "
                      • Ask will cause KDE to ask for your confirmation whenever a server " - "wants to set a cookie.\"
                        • \n" --"
                      • Accept will cause cookies to be accepted without prompting you.
                        • " --"\n" --"
                      • Reject will cause the cookiejar to refuse all cookies it " --"receives.
                        • \n" --"
                      " --"

                      \n" -+"

                    • Accept will cause cookies to be accepted without prompting you.\n" -+"
                    • Reject will cause the cookiejar to refuse all cookies it receives." -+"
                      • \n" -+"

                    \n" - "NOTE: Domain specific policies, which can be set below, always take " - "precedence over the default policy.\n" - "" -@@ -930,8 +931,7 @@ - "

                  • 詢問會讓 KDE 在每次有伺服器要設定 cookie 時要求您的許可
                    • \n" - "
                  • 接受會不提示您而接受 cookies
                    • \n" - "
                  • 拒絕會拒絕所有收到的 cookies
                    • \n" --"
                  " --"

                  \n" -+"

                \n" - "注意：特定網域政策可以在下面設定，它的優先權會高於預設的政策。\n" - "" - -@@ -964,31 +964,32 @@ - #, no-c-format - msgid "" - "\n" --"To add a new policy, simply click on the Add... " --"button and supply the necessary information. To change an existing policy, use " --"the Change... button and choose the new policy from the policy dialog " --"box. Clicking on the Delete button will remove the currently selected " --"policy causing the default policy setting to be used for that domain whereas " --"Delete All will remove all the site specific policies.\n" -+"To add a new policy, simply click on the Add... button and supply the " -+"necessary information. To change an existing policy, use the Change... button and choose the new policy from the policy dialog box. Clicking on " -+"the Delete button will remove the currently selected policy causing " -+"the default policy setting to be used for that domain whereas Delete All will remove all the site specific policies.\n" - "" - msgstr "" - "\n" --"要增加新的政策。只要單擊 新增...按鈕，並提供對話窗中必須的資訊。要變更一個現存的政策，單擊 變更..." --"按鈕，並在對話窗中選擇新的政策。單擊 刪除 將會移除您所選擇的項目，並以預設的政策取代該網域的政策。刪除全部 " --"會移除所有的特定網站政策。\n" -+"要增加新的政策。只要單擊 新增...按鈕，並提供對話窗中必須的資訊。要變更" -+"一個現存的政策，單擊 變更...按鈕，並在對話窗中選擇新的政策。單擊 刪" -+"除 將會移除您所選擇的項目，並以預設的政策取代該網域的政策。刪除全部 會移除所有的特定網站政策。\n" - "" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 184 - #: rc.cpp:231 rc.cpp:428 rc.cpp:668 - #, no-c-format - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 192 - #: rc.cpp:234 rc.cpp:674 - #, no-c-format - msgid "Chan&ge..." --msgstr "變更(&H)..." -+msgstr "變更(&H)…" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 216 - #: rc.cpp:243 -@@ -1006,7 +1007,8 @@ - "" - msgstr "" - "\n" --"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站，系統會使用自訂的 cookie 處理方式，原不是預設的處理方式。\n" -+"你所設定使用不同的 cookie 處理方式的網站列表。 對這些網站，系統會使用自訂的 " -+"cookie 處理方式，原不是預設的處理方式。\n" - "" - - #. i18n: file kcookiespoliciesdlg_ui.ui line 295 -@@ -1022,26 +1024,28 @@ - "\n" - "Setup proxy configuration.\n" - "

                \n" --"A proxy server is an intermediate machine that sits between your computer and " --"the Internet and provides services such as web page caching and filtering. " --"Caching proxy servers give you faster access to web sites you have already " --"visited by locally storing or caching those pages; filtering proxy servers " --"usually provide the ability to block out requests for ads, spam, or anything " --"else you want to block.\n" --"

                \n" --"If you are uncertain whether or not you need to use a proxy server to connect " --"to the Internet, consult your Internet service provider's setup guide or your " --"system administrator.\n" -+"A proxy server is an intermediate machine that sits between your computer " -+"and the Internet and provides services such as web page caching and " -+"filtering. Caching proxy servers give you faster access to web sites you " -+"have already visited by locally storing or caching those pages; filtering " -+"proxy servers usually provide the ability to block out requests for ads, " -+"spam, or anything else you want to block.\n" -+"

                \n" -+"If you are uncertain whether or not you need to use a proxy server to " -+"connect to the Internet, consult your Internet service provider's setup " -+"guide or your system administrator.\n" - "" - msgstr "" - "\n" - "設定代理伺服器組態。\n" - "

                \n" --"代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。

                " --"

                快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東西的能" --"力。\n" -+"代理伺服器是位於您的電腦和網際網路的中介程式，提供網頁快取和/或過濾的服務。

                快取式代理伺服器會將您曾經參訪過的網站內容儲存起來，以加速加速網際網路資" -+"料讀取速度；過濾式快取伺服器，則提供阻擋廣告、垃圾以及其他任何你想要阻擋的東" -+"西的能力。\n" - "

                \n" --"若您不知道是否需要設定代理伺服器，請先參考您的網路服務供應商的設定指南，或詢問系統管理員。\n" -+"若您不知道是否需要設定代理伺服器，請先參考您的網路服務供應商的設定指南，或詢" -+"問系統管理員。\n" - "" - - #. i18n: file kproxydlg_ui.ui line 59 -@@ -1067,30 +1071,27 @@ - #, no-c-format - msgid "" - "\n" --"Automatically detect and configure the proxy settings." --"

                \n" --"Automatic detection is performed using the Web Proxy Auto-Discovery Protocol " --"(WPAD)." --"

                \n" -+"Automatically detect and configure the proxy settings.

                \n" -+"Automatic detection is performed using the Web Proxy Auto-Discovery " -+"Protocol (WPAD).

                \n" - "NOTE: 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" - "" - msgstr "" - "\n" --"自動偵測並設定代理伺服器設定值。" --"

                \n" --"自動偵測是使用 網頁代理伺服器自動發現協定 (WPAD) 進行的。" --"

                \n" --"注意：這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運作。如果您在使用這個選項時遇到問題，請查閱在 " --"http://konqueror.kde.org 的 FAQ 章節。\n" -+"自動偵測並設定代理伺服器設定值。

                \n" -+"自動偵測是使用 網頁代理伺服器自動發現協定 (WPAD) 進行的。

                \n" -+"注意：這個選項在某些 UNIX/Linux 發行版本可能無法正常運作或者完全無法運" -+"作。如果您在使用這個選項時遇到問題，請查閱在 http://konqueror.kde.org 的 FAQ " -+"章節。\n" - "" - - #. i18n: file kproxydlg_ui.ui line 94 - #: rc.cpp:291 - #, no-c-format - msgid "U&se the following proxy configuration URL" --msgstr "使用下列代理伺服器設定網址(&s):" -+msgstr "使用下列代理伺服器設定網址(&S):" - - #. i18n: file kproxydlg_ui.ui line 97 - #: rc.cpp:294 -@@ -1115,26 +1116,24 @@ - #, no-c-format - msgid "" - "\n" --"Use environment variables to configure the proxy settings." --"

                \n" --"Environment variables such as HTTP_PROXY and NO_PROXY " --"are usually used in multi-user UNIX installations, where both graphical and " --"non-graphical applications need to share the same proxy configuration " -+"Use environment variables to configure the proxy settings.

                \n" -+"Environment variables such as HTTP_PROXY and NO_PROXY are " -+"usually used in multi-user UNIX installations, where both graphical and non-" -+"graphical applications need to share the same proxy configuration " - "information.\n" - "" - msgstr "" - "\n" --"使用環境變數來設定代理伺服器設定值。" --"

                \n" --"環境變數，像是 HTTP_PROXY 和 NO_PROXY 常常在多使用者的 UNIX " --"系統中使用，而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n" -+"使用環境變數來設定代理伺服器設定值。

                \n" -+"環境變數，像是 HTTP_PROXY 和 NO_PROXY 常常在多使用者的 UNIX 系" -+"統中使用，而無論是圖型介面程式或是文字介面程式都共用同樣的代理伺服器資訊。\n" - "" - - #. i18n: file kproxydlg_ui.ui line 187 - #: rc.cpp:309 rc.cpp:321 - #, no-c-format - msgid "Setup..." --msgstr "設定..." -+msgstr "設定…" - - #. i18n: file kproxydlg_ui.ui line 190 - #: rc.cpp:312 -@@ -1231,26 +1230,25 @@ - #, no-c-format - msgid "" - "\n" --"Use persistent proxy connection." --"

                \n" -+"Use persistent proxy connection.

                \n" - "Although a persistent proxy connection is faster, note that it only works " --"correctly with proxies that are fully HTTP 1.1 compliant. Do not " --"use this option in combination with non-HTTP 1.1 compliant proxy servers such " --"as JunkBuster and WWWOfle.\n" -+"correctly with proxies that are fully HTTP 1.1 compliant. Do not use " -+"this option in combination with non-HTTP 1.1 compliant proxy servers such as " -+"JunkBuster and WWWOfle.\n" - "" - msgstr "" - "\n" --"使用 HTTP/1.1 來連線." --"

                \n" --"雖然 HTTP/1.1 中的持續性連線比較快速，但是只能使用在支援 HTTP/1.1 的 代理伺服器上。請勿 " --"在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 JunkBuster 和 WWWOfle)\n" -+"使用 HTTP/1.1 來連線.

                \n" -+"雖然 HTTP/1.1 中的持續性連線比較快速，但是只能使用在支援 HTTP/1.1 的 代理伺服" -+"器上。請勿 在不支援 HTTP/1.1 的代理伺服器啟動這個選項。 (例如 " -+"JunkBuster 和 WWWOfle)\n" - "" - - #. i18n: file manualproxy_ui.ui line 27 - #: rc.cpp:372 - #, no-c-format - msgid "Ser&vers" --msgstr "伺服器(&v)" -+msgstr "伺服器(&V)" - - #. i18n: file manualproxy_ui.ui line 95 - #: rc.cpp:384 -@@ -1276,15 +1274,17 @@ - msgid "" - "Enter the port number of the FTP proxy server. Default 8080. Another common " - "value is 3128." --msgstr "請輸入 FTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。" -+msgstr "" -+"請輸入 FTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。" - - #. i18n: file manualproxy_ui.ui line 133 - #: rc.cpp:396 rc.cpp:399 - #, no-c-format - msgid "" --"Enter the port number of the HTTP proxy server. Default is 8080. Another common " --"value is 3128." --msgstr "請輸入 HTTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。" -+"Enter the port number of the HTTP proxy server. Default is 8080. Another " -+"common value is 3128." -+msgstr "" -+"請輸入 HTTP 代理伺服器通訊埠號碼。預設值為 8080。另一個常用的值是 3128。" - - #. i18n: file manualproxy_ui.ui line 175 - #: rc.cpp:402 -@@ -1311,17 +1311,15 @@ - "\n" - "Reverse the use of the exception list. Checking this box will result in the " - "proxy servers being used only when the requested URL matches one of the " --"addresses listed here." --"

                This feature is useful if all you want or need is to use a proxy server for " --"a few specific sites." --"

                If you have more complex requirements you might want to use a configuration " --"script.\n" -+"addresses listed here.

                This feature is useful if all you want or need is " -+"to use a proxy server for a few specific sites.

                If you have more complex " -+"requirements you might want to use a configuration script.\n" - "" - msgstr "" - "\n" --"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時才使用代理伺服器。" --"

                如果您只需要在少數特定網站使用代理伺服器時這個功能相當有幫助。" --"

                如果您有更複雜的需求，您可能需要使用設定命令稿。\n" -+"反轉例外列表的功能。核取此選項會使得只有當要求的 URL 符合此位址列表其中之一時" -+"才使用代理伺服器。

                如果您只需要在少數特定網站使用代理伺服器時這個功能相當有" -+"幫助。

                如果您有更複雜的需求，您可能需要使用設定命令稿。\n" - "" - - #. i18n: file manualproxy_ui.ui line 228 -@@ -1358,7 +1356,7 @@ - #: rc.cpp:434 - #, no-c-format - msgid "C&hange..." --msgstr "改變(&H)..." -+msgstr "改變(&H)…" - - #. i18n: file manualproxy_ui.ui line 270 - #: rc.cpp:437 -@@ -1377,12 +1375,13 @@ - #, no-c-format - msgid "" - "\n" --"Enter the host or domain to which this policy applies, e.g. www.kde.org " --"or .kde.org.\n" -+"Enter the host or domain to which this policy applies, e.g. www.kde.org or .kde.org.\n" - "" - msgstr "" - "\n" --"請輸入此要套用此政策的主機或網域。例如 www.kde.org 或 .kde.org。\n" -+"請輸入此要套用此政策的主機或網域。例如 www.kde.org 或 .kde.org。\n" - "" - - #. i18n: file policydlg_ui.ui line 53 -@@ -1449,7 +1448,8 @@ - msgid "" - "Check this to enable SOCKS4 and SOCKS5 support in KDE applications and I/O " - "subsystems." --msgstr "核取此項以啟用在 KDE 應用程式與輸出/入子系統中的 SOCKS4 與 SOCKS5 的支援。" -+msgstr "" -+"核取此項以啟用在 KDE 應用程式與輸出/入子系統中的 SOCKS4 與 SOCKS5 的支援。" - - #. i18n: file socksbase.ui line 48 - #: rc.cpp:494 -@@ -1496,7 +1496,9 @@ - "Select custom if you wish to use an unlisted SOCKS library. Please note that " - "this may not always work as it depends on the API of the library which you " - "specify (below)." --msgstr "如果您希望使用未列出的 SOCKS 函式庫，請選擇自訂。請注意當它依附於您在下面指定的函式庫的 API 時並不一定能運作。" -+msgstr "" -+"如果您希望使用未列出的 SOCKS 函式庫，請選擇自訂。請注意當它依附於您在下面指定" -+"的函式庫的 API 時並不一定能運作。" - - #. i18n: file socksbase.ui line 117 - #: rc.cpp:515 -@@ -1532,12 +1534,12 @@ - #: rc.cpp:530 - #, no-c-format - msgid "" --"Here you can specify additional directories to search for the SOCKS libraries. " --"/usr/lib, /usr/local/lib, /usr/local/socks5/lib and /opt/socks5/lib are already " --"searched by default." -+"Here you can specify additional directories to search for the SOCKS " -+"libraries. /usr/lib, /usr/local/lib, /usr/local/socks5/lib and /opt/socks5/" -+"lib are already searched by default." - msgstr "" --"您可以在這裡指定用來搜尋 SOCKS 函式庫的額外目錄。/usr/lib、/usr/local/lib、/usr/local/socks5/lib 與 " --"/opt/socks5/lib 都已經預設為搜尋路徑。" -+"您可以在這裡指定用來搜尋 SOCKS 函式庫的額外目錄。/usr/lib、/usr/local/lib、/" -+"usr/local/socks5/lib 與 /opt/socks5/lib 都已經預設為搜尋路徑。" - - #. i18n: file socksbase.ui line 186 - #: rc.cpp:533 -@@ -1581,21 +1583,20 @@ - msgid "" - "\n" - "Enter the site or domain name where a fake browser identification should be " --"used." --"

                \n" --"NOTE: Wildcard syntax such as \\\"*,?\\\" is NOT allowed: instead, use " --"the top level address of a site to make generic matches; for example, if you " --"want all KDE sites to receive a fake browser identification, you would enter " --".kde.org - the fake identity would then be sent to any KDE site " --"that ends with .kde.org.\n" -+"used.

                \n" -+"NOTE: Wildcard syntax such as \\\"*,?\\\" is NOT allowed: instead, " -+"use the top level address of a site to make generic matches; for example, if " -+"you want all KDE sites to receive a fake browser identification, you would " -+"enter .kde.org - the fake identity would then be sent to any " -+"KDE site that ends with .kde.org.\n" - "" - msgstr "" - "\n" --"請輸入您想使用偽裝識別碼的網址或網域。" --"

                \n" --"請注意：您不可以使用萬用字元，如「*,?」。請輸入最頂層的網址讓所有在它之下找到的網址歸成一類；例如，若您要所有 KDE " --"網站都收到偽裝識別碼，您要輸入 .kde.org - 偽裝識別碼就會送到任何以 .kde.org " --"結尾的 KDE 網站。\n" -+"請輸入您想使用偽裝識別碼的網址或網域。

                \n" -+"請注意：您不可以使用萬用字元，如「*,?」。請輸入最頂層的網址讓所有在它" -+"之下找到的網址歸成一類；例如，若您要所有 KDE 網站都收到偽裝識別碼，您要輸入 " -+".kde.org - 偽裝識別碼就會送到任何以 .kde.org 結尾" -+"的 KDE 網站。\n" - "" - - #. i18n: file uagentproviderdlg_ui.ui line 60 -@@ -1641,22 +1642,23 @@ - #, no-c-format - msgid "" - "\n" --"Here you can modify the default browser-identification text or set a site " --"(eg. www.kde.org) or a domain (eg. kde.org) " --"specific identification text." --"

                \n" -+"Here you can modify the default browser-identification text or set a site " -+"(eg. www.kde.org) or a domain (eg. kde.org) " -+"specific identification text.

                \n" - "To add a new site specific identification text, click the New " - "button and supply the necessary information. To change an existing site " --"specific entry, click on the Change button. The Delete " --"button will remove the selected site specific identification text, causing the " --"setting to be used for that site or domain.\n" -+"specific entry, click on the Change button. The Delete button will remove the selected site specific identification text, " -+"causing the setting to be used for that site or domain.\n" - "" - msgstr "" - "\n" --"您可以在這邊修改網站(如www.kde.org)或網域(如kde.org)的預設瀏覽器識別碼。" --"

                \n" --"要增加新的特定網站識別文字，只要單擊 新增按鈕，並提供對話窗中所需的資訊。要變更一個現存的網站識別項目，單擊 " --"變更按鈕。刪除按鈕將會移除您所選擇的特定網站識別文字，並將預設的設定使用於該網站或網域。\n" -+"您可以在這邊修改網站(如www.kde.org)或網域(如kde.org)的預設瀏覽器識別碼。

                \n" -+"要增加新的特定網站識別文字，只要單擊 新增按鈕，並提供對話窗中所" -+"需的資訊。要變更一個現存的網站識別項目，單擊 變更按鈕。刪" -+"除按鈕將會移除您所選擇的特定網站識別文字，並將預設的設定使用於該網站或" -+"網域。\n" - "" - - #. i18n: file useragentdlg_ui.ui line 33 -@@ -1670,22 +1672,20 @@ - #, no-c-format - msgid "" - "\n" --"Send the browser identification to web sites." --"

                \n" -+"Send the browser identification to web sites.

                \n" - "NOTE: Many sites rely on this information to display pages properly, " - "hence, it is highly recommended that you do not totally disable this feature " --"but rather customize it." --"

                \n" -+"but rather customize it.

                \n" - "By default, only minimal identification information is sent to remote sites. " - "The identification text that will be sent is shown below.\n" - "" - msgstr "" - "\n" --"送出瀏覽器識別碼給網站。" --"

                \n" --"注意：許多網站需要這類訊息來使得網頁能正常顯示，因此強烈地建議您不要關掉所有的選項，但您可以自行設定。" --"

                \n" --"預設的情況，只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下面。\n" -+"送出瀏覽器識別碼給網站。

                \n" -+"注意：許多網站需要這類訊息來使得網頁能正常顯示，因此強烈地建議您不要關" -+"掉所有的選項，但您可以自行設定。

                \n" -+"預設的情況，只有最少的識別碼資訊會送至遠端網站。要送出的識別文字會顯示在下" -+"面。\n" - "" - - #. i18n: file useragentdlg_ui.ui line 54 -@@ -1698,16 +1698,16 @@ - #: rc.cpp:617 - #, no-c-format - msgid "" --"The browser identification text sent to the sites you visit. Use the provided " --"options to customize it." -+"The browser identification text sent to the sites you visit. Use the " -+"provided options to customize it." - msgstr "將瀏覽器資訊送給瀏覽的網站。你可以使用提供的選項來自訂。" - - #. i18n: file useragentdlg_ui.ui line 88 - #: rc.cpp:620 - #, no-c-format - msgid "" --"The browser identification text sent to the sites you visit. You can customize " --"it using the options provided below." -+"The browser identification text sent to the sites you visit. You can " -+"customize it using the options provided below." - msgstr "這是在瀏覽時將送至遠端網站之瀏覽器識別碼。您可以利用下列選項自訂它。" - - #. i18n: file useragentdlg_ui.ui line 96 -@@ -1733,21 +1733,21 @@ - #: rc.cpp:632 - #, no-c-format - msgid "" --"Includes your operating system's version number in the browser identification " --"text." -+"Includes your operating system's version number in the browser " -+"identification text." - msgstr "在瀏覽器識別碼中包含您的作業系統版本。" - - #. i18n: file useragentdlg_ui.ui line 148 - #: rc.cpp:635 - #, no-c-format - msgid "Add &platform name" --msgstr "新增平台名稱(&P)" -+msgstr "新增平臺名稱(&P)" - - #. i18n: file useragentdlg_ui.ui line 151 - #: rc.cpp:638 - #, no-c-format - msgid "Includes your platform type in the browser identification text" --msgstr "在瀏覽器識別碼中包含您的平台類型。" -+msgstr "在瀏覽器識別碼中包含您的平臺類型。" - - #. i18n: file useragentdlg_ui.ui line 159 - #: rc.cpp:641 -@@ -1801,8 +1801,8 @@ - #: rc.cpp:665 - #, no-c-format - msgid "" --"List of sites for which the specified identification text will be used instead " --"of the default one." -+"List of sites for which the specified identification text will be used " -+"instead of the default one." - msgstr "對於這些網站，一個指定的瀏覽器資訊會被送出，而不是預設的瀏覽器。" - - #. i18n: file useragentdlg_ui.ui line 267 -@@ -1839,10 +1839,12 @@ - #: rc.cpp:695 - #, no-c-format - msgid "" --"When FTP connections are passive the client connects to the server, instead of " --"the other way round, so firewalls do not block the connection; old FTP servers " --"may not support Passive FTP though." --msgstr "當 FTP 連線是客戶端以被動連線到伺服器，而非其他方式，防火牆將不會阻擋該連線；舊式 FTP 伺服器可能不支援被動 FTP 通行。" -+"When FTP connections are passive the client connects to the server, instead " -+"of the other way round, so firewalls do not block the connection; old FTP " -+"servers may not support Passive FTP though." -+msgstr "" -+"當 FTP 連線是客戶端以被動連線到伺服器，而非其他方式，防火牆將不會阻擋該連線；" -+"舊式 FTP 伺服器可能不支援被動 FTP 通行。" - - #. i18n: file kio_ftprc.kcfg line 16 - #: rc.cpp:698 -@@ -1854,9 +1856,11 @@ - #: rc.cpp:701 - #, no-c-format - msgid "" --"While a file is being uploaded its extension is \".part\". When fully uploaded " --"it is renamed to its real name." --msgstr "當檔案開始上傳時為它加上延伸檔名「.part」。當檔案完整的上傳時將它的名稱改變為真實名稱。" -+"While a file is being uploaded its extension is \".part\". When fully " -+"uploaded it is renamed to its real name." -+msgstr "" -+"當檔案開始上傳時為它加上延伸檔名「.part」。當檔案完整的上傳時將它的名稱改變為" -+"真實名稱。" - - #: smbrodlg.cpp:43 - msgid "This is the configuration for the samba client only, not the server." -@@ -1872,30 +1876,32 @@ - - #: smbrodlg.cpp:171 - msgid "" --"

                Windows Shares

                Konqueror is able to access shared windows filesystems " --"if properly configured. If there is a specific computer from which you want to " --"browse, fill in the Browse server field. This is mandatory if you do " --"not run Samba locally. The Broadcast address and WINS address " --"fields will also be available, if you use the native code, or the location of " --"the 'smb.conf' file from which the options are read, when using Samba. In any " --"case, the broadcast address (interfaces in smb.conf) must be set up if it is " --"guessed incorrectly or you have multiple cards. A WINS server usually improves " --"performance, and reduces the network load a lot." --"

                The bindings are used to assign a default user for a given server, possibly " --"with the corresponding password, or for accessing specific shares. If you " --"choose to, new bindings will be created for logins and shares accessed during " --"browsing. You can edit all of them from here. Passwords will be stored locally, " --"and scrambled so as to render them unreadable to the human eye. For security " --"reasons, you may not want to do that, as entries with passwords are clearly " --"indicated as such." --"

                " --msgstr "" --"

                Windows 資源

                Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽的電腦，請將之填入 瀏覽伺服器 " --"欄位中。如果您沒有在本地端執行 Samba 時，這是必要的。廣播位址 與 WINS 位址 " --"欄位在您要使用原生碼時是可用的，或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況，瀏覽器位址 (smb.conf 中的介面) " --"在猜測錯誤或您有多張網路介面時，是必須指定的。WINS 伺服器通常可以增進效能，並且有效減少網路負載。" --"

                連結使用於指定特定伺服器的預設使用者，可能對應到密碼或存取指定的資源。如果您選擇這樣，新的連結將會為登入與資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是" --"儲存在本地端的，並且經過編碼使它無法被讀取。基於安全因素，您可能要注意之。包含密碼的項目將會清楚的指示。" -+"

                Windows Shares

                Konqueror is able to access shared windows " -+"filesystems if properly configured. If there is a specific computer from " -+"which you want to browse, fill in the Browse server field. This is " -+"mandatory if you do not run Samba locally. The Broadcast address " -+"and WINS address fields will also be available, if you use the " -+"native code, or the location of the 'smb.conf' file from which the options " -+"are read, when using Samba. In any case, the broadcast address (interfaces " -+"in smb.conf) must be set up if it is guessed incorrectly or you have " -+"multiple cards. A WINS server usually improves performance, and reduces the " -+"network load a lot.

                The bindings are used to assign a default user for a " -+"given server, possibly with the corresponding password, or for accessing " -+"specific shares. If you choose to, new bindings will be created for logins " -+"and shares accessed during browsing. You can edit all of them from here. " -+"Passwords will be stored locally, and scrambled so as to render them " -+"unreadable to the human eye. For security reasons, you may not want to do " -+"that, as entries with passwords are clearly indicated as such.

                " -+msgstr "" -+"

                Windows 資源

                Konqueror 可以存取視窗檔案系統的資源。如果有指定要瀏覽" -+"的電腦，請將之填入 瀏覽伺服器 欄位中。如果您沒有在本地端執行 Samba " -+"時，這是必要的。廣播位址 與 WINS 位址 欄位在您要使用原生碼" -+"時是可用的，或是在使用 Samba 時由 smb.conf 中取得選項。在任一種狀況，瀏覽器位" -+"址 (smb.conf 中的介面) 在猜測錯誤或您有多張網路介面時，是必須指定的。WINS 伺" -+"服器通常可以增進效能，並且有效減少網路負載。

                連結使用於指定特定伺服器的預設" -+"使用者，可能對應到密碼或存取指定的資源。如果您選擇這樣，新的連結將會為登入與" -+"資源而在瀏覽時建立。您可以在這邊編輯它們。密碼是儲存在本地端的，並且經過編碼" -+"使它無法被讀取。基於安全因素，您可能要注意之。包含密碼的項目將會清楚的指示。" - "

                " - - #: socks.cpp:42 -@@ -1928,27 +1934,24 @@ - - #: socks.cpp:270 - msgid "" --"

                SOCKS

                " --"

                This module allows you to configure KDE support for a SOCKS server or " --"proxy.

                " --"

                SOCKS is a protocol to traverse firewalls as described in RFC 1928. " --"

                If you have no idea what this is and if your system administrator does not " --"tell you to use it, leave it disabled.

                " --msgstr "" --"

                SOCKS

                " --"

                這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。

                " --"

                SOCKS 是用來穿過防火牆的協定，正如 RFC 1928 " --"所述。" --"

                如果您不知道這是什麼或您的系統管理者沒有要您使用它，請讓它保持停用。

                " -+"

                SOCKS

                This module allows you to configure KDE support for a SOCKS " -+"server or proxy.

                SOCKS is a protocol to traverse firewalls as " -+"described in RFC 1928.

                If you " -+"have no idea what this is and if your system administrator does not tell you " -+"to use it, leave it disabled.

                " -+msgstr "" -+"

                SOCKS

                這個模組允許您設定 KDE 對 SOCKS 伺服器或代理伺服器的支援。

                SOCKS 是用來穿過防火牆的協定，正如 RFC 1928 所述。

                如果您不知道這是什麼或您的系統管理者沒有要您使用它，" -+"請讓它保持停用。

                " - - #: useragentdlg.cpp:225 - msgid "" --"" --"
                Found an existing identification for" --"
                %1" --"
                Do you want to replace it?
                " --msgstr "
                找到既存之關於
                %1
                的識別碼，您是否要置換它？
                " -+"
                Found an existing identification for
                %1
                Do you " -+"want to replace it?
                " -+msgstr "" -+"
                找到既存之關於
                %1
                的識別碼，您是否要置換它？" - - #: useragentdlg.cpp:230 - msgid "Duplicate Identification" -@@ -1964,23 +1967,25 @@ - - #: useragentdlg.cpp:383 - msgid "" --"

                Browser Identification

                The browser-identification module allows you to " --"have full control over how Konqueror will identify itself to web sites you " --"browse.

                This ability to fake identification is necessary because some web " --"sites do not display properly when they detect that they are not talking to " --"current versions of either Netscape Navigator or Internet Explorer, even if the " --"browser actually supports all the necessary features to render those pages " --"properly. For such sites, you can use this feature to try to browse them. " --"Please understand that this might not always work, since such sites might be " --"using non-standard web protocols and or specifications.

                NOTE: " --"To obtain specific help on a particular section of the dialog box, simply click " --"on the quick help button on the window title bar, then click on the section for " --"which you are seeking help." --msgstr "" --"

                瀏覽器識別碼

                瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站的資訊。" --"

                這項功能提供了必要的偽裝的識別碼，這是因為某些網站在未能偵測到Netscape Navigator 或 Internet Explorer " --"時無法正常顯示，即使這些「未支援的瀏覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來瀏覽這些網站" --"

                注意：要獲得對話盒特定部分的說明，只要按下視窗標題列的快速說明按鈕，然後按下您想求助的段落。" -+"

                Browser Identification

                The browser-identification module allows you " -+"to have full control over how Konqueror will identify itself to web sites " -+"you browse.

                This ability to fake identification is necessary because some " -+"web sites do not display properly when they detect that they are not talking " -+"to current versions of either Netscape Navigator or Internet Explorer, even " -+"if the browser actually supports all the necessary features to render those " -+"pages properly. For such sites, you can use this feature to try to browse " -+"them. Please understand that this might not always work, since such sites " -+"might be using non-standard web protocols and or specifications.

                NOTE: To obtain specific help on a particular section of the dialog box, simply " -+"click on the quick help button on the window title bar, then click on the " -+"section for which you are seeking help." -+msgstr "" -+"

                瀏覽器識別碼

                瀏覽器識別碼控制視窗提供您來控制 Konqueror 回報遠端網站" -+"的資訊。

                這項功能提供了必要的偽裝的識別碼，這是因為某些網站在未能偵測到" -+"Netscape Navigator 或 Internet Explorer 時無法正常顯示，即使這些「未支援的瀏" -+"覽器」實際上支援必須的功能並能正常的顯示。因此您必須更改預設的瀏覽器識別碼來" -+"瀏覽這些網站

                注意：要獲得對話盒特定部分的說明，只要按下視窗標題列的" -+"快速說明按鈕，然後按下您想求助的段落。" - - #~ msgid "MS Windows encoding:" - #~ msgstr "MS Windows 編碼:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonqhtml.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonqhtml.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonqhtml.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonqhtml.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmkonqhtml 1.12\n" - "POT-Creation-Date: 2007-10-22 01:14+0200\n" - "PO-Revision-Date: 2005-10-27 21:45+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,9 +33,11 @@ - - #: appearance.cpp:33 - msgid "" --"

                Konqueror Fonts

                On this page, you can configure which fonts Konqueror " --"should use to display the web pages you view." --msgstr "

                Konqueror 字型

                在此分頁，您可以設定 Konqueror 應該使用哪種字型來顯示您檢視的網頁。" -+"

                Konqueror Fonts

                On this page, you can configure which fonts " -+"Konqueror should use to display the web pages you view." -+msgstr "" -+"

                Konqueror 字型

                在此分頁，您可以設定 Konqueror 應該使用哪種字型來顯示" -+"您檢視的網頁。" - - #: appearance.cpp:43 - msgid "Font Si&ze" -@@ -51,8 +53,8 @@ - - #: appearance.cpp:53 - msgid "" --"Konqueror will never display text smaller than this size," --"
                overriding any other settings" -+"Konqueror will never display text smaller than this size,
                overriding any " -+"other settings" - msgstr "Konqueror 永遠不會顯示小於這個大小的文字，
                此設定值會覆蓋其他設定" - - #: appearance.cpp:57 -@@ -125,7 +127,9 @@ - msgid "" - "Select the default encoding to be used; normally, you will be fine with 'Use " - "language encoding' and should not have to change this." --msgstr "選擇要使用的預設編碼；通常，您只要選擇「使用語言編碼」即可，而不需要改變此選項。" -+msgstr "" -+"選擇要使用的預設編碼；通常，您只要選擇「使用語言編碼」即可，而不需要改變此選" -+"項。" - - #: domainlistview.cpp:47 - msgid "Host/Domain" -@@ -137,11 +141,11 @@ - - #: domainlistview.cpp:55 - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #: domainlistview.cpp:59 - msgid "Chan&ge..." --msgstr "改變(&H)..." -+msgstr "改變(&H)…" - - #: domainlistview.cpp:63 - msgid "De&lete" -@@ -149,11 +153,11 @@ - - #: domainlistview.cpp:67 - msgid "&Import..." --msgstr "匯入(&I)..." -+msgstr "匯入(&I)…" - - #: domainlistview.cpp:73 - msgid "&Export..." --msgstr "匯出(&E)..." -+msgstr "匯出(&E)…" - - #: domainlistview.cpp:82 - msgid "Click on this button to manually add a host or domain specific policy." -@@ -213,60 +217,65 @@ - - #: filteropts.cpp:76 - msgid "Import..." --msgstr "匯入..." -+msgstr "匯入…" - - #: filteropts.cpp:78 - msgid "Export..." --msgstr "匯出..." -+msgstr "匯出…" - - #: filteropts.cpp:88 - msgid "" - "Enable or disable AdBlocK filters. When enabled a set of expressions to be " - "blocked should be defined in the filter list for blocking to take effect." --msgstr "啟用或停用 AdBlocK 過濾器。當啟用時應在過濾器清單中定義要阻擋的表示式才能使阻擋功能生效。" -+msgstr "" -+"啟用或停用 AdBlocK 過濾器。當啟用時應在過濾器清單中定義要阻擋的表示式才能使阻" -+"擋功能生效。" - - #: filteropts.cpp:91 - msgid "" --"When enabled blocked images will be removed from the page completely otherwise " --"a placeholder 'blocked' image will be used." --msgstr "當啟用時被阻擋的圖片會完全從網頁中移除，另外就是使用「被阻擋的」佔位符圖片。" -+"When enabled blocked images will be removed from the page completely " -+"otherwise a placeholder 'blocked' image will be used." -+msgstr "" -+"當啟用時被阻擋的圖片會完全從網頁中移除，另外就是使用「被阻擋的」佔位符圖片。" - - #: filteropts.cpp:93 - msgid "" --"This is the list of URL filters that will be applied to all linked images and " --"frames. The filters are processed in order so place more generic filters " -+"This is the list of URL filters that will be applied to all linked images " -+"and frames. The filters are processed in order so place more generic filters " - "towards the top of the list." --msgstr "這是套用到所有連結的圖片與框架的 URL 過濾器清單。此過濾器是照順序處理的，因此較通用的過濾器要置於清單的頂端。" -+msgstr "" -+"這是套用到所有連結的圖片與框架的 URL 過濾器清單。此過濾器是照順序處理的，因此" -+"較通用的過濾器要置於清單的頂端。" - - #: filteropts.cpp:96 - msgid "" --"Enter an expression to filter. Expressions can be defined as either a filename " --"style wildcard e.g. http://www.site.com/ads* or as a full regular expression by " --"surrounding the string with '/' e.g. //(ad|banner)\\./" -+"Enter an expression to filter. Expressions can be defined as either a " -+"filename style wildcard e.g. http://www.site.com/ads* or as a full regular " -+"expression by surrounding the string with '/' e.g. //(ad|banner)\\./" - msgstr "" --"輸入要過濾的表示式。表示式可以定義為檔案名稱風格的萬用字元如 http://www.site.com/ads*，或是使用 '/' 字元框住完整的正規表示式如 " --"//(ad|banner)\\./" -+"輸入要過濾的表示式。表示式可以定義為檔案名稱風格的萬用字元如 http://www.site." -+"com/ads*，或是使用 '/' 字元框住完整的正規表示式如 //(ad|banner)\\./" - - #: filteropts.cpp:324 - msgid "" - "

                Konqueror AdBlocK

                Konqueror AdBlocK allows you to create a list of " --"filters that are checked against linked images and frames. URL's that match are " --"either discarded or replaced with a placeholder image. " -+"filters that are checked against linked images and frames. URL's that match " -+"are either discarded or replaced with a placeholder image. " - msgstr "" --"

                Konqueror AdBlocK

                Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結的圖片和框架。符合的 URL " --"會被取消或以佔位符圖片代替。" -+"

                Konqueror AdBlocK

                Konqueror AdBlocK 讓您建立一個過濾器清單來檢查連結" -+"的圖片和框架。符合的 URL 會被取消或以佔位符圖片代替。" - - #: htmlopts.cpp:41 - msgid "" - "

                Konqueror Browser

                Here you can configure Konqueror's browser " - "functionality. Please note that the file manager functionality has to be " --"configured using the \"File Manager\" configuration module. You can make some " --"settings how Konqueror should handle the HTML code in the web pages it loads. " --"It is usually not necessary to change anything here." --msgstr "" --"

                Konqueror 瀏覽器

                您可以在這裡設定 Konqueror " --"的瀏覽功能。請注意檔案管理功能必須使用「檔案管理程式」組態模組來設定。您可以設定 Konqueror 要如何處理它所載入的網頁中的 HTML " --"碼。通常是不需要在這裡做任何改變的。" -+"configured using the \"File Manager\" configuration module. You can make " -+"some settings how Konqueror should handle the HTML code in the web pages it " -+"loads. It is usually not necessary to change anything here." -+msgstr "" -+"

                Konqueror 瀏覽器

                您可以在這裡設定 Konqueror 的瀏覽功能。請注意檔案管" -+"理功能必須使用「檔案管理程式」組態模組來設定。您可以設定 Konqueror 要如何處理" -+"它所載入的網頁中的 HTML 碼。通常是不需要在這裡做任何改變的。" - - #: htmlopts.cpp:49 - msgid "Boo&kmarks" -@@ -279,8 +288,11 @@ - #: htmlopts.cpp:51 - 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 將允許您在加入新書籤時改變書籤的標題並選擇要將之儲存於哪個資料夾。" -+"bookmark and choose a folder in which to store it when you add a new " -+"bookmark." -+msgstr "" -+"如果核取此方塊，Konqueror 將允許您在加入新書籤時改變書籤的標題並選擇要將之儲" -+"存於哪個資料夾。" - - #: htmlopts.cpp:55 - msgid "Show only marked bookmarks in bookmark toolbar" -@@ -290,7 +302,9 @@ - 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 在書籤工具列中將只顯示您在書籤編輯器中標記的書籤。" -+msgstr "" -+"如果核取這個方塊，Konqueror 在書籤工具列中將只顯示您在書籤編輯器中標記的書" -+"籤。" - - #: htmlopts.cpp:65 - msgid "Form Com&pletion" -@@ -302,9 +316,11 @@ - - #: htmlopts.cpp:67 - 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 會記住您在網頁表單中輸入的資料，並且在所有表單中的類似欄位自動輸入。" -+"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 - msgid "&Maximum completions:" -@@ -325,9 +341,11 @@ - - #: 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 "這個選項會在許多情況下開啟新分頁而非新視窗，像是以滑鼠中鍵選擇連結或資料夾時。" -+"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" -@@ -335,8 +353,8 @@ - - #: htmlopts.cpp:93 - msgid "" --"This will display the tab bar only if there are two or more tabs. Otherwise it " --"will always be displayed." -+"This will display the tab bar only if there are two or more tabs. Otherwise " -+"it will always be displayed." - msgstr "這樣只有在開啟兩個以上的分頁使才會顯示分頁列。否則它將永遠顯示。" - - #: htmlopts.cpp:108 -@@ -349,9 +367,11 @@ - - #: htmlopts.cpp:111 - 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 "如果設定此選項，當游標移至超連結上時，其形狀會有所變化（通常是變成手的形狀）。" -+"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 - msgid "M&iddle click opens URL in selection" -@@ -372,7 +392,9 @@ - "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 檢視中按滑鼠右鍵以回到紀錄中的上一步。要使用前後選單，按下滑鼠右鍵並移動。" -+msgstr "" -+"如果核取此方塊，您可以在 Konqueror 檢視中按滑鼠右鍵以回到紀錄中的上一步。要使" -+"用前後選單，按下滑鼠右鍵並移動。" - - #: htmlopts.cpp:132 - msgid "A&utomatically load images" -@@ -380,14 +402,15 @@ - - #: htmlopts.cpp:133 - 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, " --"and you can then manually load the images by clicking on the image button." --"
                Unless you have a very slow network connection, you will probably want to " --"check this box to enhance your browsing experience." --msgstr "" --"如果核取此方塊， Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該影像的保留位置，而您可以單擊影像按鈕手動載入影像。" --"
                除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經驗。" -+"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, and you can then manually load the images by clicking on the image " -+"button.
                Unless you have a very slow network connection, you will probably " -+"want to check this box to enhance your browsing experience." -+msgstr "" -+"如果核取此方塊， Konqueror 會自動載入任何內嵌於網頁中的影像。否則它只會顯示該" -+"影像的保留位置，而您可以單擊影像按鈕手動載入影像。
                除非您的網路連線速度很" -+"慢，不然核取此方塊可以增強您的瀏覽經驗。" - - #: htmlopts.cpp:138 - msgid "Dra&w frame around not completely loaded images" -@@ -395,13 +418,14 @@ - - #: htmlopts.cpp:139 - 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." --"
                Especially if you have a slow network connection, you will probably want to " --"check this box to enhance your browsing experience." --msgstr "" --"如果核取此方塊， Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中的保留位置。" --"
                除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經驗。" -+"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.
                Especially " -+"if you have a slow network connection, you will probably want to check this " -+"box to enhance your browsing experience." -+msgstr "" -+"如果核取此方塊， Konqueror 會在尚未完全載入的圖片周圍先繪出一個框架作為網頁中" -+"的保留位置。
                除非您的網路連線速度很慢，不然核取此方塊可以增強您的瀏覽經" -+"驗。" - - #: htmlopts.cpp:144 - msgid "Allow automatic delayed &reloading/redirecting" -@@ -411,7 +435,9 @@ - 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 會忽略這些要求。" -+msgstr "" -+"有些網頁會在一段時間後要求自動重新載入或重新導向。若核消此方塊， Konqueror 會" -+"忽略這些要求。" - - #: htmlopts.cpp:158 - msgid "Und&erline links:" -@@ -436,21 +462,15 @@ - #: htmlopts.cpp:167 - msgid "" - "Controls how Konqueror handles underlining hyperlinks:" --"
                " --"
                  " --"
                • Enabled: Always underline links
                  • " --"
                • Disabled: Never underline links
                  • " --"
                • Only on Hover: Underline when the mouse is moved over the link
                  • " --"
                " --"
                Note: The site's CSS definitions can override this value" --msgstr "" --"控制 Konqueror 如何處理超連結加底線：" --"
                " --"
                  " --"
                • 啟用：永遠為連結加底線
                  • " --"
                • 停用：永遠不為連結加底線
                  • " --"
                • 只有停留其上時：當滑鼠越過連結時才加底線
                " --"
                注意：網站的 CSS 定義可以覆蓋此設定" -+"
                • Enabled: Always underline links
                • Disabled: " -+"Never underline links
                • Only on Hover: Underline when the mouse " -+"is moved over the link

                Note: The site's CSS definitions can " -+"override this value" -+msgstr "" -+"控制 Konqueror 如何處理超連結加底線：
                • 啟用：永遠為連結加底" -+"線
                • 停用：永遠不為連結加底線
                • 只有停留其上時：當" -+"滑鼠越過連結時才加底線

                注意：網站的 CSS 定義可以覆蓋此設定" - - #: htmlopts.cpp:178 - msgid "A&nimations:" -@@ -474,20 +494,14 @@ - - #: htmlopts.cpp:187 - msgid "" --"Controls how Konqueror shows animated images:" --"
                " --"
                  " --"
                • Enabled: Show all animations completely.
                  • " --"
                • Disabled: Never show animations, show the start image only.
                  • " --"
                • Show only once: Show all animations completely but do not repeat " --"them.
                  • " --msgstr "" --"控制 Konqueror 如何顯示動畫影像：" --"
                  " --"
                    " --"
                  • 啟用：完整顯所有動畫。
                    • " --"
                  • 停用：永遠不顯示動畫，只顯示起始影像。
                    • " --"
                  • 只顯示一次：完整顯所有動畫但不重複播放。
                    • " -+"Controls how Konqueror shows animated images:
                    • Enabled: " -+"Show all animations completely.
                    • Disabled: Never show " -+"animations, show the start image only.
                    • Show only once: Show " -+"all animations completely but do not repeat them.
                      • " -+msgstr "" -+"控制 Konqueror 如何顯示動畫影像：
                      • 啟用：完整顯所有動畫。
                      • 停用：永遠不顯示動畫，只顯示起始影像。
                      • 只顯示一次：完整顯所有動畫但不重複播放。
                        • " - - #: javaopts.cpp:62 jsopts.cpp:48 pluginopts.cpp:59 - msgid "Global Settings" -@@ -531,58 +545,69 @@ - - #: javaopts.cpp:123 - msgid "" --"Enables the execution of scripts written in Java that can be contained in HTML " --"pages. Note that, as with any browser, enabling active contents can be a " --"security problem." --msgstr "啟用內嵌於 HTML 網頁中以 Java 寫成的命令稿之執行。請注意，不論在任何瀏覽器中，啟用動態內容都有可能造成安全性問題。" -+"Enables the execution of scripts written in Java that can be contained in " -+"HTML pages. Note that, as with any browser, enabling active contents can be " -+"a security problem." -+msgstr "" -+"啟用內嵌於 HTML 網頁中以 Java 寫成的命令稿之執行。請注意，不論在任何瀏覽器" -+"中，啟用動態內容都有可能造成安全性問題。" - - #: javaopts.cpp:126 - msgid "" - "This box contains the domains and hosts you have set a specific Java policy " - "for. This policy will be used instead of the default policy for enabling or " --"disabling Java applets on pages sent by these domains or hosts. " --"

                        Select a policy and use the controls on the right to modify it." -+"disabling Java applets on pages sent by these domains or hosts.

                        Select a " -+"policy and use the controls on the right to modify it." - msgstr "" --"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的 Java applet 。" --"

                        選擇一個政策並使用右邊的控制項來編輯它。" -+"此方塊包含您要設定特定 Java 政策的網域或主機。這個政策會取代預設政策以決定要" -+"啟用或停用由這些網域或主機所傳送的 Java applet 。

                        選擇一個政策並使用右邊的" -+"控制項來編輯它。" - - #: javaopts.cpp:133 - msgid "" - "Click this button to choose the file that contains the Java policies. These " --"policies will be merged with the existing ones. Duplicate entries are ignored." --msgstr "單擊此按鈕以選擇含有 Java 政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。" -+"policies will be merged with the existing ones. Duplicate entries are " -+"ignored." -+msgstr "" -+"單擊此按鈕以選擇含有 Java 政策的檔案。這些政策會被合併到現有的政策中。重複的" -+"項目會被忽略。" - - #: javaopts.cpp:136 - msgid "" --"Click this button to save the Java policy to a zipped file. The file, named " --"java_policy.tgz, will be saved to a location of your choice." --msgstr "單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為java_policy.tgz的檔案會儲存到您選擇的位置。" -+"Click this button to save the Java policy to a zipped file. The file, named " -+"java_policy.tgz, will be saved to a location of your choice." -+msgstr "" -+"單擊此按鈕來把 Java 政策儲存為壓縮的檔案。這個名為java_policy.tgz的檔" -+"案會儲存到您選擇的位置。" - - #: javaopts.cpp:140 - msgid "" --"Here you can set specific Java policies for any particular host or domain. To " --"add a new policy, simply click the New... button and supply the " -+"Here you can set specific Java policies for any particular host or domain. " -+"To add a new policy, simply click the New... button and supply the " - "necessary information requested by the dialog box. To change an existing " --"policy, click on the Change... button and choose the new policy from the " --"policy dialog box. Clicking on the Delete button will remove the " --"selected policy, causing the default policy setting to be used for that domain." --msgstr "" --"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策，只要單擊新增..." --"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除" --"按鈕會移除選擇的政策，並使用預設政策設定於該網域。" -+"policy, click on the Change... button and choose the new policy from " -+"the policy dialog box. Clicking on the Delete button will remove the " -+"selected policy, causing the default policy setting to be used for that " -+"domain." -+msgstr "" -+"您可以在這裡設定任何特定主機或網域的特定 Java 政策。要增加新政策，只要單擊" -+"新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊改變..." -+"按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策，並使" -+"用預設政策設定於該網域。" - - #: javaopts.cpp:153 - msgid "" --"Enabling the security manager will cause the jvm to run with a Security Manager " --"in place. This will keep applets from being able to read and write to your file " --"system, creating arbitrary sockets, and other actions which could be used to " --"compromise your system. Disable this option at your own risk. You can modify " --"your $HOME/.java.policy file with the Java policytool utility to give code " --"downloaded from certain sites more permissions." --msgstr "" --"啟用安全性管理員會使 jvm 在適當的安全性管理下執行。這會防止 applet 讀寫您的檔案系統、任意建立 socket 或其他妨礎 " --"系統安全性的動作。停用此選項需要自負風險。您可以使用 Java policytool 公用程式來編輯您的 $HOME/.java.policy " --"檔案以給予下載自某些網站的程式更多權限。" -+"Enabling the security manager will cause the jvm to run with a Security " -+"Manager in place. This will keep applets from being able to read and write " -+"to your file system, creating arbitrary sockets, and other actions which " -+"could be used to compromise your system. Disable this option at your own " -+"risk. You can modify your $HOME/.java.policy file with the Java policytool " -+"utility to give code downloaded from certain sites more permissions." -+msgstr "" -+"啟用安全性管理員會使 jvm 在適當的安全性管理下執行。這會防止 applet 讀寫您的檔" -+"案系統、任意建立 socket 或其他妨礎 系統安全性的動作。停用此選項需要自負風險。" -+"您可以使用 Java policytool 公用程式來編輯您的 $HOME/.java.policy 檔案以給予下" -+"載自某些網站的程式更多權限。" - - #: javaopts.cpp:161 - msgid "Enabling this will cause the jvm to use KIO for network transport " -@@ -590,31 +615,34 @@ - - #: javaopts.cpp:163 - msgid "" --"Enter the path to the java executable. If you want to use the jre in your path, " --"simply leave it as 'java'. If you need to use a different jre, enter the path " --"to the java executable (e.g. /usr/lib/jdk/bin/java), or the path to the " --"directory that contains 'bin/java' (e.g. /opt/IBMJava2-13)." --msgstr "" --"輸入至 java 可執行檔的路徑。如果您想使用在您的路徑中的 jre ，只要保留「java」。如果您需要使用不同的 jre ，輸入到該 java " --"可執行檔的路徑（如 /usr/lib/jdk/bin/java），或是到包含「bin/java」目錄的路徑（如 /opt/IBMJava2-13）。" -+"Enter the path to the java executable. If you want to use the jre in your " -+"path, simply leave it as 'java'. If you need to use a different jre, enter " -+"the path to the java executable (e.g. /usr/lib/jdk/bin/java), or the path to " -+"the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13)." -+msgstr "" -+"輸入至 java 可執行檔的路徑。如果您想使用在您的路徑中的 jre ，只要保留" -+"「java」。如果您需要使用不同的 jre ，輸入到該 java 可執行檔的路徑（如 /usr/" -+"lib/jdk/bin/java），或是到包含「bin/java」目錄的路徑（如 /opt/IBMJava2-13）。" - - #: javaopts.cpp:168 - msgid "" --"If you want special arguments to be passed to the virtual machine, enter them " --"here." -+"If you want special arguments to be passed to the virtual machine, enter " -+"them here." - msgstr "如果您想要傳送特殊的參數給虛擬機器，可以在此輸入。" - - #: javaopts.cpp:170 - msgid "" --"When all the applets have been destroyed, the applet server should shut down. " --"However, starting the jvm takes a lot of time. If you would like to keep the " --"java process running while you are browsing, you can set the timeout value to " --"whatever you like. To keep the java process running for the whole time that the " --"konqueror process is, leave the Shutdown Applet Server checkbox unchecked." --msgstr "" --"當所有的 applet 都消滅時， applet 伺服器應該要關閉。然而啟動 jvm 需要不少時間。如果您想要在瀏覽時保持 java " --"程序的執行，您可以把逾時時間設為任何您想要的時間。要讓 java 程序在整個 konqueror 程序中執行，就不要核取 關閉 applet 伺服器 " --"核取方塊。" -+"When all the applets have been destroyed, the applet server should shut " -+"down. However, starting the jvm takes a lot of time. If you would like to " -+"keep the java process running while you are browsing, you can set the " -+"timeout value to whatever you like. To keep the java process running for the " -+"whole time that the konqueror process is, leave the Shutdown Applet Server " -+"checkbox unchecked." -+msgstr "" -+"當所有的 applet 都消滅時， applet 伺服器應該要關閉。然而啟動 jvm 需要不少時" -+"間。如果您想要在瀏覽時保持 java 程序的執行，您可以把逾時時間設為任何您想要的" -+"時間。要讓 java 程序在整個 konqueror 程序中執行，就不要核取 關閉 applet 伺服" -+"器 核取方塊。" - - #: javaopts.cpp:283 pluginopts.cpp:626 - msgid "Doma&in-Specific" -@@ -646,8 +674,8 @@ - "JavaScript) that can be contained in HTML pages. Note that, as with any " - "browser, enabling scripting languages can be a security problem." - msgstr "" --"啟用內嵌於 HTML 網頁中以 ECMA-Script（也稱為 JavaScript）寫成的命令稿的執行。請注意，在任何瀏覽器中啟用 scripting " --"語言可能造成安全性的問題。" -+"啟用內嵌於 HTML 網頁中以 ECMA-Script（也稱為 JavaScript）寫成的命令稿的執行。" -+"請注意，在任何瀏覽器中啟用 scripting 語言可能造成安全性的問題。" - - #: jsopts.cpp:58 - msgid "Report &errors" -@@ -669,42 +697,49 @@ - #: jsopts.cpp:72 - msgid "" - "Here you can set specific JavaScript policies for any particular host or " --"domain. To add a new policy, simply click the New... " --"button and supply the necessary information requested by the dialog box. To " --"change an existing policy, click on the Change... " --"button and choose the new policy from the policy dialog box. Clicking on the " --"Delete button will remove the selected policy causing the default policy " --"setting to be used for that domain. The Import and Export " --"button allows you to easily share your policies with other people by allowing " --"you to save and retrieve them from a zipped file." --msgstr "" --"您可以在這裡設定任何特定主機或網域的特定 JavaScript 政策。要增加新政策，只要單擊新增..." --"按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除" --"按鈕會移除選擇的政策並使用預設政策設定於該網域。匯入與匯出按鈕讓你可以用壓縮檔案的方式儲存與接收政策，以便和別人分享您的政策。" -+"domain. To add a new policy, simply click the New... button and " -+"supply the necessary information requested by the dialog box. To change an " -+"existing policy, click on the Change... button and choose the new " -+"policy from the policy dialog box. Clicking on the Delete button will " -+"remove the selected policy causing the default policy setting to be used for " -+"that domain. The Import and Export button allows you to easily " -+"share your policies with other people by allowing you to save and retrieve " -+"them from a zipped file." -+msgstr "" -+"您可以在這裡設定任何特定主機或網域的特定 JavaScript 政策。要增加新政策，只要" -+"單擊新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊" -+"改變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政" -+"策並使用預設政策設定於該網域。匯入與匯出按鈕讓你可以用壓縮檔案" -+"的方式儲存與接收政策，以便和別人分享您的政策。" - - #: jsopts.cpp:82 - msgid "" - "This box contains the domains and hosts you have set a specific JavaScript " --"policy for. This policy will be used instead of the default policy for enabling " --"or disabling JavaScript on pages sent by these domains or hosts. " -+"policy for. This policy will be used instead of the default policy for " -+"enabling or disabling JavaScript on pages sent by these domains or hosts. " - "

                        Select a policy and use the controls on the right to modify it." - msgstr "" --"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。" --"

                        選擇一個政策並使用右邊的控制項來編輯它。" -+"此方塊包含您要設定特定 JavaScript 政策的網域或主機。這個政策會取代預設政策以" -+"決定要啟用或停用由這些網域或主機所傳送的網頁的JavaScript 。

                        選擇一個政策並" -+"使用右邊的控制項來編輯它。" - - #: jsopts.cpp:89 - msgid "" - "Click this button to choose the file that contains the JavaScript policies. " - "These policies will be merged with the existing ones. Duplicate entries are " - "ignored." --msgstr "單擊此按鈕以選擇含有 JavaScript 政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。" -+msgstr "" -+"單擊此按鈕以選擇含有 JavaScript 政策的檔案。這些政策會被合併到現有的政策中。" -+"重複的項目會被忽略。" - - #: jsopts.cpp:92 - msgid "" - "Click this button to save the JavaScript policy to a zipped file. The file, " --"named javascript_policy.tgz, will be saved to a location of your choice." -+"named javascript_policy.tgz, will be saved to a location of your " -+"choice." - msgstr "" --"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為javascript_policy.tgz的檔案會儲存到您選擇的位置。" -+"單擊此按鈕來把 JavaScript 政策儲存為壓縮的檔案。這個名為javascript_policy." -+"tgz的檔案會儲存到您選擇的位置。" - - #: jsopts.cpp:98 - msgid "Global JavaScript Policies" -@@ -779,23 +814,22 @@ - - #: jspolicies.cpp:183 - msgid "" --"Accept popup window requests only when links are activated through an explicit " --"mouse click or keyboard operation." -+"Accept popup window requests only when links are activated through an " -+"explicit mouse click or keyboard operation." - msgstr "只有當連結是經過明確的滑鼠或鍵盤操作而作用的彈出式視窗要求才接受。" - - #: jspolicies.cpp:190 - msgid "" --"If you disable this, Konqueror will stop interpreting the window.open() " --"JavaScript command. This is useful if you regularly visit sites that make " --"extensive use of this command to pop up ad banners." --"
                        " --"
                        Note: Disabling this option might also break certain sites that " --"require window.open() for proper operation. Use this feature carefully." --msgstr "" --"如果您停用此選項， Konqueror 會停止解譯 window.open() JavaScript 命令。如果您時常參觀大量使用此命令來彈出廣 " --"告的網站時會很有用。" --"
                        " --"
                        注意：停用此選項也可能會中斷某些需要window.open()才能正確操作的網站。請小心使用此功能。" -+"If you disable this, Konqueror will stop interpreting the window.open() JavaScript command. This is useful if you regularly visit sites that make " -+"extensive use of this command to pop up ad banners.

                        Note: " -+"Disabling this option might also break certain sites that require window." -+"open() for proper operation. Use this feature carefully." -+msgstr "" -+"如果您停用此選項， Konqueror 會停止解譯 window.open() JavaScript 命" -+"令。如果您時常參觀大量使用此命令來彈出廣 告的網站時會很有用。

                        注" -+"意：停用此選項也可能會中斷某些需要window.open()才能正確操作的網" -+"站。請小心使用此功能。" - - #: jspolicies.cpp:204 - msgid "Resize window:" -@@ -811,18 +845,20 @@ - - #: jspolicies.cpp:226 - msgid "" --"Ignore attempts of scripts to change the window size. The web page will " --"think it changed the size but the actual window is not affected." --msgstr "忽略命令稿改變視窗大小的嘗試。讓網頁認為它已經變更了大小但是實際視窗的大小不會受影響。" -+"Ignore attempts of scripts to change the window size. The web page will " -+"think it changed the size but the actual window is not affected." -+msgstr "" -+"忽略命令稿改變視窗大小的嘗試。讓網頁認為它已經變更了大小但是實際視窗的" -+"大小不會受影響。" - - #: jspolicies.cpp:233 - msgid "" --"Some websites change the window size on their own by using " --"window.resizeBy() or window.resizeTo(). This option specifies the " --"treatment of such attempts." -+"Some websites change the window size on their own by using window.resizeBy" -+"() or window.resizeTo(). This option specifies the treatment of " -+"such attempts." - msgstr "" --"某些網站會使用 window.resizeBy() 或 window.resizeTo() " --"來改變它們本身視窗的大小。這個選項指定了要如何處理這類的意圖。" -+"某些網站會使用 window.resizeBy() 或 window.resizeTo() 來改變它" -+"們本身視窗的大小。這個選項指定了要如何處理這類的意圖。" - - #: jspolicies.cpp:242 - msgid "Move window:" -@@ -834,18 +870,20 @@ - - #: jspolicies.cpp:264 - msgid "" --"Ignore attempts of scripts to change the window position. The web page will " --"think it moved the window but the actual position is not affected." --msgstr "忽略命令稿改變視窗位置的嘗試。讓網頁認為它已經移動了視窗但是實際視窗的位置不會受影響。" -+"Ignore attempts of scripts to change the window position. The web page will " -+"think it moved the window but the actual position is not affected." -+msgstr "" -+"忽略命令稿改變視窗位置的嘗試。讓網頁認為它已經移動了視窗但是實際視窗的" -+"位置不會受影響。" - - #: jspolicies.cpp:271 - msgid "" --"Some websites change the window position on their own by using " --"window.moveBy() or window.moveTo(). This option specifies the " --"treatment of such attempts." -+"Some websites change the window position on their own by using window." -+"moveBy() or window.moveTo(). This option specifies the treatment " -+"of such attempts." - msgstr "" --"某些網站會使用 window.moveBy() 或 window.moveTo() " --"來改變它們本身視窗的位置。這個選項指定了要如何處理這類的意圖。" -+"某些網站會使用 window.moveBy() 或 window.moveTo() 來改變它們本" -+"身視窗的位置。這個選項指定了要如何處理這類的意圖。" - - #: jspolicies.cpp:280 - msgid "Focus window:" -@@ -857,19 +895,23 @@ - - #: jspolicies.cpp:302 - msgid "" --"Ignore attempts of scripts to focus the window. The web page will think " --"it brought the focus to the window but the actual focus will remain unchanged." --msgstr "忽略命令稿改變視窗焦點的嘗試。讓網頁認為它已經獲得了視窗焦點但是實際視窗的焦點不會受影響。" -+"Ignore attempts of scripts to focus the window. The web page will think it brought the focus to the window but the actual focus will remain " -+"unchanged." -+msgstr "" -+"忽略命令稿改變視窗焦點的嘗試。讓網頁認為它已經獲得了視窗焦點但是實際視" -+"窗的焦點不會受影響。" - - #: jspolicies.cpp:310 - msgid "" --"Some websites set the focus to their browser window on their own by using " --"window.focus(). This usually leads to the window being moved to the front " --"interrupting whatever action the user was dedicated to at that time. This " --"option specifies the treatment of such attempts." --msgstr "" --"某些網站會使用 window.focus() " --"來使它們本身瀏覽器視窗獲得焦點。這樣通常會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何處理這類的意圖。" -+"Some websites set the focus to their browser window on their own by using " -+"window.focus(). This usually leads to the window being moved to the " -+"front interrupting whatever action the user was dedicated to at that time. " -+"This option specifies the treatment of such attempts." -+msgstr "" -+"某些網站會使用 window.focus() 來使它們本身瀏覽器視窗獲得焦點。這樣通常" -+"會將它的視窗最上方因而中斷了使用者當時要進行的動作。帶到這個選項指定了要如何" -+"處理這類的意圖。" - - #: jspolicies.cpp:321 - msgid "Modify status bar text:" -@@ -881,18 +923,21 @@ - - #: jspolicies.cpp:343 - msgid "" --"Ignore attempts of scripts to change the status bar text. The web page will " --"think it changed the text but the actual text will remain unchanged." --msgstr "忽略命令稿改變狀態列文字的嘗試。讓網頁認為它已經改變了狀態列文字但是實際的文字不會受影響。" -+"Ignore attempts of scripts to change the status bar text. The web page will " -+"think it changed the text but the actual text will remain unchanged." -+msgstr "" -+"忽略命令稿改變狀態列文字的嘗試。讓網頁認為它已經改變了狀態列文字但是實" -+"際的文字不會受影響。" - - #: jspolicies.cpp:351 - msgid "" --"Some websites change the status bar text by setting window.status or " --"window.defaultStatus, thus sometimes preventing displaying the real URLs of " --"hyperlinks. This option specifies the treatment of such attempts." --msgstr "" --"某些網站會使用 window.status 或 window.defaultStatus " --"來改變狀態列的文字，這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意圖。" -+"Some websites change the status bar text by setting window.status or " -+"window.defaultStatus, thus sometimes preventing displaying the real " -+"URLs of hyperlinks. This option specifies the treatment of such attempts." -+msgstr "" -+"某些網站會使用 window.status 或 window.defaultStatus 來改變狀態" -+"列的文字，這樣一來有時會妨礙真實網址的顯示。這個選項指定了要如何處理這類的意" -+"圖。" - - #: khttpoptdlg.cpp:16 - msgid "Accept languages:" -@@ -932,19 +977,18 @@ - - #: main.cpp:159 - msgid "" --"

                        JavaScript

                        On this page, you can configure whether JavaScript programs " --"embedded in web pages should be allowed to be executed by Konqueror." --"

                        Java

                        On this page, you can configure whether Java applets embedded in " --"web pages should be allowed to be executed by Konqueror." --"
                        " --"
                        Note: Active content is always a security risk, which is why " --"Konqueror allows you to specify very fine-grained from which hosts you want to " --"execute Java and/or JavaScript programs." --msgstr "" --"

                        JavaScript

                        在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 JavaScript 程式。" --"

                        Java

                        在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 Java Applet 程式。" --"
                        " --"
                        注意：動態的內容常常會有安全性的顧慮，這也是為什麼 Konqueror 讓您指定您想執行來自哪個主機的 Java 和/或 " -+"

                        JavaScript

                        On this page, you can configure whether JavaScript " -+"programs embedded in web pages should be allowed to be executed by Konqueror." -+"

                        Java

                        On this page, you can configure whether Java applets embedded " -+"in web pages should be allowed to be executed by Konqueror.

                        Note: Active content is always a security risk, which is why Konqueror allows " -+"you to specify very fine-grained from which hosts you want to execute Java " -+"and/or JavaScript programs." -+msgstr "" -+"

                        JavaScript

                        在此分頁，您可以設定 Konqueror 是否允許執行內嵌於網頁中的 " -+"JavaScript 程式。

                        Java

                        在此分頁，您可以設定 Konqueror 是否允許執行內嵌" -+"於網頁中的 Java Applet 程式。

                        注意：動態的內容常常會有安全性的" -+"顧慮，這也是為什麼 Konqueror 讓您指定您想執行來自哪個主機的 Java 和/或 " - "JavaScript 程式。" - - #: pluginopts.cpp:61 -@@ -975,43 +1019,54 @@ - #: pluginopts.cpp:98 - msgid "" - "Enables the execution of plugins that can be contained in HTML pages, e.g. " --"Macromedia Flash. Note that, as with any browser, enabling active contents can " --"be a security problem." --msgstr "啟用包含於 HTML 頁面中的外掛程式的執行，如 Macromedia Flash 。注意，在任何瀏覽器中啟用動態內容可能造成安全性的問題。" -+"Macromedia Flash. Note that, as with any browser, enabling active contents " -+"can be a security problem." -+msgstr "" -+"啟用包含於 HTML 頁面中的外掛程式的執行，如 Macromedia Flash 。注意，在任何瀏" -+"覽器中啟用動態內容可能造成安全性的問題。" - - #: pluginopts.cpp:102 - msgid "" --"This box contains the domains and hosts you have set a specific plugin policy " --"for. This policy will be used instead of the default policy for enabling or " --"disabling plugins on pages sent by these domains or hosts. " -+"This box contains the domains and hosts you have set a specific plugin " -+"policy for. This policy will be used instead of the default policy for " -+"enabling or disabling plugins on pages sent by these domains or hosts. " - "

                        Select a policy and use the controls on the right to modify it." - msgstr "" --"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定要啟用或停用由這些網域或主機所傳送的外掛程式。" --"

                        選擇一個政策並使用右邊的控制項來修改它。" -+"此方塊包含您要設定特定外掛程式政策的網域或主機。這個政策會取代預設政策以決定" -+"要啟用或停用由這些網域或主機所傳送的外掛程式。

                        選擇一個政策並使用右邊的控制" -+"項來修改它。" - - #: pluginopts.cpp:108 - msgid "" --"Click this button to choose the file that contains the plugin policies. These " --"policies will be merged with the existing ones. Duplicate entries are ignored." --msgstr "單擊此按鈕以選擇含有外掛程式政策的檔案。這些政策會被合併到現有的政策中。重複的項目會被忽略。" -+"Click this button to choose the file that contains the plugin policies. " -+"These policies will be merged with the existing ones. Duplicate entries are " -+"ignored." -+msgstr "" -+"單擊此按鈕以選擇含有外掛程式政策的檔案。這些政策會被合併到現有的政策中。重複" -+"的項目會被忽略。" - - #: pluginopts.cpp:111 - msgid "" --"Click this button to save the plugin policy to a zipped file. The file, named " --"plugin_policy.tgz, will be saved to a location of your choice." --msgstr "單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為plugin_policy.tgz的檔案會儲存到您選擇的位置。" -+"Click this button to save the plugin policy to a zipped file. The file, " -+"named plugin_policy.tgz, will be saved to a location of your choice." -+msgstr "" -+"單擊此按鈕來把外掛程式政策儲存為壓縮的檔案。這個名為plugin_policy.tgz" -+"的檔案會儲存到您選擇的位置。" - - #: pluginopts.cpp:114 - msgid "" --"Here you can set specific plugin policies for any particular host or domain. To " --"add a new policy, simply click the New... button and supply the " -+"Here you can set specific plugin policies for any particular host or domain. " -+"To add a new policy, simply click the New... button and supply the " - "necessary information requested by the dialog box. To change an existing " --"policy, click on the Change... button and choose the new policy from the " --"policy dialog box. Clicking on the Delete button will remove the " --"selected policy causing the default policy setting to be used for that domain." --msgstr "" --"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策，只要單擊新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊改變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策並使用預設政策設定於該網域。" -+"policy, click on the Change... button and choose the new policy from " -+"the policy dialog box. Clicking on the Delete button will remove the " -+"selected policy causing the default policy setting to be used for that " -+"domain." -+msgstr "" -+"您可以在這裡設定任何特定主機或網域的特定外掛程式政策。要增加新政策，只要單擊" -+"新增...按鈕並提供對話方塊要求的必要資訊。要改變現有的政策，單擊改" -+"變...按鈕並從政策對話方塊選擇新政策。單擊刪除按鈕會移除選擇的政策" -+"並使用預設政策設定於該網域。" - - #: pluginopts.cpp:129 pluginopts.cpp:523 - msgid "Netscape Plugins" -@@ -1049,19 +1104,21 @@ - - #: pluginopts.cpp:257 - msgid "" --"

                        Konqueror Plugins

                        The Konqueror web browser can use Netscape plugins " --"to show special content, just like the Navigator does. Please note that the way " --"you have to install Netscape plugins may depend on your distribution. A typical " --"place to install them is, for example, '/opt/netscape/plugins'." --msgstr "" --"

                        Konqueror 外掛程式

                        Konqueror 網頁瀏覽器可以使用 Netscape 外掛程式來顯示特別的內容，正如 Navigator " --"一般。請注意，安裝 Netscape 外掛程式的方式可能取決於您的發行版本 (distribution)。舉例來說，典型的安裝位置是 " --"「/opt/netscape/plugin」。" -+"

                        Konqueror Plugins

                        The Konqueror web browser can use Netscape " -+"plugins to show special content, just like the Navigator does. Please note " -+"that the way you have to install Netscape plugins may depend on your " -+"distribution. A typical place to install them is, for example, '/opt/" -+"netscape/plugins'." -+msgstr "" -+"

                        Konqueror 外掛程式

                        Konqueror 網頁瀏覽器可以使用 Netscape 外掛程式來" -+"顯示特別的內容，正如 Navigator 一般。請注意，安裝 Netscape 外掛程式的方式可能" -+"取決於您的發行版本 (distribution)。舉例來說，典型的安裝位置是 「/opt/" -+"netscape/plugin」。" - - #: pluginopts.cpp:283 - msgid "" --"Do you want to apply your changes before the scan? Otherwise the changes will " --"be lost." -+"Do you want to apply your changes before the scan? Otherwise the changes " -+"will be lost." - msgstr "您是否要在掃描前套用您的變更？否則這些變更將會遺失。" - - #: pluginopts.cpp:302 -@@ -1118,7 +1175,8 @@ - msgid "" - "Enter the name of a host (like www.kde.org) or a domain, starting with a dot " - "(like .kde.org or .org)" --msgstr "輸入主機名稱（如 www.kde.org ）或以 . 開頭的網域（如 .kde.org 或 .org ）" -+msgstr "" -+"輸入主機名稱（如 www.kde.org ）或以 . 開頭的網域（如 .kde.org 或 .org ）" - - #: policydlg.cpp:112 - msgid "You must first enter a domain name." -@@ -1153,8 +1211,8 @@ - #: 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." -+"This will open a new tab opened from a page after the current tab, instead " -+"of after the last tab." - msgstr "這會在目前分頁之後開啟新的分頁，而非在最後一個分頁之後。" - - #. i18n: file advancedTabOptions.ui line 79 -@@ -1167,8 +1225,8 @@ - #: 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." -+"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 advancedTabOptions.ui line 90 -@@ -1194,8 +1252,8 @@ - #: 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." -+"Whether or not JavaScript popups if allowed shall open in a new tab or in a " -+"new window." - msgstr "是否允許 JavaScript 彈出視窗，如果允許，要在新的分頁和新的視窗中開啟。" - - #. i18n: file advancedTabOptions.ui line 112 -@@ -1208,9 +1266,11 @@ - #: 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 "當您關閉目前使用中的分頁時會使用前一個用過或開啟的分頁而非位於目前分頁右邊的分頁。" -+"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 "" -+"當您關閉目前使用中的分頁時會使用前一個用過或開啟的分頁而非位於目前分頁右邊的" -+"分頁。" - - #. i18n: file advancedTabOptions.ui line 123 - #: rc.cpp:42 -@@ -1224,11 +1284,12 @@ - msgid "" - "When you click a URL in another KDE 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." -+"found, the URL opened as a new tab within it. Otherwise a new Konqueror " -+"window will be opened with the required URL." - msgstr "" --"當您在其他程式點選網址或者呼叫 kfmclient 開啟網址，目前的桌面將搜尋未最小化的 " --"Konqueror，如果找到了，該網址會在其中開啟為新的分頁。否則將會開啟一個新的 Konqueror 視窗給該要求的網址。" -+"當您在其他程式點選網址或者呼叫 kfmclient 開啟網址，目前的桌面將搜尋未最小化" -+"的 Konqueror，如果找到了，該網址會在其中開啟為新的分頁。否則將會開啟一個新的 " -+"Konqueror 視窗給該要求的網址。" - - #. i18n: file nsconfigwidget.ui line 17 - #: rc.cpp:48 -@@ -1264,13 +1325,14 @@ - #: rc.cpp:63 - #, no-c-format - msgid "" --"If this option is enabled, KDE 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 KDE startup. You might want to disable this option, " --"especially if you seldom install plugins." --msgstr "" --"如果啟用此選項， KDE 會在每次啟動時尋找新的 Netscape 外掛程式。如果您時常安裝新的外掛程式，這可以讓它簡單一些，但它也會減慢 KDE " --"的啟動速度。您可能會想要停用此選項，特別是當您不常安裝外掛程式的時候。" -+"If this option is enabled, KDE 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 KDE startup. You might want to disable this " -+"option, especially if you seldom install plugins." -+msgstr "" -+"如果啟用此選項， KDE 會在每次啟動時尋找新的 Netscape 外掛程式。如果您時常安裝" -+"新的外掛程式，這可以讓它簡單一些，但它也會減慢 KDE 的啟動速度。您可能會想要停" -+"用此選項，特別是當您不常安裝外掛程式的時候。" - - #. i18n: file nsconfigwidget.ui line 106 - #: rc.cpp:66 -@@ -1321,7 +1383,14 @@ - msgstr "使用 a&rtsdsp 以透過 aRts 導引外掛程式音效" - - #~ msgid "Sho&w Java console" --#~ msgstr "顯示 Java 控制台(&W)" -+#~ msgstr "顯示 Java 控制臺(&W)" - --#~ msgid "If this box is checked, Konqueror will open a console window that Java programs can use for character-based input/output. Well-written Java applets do not need this, but the console can help to find problems with Java applets." --#~ msgstr "如果核取此方塊， Konqueror 會開啟一個讓 Java 程式可以使用以文字為基礎的輸入/輸出控制台視窗。撰寫得好的 Java applet 不需要這個，但控制台可以幫助找出 Java applet 的問題。" -+#~ msgid "" -+#~ "If this box is checked, Konqueror will open a console window that Java " -+#~ "programs can use for character-based input/output. Well-written Java " -+#~ "applets do not need this, but the console can help to find problems with " -+#~ "Java applets." -+#~ msgstr "" -+#~ "如果核取此方塊， Konqueror 會開啟一個讓 Java 程式可以使用以文字為基礎的輸" -+#~ "入/輸出控制臺視窗。撰寫得好的 Java applet 不需要這個，但控制臺可以幫助找" -+#~ "出 Java applet 的問題。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonq.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonq.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonq.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonq.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: kcmkonq\n" - "POT-Creation-Date: 2008-06-08 01:37+0200\n" - "PO-Revision-Date: 2006-09-04 09:09+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -21,9 +20,10 @@ - - #: behaviour.cpp:46 - msgid "" --"

                        Konqueror Behavior

                        You can configure how Konqueror behaves as a file " --"manager here." --msgstr "

                        Konqueror 行為

                        您可以在這裡設定 Konqueror 做為檔案管理程式的行為。" -+"

                        Konqueror Behavior

                        You can configure how Konqueror behaves as a " -+"file manager here." -+msgstr "" -+"

                        Konqueror 行為

                        您可以在這裡設定 Konqueror 做為檔案管理程式的行為。" - - #: behaviour.cpp:50 - msgid "Misc Options" -@@ -31,13 +31,15 @@ - - #: behaviour.cpp:66 - msgid "Open folders in separate &windows" --msgstr "在不同的視窗開啟目錄(&w)" -+msgstr "在不同的視窗開啟目錄(&W)" - - #: behaviour.cpp:67 - msgid "" - "If this option is checked, Konqueror will open a new window when you open a " - "folder, rather than showing that folder's contents in the current window." --msgstr "如果核取此選項，當您開啟一個目錄時 Konqueror 會開啟一個新視窗，而不是在目前的視窗顯示目錄內容。" -+msgstr "" -+"如果核取此選項，當您開啟一個目錄時 Konqueror 會開啟一個新視窗，而不是在目前的" -+"視窗顯示目錄內容。" - - #: behaviour.cpp:74 - msgid "&Show network operations in a single window" -@@ -45,10 +47,12 @@ - - #: behaviour.cpp:77 - msgid "" --"Checking this option will group the progress information for all network file " --"transfers into a single window with a list. When the option is not checked, all " --"transfers appear in a separate window." --msgstr "選擇此選項會將所有網路檔案傳輸的處理資訊整合到單一視窗的列表中。當不選擇此選項時，所有的傳輸資訊會出現在不同的視窗。" -+"Checking this option will group the progress information for all network " -+"file transfers into a single window with a list. When the option is not " -+"checked, all transfers appear in a separate window." -+msgstr "" -+"選擇此選項會將所有網路檔案傳輸的處理資訊整合到單一視窗的列表中。當不選擇此選" -+"項時，所有的傳輸資訊會出現在不同的視窗。" - - #: behaviour.cpp:85 - msgid "Show file &tips" -@@ -56,9 +60,11 @@ - - #: behaviour.cpp:88 - 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" --msgstr "您可以在此控制，如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的額外資訊的小視窗" -+"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" -+msgstr "" -+"您可以在此控制，如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的額外資" -+"訊的小視窗" - - #: behaviour.cpp:108 - msgid "Show &previews in file tips" -@@ -66,9 +72,11 @@ - - #: behaviour.cpp:111 - 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 "您可以在此控制，如果您希望在把滑鼠移到一個檔案上時彈出一個顯示該檔案的大型預覽 的視窗。" -+"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 - msgid "Rename icons in&line" -@@ -76,8 +84,8 @@ - - #: behaviour.cpp:115 - msgid "" --"Checking this option will allow files to be renamed by clicking directly on the " --"icon name. " -+"Checking this option will allow files to be renamed by clicking directly on " -+"the icon name. " - msgstr "選取這個選項會允許直接按一下圖示名稱來更改檔名。" - - #: behaviour.cpp:121 -@@ -90,10 +98,12 @@ - - #: behaviour.cpp:131 - 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 （可能是一個目錄或網頁）。這通常是您的家目錄，以一個「符號」(~)來代表。" -+"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 - msgid "Show 'Delete' context me&nu entries which bypass the trashcan" -@@ -102,10 +112,11 @@ - #: behaviour.cpp:143 - 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 " --"the Shift key while calling 'Move to Trash'." -+"and in the file manager's context menus. You can always delete files by " -+"holding the Shift key while calling 'Move to Trash'." - msgstr "" --"如果您希望「刪除」選單指令顯示在桌面和檔案管理程式的快顯選單中請核取此項。您隨時可以按住 Shift 按鍵並選擇「移至資源回收桶」來刪除檔案。" -+"如果您希望「刪除」選單指令顯示在桌面和檔案管理程式的快顯選單中請核取此項。您" -+"隨時可以按住 Shift 按鍵並選擇「移至資源回收桶」來刪除檔案。" - - #: behaviour.cpp:148 - msgid "Ask Confirmation For" -@@ -114,16 +125,13 @@ - #: behaviour.cpp:150 - msgid "" - "This option tells Konqueror whether to ask for a confirmation when you " --"\"delete\" a file. " --"
                          " --"
                        • Move To Trash: moves the file to your trash folder, from where it " --"can be recovered very easily.
                          • " -+"\"delete\" a file.
                          • Move To Trash: moves the file to your " -+"trash folder, from where it can be recovered very easily.
                            • " - "
                          • Delete: simply deletes the file.
                          " - msgstr "" --"這個選項會告訴 Konqueror ，當您「刪除」檔案時，是否要求做確認。 " --"
                            " --"
                          • 移至資源回收桶： 搬移檔案至您的資源回收桶目錄，它可以非常容易的從那裡復原。
                            • " --"
                          • 刪除： 直接刪除檔案。
                          " -+"這個選項會告訴 Konqueror ，當您「刪除」檔案時，是否要求做確認。
                          • " -+"移至資源回收桶： 搬移檔案至您的資源回收桶目錄，它可以非常容易的從那裡復" -+"原。
                          • 刪除： 直接刪除檔案。
                          " - - #: behaviour.cpp:159 - msgid "&Move to trash" -@@ -131,7 +139,7 @@ - - #: behaviour.cpp:161 - msgid "D&elete" --msgstr "刪除(&e)" -+msgstr "刪除(&E)" - - #: browser.cpp:51 - msgid "&Appearance" -@@ -153,7 +161,9 @@ - msgid "" - "

                          Multiple Desktops

                          In this module, you can configure how many virtual " - "desktops you want and how these should be labeled." --msgstr "

                          多重桌面

                          在此模組中，您可以設定您需要多少虛擬桌面以及這些桌面的標籤為何。" -+msgstr "" -+"

                          多重桌面

                          在此模組中，您可以設定您需要多少虛擬桌面以及這些桌面的標籤為" -+"何。" - - #: desktop.cpp:71 - msgid "N&umber of desktops: " -@@ -161,9 +171,10 @@ - - #: desktop.cpp:77 - msgid "" --"Here you can set how many virtual desktops you want on your KDE desktop. Move " --"the slider to change the value." --msgstr "您可以設定想要在您的 KDE 桌面上放多少個虛擬桌面。移動捲軸可以改變數量大小。" -+"Here you can set how many virtual desktops you want on your KDE desktop. " -+"Move the slider to change the value." -+msgstr "" -+"您可以設定想要在您的 KDE 桌面上放多少個虛擬桌面。移動捲軸可以改變數量大小。" - - #: desktop.cpp:88 - msgid "Desktop &Names" -@@ -213,54 +224,51 @@ - - #: desktopbehavior_impl.cpp:157 desktopbehavior_impl.cpp:203 - msgid "" --" " --"
                            " --"
                          • No action: as you might guess, nothing happens!
                            • " -+"
                            • No action: as you might guess, nothing happens!
                              • " - "
                            • Window list menu: a menu showing all windows on all virtual " --"desktops pops up. You can click on the desktop name to switch to that desktop, " --"or on a window name to shift focus to that window, switching desktops if " --"necessary, and restoring the window if it is hidden. Hidden or minimized " --"windows are represented with their names in parentheses.
                              • " --"
                            • Desktop menu: 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 KDE.
                              • " --"
                            • Application menu: the \"K\" 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.
                            " --msgstr "" --" " --"
                              " --"
                            • 不動作：您可以猜得到，不會發生任何事！
                              • " --"
                            • 視窗列表選單：會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌" --"面，若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
                              • " --"
                            • 桌面選單：會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
                              • " --"
                            • 應用程式選單：會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對快速切換應用程式會很有用。
                            " -+"desktops pops up. You can click on the desktop name to switch to that " -+"desktop, or on a window name to shift focus to that window, switching " -+"desktops if necessary, and restoring the window if it is hidden. Hidden or " -+"minimized windows are represented with their names in parentheses. " -+"
                          • Desktop menu: 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 KDE.
                          • Application menu: the \"K" -+"\" 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.
                          " -+msgstr "" -+"
                          • 不動作：您可以猜得到，不會發生任何事！
                          • 視窗列表" -+"選單：會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切" -+"換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌面，若視窗是隱藏的則會" -+"將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
                          • 桌面" -+"選單：會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選" -+"項。
                          • 應用程式選單：會彈出「K」選單。如果您喜歡隱藏面板（也" -+"稱為「Kicker」），這對快速切換應用程式會很有用。
                          " - - #: desktopbehavior_impl.cpp:178 - msgid "" --"You can choose what happens when you click the middle button of your pointing " --"device on the desktop: " --"
                            " --"
                          • No action: as you might guess, nothing happens!
                            • " --"
                          • Window list menu: a menu showing all windows on all virtual " --"desktops pops up. You can click on the desktop name to switch to that desktop, " --"or on a window name to shift focus to that window, switching desktops if " --"necessary, and restoring the window if it is hidden. Hidden or minimized " --"windows are represented with their names in parentheses.
                            • " --"
                          • Desktop menu: 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 KDE.
                            • " --"
                          • Application menu: the \"K\" 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.
                          " --msgstr "" --"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事： " --"
                            " --"
                          • 不動作： 您可以猜得到，沒事發生！
                            • " --"
                          • 視窗列表選單：會彈出一個顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名稱來轉換視窗，如果需要會同時切換桌" --"面，若視窗是隱藏的則會將它復原。隱藏或最小化的視窗會以括弧包含它們的名稱來表示。
                            • " --"
                          • 桌面選單：會彈出桌面的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
                            • " --"
                          • 應用程式選單：會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對快速切換應用程式會很有用。
                          " -+"You can choose what happens when you click the middle button of your " -+"pointing device on the desktop:
                          • No action: as you might " -+"guess, nothing happens!
                          • Window list menu: a menu showing " -+"all windows on all virtual desktops pops up. You can click on the desktop " -+"name to switch to that desktop, or on a window name to shift focus to that " -+"window, switching desktops if necessary, and restoring the window if it is " -+"hidden. Hidden or minimized windows are represented with their names in " -+"parentheses.
                          • Desktop menu: 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 KDE.
                            • " -+"
                          • Application menu: the \"K\" 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.
                          " -+msgstr "" -+"您可以選擇當您在桌面上敲擊指標裝置中間按鈕時會發生什麼事：
                          • 不動" -+"作： 您可以猜得到，沒事發生！
                          • 視窗列表選單：會彈出一個" -+"顯示所有在虛擬桌面視窗的選單。您可以藉著單擊桌面名稱來切換桌面，或單擊視窗名" -+"稱來轉換視窗，如果需要會同時切換桌面，若視窗是隱藏的則會將它復原。隱藏或最小" -+"化的視窗會以括弧包含它們的名稱來表示。
                          • 桌面選單：會彈出桌面" -+"的內容選單。這個選單有設定顯示、鎖定螢幕及登出 KDE 的選項。
                          • 應用" -+"程式選單：會彈出「K」選單。如果您喜歡隱藏面板（也稱為「Kicker」），這對" -+"快速切換應用程式會很有用。
                          " - - #: desktopbehavior_impl.cpp:269 - msgid "No Action" -@@ -346,7 +354,8 @@ - msgid "" - "This is the maximum number of lines that can be used to draw icon text. Long " - "file names are truncated at the end of the last line." --msgstr "這是用來繪製圖示文字的最大行數。過長的檔案名稱會在最後一行的結尾處被截斷。" -+msgstr "" -+"這是用來繪製圖示文字的最大列數。過長的檔案名稱會在最後一列的結尾處被截斷。" - - #: fontopts.cpp:165 - msgid "&Width for icon text:" -@@ -367,7 +376,9 @@ - "Checking this option will result in filenames being underlined, so that they " - "look like links on a web page. Note: to complete the analogy, make sure that " - "single click activation is enabled in the mouse control module." --msgstr "核取這個選項將會在檔名加上底線，這樣看起來會像是網頁上的連結。注意：要完整地模擬這個情況，請確定在滑鼠控制模組中的單鍵啟動功能是開啟的。" -+msgstr "" -+"核取這個選項將會在檔名加上底線，這樣看起來會像是網頁上的連結。注意：要完整地" -+"模擬這個情況，請確定在滑鼠控制模組中的單鍵啟動功能是開啟的。" - - #: fontopts.cpp:194 - msgid "Display file sizes in b&ytes" -@@ -378,7 +389,9 @@ - "Checking this option will result in file sizes being displayed in bytes. " - "Otherwise file sizes are being displayed in kilobytes or megabytes if " - "appropriate." --msgstr "選擇該選項會以位元組來顯示檔案大小。否則，檔案大小會以千位元組或百萬位元組中較適合者來顯示。" -+msgstr "" -+"選擇該選項會以位元組來顯示檔案大小。否則，檔案大小會以千位元組或百萬位元組中" -+"較適合者來顯示。" - - #: fontopts.cpp:223 - msgid "" -@@ -400,28 +413,28 @@ - - #: previews.cpp:65 - msgid "" --"

                          Allow previews, \"Folder Icons Reflect Contents\", and retrieval of " --"meta-data on protocols:

                          " -+"

                          Allow previews, \"Folder Icons Reflect Contents\", and retrieval of meta-" -+"data on protocols:

                          " - msgstr "

                          允許預覽、「資料夾圖示反應其內容」與在協定上中繼資料的取回：

                          " - - #: previews.cpp:68 - msgid "" --"

                          Preview Options

                          Here you can modify the behavior of Konqueror when it " --"shows the files in a folder." --"

                          The list of protocols:

                          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." --"

                          Maximum File Size:

                          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." --msgstr "" --"

                          預覽選項

                          您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。" --"

                          協定列表：

                          核取用來顯示預覽的協定，取消不該預覽的協定。例如，當區域網路夠快時，您可能會想顯示 SMB " --"上的預覽。但是假如您常上一些很慢的FTP 站，您可能會想關閉 FTP 的部分。" --"

                          檔案大小的最大值：

                          選擇要產生預覽的檔案大小最大值。舉例來說，如果設為 1 MB （預設值），所有大於 1 MB " --"的檔案都不會產生預覽，這是基於速度的考量。" -+"

                          Preview Options

                          Here you can modify the behavior of Konqueror when " -+"it shows the files in a folder.

                          The list of protocols:

                          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.

                          Maximum File Size:

                          " -+"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." -+msgstr "" -+"

                          預覽選項

                          您可以在此編輯當 Konqueror 顯示目錄中的檔案時的行為。

                          協" -+"定列表：

                          核取用來顯示預覽的協定，取消不該預覽的協定。例如，當區域網路夠快" -+"時，您可能會想顯示 SMB 上的預覽。但是假如您常上一些很慢的FTP 站，您可能會想關" -+"閉 FTP 的部分。

                          檔案大小的最大值：

                          選擇要產生預覽的檔案大小最大值。舉" -+"例來說，如果設為 1 MB （預設值），所有大於 1 MB 的檔案都不會產生預覽，這是基" -+"於速度的考量。" - - #: previews.cpp:81 - msgid "Select Protocols" -@@ -439,10 +452,11 @@ - msgid "" - "This option makes it possible to choose when the file previews, smart folder " - "icons, and meta-data in the File Manager should be activated.\n" --"In the list of protocols that appear, select which ones are fast enough for you " --"to allow previews to be generated." -+"In the list of protocols that appear, select which ones are fast enough for " -+"you to allow previews to be generated." - msgstr "" --"此選項讓您可以選擇何時要預覽檔案，智慧式資料夾圖示，與啟動檔案管理員中的中繼資料。\n" -+"此選項讓您可以選擇何時要預覽檔案，智慧式資料夾圖示，與啟動檔案管理員中的中繼" -+"資料。\n" - "在出現的協定列表中，選擇對您來說產生預覽速度夠快的方案。" - - #: previews.cpp:124 -@@ -464,12 +478,13 @@ - #: previews.cpp:145 - msgid "" - "Select this to use thumbnails that are found inside some file types (e.g. " --"JPEG). This will increase speed and reduce disk usage. Deselect it if you have " --"files that have been processed by programs which create inaccurate thumbnails, " --"such as ImageMagick." --msgstr "" --"選擇此選項以使用在某些檔案類型(如 JPEG)中找到的 Thumbnail。 這樣會增進速度並減少硬碟的使用量。如果您的檔案曾被 ImageMagick 這 " --"類會建立不準確的 Thumbnail 的程式處理過，請不要選擇此選項。" -+"JPEG). This will increase speed and reduce disk usage. Deselect it if you " -+"have files that have been processed by programs which create inaccurate " -+"thumbnails, such as ImageMagick." -+msgstr "" -+"選擇此選項以使用在某些檔案類型(如 JPEG)中找到的 Thumbnail。 這樣會增進速度並" -+"減少硬碟的使用量。如果您的檔案曾被 ImageMagick 這 類會建立不準確的 Thumbnail " -+"的程式處理過，請不要選擇此選項。" - - #. i18n: file desktopbehavior.ui line 34 - #: rc.cpp:3 -@@ -490,7 +505,9 @@ - "Uncheck this option if you do not want to have icons on the desktop. Without " - "icons the desktop will be somewhat faster but you will no longer be able to " - "drag files to the desktop." --msgstr "如果您不希望桌面上有圖示，請取消此選項。沒有圖示桌面會稍微快一點，但您將不再能拖拉檔案到桌面。" -+msgstr "" -+"如果您不希望桌面上有圖示，請取消此選項。沒有圖示桌面會稍微快一點，但您將不再" -+"能拖拉檔案到桌面。" - - #. i18n: file desktopbehavior.ui line 92 - #: rc.cpp:12 -@@ -507,8 +524,8 @@ - "like netscape that check the root window for running instances, disable this " - "option." - msgstr "" --"若您想執行能在桌面上畫圖的 X11 程式，諸如 xsnow、xpenguin 或是 xmountain 請點選該選項。若對應用程式有任何問題，如 " --"netscape，請檢查主視窗且關閉該選項。" -+"若您想執行能在桌面上畫圖的 X11 程式，諸如 xsnow、xpenguin 或是 xmountain 請點" -+"選該選項。若對應用程式有任何問題，如 netscape，請檢查主視窗且關閉該選項。" - - #. i18n: file desktopbehavior.ui line 105 - #: rc.cpp:18 -@@ -559,12 +576,13 @@ - #: rc.cpp:39 - #, no-c-format - msgid "" --"If this option is selected, applications will not have their menu bar attached " --"to their own window anymore. Instead, there is one menu bar at the top of the " --"screen which shows the menus of the currently active application. You might " --"recognize this behavior from Mac OS." -+"If this option is selected, applications will not have their menu bar " -+"attached to their own window anymore. Instead, there is one menu bar at the " -+"top of the screen which shows the menus of the currently active application. " -+"You might recognize this behavior from Mac OS." - msgstr "" --"如果選取這個選項，程式的選單不會在自己的視窗上，而是在螢幕最上方的選單列上顯示目前作用的應用程式選單。 您可能了解這個行為就像是 Mac OS 的視窗一樣。" -+"如果選取這個選項，程式的選單不會在自己的視窗上，而是在螢幕最上方的選單列上顯" -+"示目前作用的應用程式選單。 您可能了解這個行為就像是 Mac OS 的視窗一樣。" - - #. i18n: file desktopbehavior.ui line 159 - #: rc.cpp:42 -@@ -594,7 +612,7 @@ - #: rc.cpp:54 rc.cpp:57 rc.cpp:60 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file desktopbehavior.ui line 304 - #: rc.cpp:63 -@@ -606,7 +624,7 @@ - #: rc.cpp:66 - #, no-c-format - msgid "Automatically &line up icons" --msgstr "自動排列圖示(&l)" -+msgstr "自動排列圖示(&L)" - - #. i18n: file desktopbehavior.ui line 318 - #: rc.cpp:69 -@@ -629,14 +647,17 @@ - "

                          If you check this option, any files in your desktop directory that begin " - "with a period (.) will be shown. Usually, such files contain configuration " - "information, and remain hidden from view.

                          \n" --"

                          For example, files which are named \".directory\" are plain text files which " --"contain information for Konqueror, such as the icon to use in displaying a " --"directory, the order in which files should be sorted, etc. You should not " --"change or delete these files unless you know what you are doing.

                          " --msgstr "" --"

                          如果您核取這個選項，任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常，這類的檔案包含設定資訊，而且保持隱藏的狀態。

                          \n" --"

                          例如，命名為「.directory」的檔案是包含 Konqueror " --"資訊的純文字檔案，像是顯示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案，除非您知道您在做什麼。

                          " -+"

                          For example, files which are named \".directory\" are plain text files " -+"which contain information for Konqueror, such as the icon to use in " -+"displaying a directory, the order in which files should be sorted, etc. You " -+"should not change or delete these files unless you know what you are doing." -+msgstr "" -+"

                          如果您核取這個選項，任何在您桌面目錄以句點 (.) 開頭的檔案會被顯示。通常，" -+"這類的檔案包含設定資訊，而且保持隱藏的狀態。

                          \n" -+"

                          例如，命名為「.directory」的檔案是包含 Konqueror 資訊的純文字檔案，像是顯" -+"示目錄的圖示、檔案的排列順序等。您不應該改變或刪除這些檔案，除非您知道您在做" -+"什麼。

                          " - - #. i18n: file desktopbehavior.ui line 336 - #: rc.cpp:79 -@@ -693,9 +714,11 @@ - #: rootopts.cpp:81 - msgid "" - "This folder contains all the files which you see on your desktop. You can " --"change the location of this folder if you want to, and the contents will move " --"automatically to the new location as well." --msgstr "這個目錄包含所有在您桌面上看到的檔案。如果您想要的話，您可以改變目錄位置，而內容將會自動地搬移至新的位置。" -+"change the location of this folder if you want to, and the contents will " -+"move automatically to the new location as well." -+msgstr "" -+"這個目錄包含所有在您桌面上看到的檔案。如果您想要的話，您可以改變目錄位置，而" -+"內容將會自動地搬移至新的位置。" - - #: rootopts.cpp:89 - msgid "A&utostart path:" -@@ -703,11 +726,13 @@ - - #: rootopts.cpp:96 - msgid "" --"This folder contains applications or links to applications (shortcuts) that you " --"want to have started automatically whenever KDE starts. You can change the " --"location of this folder if you want to, and the contents will move " -+"This folder contains applications or links to applications (shortcuts) that " -+"you want to have started automatically whenever KDE starts. You can change " -+"the location of this folder if you want to, and the contents will move " - "automatically to the new location as well." --msgstr "這個目錄包含當 KDE 啟動時，您想要自動啟動的程式或程式連結（捷徑）。如果您想要的話，您可以改變目錄位置，而內容將會自動地搬移至新的位置。" -+msgstr "" -+"這個目錄包含當 KDE 啟動時，您想要自動啟動的程式或程式連結（捷徑）。如果您想要" -+"的話，您可以改變目錄位置，而內容將會自動地搬移至新的位置。" - - #: rootopts.cpp:105 - msgid "D&ocuments path:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonsole.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkonsole.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkonsole.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kcmkonsole\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-06-19 09:15+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,13 +30,14 @@ - - #: kcmkonsole.cpp:43 - msgid "" --"

                          Konsole

                          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." -+"

                          Konsole

                          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." - msgstr "" --"konsole 藉著這個程式您可以調整 konsole (KDE " --"終端機程式)的設定值，您可以在此調整一些通用的設定，或是您也可以使用RMB來達到同樣的目的。您還可以在此編輯 konsole 的風格設定。" -+"konsole 藉著這個程式您可以調整 konsole (KDE 終端機程式)的設定值，您" -+"可以在此調整一些通用的設定，或是您也可以使用RMB來達到同樣的目的。您還可以在此" -+"編輯 konsole 的風格設定。" - - #: kcmkonsole.cpp:51 - msgid "" -@@ -55,10 +55,10 @@ - - #: kcmkonsole.cpp:162 - msgid "" --"The Ctrl+S/Ctrl+Q flow control setting will only affect newly started Konsole " --"sessions.\n" --"The 'stty' command can be used to change the flow control settings of existing " --"Konsole sessions." -+"The Ctrl+S/Ctrl+Q flow control setting will only affect newly started " -+"Konsole sessions.\n" -+"The 'stty' command can be used to change the flow control settings of " -+"existing Konsole sessions." - msgstr "" - "Ctrl+S/Ctrl+Q 流程控制設定只會影響最新啟動的 Konsole 工作階段。\n" - "「stty」指令則可用來改變既存 Konsole 工作階段的流程控制設定。" -@@ -66,14 +66,15 @@ - #: kcmkonsole.cpp:170 - msgid "" - "You have chosen to enable bidirectional text rendering by default.\n" --"Note that bidirectional text may not always be shown correctly, especially when " --"selecting parts of text written right-to-left. This is a known issue which " --"cannot be resolved at the moment due to the nature of text handling in " -+"Note that bidirectional text may not always be shown correctly, especially " -+"when selecting parts of text written right-to-left. This is a known issue " -+"which cannot be resolved at the moment due to the nature of text handling in " - "console-based applications." - msgstr "" - "您已經選擇預設啟動雙向文字描繪。\n" --"注意雙向文字描繪可能不會每次都能正確顯示，特別是在選取部分由右至左書寫的文字時。這是一個已知的問題但目前仍無法解決，因為它涉及 console " --"類應用程式處理文字方式的問題。" -+"注意雙向文字描繪可能不會每次都能正確顯示，特別是在選取部分由右至左書寫的文字" -+"時。這是一個已知的問題但目前仍無法解決，因為它涉及 console 類應用程式處理文字" -+"方式的問題。" - - #. i18n: file kcmkonsoledialog.ui line 42 - #: rc.cpp:3 -@@ -163,7 +164,7 @@ - #: rc.cpp:45 - #, no-c-format - msgid "&Line spacing:" --msgstr "行距(&L):" -+msgstr "列距(&L):" - - #. i18n: file kcmkonsoledialog.ui line 297 - #: rc.cpp:48 -@@ -385,7 +386,7 @@ - #: rc.cpp:156 - #, no-c-format - msgid "Sa&ve Schema..." --msgstr "儲存風格(&V)..." -+msgstr "儲存風格(&V)…" - - #. i18n: file schemadialog.ui line 347 - #: rc.cpp:159 -@@ -403,7 +404,7 @@ - #: rc.cpp:165 - #, no-c-format - msgid "..." --msgstr "..." -+msgstr "…" - - #. i18n: file schemadialog.ui line 415 - #: rc.cpp:168 -@@ -553,7 +554,7 @@ - #: rc.cpp:246 - #, no-c-format - msgid "Sa&ve Session..." --msgstr "儲存工作階段(&V)..." -+msgstr "儲存工作階段(&V)…" - - #. i18n: file sessiondialog.ui line 270 - #: rc.cpp:249 -@@ -684,8 +685,8 @@ - #: sessioneditor.cpp:304 - msgid "" - "The Execute entry is not a valid command.\n" --"You can still save this session, but it will not show up in Konsole's Session " --"list." -+"You can still save this session, but it will not show up in Konsole's " -+"Session list." - msgstr "" - "「執行」項目並非有效指令。\n" - "您仍然可以儲存此工作階段，但它將不會顯示在 Konsole 的工作階段清單。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkurifilt.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkurifilt.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkurifilt.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkurifilt.po 2011-11-11 15:45:17.000000000 +0100 -@@ -24,7 +24,7 @@ - "Project-Id-Version: kcmkurifilt\n" - "POT-Creation-Date: 2006-09-29 02:33+0200\n" - "PO-Revision-Date: 2005-10-28 19:15+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,28 +33,27 @@ - - #: filteropts.cpp:38 - msgid "Under construction..." --msgstr "建構中..." -+msgstr "建構中…" - - #: main.cpp:49 - msgid "" - "

                          Enhanced Browsing

                          In this module you can configure some enhanced " --"browsing features of KDE. " --"

                          Internet Keywords

                          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 \"KDE\" or \"K Desktop Environment\" in Konqueror to " --"go to KDE's homepage." --"

                          Web Shortcuts

                          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 " --"press Alt+F2 (if you have not changed this shortcut) and enter the shortcut in " --"the KDE Run Command dialog." -+"browsing features of KDE.

                          Internet Keywords

                          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 \"KDE\" or \"K Desktop " -+"Environment\" in Konqueror to go to KDE's homepage.

                          Web Shortcuts

                          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 press Alt+F2 (if you have not " -+"changed this shortcut) and enter the shortcut in the KDE Run Command dialog." - msgstr "" - "

                          加強型瀏覽

                          在這個模組你可以設定 KDE 的一些加強型瀏覽功能。 " --"

                          Internet 關鍵字

                          Internet 關鍵字讓你打商標，計劃，名人等等...名稱然後跳到相關的位置。 例如，你可以在 Konqueror " --"中只打 \"KDE\" 或 \"K Desktop Environment\" 來跳到 KDE 的首頁。" --"

                          網頁捷徑

                          網頁捷徑是一種使用網路搜尋引擎的快速方法。 例如，打 \"altavista:frobozz\" 或 \"av:frobozz\" " --"然後 Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易：只要按 Alt-F2 (假如你沒有改變這個捷徑) 然後在 " --"KDE 執行命令對話視窗輸入捷徑。" -+"

                          Internet 關鍵字

                          Internet 關鍵字讓你打商標，計劃，名人等等...名稱然後" -+"跳到相關的位置。 例如，你可以在 Konqueror 中只打 \"KDE\" 或 \"K Desktop " -+"Environment\" 來跳到 KDE 的首頁。

                          網頁捷徑

                          網頁捷徑是一種使用網路搜尋" -+"引擎的快速方法。 例如，打 \"altavista:frobozz\" 或 \"av:frobozz\" 然後 " -+"Konqueror 就會在 AltaVista 做 \"frobozz\" 搜尋。 甚至更容易：只要按 Alt-F2 " -+"(假如你沒有改變這個捷徑) 然後在 KDE 執行命令對話視窗輸入捷徑。" - - #: main.cpp:63 - msgid "&Filters" -@@ -71,14 +70,14 @@ - #, no-c-format - msgid "" - "\n" --"Enable shortcuts that allow you to quickly search for information on the web. " --"For example, entering the shortcut gg:KDE will result in a search of the " --"word KDE on the Google(TM) search engine.\n" -+"Enable shortcuts that allow you to quickly search for information on the " -+"web. For example, entering the shortcut gg:KDE will result in a " -+"search of the word KDE on the Google(TM) search engine.\n" - "" - msgstr "" - "\n" --"假如選取這個選項，KDE 會讓你快速的搜尋網際網路上的資訊。例如，輸入捷徑 gg:KDE 就會使用 Google(TM) 搜尋引擎來搜尋 " --"KDE 這個字。\n" -+"假如選取這個選項，KDE 會讓你快速的搜尋網際網路上的資訊。例如，輸入捷徑 gg:" -+"KDE 就會使用 Google(TM) 搜尋引擎來搜尋 KDE 這個字。\n" - "" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 56 -@@ -91,8 +90,8 @@ - #: rc.cpp:14 rc.cpp:66 - #, no-c-format - msgid "" --"Choose the delimiter that separates the keyword from the phrase or word to be " --"searched." -+"Choose the delimiter that separates the keyword from the phrase or word to " -+"be searched." - msgstr "選擇要搜尋的語詞或文字中用來分開關鍵字的符號。" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 81 -@@ -106,13 +105,14 @@ - #, no-c-format - msgid "" - "\n" --"Select the search engine to use for input boxes that provide automatic lookup " --"services when you type in normal words and phrases instead of a URL. To disable " --"this feature select None from the list.\n" -+"Select the search engine to use for input boxes that provide automatic " -+"lookup services when you type in normal words and phrases instead of a URL. " -+"To disable this feature select None from the list.\n" - "" - msgstr "" - "\n" --"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請在此列表中選擇 無。\n" -+"選擇當您在輸入方塊中鍵入單字或語詞而非網址時用來搜尋的引擎。要停用這個功能請" -+"在此列表中選擇 無。\n" - "" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 95 -@@ -125,7 +125,7 @@ - #: rc.cpp:33 - #, no-c-format - msgid "Chan&ge..." --msgstr "更改(&G)..." -+msgstr "更改(&G)…" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 126 - #: rc.cpp:36 -@@ -149,7 +149,7 @@ - #: rc.cpp:45 - #, no-c-format - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 151 - #: rc.cpp:48 -@@ -173,8 +173,8 @@ - #: rc.cpp:57 - #, no-c-format - msgid "" --"List of search providers, their associated shortcuts and whether they shall be " --"listed in menus." -+"List of search providers, their associated shortcuts and whether they shall " -+"be listed in menus." - msgstr "這個清單包含了搜尋提供者和它們相關的捷徑以及是否要在選單中列出它們。" - - #. i18n: file plugins/ikws/ikwsopts_ui.ui line 221 -@@ -218,32 +218,29 @@ - #, no-c-format - msgid "" - "\n" --"Enter the URI that is used to do a search on the search engine here." --"
                          The whole text to be searched for can be specified as \\{@} or \\{0}." --"
                          \n" -+"Enter the URI that is used to do a search on the search engine here.
                          The " -+"whole text to be searched for can be specified as \\{@} or \\{0}.
                          \n" - "Recommended is \\{@}, since it removes all query variables (name=value) from " - "the resulting string whereas \\{0} will be substituted with the unmodified " --"query string." --"
                          You can use \\{1} ... \\{n} to specify certain words from the query and " --"\\{name} to specify a value given by 'name=value' in the user query." --"
                          In addition it is possible to specify multiple references (names, numbers " --"and strings) at once (\\{name1,name2,...,\"string\"})." --"
                          The first matching value (from the left) will be used as substitution " --"value for the resulting URI." --"
                          A quoted string can be used as default value if nothing matches from the " --"left of the reference list.\n" -+"query string.
                          You can use \\{1} ... \\{n} to specify certain words from " -+"the query and \\{name} to specify a value given by 'name=value' in the user " -+"query.
                          In addition it is possible to specify multiple references (names, " -+"numbers and strings) at once (\\{name1,name2,...,\"string\"}).
                          The first " -+"matching value (from the left) will be used as substitution value for the " -+"resulting URI.
                          A quoted string can be used as default value if nothing " -+"matches from the left of the reference list.\n" - "                          " - msgstr "" - "\n" --"在這裡輸入一個 URI 以進行搜尋引擎搜尋。" --"
                          使用整個字串進行搜尋時，可以使用 \\{@} 或 \\{0} 來進行。" --"
                          \n" --"我們建議您最好是使用 \\{@}，因為它會從結果字串中移除所有查詢變數 (name=value) 而 \\{0} 則會使用未修改的查詢字串。" --"
                          您可以使用 \\{1} ... \\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 'name=value'。" --"
                          另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參考 (names, numbers and " --"strings)。" --"
                          第一個符合的數值(從左數來)會做為結果 URI 的數值。" --"
                          如果從參考列表中找不到符合項目，用引號框起來的數值也可以做為預設數值。\n" -+"在這裡輸入一個 URI 以進行搜尋引擎搜尋。
                          使用整個字串進行搜尋時，可以使用 " -+"\\{@} 或 \\{0} 來進行。
                          \n" -+"我們建議您最好是使用 \\{@}，因為它會從結果字串中移除所有查詢變數 " -+"(name=value) 而 \\{0} 則會使用未修改的查詢字串。
                          您可以使用 \\{1} ... " -+"\\{n} 來從查詢中指定某個字或 \\{name} 來在使用者查詢中指定特定數值的 " -+"'name=value'。
                          另外也可以一次 (\\{name1,name2,...,\"string\"}) 指定多個參" -+"考 (names, numbers and strings)。
                          第一個符合的數值(從左數來)會做為結果 " -+"URI 的數值。
                          如果從參考列表中找不到符合項目，用引號框起來的數值也可以做為" -+"預設數值。\n" - "                          " - - #. i18n: file plugins/ikws/searchproviderdlg_ui.ui line 66 -@@ -258,12 +255,13 @@ - msgid "" - "\n" - "The shortcuts entered here can be used as a pseudo-URI scheme in KDE. For " --"example, the shortcut av can be used as in av:my search\n" -+"example, the shortcut av can be used as in av:my search\n" - "" - msgstr "" - "\n" --"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如，捷徑 av 可被用來當作在 av" --":my search\n" -+"在這裡輸入的捷徑可被用來當作在 KDE 的 pseudo-URI scheme。 例如，捷徑 av 可被用來當作在 av:my search\n" - "" - - #. i18n: file plugins/ikws/searchproviderdlg_ui.ui line 90 -@@ -280,17 +278,19 @@ - - #: plugins/ikws/ikwsopts.cpp:96 - msgid "" --"In this module you can configure the web shortcuts feature. Web shortcuts allow " --"you to quickly search or lookup words on the Internet. For example, to search " --"for information about the KDE project using the Google engine, you simply type " --"gg:KDE or google:KDE." --"

                          If you select a default search engine, normal words or phrases will be " --"looked up at the specified search engine by simply typing them into " --"applications, such as Konqueror, that have built-in support for such a feature." -+"In this module you can configure the web shortcuts feature. Web shortcuts " -+"allow you to quickly search or lookup words on the Internet. For example, to " -+"search for information about the KDE project using the Google engine, you " -+"simply type gg:KDE or google:KDE.

                          If you select a default " -+"search engine, normal words or phrases will be looked up at the specified " -+"search engine by simply typing them into applications, such as Konqueror, " -+"that have built-in support for such a feature." - msgstr "" --"在這個模組中您可以設定網頁捷徑功能。網頁捷徑讓您可以快速的在網際網路上搜尋或查詢單字。例如：要使用 Google 引擎搜尋關於 KDE 計畫的資訊，您只要輸入 " --"gg:KDE 或 google:KDE。" --"

                          如果您選擇預設的搜尋引擎，一般的文字或語詞會在指定的搜尋引擎中查詢，只要將它們鍵入有內建此項功能的應用程式，像是 Konqueror。" -+"在這個模組中您可以設定網頁捷徑功能。網頁捷徑讓您可以快速的在網際網路上搜尋或" -+"查詢單字。例如：要使用 Google 引擎搜尋關於 KDE 計畫的資訊，您只要輸入 gg:" -+"KDE 或 google:KDE。

                          如果您選擇預設的搜尋引擎，一般的文字或語詞會" -+"在指定的搜尋引擎中查詢，只要將它們鍵入有內建此項功能的應用程式，像是 " -+"Konqueror。" - - #: plugins/ikws/kurisearchfilter.cpp:87 - msgid "Search F&ilters" -@@ -307,8 +307,8 @@ - #: plugins/ikws/searchproviderdlg.cpp:86 - msgid "" - "The URI does not contain a \\{...} placeholder for the user query.\n" --"This means that the same page is always going to be visited, regardless of what " --"the user types." -+"This means that the same page is always going to be visited, regardless of " -+"what the user types." - msgstr "" - "URI 不包含一個 \\{...} 佔位符給使用者查詢。\n" - "這表示相同的網頁一直被瀏覽，而不管使用者打什麼。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwindecoration.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwindecoration.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwindecoration.po 2005-11-09 07:38:42.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwindecoration.po 2011-11-11 15:45:17.000000000 +0100 -@@ -18,7 +18,7 @@ - "Project-Id-Version: kcmkwindecoration\n" - "POT-Creation-Date: 2005-10-28 02:43+0200\n" - "PO-Revision-Date: 2005-08-12 16:25+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -51,12 +51,13 @@ - - #: buttons.cpp:683 - msgid "" --"To add or remove titlebar buttons, simply drag " --"items between the available item list and the titlebar preview. Similarly, drag " --"items within the titlebar preview to re-position them." -+"To add or remove titlebar buttons, simply drag items between the " -+"available item list and the titlebar preview. Similarly, drag items within " -+"the titlebar preview to re-position them." - msgstr "" --"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中拉拉拉拉... 拉過來放著預覽即可. 若是你打算移動他們的順序, " --"也可以用相同的招數來搞定他們." -+"若要增加或是移除標題列按鍵, 只要將你打算處理的小按鍵們從列表中拉拉拉拉... " -+"拉過來放著預覽即可. 若是你打算移動他們的順序, 也可以用相同的招數來搞定他" -+"們." - - #: buttons.cpp:780 - msgid "Resize" -@@ -120,7 +121,9 @@ - msgid "" - "Enabling this checkbox will show window button tooltips. If this checkbox is " - "off, no window button tooltips will be shown." --msgstr "若是選取此功能，將會顯示視窗按鍵的小提示。當然如果你沒有選取這個功能，不會有任何的視窗按鍵小提示出現。" -+msgstr "" -+"若是選取此功能，將會顯示視窗按鍵的小提示。當然如果你沒有選取這個功能，不會有" -+"任何的視窗按鍵小提示出現。" - - #: kwindecoration.cpp:130 - msgid "Use custom titlebar button &positions" -@@ -128,9 +131,11 @@ - - #: kwindecoration.cpp:132 - msgid "" --"The appropriate settings can be found in the \"Buttons\" Tab; please note that " --"this option is not available on all styles yet." --msgstr "這些設定將可以在「按鈕」標籤那裡找到；請注意目前暫時 在任何樣式中都沒有可以設定的選項 。" -+"The appropriate settings can be found in the \"Buttons\" Tab; please note " -+"that this option is not available on all styles yet." -+msgstr "" -+"這些設定將可以在「按鈕」標籤那裡找到；請注意目前暫時 在任何樣式中都沒有可以設" -+"定的選項 。" - - #: kwindecoration.cpp:163 - msgid "&Window Decoration" -@@ -186,23 +191,23 @@ - - #: kwindecoration.cpp:591 - msgid "" --"

                          Window Manager Decoration

                          " --"

                          This module allows you to choose the window border decorations, as well as " --"titlebar button positions and custom decoration options.

                          " --"To choose a theme for your window decoration click on its name and apply your " --"choice by clicking the \"Apply\" button below. If you do not want to apply your " --"choice you can click the \"Reset\" button to discard your changes." --"

                          You can configure each theme in the \"Configure [...]\" tab. There are " --"different options specific for each theme.

                          " --"

                          In \"General Options (if available)\" you can activate the \"Buttons\" tab " --"by checking the \"Use custom titlebar button positions\" box. In the " --"\"Buttons\" tab you can change the positions of the buttons to your liking.

                          " -+"

                          Window Manager Decoration

                          This module allows you to choose the " -+"window border decorations, as well as titlebar button positions and custom " -+"decoration options.

                          To choose a theme for your window decoration click on " -+"its name and apply your choice by clicking the \"Apply\" button below. If " -+"you do not want to apply your choice you can click the \"Reset\" button to " -+"discard your changes.

                          You can configure each theme in the \"Configure [...]" -+"\" tab. There are different options specific for each theme.

                          In " -+"\"General Options (if available)\" you can activate the \"Buttons\" tab by " -+"checking the \"Use custom titlebar button positions\" box. In the \"Buttons" -+"\" tab you can change the positions of the buttons to your liking.

                          " - msgstr "" --"

                          視窗管理程式裝飾

                          " --"

                          這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位置和自訂裝飾選項。

                          要為您的視窗裝飾選擇主題，按下它的名稱並且按下方的「套用」按鈕來套用您的選擇。如" --"果您不想套用您的選擇，您可以按「重設」按鈕來放棄您的改變。" --"

                          您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選項。

                          " --"

                          在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。

                          " -+"

                          視窗管理程式裝飾

                          這個模組讓您可以選擇視窗邊框的裝飾、標題列按鈕位" -+"置和自訂裝飾選項。

                          要為您的視窗裝飾選擇主題，按下它的名稱並且按下方的「套" -+"用」按鈕來套用您的選擇。如果您不想套用您的選擇，您可以按「重設」按鈕來放棄您" -+"的改變。

                          您可以在「設定 [...]」分頁中設定每一個主題。那裡有各個主題的不同選" -+"項。

                          在「一般選項(如果可用)」中您可以核取「使用自訂標題按鈕位置」方塊來" -+"使用「按鈕」分頁。在「按鈕」分頁中您可以依您的喜好改變按鈕的位置。

                          " - - #: preview.cpp:48 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwinrules.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwinrules.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwinrules.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwinrules.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kcmkwinrules\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-08-14 14:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -107,13 +106,14 @@ - #: kcm.cpp:81 - msgid "" - "

                          Window-specific Settings

                          Here you can customize window settings " --"specifically only for some windows. " --"

                          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 " --"refer to its documentation for how to customize window behavior." -+"specifically only for some windows.

                          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 refer to its documentation for how " -+"to customize window behavior." - msgstr "" --"

                          特定視窗設定配置模組

                          在這裏您可以自行設定特定視窗的一些設定。" --"

                          請注意若您不是使用 KWin 作視窗管理器，這些設定不會生效。如果您正在使用其他的視窗管理器，請參考它的文件。" -+"

                          特定視窗設定配置模組

                          在這裏您可以自行設定特定視窗的一些設定。

                          請注" -+"意若您不是使用 KWin 作視窗管理器，這些設定不會生效。如果您正在使用其他的視窗" -+"管理器，請參考它的文件。" - - #: kcm.cpp:97 - msgid "Remember settings separately for every window" -@@ -201,8 +201,8 @@ - #: rc.cpp:27 - #, no-c-format - msgid "" --"For selecting all windows belonging to a specific application, selecting only " --"window class should usually work." -+"For selecting all windows belonging to a specific application, selecting " -+"only window class should usually work." - msgstr "要選擇特定應用程式的所有視窗，只需選擇一個視窗類別就行了。" - - #. i18n: file detectwidgetbase.ui line 187 -@@ -215,13 +215,14 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"For selecting a specific window in an application, both window class and window " --"role should be selected. Window class will determine the application, and " --"window role the specific window in the application; many applications do not " --"provide useful window roles though." -+"For selecting a specific window in an application, both window class and " -+"window role should be selected. Window class will determine the application, " -+"and window role the specific window in the application; many applications do " -+"not provide useful window roles though." - msgstr "" --"要選擇應用程式中某個視窗，您需要一併選擇視窗類別和視窗角色。視窗類別會判別是哪個應用程式，而視窗角色則會判別是當中的哪一個視窗。不過，很多應用程式都沒有提供有用" --"的視窗角色。" -+"要選擇應用程式中某個視窗，您需要一併選擇視窗類別和視窗角色。視窗類別會判別是" -+"哪個應用程式，而視窗角色則會判別是當中的哪一個視窗。不過，很多應用程式都沒有" -+"提供有用的視窗角色。" - - #. i18n: file detectwidgetbase.ui line 198 - #: rc.cpp:36 -@@ -234,9 +235,11 @@ - #, no-c-format - msgid "" - "With some (non-KDE) applications whole window class can be sufficient for " --"selecting a specific window in an application, as they set whole window class " --"to contain both application and window role." --msgstr "一些(非KDE)應用程式只需使用整個視窗類別就足夠了。因為它們可以設定整個視窗類別來一併包含應用程式和視窗角色。" -+"selecting a specific window in an application, as they set whole window " -+"class to contain both application and window role." -+msgstr "" -+"一些(非KDE)應用程式只需使用整個視窗類別就足夠了。因為它們可以設定整個視窗類別" -+"來一併包含應用程式和視窗角色。" - - #. i18n: file detectwidgetbase.ui line 209 - #: rc.cpp:42 -@@ -248,24 +251,22 @@ - #: rc.cpp:45 - #, no-c-format - msgid "" --"A single shortcut can be easily assigned or cleared using the two buttons. Only " --"shortcuts with modifiers can be used." --"

                          \n" -+"A single shortcut can be easily assigned or cleared using the two buttons. " -+"Only shortcuts with modifiers can be used.

                          \n" - "It is possible to have several possible shortcuts, and the first available " - "shortcut will be used. The shortcuts are specified using space-separated " --"shortcut sets. One set is specified as base+(list" --"), where base are modifiers and list is a list of keys." --"
                          \n" --"For example \"Shift+Alt+(123) Shift+Ctrl+(ABC)\" will first try " --"Shift+Alt+1, then others with Shift+Ctrl+C as the last one." -+"shortcut sets. One set is specified as base+(list), where base " -+"are modifiers and list is a list of keys.
                          \n" -+"For example \"Shift+Alt+(123) Shift+Ctrl+(ABC)\" will first try " -+"Shift+Alt+1, then others with Shift+Ctrl+C as the last one." - msgstr "" --"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才可使用。" --"

                          \n" --"系統是可以對單一快捷鍵指定多個按鈕組合的，但只有最先可用的一個會生效。而每組快捷鍵的在指定時要以空白分隔。格式為：修飾鍵+(按鈕組合" --")。" --"
                          \n" --"例如 \"Shift+Alt+(123) Shift+Ctrl+(ABC)\"，會把先試一下Shift+Alt+1，不可用就試" --"Shift+Alt+2...如此類推，最後是Shift+Alt+C。當中可用的一個會用作該單一快捷鍵。" -+"您可以很容易地使用這兩個按鈕來加入/清除一組單快捷鍵。只有附上修飾鍵的快捷鍵才" -+"可使用。

                          \n" -+"系統是可以對單一快捷鍵指定多個按鈕組合的，但只有最先可用的一個會生效。而每組" -+"快捷鍵的在指定時要以空白分隔。格式為：修飾鍵+(按鈕組合)。
                          \n" -+"例如 \"Shift+Alt+(123) Shift+Ctrl+(ABC)\"，會把先試一下Shift+Alt" -+"+1，不可用就試Shift+Alt+2...如此類推，最後是Shift+Alt+C。當" -+"中可用的一個會用作該單一快捷鍵。" - - #. i18n: file editshortcutbase.ui line 81 - #: rc.cpp:50 -@@ -283,13 +284,13 @@ - #: rc.cpp:56 - #, no-c-format - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #. i18n: file ruleslistbase.ui line 40 - #: rc.cpp:59 - #, no-c-format - msgid "&Modify..." --msgstr "修改(&M)..." -+msgstr "修改(&M)…" - - #. i18n: file ruleslistbase.ui line 59 - #: rc.cpp:65 -@@ -643,7 +644,7 @@ - #: rc.cpp:614 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file ruleswidgetbase.ui line 1937 - #: rc.cpp:617 -@@ -743,57 +744,50 @@ - - #: ruleswidget.cpp:55 - msgid "" --"Enable this checkbox to alter this window property for the specified window(s)." -+"Enable this checkbox to alter this window property for the specified window" -+"(s)." - msgstr "開啟這個選項來改變這個視窗屬性(可用於多個指定的視窗)。" - - #: ruleswidget.cpp:57 - msgid "" --"Specify how the window property should be affected:" --"

                            " --"
                          • Do Not Affect: The window property will not be affected and " --"therefore the default handling for it will be used. Specifying this will block " --"more generic window settings from taking effect.
                            • " --"
                          • Apply Initially: The window property will be only set to the given " --"value after the window is created. No further changes will be affected.
                            • " --"
                          • Remember: The value of the window property will be remembered and " --"every time time the window is created, the last remembered value will be " --"applied.
                            • " --"
                          • Force: The window property will be always forced to the given " --"value.
                            • " --"
                          • Apply Now: The window property will be set to the given value " --"immediately and will not be affected later (this action will be deleted " --"afterwards).
                            • " --"
                          • Force temporarily: The window property will be forced to the given " --"value until it is hidden (this action will be deleted after the window is " --"hidden).
                          " -+"Specify how the window property should be affected:
                          • Do Not Affect:" -+" The window property will not be affected and therefore the default " -+"handling for it will be used. Specifying this will block more generic window " -+"settings from taking effect.
                          • Apply Initially: The window " -+"property will be only set to the given value after the window is created. No " -+"further changes will be affected.
                          • Remember: The value of " -+"the window property will be remembered and every time time the window is " -+"created, the last remembered value will be applied.
                          • Force: " -+"The window property will be always forced to the given value.
                          • Apply Now: The window property will be set to the given " -+"value immediately and will not be affected later (this action will be " -+"deleted afterwards).
                          • Force temporarily: The window property " -+"will be forced to the given value until it is hidden (this action will be " -+"deleted after the window is hidden).
                          " - msgstr "" --"指定視窗屬性會如何被影響：" --"
                            " --"
                          • 不影響：視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。
                            • " --"
                          • 初始化套用：視窗屬性只會在視窗被建立時設成指定值，不會再有其他變更會影響到。
                            • " --"
                          • 記住：上一次的變更會被記住。每一次視窗被建立時，記住的設定就會被套用。
                            • " --"
                          • 強制：視窗屬性何時都會強制設成該值。
                            • " --"
                          • 立刻生效：視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪除)。
                            • " --"
                          • 暫時強制：視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)
                          " -+"指定視窗屬性會如何被影響：
                          • 不影響：視窗屬性不會被影響。會使用" -+"預設的處理。指定作此值會禁止更多通用的設定生效。
                          • 初始化套用：視窗屬性只會在視窗被建立時設成指定值，不會再有其他變更會影響到。
                          • 記住：上一次的變更會被記住。每一次視窗被建立時，記住的設定就" -+"會被套用。
                          • 強制：視窗屬性何時都會強制設成該值。
                          • " -+"立刻生效：視窗屬性會立刻設成指定值。不過稍後就會無效(這個動作之後會被刪" -+"除)。
                          • 暫時強制：視窗屬性會被強制設成該值直至它被隱藏。(這個" -+"動作在隱藏後會被刪除)
                          " - - #: ruleswidget.cpp:72 - msgid "" --"Specify how the window property should be affected:" --"
                            " --"
                          • Do Not Affect: The window property will not be affected and " --"therefore the default handling for it will be used. Specifying this will block " --"more generic window settings from taking effect.
                            • " --"
                          • Force: The window property will be always forced to the given " --"value.
                            • " --"
                          • Force temporarily: The window property will be forced to the given " --"value until it is hidden (this action will be deleted after the window is " --"hidden).
                          " -+"Specify how the window property should be affected:
                          • Do Not Affect:" -+" The window property will not be affected and therefore the default " -+"handling for it will be used. Specifying this will block more generic window " -+"settings from taking effect.
                          • Force: The window property " -+"will be always forced to the given value.
                          • Force temporarily: The window property will be forced to the given value until it is hidden " -+"(this action will be deleted after the window is hidden).
                          " - msgstr "" --"指定視窗屬性會如何被影響：" --"
                            " --"
                          • 不影響：視窗屬性不會被影響。會使用預設的處理。指定作此值會禁止更多通用的設定生效。
                            • " --"
                          • 強制：視窗屬性何時都會強制設成該值。
                            • " --"
                          • 暫時強制：視窗屬性會被強制設成該值直至它被隱藏。(這個動作在隱藏後會被刪除)
                          " -+"指定視窗屬性會如何被影響：
                          • 不影響：視窗屬性不會被影響。會使用" -+"預設的處理。指定作此值會禁止更多通用的設定生效。
                          • 強制：視窗" -+"屬性何時都會強制設成該值。
                          • 暫時強制：視窗屬性會被強制設成該" -+"值直至它被隱藏。(這個動作在隱藏後會被刪除)
                          " - - #: ruleswidget.cpp:117 - msgid "All Desktops" -@@ -811,12 +805,14 @@ - #: ruleswidget.cpp:665 - msgid "" - "You have specified the window class as unimportant.\n" --"This means the settings will possibly apply to windows from all applications. " --"If you really want to create a generic setting, it is recommended you at least " --"limit the window types to avoid special window types." -+"This means the settings will possibly apply to windows from all " -+"applications. If you really want to create a generic setting, it is " -+"recommended you at least limit the window types to avoid special window " -+"types." - msgstr "" - "您已指定視窗類別為'不重要'。\n" --"這表示這個設定會套用至所有應用程式的所有視窗。如果您是希望這樣做來建立一個通用設定，我們建議您至少要限制視窗類型，來避免特殊的視窗類型。" -+"這表示這個設定會套用至所有應用程式的所有視窗。如果您是希望這樣做來建立一個通" -+"用設定，我們建議您至少要限制視窗類型，來避免特殊的視窗類型。" - - #: ruleswidget.cpp:690 - msgid "Edit Window-Specific Settings" -@@ -824,12 +820,13 @@ - - #: ruleswidget.cpp:713 - msgid "" --"This configuration dialog allows altering settings only for the selected window " --"or application. Find the setting you want to affect, enable the setting using " --"the checkbox, select in what way the setting should be affected and to which " --"value." -+"This configuration dialog allows altering settings only for the selected " -+"window or application. Find the setting you want to affect, enable the " -+"setting using the checkbox, select in what way the setting should be " -+"affected and to which value." - msgstr "" --"這個組態對話盒允許只針對選擇的視窗或應用程式的特別設定。找到您想用的設定值，使用核取方塊啟用此設定值，選擇設定值要以何種方式生效、要影響哪個數值。" -+"這個組態對話盒允許只針對選擇的視窗或應用程式的特別設定。找到您想用的設定值，" -+"使用核取方塊啟用此設定值，選擇設定值要以何種方式生效、要影響哪個數值。" - - #: ruleswidget.cpp:717 - msgid "Consult the documentation for more details." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwm.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwm.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmkwm.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmkwm.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcmkwm\n" - "POT-Creation-Date: 2006-04-11 03:54+0200\n" - "PO-Revision-Date: 2006-06-19 09:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -65,14 +64,16 @@ - #: main.cpp:190 - msgid "" - "

                          Window Behavior

                          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. " --"

                          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 " --"refer to its documentation for how to customize window behavior." -+"being moved, resized or clicked on. You can also specify a focus policy as " -+"well as a placement policy for new windows.

                          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 refer to its " -+"documentation for how to customize window behavior." - msgstr "" --"

                          視窗行為

                          在這裡你可以自定當視窗被移動，改變大小或按下時視窗的行為。你也可以指定焦點策略和新視窗的配置策略。" --"

                          請注意假如你不是使用 KWin 當作你的視窗管理員，這個設定將不會產生作用。假如你使用其他的視窗管理員，請參考它的文件來看如何自定視窗行為。" -+"

                          視窗行為

                          在這裡你可以自定當視窗被移動，改變大小或按下時視窗的行為。" -+"你也可以指定焦點策略和新視窗的配置策略。

                          請注意假如你不是使用 KWin 當作你的" -+"視窗管理員，這個設定將不會產生作用。假如你使用其他的視窗管理員，請參考它的文" -+"件來看如何自定視窗行為。" - - #: mouse.cpp:152 - msgid "&Titlebar double-click:" -@@ -199,8 +200,8 @@ - - #: mouse.cpp:239 - msgid "" --"In this column you can customize mouse clicks into the titlebar or the frame of " --"an active window." -+"In this column you can customize mouse clicks into the titlebar or the frame " -+"of an active window." - msgstr "在這一欄你可以自定滑鼠在作用中的視窗標題列或邊框上按下的功能。" - - #: mouse.cpp:244 mouse.cpp:265 mouse.cpp:305 mouse.cpp:732 -@@ -217,32 +218,32 @@ - - #: mouse.cpp:252 - msgid "" --"Behavior on left click into the titlebar or frame of an active " --"window." -+"Behavior on left click into the titlebar or frame of an active window." - msgstr "在作用中的視窗標題列或邊框上按下滑鼠左鍵的行為。" - - #: mouse.cpp:255 - msgid "" --"Behavior on right click into the titlebar or frame of an " --"active window." -+"Behavior on right click into the titlebar or frame of an " -+"active window." - msgstr "在作用中的視窗標題列或邊框上按下滑鼠右鍵的行為。" - - #: mouse.cpp:276 - msgid "" --"Behavior on middle click into the titlebar or frame of an " --"active window." -+"Behavior on middle click into the titlebar or frame of an " -+"active window." - msgstr "在作用中的視窗標題列或邊框上按下滑鼠中鍵的行為。" - - #: mouse.cpp:285 - msgid "" --"Behavior on left click into the titlebar or frame of an " --"inactive window." -+"Behavior on left click into the titlebar or frame of an " -+"inactive window." - msgstr "在非作用中的視窗標題列或邊框上按下滑鼠左鍵的行為。" - - #: mouse.cpp:288 - msgid "" --"Behavior on right click into the titlebar or frame of an " --"inactive window." -+"Behavior on right click into the titlebar or frame of an " -+"inactive window." - msgstr "在非作用中的視窗標題列或邊框上按下滑鼠右鍵的行為。" - - #: mouse.cpp:294 -@@ -251,8 +252,8 @@ - - #: mouse.cpp:296 - msgid "" --"In this column you can customize mouse clicks into the titlebar or the frame of " --"an inactive window." -+"In this column you can customize mouse clicks into the titlebar or the frame " -+"of an inactive window." - msgstr "在這一欄你可以自定滑鼠在非作用中的視窗標題列或邊框上按下的功能。" - - #: mouse.cpp:300 mouse.cpp:649 -@@ -269,8 +270,8 @@ - - #: mouse.cpp:319 - msgid "" --"Behavior on middle click into the titlebar or frame of an " --"inactive window." -+"Behavior on middle click into the titlebar or frame of an " -+"inactive window." - msgstr "在非作用中的視窗標題列或邊框上按下滑鼠中鍵的行為。" - - #: mouse.cpp:329 -@@ -299,27 +300,35 @@ - - #: mouse.cpp:606 - msgid "" --"Here you can customize mouse click behavior when clicking on an inactive inner " --"window ('inner' means: not titlebar, not frame)." --msgstr "在這裡你可以自定當滑鼠在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。" -+"Here you can customize mouse click behavior when clicking on an inactive " -+"inner window ('inner' means: not titlebar, not frame)." -+msgstr "" -+"在這裡你可以自定當滑鼠在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非" -+"邊框)。" - - #: mouse.cpp:625 - msgid "" - "In this row you can customize left click behavior when clicking into an " - "inactive inner window ('inner' means: not titlebar, not frame)." --msgstr "在這一列你可以自定當左鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。" -+msgstr "" -+"在這一列你可以自定當左鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列," -+"非邊框)。" - - #: mouse.cpp:628 - msgid "" - "In this row you can customize right click behavior when clicking into an " - "inactive inner window ('inner' means: not titlebar, not frame)." --msgstr "在這一列你可以自定當右鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。" -+msgstr "" -+"在這一列你可以自定當右鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列," -+"非邊框)。" - - #: mouse.cpp:638 - msgid "" - "In this row you can customize middle click behavior when clicking into an " - "inactive inner window ('inner' means: not titlebar, not frame)." --msgstr "在這一列你可以自定當中鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列,非邊框)。" -+msgstr "" -+"在這一列你可以自定當中鍵在非作用中的內部視窗按下的行為('內部'代表: 非標題列," -+"非邊框)。" - - #: mouse.cpp:646 - msgid "Activate, Raise & Pass Click" -@@ -363,8 +372,8 @@ - - #: mouse.cpp:707 - msgid "" --"Here you can customize KDE's behavior when middle clicking into a window while " --"pressing the modifier key." -+"Here you can customize KDE's behavior when middle clicking into a window " -+"while pressing the modifier key." - msgstr "在這裡你可以自定當 [按住 ALT 鍵 + 視窗上按下中鍵] 時 KDE 的行為。" - - #: mouse.cpp:714 -@@ -373,8 +382,8 @@ - - #: mouse.cpp:715 - msgid "" --"Here you can customize KDE's behavior when scrolling with the mouse wheel in a " --"window while pressing the modifier key." -+"Here you can customize KDE's behavior when scrolling with the mouse wheel " -+"in a window while pressing the modifier key." - msgstr "在這裡你可以自定 [同時按住輔助鍵並使用滑鼠滾輪] 時 KDE 的行為。" - - #: mouse.cpp:721 -@@ -420,31 +429,30 @@ - #: windows.cpp:140 - msgid "" - "The focus policy is used to determine the active window, i.e. the window you " --"can work in. " --"

                            " --"
                          • Click to focus: A window becomes active when you click into it. " --"This is the behavior you might know from other operating systems.
                            • " --"
                          • Focus follows mouse: Moving the mouse pointer actively on to a " --"normal window activates it. New windows will receive the focus, without you " --"having to point the mouse at them explicitly. Very practical if you are using " --"the mouse a lot.
                            • " --"
                          • Focus under mouse: The window that happens to be under the mouse " --"pointer is active. If the mouse points nowhere, the last window that was under " --"the mouse has focus. New windows will not automatically receive the focus.
                            • " --"
                          • Focus strictly under mouse: Only the window under the mouse " --"pointer is active. If the mouse points nowhere, nothing has focus.
                          " --"Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent certain " --"features such as the Alt+Tab walk through windows dialog in the KDE mode from " --"working properly." --msgstr "" --"焦點策略用來決定作用視窗，換句話說就是你工作的視窗。 " --"
                            " --"
                          • 按鍵取得焦點： 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系統看過。
                            • " --"
                          • 焦點隨滑鼠移動： " --"只要移動滑鼠游標到一個正常視窗上它就會作用。新視窗會收到焦點，不需要您很明確的指向它們。這相當有用，假如你常用滑鼠。
                            • " --"
                          • 焦點在滑鼠之下：在滑鼠下的視窗變成作用中。假如滑鼠游標那兒都不在，焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。
                            • " --"
                          • 焦點完全地在滑鼠之下：只有在滑鼠游標下的視窗是作用的。假如滑鼠游標那兒都不在，則沒有東西有焦點。
                          " --"請注意 [焦點在滑鼠之下] 和 [焦點完全地在滑鼠之下] 會使某些功能失效，如在 KDE 模式中以 Alt+Tab 來切換視窗對話盒。" -+"can work in.
                          • Click to focus: A window becomes active when " -+"you click into it. This is the behavior you might know from other operating " -+"systems.
                          • Focus follows mouse: Moving the mouse pointer " -+"actively on to a normal window activates it. New windows will receive the " -+"focus, without you having to point the mouse at them explicitly. Very " -+"practical if you are using the mouse a lot.
                          • Focus under mouse: The window that happens to be under the mouse pointer is active. If the " -+"mouse points nowhere, the last window that was under the mouse has focus. " -+"New windows will not automatically receive the focus.
                          • Focus " -+"strictly under mouse: Only the window under the mouse pointer is " -+"active. If the mouse points nowhere, nothing has focus.
                          Note that " -+"'Focus under mouse' and 'Focus strictly under mouse' prevent certain " -+"features such as the Alt+Tab walk through windows dialog in the KDE mode " -+"from working properly." -+msgstr "" -+"焦點策略用來決定作用視窗，換句話說就是你工作的視窗。
                          • 按鍵取得焦" -+"點： 當你在它上面點選使得視窗變成作用中視窗。這種方式你可能在其他作業系" -+"統看過。
                          • 焦點隨滑鼠移動： 只要移動滑鼠游標到一個正常視窗上它" -+"就會作用。新視窗會收到焦點，不需要您很明確的指向它們。這相當有用，假如你常用" -+"滑鼠。
                          • 焦點在滑鼠之下：在滑鼠下的視窗變成作用中。假如滑鼠游" -+"標那兒都不在，焦點會在游標最後經過的視窗上。新視窗不會自動收到焦點。
                            • " -+"
                          • 焦點完全地在滑鼠之下：只有在滑鼠游標下的視窗是作用的。假如滑鼠游" -+"標那兒都不在，則沒有東西有焦點。
                          請注意 [焦點在滑鼠之下] 和 [焦點完全地" -+"在滑鼠之下] 會使某些功能失效，如在 KDE 模式中以 Alt+Tab 來切換視窗對話盒。" - - #: windows.cpp:165 - msgid "Auto &raise" -@@ -468,9 +476,11 @@ - - #: windows.cpp:196 - 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 "假如 [自動前景] 啟動，當滑鼠游標停在上面一會兒，在背景的視窗會自動跑到前景來。" -+"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 - msgid "" -@@ -483,13 +493,17 @@ - "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 "當此選項啟用，你按在視窗內容上時，作用中視窗自動被帶到前面來。要將它變更為非作用中視窗，您需要改變「動作」分頁中的設定。" -+msgstr "" -+"當此選項啟用，你按在視窗內容上時，作用中視窗自動被帶到前面來。要將它變更為非" -+"作用中視窗，您需要改變「動作」分頁中的設定。" - - #: windows.cpp:207 - 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 "當啟用此選項，滑鼠游標停在視窗上超過這個延遲時間，視窗會變成作用中（取得焦點）。" -+"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 - msgid "" -@@ -508,20 +522,24 @@ - #: windows.cpp:221 - 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" -+"windows on the current desktop (the Alt+Tab combination can be " -+"reconfigured).\n" - "\n" - "If this checkbox is checked a popup widget is shown, displaying the icons of " - "all windows to walk through and the title of the currently selected one.\n" - "\n" --"Otherwise, the focus is passed to a new window each time Tab is pressed, with " --"no popup widget. In addition, the previously activated window will be sent to " --"the back in this mode." -+"Otherwise, the focus is passed to a new window each time Tab is pressed, " -+"with no popup widget. In addition, the previously activated window will be " -+"sent to the back in this mode." - msgstr "" --"保持 Alt 鍵按住並且重覆按 Tab 鍵來在目前桌面的所有視窗間切換（Alt+Tab 的組合可以自行設定）。\n" -+"保持 Alt 鍵按住並且重覆按 Tab 鍵來在目前桌面的所有視窗間切換（Alt+Tab 的組合" -+"可以自行設定）。\n" - "\n" --"如果核取此方塊則會出現彈出式元件， 顯示所有視窗的圖示來切換和目前選擇的標題。\n" -+"如果核取此方塊則會出現彈出式元件， 顯示所有視窗的圖示來切換和目前選擇的標" -+"題。\n" - "\n" --"否則，焦點會隨著每一次 Tab 按下傳到新的視窗。沒有彈出式元件。此外，在此模式中前一個作用中視窗會被送到後方。" -+"否則，焦點會隨著每一次 Tab 按下傳到新的視窗。沒有彈出式元件。此外，在此模式中" -+"前一個作用中視窗會被送到後方。" - - #: windows.cpp:233 - msgid "&Traverse windows on all desktops" -@@ -529,8 +547,8 @@ - - #: windows.cpp:236 - msgid "" --"Leave this option disabled if you want to limit walking through windows to the " --"current desktop." -+"Leave this option disabled if you want to limit walking through windows to " -+"the current desktop." - msgstr "如果你想要讓視窗可以在桌面之間切換，打開這個選項。" - - #: windows.cpp:240 -@@ -542,7 +560,9 @@ - "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 "如果您想要鍵盤或使用桌面邊框導覽在您超過桌面邊緣時帶您到對應邊緣的新桌面，請啟用此選項。" -+msgstr "" -+"如果您想要鍵盤或使用桌面邊框導覽在您超過桌面邊緣時帶您到對應邊緣的新桌面，請" -+"啟用此選項。" - - #: windows.cpp:247 - msgid "Popup desktop name on desktop &switch" -@@ -550,8 +570,8 @@ - - #: windows.cpp:250 - msgid "" --"Enable this option if you wish to see the current desktop name popup whenever " --"the current desktop is changed." -+"Enable this option if you wish to see the current desktop name popup " -+"whenever the current desktop is changed." - msgstr "當您選取了這個選項後，每當您改變了桌面時，桌面的名字將會跳出來提示您。" - - #: windows.cpp:535 -@@ -564,8 +584,8 @@ - - #: windows.cpp:538 - msgid "" --"Animate the action of reducing the window to its titlebar (shading) as well as " --"the expansion of a shaded window" -+"Animate the action of reducing the window to its titlebar (shading) as well " -+"as the expansion of a shaded window" - msgstr "視窗收起到標題列和展開收起的視窗的動畫" - - #: windows.cpp:541 -@@ -574,14 +594,14 @@ - - #: windows.cpp:551 - 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." -+"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 - msgid "" --"Sets the time in milliseconds before the window unshades when the mouse pointer " --"goes over the shaded window." -+"Sets the time in milliseconds before the window unshades when the mouse " -+"pointer goes over the shaded window." - msgstr "用毫秒設定當滑鼠在收起的視窗上視窗展開前的時間。" - - #: windows.cpp:565 -@@ -590,10 +610,12 @@ - - #: windows.cpp:568 - 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 "當這個選項被選取了以後，每當滑鼠移到畫面的邊界時，系統會自動的幫您切換您的桌面。例如您要將一個視窗拖移到其他桌面時，這將會是很很方便的功能。" -+"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 - msgid "D&isabled" -@@ -616,7 +638,9 @@ - "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 "這裡您可以設定當滑鼠移到畫面邊界時，所要延遲切換桌面的秒數。桌面將會在觸及畫面邊界時，經過您所設定的時間後自動切換（單位是微秒）。" -+msgstr "" -+"這裡您可以設定當滑鼠移到畫面邊界時，所要延遲切換桌面的秒數。桌面將會在觸及畫" -+"面邊界時，經過您所設定的時間後自動切換（單位是微秒）。" - - #: windows.cpp:592 - msgid "Focus stealing prevention level:" -@@ -657,34 +681,31 @@ - "

                          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.)" --"

                            " --"
                          • None: Prevention is turned off and new windows always become " --"activated.
                            • " --"
                          • Low: 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.
                            • " --"
                          • Normal: Prevention is enabled.
                            • " --"
                          • High: 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.
                            • " --"
                          • Extreme: All windows must be explicitly activated by the user.
                            • " --"

                          " --"

                          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.

                          " --msgstr "" --"

                          這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。（注意：這項功能在焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。）" --"

                            " --"
                          • 無：關閉防堵功能，新視窗都能取得焦點。
                            • " --"
                          • 低：啟用防堵功能；當某些視窗不支援取得優先權(underlying)機制而 KWin " --"不能有效決定是否讓該視窗取得焦點時則讓它成為作用中視窗。這個設定值造成的結果可能比普通等級好，也可能不好，取決於應用程式自身。
                            • " --"
                          • 普通：啟用防堵功能。
                            • " --"
                          • 高：新視窗只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。這個設定在不使用滑鼠焦點政策時可能不怎麼實用。<" --"/li>" --"
                          • 最高：所有的視窗都需要經由使用者明定。

                          " --"

                          要防止失去焦點的視窗需要標記為隨選注意，亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。

                          " -+"policies.)
                          • None: Prevention is turned off and new windows " -+"always become activated.
                          • Low: 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.
                          • Normal: Prevention is " -+"enabled.
                          • High: 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." -+"
                          • Extreme: All windows must be explicitly activated by the " -+"user.

                          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." -+"

                          " -+msgstr "" -+"

                          這個選項指定 KWin 要如何防止未預期開啟的新視窗取得焦點。（注意：這項功能在" -+"焦點追隨滑鼠或焦點相黏追隨滑鼠政策下無法運作。）

                          • 無：關閉防堵" -+"功能，新視窗都能取得焦點。
                          • 低：啟用防堵功能；當某些視窗不支" -+"援取得優先權(underlying)機制而 KWin 不能有效決定是否讓該視窗取得焦點時則讓它" -+"成為作用中視窗。這個設定值造成的結果可能比普通等級好，也可能不好，取決於應用" -+"程式自身。
                          • 普通：啟用防堵功能。
                          • 高：新視窗" -+"只有在當時沒有作用中的視窗或者它們自身屬於目前作用中的應用程式才能取得焦點。" -+"這個設定在不使用滑鼠焦點政策時可能不怎麼實用。
                          • 最高：所有的" -+"視窗都需要經由使用者明定。

                          要防止失去焦點的視窗需要標記為隨選" -+"注意，亦即預設突顯它們的工作列項目。這可以在通知控制模組中改變。

                          " - - #: windows.cpp:625 - msgid "Hide utility windows for inactive applications" -@@ -692,13 +713,14 @@ - - #: windows.cpp:627 - 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 " --"active. Note that applications have to mark the windows with the proper window " --"type for this feature to work." -+"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 active. Note that applications have to mark the windows " -+"with the proper window type for this feature to work." - msgstr "" --"當開啟時，非作用中應用程式的公用視窗(工具視窗，浮動選單，...)會被隱藏，只有在該應用程式變為作用中時才會顯示。注意應用程式必須以正確的視窗類型標記其視窗才能" --"使此功能生效。" -+"當開啟時，非作用中應用程式的公用視窗(工具視窗，浮動選單，...)會被隱藏，只有在" -+"該應用程式變為作用中時才會顯示。注意應用程式必須以正確的視窗類型標記其視窗才" -+"能使此功能生效。" - - #: windows.cpp:780 - msgid "Windows" -@@ -711,10 +733,11 @@ - #: windows.cpp:790 - 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." -+"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 - msgid "Display content in &resizing windows" -@@ -726,7 +749,8 @@ - "it, instead of just showing a window 'skeleton'. The result may not be " - "satisfying on slow machines." - msgstr "" --"開啟這個選項假如你要改變視窗大小時完全顯示視窗的內容，否則只會顯示視窗的 '框'。在一台很慢的機器上而且沒有圖型加速卡時，結果可能不會令人太滿意。" -+"開啟這個選項假如你要改變視窗大小時完全顯示視窗的內容，否則只會顯示視窗的 " -+"'框'。在一臺很慢的機器上而且沒有圖型加速卡時，結果可能不會令人太滿意。" - - #: windows.cpp:800 - msgid "Display window &geometry when moving or resizing" -@@ -734,10 +758,12 @@ - - #: windows.cpp:802 - 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 "如果您想在移動或改變視窗大小時顯示幾何狀態，啟用此選項。這將顯示視窗相對於螢幕左上角的位置及其大小。" -+"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 - msgid "Animate minimi&ze and restore" -@@ -745,8 +771,8 @@ - - #: windows.cpp:814 - msgid "" --"Enable this option if you want an animation shown when windows are minimized or " --"restored." -+"Enable this option if you want an animation shown when windows are minimized " -+"or restored." - msgstr "開啟這個選項假如你要當視窗最小化或還原時有動畫顯示。" - - #: windows.cpp:828 -@@ -769,9 +795,11 @@ - - #: windows.cpp:844 - 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 "當選項啟動，這個功能會啟動最大化視窗的邊界並且允許你移動和改變它們的大小，就像正常視窗一樣" -+"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 - msgid "&Placement:" -@@ -803,26 +831,21 @@ - - #: windows.cpp:865 - msgid "" --"The placement policy determines where a new window will appear on the desktop. " --"
                            " --"
                          • Smart will try to achieve a minimum overlap of windows
                            • " --"
                          • Maximizing will try to maximize every window to fill the whole " --"screen. It might be useful to selectively affect placement of some windows " --"using the window-specific settings.
                            • " --"
                          • Cascade will cascade the windows
                            • " --"
                          • Random will use a random position
                            • " --"
                          • Centered will place the window centered
                            • " --"
                          • Zero-Cornered will place the window in the top-left corner
                            • " --"
                          " --msgstr "" --"配置策略決定一個新視窗會出現在桌面那裡。 " --"
                            " --"
                          • 聰明 會試著儘量不讓視窗重疊
                            • " --"
                          • 最大化 會試著最大化每個視窗以填滿螢幕。它在選擇性影響某些使用指定視窗設定的視窗排列會很有幫助。
                            • " --"
                          • 重疊顯示 會層疊視窗
                            • " --"
                          • 隨機放置 會使用隨機位置
                            • " --"
                          • 置中會將視窗置中
                            • " --"
                          • 零－角落會將視窗置於左上角
                          " -+"The placement policy determines where a new window will appear on the " -+"desktop.
                          • Smart will try to achieve a minimum overlap of " -+"windows
                          • Maximizing will try to maximize every window to " -+"fill the whole screen. It might be useful to selectively affect placement of " -+"some windows using the window-specific settings.
                          • Cascade " -+"will cascade the windows
                          • Random will use a random " -+"position
                          • Centered will place the window centered
                            • " -+"
                          • Zero-Cornered will place the window in the top-left corner
                          " -+msgstr "" -+"配置策略決定一個新視窗會出現在桌面那裡。
                          • 聰明 會試著儘量不讓" -+"視窗重疊
                          • 最大化 會試著最大化每個視窗以填滿螢幕。它在選擇性" -+"影響某些使用指定視窗設定的視窗排列會很有幫助。
                          • 重疊顯示 會" -+"層疊視窗
                          • 隨機放置 會使用隨機位置
                          • 置中會將" -+"視窗置中
                          • 零－角落會將視窗置於左上角
                          " - - #: windows.cpp:904 - msgid "Snap Zones" -@@ -834,13 +857,16 @@ - - #: windows.cpp:910 - msgid "&Border snap zone:" --msgstr "邊框黏貼區域 (&B):" -+msgstr "邊框黏貼區域(&B):" - - #: windows.cpp:912 - 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 "在這裡你可以為螢幕邊框設定黏貼區域，換句話說， 就是當視窗靠近時會讓視窗黏貼到邊框的磁場 '強度'。" -+"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 - msgid "&Window snap zone:" -@@ -848,10 +874,12 @@ - - #: windows.cpp:921 - 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 "在這裡你可以為視窗設定黏貼區域，換句話說，就是當視窗彼此靠近時會讓視窗黏貼在一起的磁性 '強度'。" -+"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 - msgid "Snap windows onl&y when overlapping" -@@ -859,10 +887,12 @@ - - #: windows.cpp:926 - 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 "在這裡你可以設定只有你試著重疊視窗時視窗才會黏貼，例如， 視窗不會黏貼假如視窗只是靠近另一個視窗或邊框。" -+"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 - msgid "" -@@ -872,38 +902,22 @@ - - #: windows.cpp:1226 - msgid "" --"It seems that alpha channel support is not available." --"
                          " --"
                          Please make sure you have " --"Xorg ≥ 6.8, and installed the kompmgr that came with kwin." --"
                          Also, make sure you have the following entries in your XConfig (e.g. " --"/etc/X11/xorg.conf):" --"
                          " --"
                          Section \"Extensions\"" --"
                          Option \"Composite\" \"Enable\"" --"
                          EndSection                          " --"
                          " --"
                          And if your GPU provides hardware-accelerated Xrender support (mainly " --"nVidia cards):" --"
                          " --"
                          Option \"RenderAccel\" \"true\"" --"
                          In Section \"Device\"                          " --msgstr "" --"似乎不支援 alpha 色頻。" --"
                          " --"
                          請確定您具備 Xorg ≥ 6.8" --"，並且安裝了 kwin 及 kompmgr。" --"
                          並且，請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):" --"
                          " --"
                          Section \"Extensions\"" --"
                          Option \"Composite\" \"Enable\"" --"
                          EndSection                          " --"
                          " --"
                          And if your GPU provides hardware-accelerated Xrender support (mainly " --"nVidia cards):" --"
                          " --"
                          Option \"RenderAccel\" \"true\"" --"
                          In Section \"Device\"                          " -+"It seems that alpha channel support is not available.

                          Please make sure you have Xorg ≥ 6.8, and installed the kompmgr that came with kwin." -+"
                          Also, make sure you have the following entries in your XConfig (e.g. /" -+"etc/X11/xorg.conf):

                          Section \"Extensions\"
                          Option \"Composite\" " -+"\"Enable\"
                          EndSection

                          And if your GPU provides hardware-" -+"accelerated Xrender support (mainly nVidia cards):

                          Option " -+"\"RenderAccel\" \"true\"
                          In Section \"Device\"                          " -+msgstr "" -+"似乎不支援 alpha 色頻。

                          請確定您具備 Xorg ≥ 6.8，並且安裝了 kwin 及 kompmgr。
                          並且，" -+"請確定在您的 XConfig 有下列項目(e.g. /etc/X11/xorg.conf):

                          Section " -+"\"Extensions\"
                          Option \"Composite\" \"Enable\"
                          EndSection

                          And if your GPU provides hardware-accelerated Xrender support " -+"(mainly nVidia cards):

                          Option \"RenderAccel\" \"true\"
                          In Section \"Device\"                          " - - #: windows.cpp:1246 - msgid "Apply translucency only to decoration" -@@ -1003,6 +1017,8 @@ - - #: windows.cpp:1624 - msgid "" --"Translucency support is new and may cause problems" --"
                          including crashes (sometimes the translucency engine, seldom even X).                          " --msgstr "透明功能是很新的，因而可能造成問題
                          甚至當機（有時是透明引擎，偶爾是 X）。                          " -+"Translucency support is new and may cause problems
                          including crashes " -+"(sometimes the translucency engine, seldom even X).                          " -+msgstr "" -+"透明功能是很新的，因而可能造成問題
                          甚至當機（有時是透明引擎，偶爾是 " -+"X）。                          " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlaunch.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlaunch.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlaunch.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlaunch.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmlaunch\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-16 15:58+0800\n" --"Last-Translator: \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -37,7 +37,8 @@ - msgstr "" - "

                          忙碌指標

                          \n" - "在應用程式啟動時, KDE 會提供一個忙碌的滑鼠指標來通知您.\n" --"要啟用忙碌指標的服務, 從選項中選擇一種視覺回饋某些應用程式可能不認識此種啟動方式\n" -+"要啟用忙碌指標的服務, 從選項中選擇一種視覺回饋某些應用程式可能不認識此種啟動" -+"方式\n" - "注意。在這種情況下，滑鼠游標將會在'啟動作業逾時'所設定的秒數之後\n" - "停止閃動" - -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlayout.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlayout.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlayout.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlayout.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: kcmlayout\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-06-19 09:46+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -972,12 +971,12 @@ - #, no-c-format - msgid "" - "

                          Keyboard Layout

                          Here you can choose your keyboard layout and model. " --"The 'model' refers to the type of keyboard that is connected to your computer, " --"while the keyboard layout defines \"which key does what\" and may be different " --"for different countries." -+"The 'model' refers to the type of keyboard that is connected to your " -+"computer, while the keyboard layout defines \"which key does what\" and may " -+"be different for different countries." - msgstr "" --"

                          鍵盤配置

                          " --"您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電腦上鍵盤的類型，而這是用來定義「每個按鍵的作用」的，所以不同國家會有所不同。" -+"

                          鍵盤配置

                          您可以在這邊選擇鍵盤的配置與型號。「型號」對應到連接在您電" -+"腦上鍵盤的類型，而這是用來定義「每個按鍵的作用」的，所以不同國家會有所不同。" - - #. i18n: file kcmlayoutwidget.ui line 84 - #: rc.cpp:12 -@@ -1003,12 +1002,14 @@ - msgid "" - "Here you can choose a keyboard model. This setting is independent of your " - "keyboard layout and refers to the \"hardware\" model, i.e. the way your " --"keyboard is manufactured. Modern keyboards that come with your computer usually " --"have two extra keys and are referred to as \"104-key\" models, which is " --"probably what you want if you do not know what kind of keyboard you have.\n" -+"keyboard is manufactured. Modern keyboards that come with your computer " -+"usually have two extra keys and are referred to as \"104-key\" models, which " -+"is probably what you want if you do not know what kind of keyboard you " -+"have.\n" - msgstr "" --"您可以在這邊選擇鍵盤型號。這個設定獨立於您的鍵盤配置，且對應到「硬體」型號，也就是鍵盤製造的方式。您電腦所使用的現代的鍵盤通常有二個額外的按鍵並對應到「104鍵" --"」型號，當您不確定您的鍵盤型號時，通常可以使用這種。\n" -+"您可以在這邊選擇鍵盤型號。這個設定獨立於您的鍵盤配置，且對應到「硬體」型號，" -+"也就是鍵盤製造的方式。您電腦所使用的現代的鍵盤通常有二個額外的按鍵並對應到" -+"「104鍵」型號，當您不確定您的鍵盤型號時，通常可以使用這種。\n" - - #. i18n: file kcmlayoutwidget.ui line 126 - #: rc.cpp:25 -@@ -1048,7 +1049,8 @@ - "docked flag. By clicking on this flag you can easily switch between layouts. " - "The first layout will be default one." - msgstr "" --"如果這個清單中出現一個以上的配置， KDE 面板將會提供一個停駐的旗幟。經由點選這個旗幟，您可以輕易的在各種配置間切換。第一個配置將是預設配置。" -+"如果這個清單中出現一個以上的配置， KDE 面板將會提供一個停駐的旗幟。經由點選這" -+"個旗幟，您可以輕易的在各種配置間切換。第一個配置將是預設配置。" - - #. i18n: file kcmlayoutwidget.ui line 213 - #: rc.cpp:46 -@@ -1074,16 +1076,20 @@ - msgid "" - "This is the list of available keyboard layouts in your system. You can add " - "layout to the active list by selecting it and pressing \"Add\" button." --msgstr "這是在您的系統中可以使用的鍵盤配置清單。您可以選擇一個配置並且按下「加入」按鈕將它加入作用中清單。" -+msgstr "" -+"這是在您的系統中可以使用的鍵盤配置清單。您可以選擇一個配置並且按下「加入」按" -+"鈕將它加入作用中清單。" - - #. i18n: file kcmlayoutwidget.ui line 327 - #: rc.cpp:64 - #, no-c-format - msgid "" --"This is the command which is executed when switching to the selected layout. It " --"may help you if you want to debug layout switching, or if you want to switch " --"layouts without the help of KDE." --msgstr "這是在切換到選擇的配置時要執行的指令。如果你想要為配置切換除錯，或是想不靠 KDE 幫助切換鍵盤時，它可能會有所幫助。" -+"This is the command which is executed when switching to the selected layout. " -+"It may help you if you want to debug layout switching, or if you want to " -+"switch layouts without the help of KDE." -+msgstr "" -+"這是在切換到選擇的配置時要執行的指令。如果你想要為配置切換除錯，或是想不靠 " -+"KDE 幫助切換鍵盤時，它可能會有所幫助。" - - #. i18n: file kcmlayoutwidget.ui line 338 - #: rc.cpp:67 -@@ -1095,9 +1101,10 @@ - #: rc.cpp:70 - #, no-c-format - msgid "" --"If after you switch to this layout some keyboard shortcuts based on latin keys " --"do not work try to enable this option." --msgstr "如果稍候您切換到這個配置導致有些基於拉丁按鍵的快捷鍵無法運作請啟用這個選項。" -+"If after you switch to this layout some keyboard shortcuts based on latin " -+"keys do not work try to enable this option." -+msgstr "" -+"如果稍候您切換到這個配置導致有些基於拉丁按鍵的快捷鍵無法運作請啟用這個選項。" - - #. i18n: file kcmlayoutwidget.ui line 349 - #: rc.cpp:73 -@@ -1118,11 +1125,12 @@ - "Here you can choose a variant of selected keyboard layout. Layout variants " - "usually represent different key maps for the same language. For example, " - "Ukrainian layout might have four variants: basic, winkeys (as in Windows), " --"typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on " --"a transliterated latin one).\n" -+"typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed " -+"on a transliterated latin one).\n" - msgstr "" --"您可以在這裡選擇額外鍵盤配置的變化。配置的變化通常代表著同樣語言下不同的按鍵配置。例如烏克蘭配置可能有四種變化：基本、視窗按鍵(用於 " --"Windows)、打字機(如同打字機)和拼音(每個烏克蘭字母都安排在對應拉丁字母的位置上)。\n" -+"您可以在這裡選擇額外鍵盤配置的變化。配置的變化通常代表著同樣語言下不同的按鍵" -+"配置。例如烏克蘭配置可能有四種變化：基本、視窗按鍵(用於 Windows)、打字機(如同" -+"打字機)和拼音(每個烏克蘭字母都安排在對應拉丁字母的位置上)。\n" - - #. i18n: file kcmlayoutwidget.ui line 429 - #: rc.cpp:83 -@@ -1142,7 +1150,9 @@ - msgid "" - "If you select \"Application\" or \"Window\" switching policy, changing the " - "keyboard layout will only affect the current application or window." --msgstr "如果你選擇「應用程式」或「視窗」切換政策，變更鍵盤配置將只影響目前的應用程式或視窗。" -+msgstr "" -+"如果你選擇「應用程式」或「視窗」切換政策，變更鍵盤配置將只影響目前的應用程式" -+"或視窗。" - - #. i18n: file kcmlayoutwidget.ui line 491 - #: rc.cpp:92 -@@ -1190,13 +1200,15 @@ - #: rc.cpp:113 - #, no-c-format - msgid "" --"If you have more than two layouts and turn this option on, switching with the " --"keyboard shortcut or clicking on the kxkb indicator will only cycle through the " --"last few layouts. You can specify the number of layouts to rotate below. You " --"can still access all layouts by right-clicking on the kxkb indicator." -+"If you have more than two layouts and turn this option on, switching with " -+"the keyboard shortcut or clicking on the kxkb indicator will only cycle " -+"through the last few layouts. You can specify the number of layouts to " -+"rotate below. You can still access all layouts by right-clicking on the kxkb " -+"indicator." - msgstr "" --"如果您有兩個以上的配置並且開啟這個選項，使用鍵盤捷徑切換或者按下 kxkb 指示器將只會在最新的配置中循環。您可以在下面指定循環的配置數量。您仍然可以在 " --"kxkb 指示器上按右鍵來使用所有的配置。" -+"如果您有兩個以上的配置並且開啟這個選項，使用鍵盤捷徑切換或者按下 kxkb 指示器" -+"將只會在最新的配置中循環。您可以在下面指定循環的配置數量。您仍然可以在 kxkb " -+"指示器上按右鍵來使用所有的配置。" - - #. i18n: file kcmlayoutwidget.ui line 559 - #: rc.cpp:116 -@@ -1247,12 +1259,11 @@ - #, no-c-format - msgid "" - "If supported, this option allows you to setup the state of NumLock after KDE " --"startup." --"

                          You can configure NumLock to be turned on or off, or configure KDE not to " --"set NumLock state." -+"startup.

                          You can configure NumLock to be turned on or off, or configure " -+"KDE not to set NumLock state." - msgstr "" --"如果能夠支援的話，這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。" --"

                          您可以把數字鎖定設定為開啟或者是關閉，或者是不要讓 KDE 去調整數字鎖定的狀態。" -+"如果能夠支援的話，這個項目能夠讓您設定在啟動 KDE 後數字鎖定鍵的狀態。

                          您可" -+"以把數字鎖定設定為開啟或者是關閉，或者是不要讓 KDE 去調整數字鎖定的狀態。" - - #. i18n: file kcmmiscwidget.ui line 47 - #: rc.cpp:149 -@@ -1288,10 +1299,12 @@ - #: rc.cpp:164 rc.cpp:170 - #, no-c-format - msgid "" --"If supported, this option allows you to set the delay after which a pressed key " --"will start generating keycodes. The 'Repeat rate' option controls the frequency " --"of these keycodes." --msgstr "如果支援，這個選項讓您可以設定按下按鍵到產生字碼的延遲。「重複速率」選項控制了這些字碼的頻率。" -+"If supported, this option allows you to set the delay after which a pressed " -+"key will start generating keycodes. The 'Repeat rate' option controls the " -+"frequency of these keycodes." -+msgstr "" -+"如果支援，這個選項讓您可以設定按下按鍵到產生字碼的延遲。「重複速率」選項控制" -+"了這些字碼的頻率。" - - #. i18n: file kcmmiscwidget.ui line 153 - #: rc.cpp:167 -@@ -1330,12 +1343,14 @@ - #, no-c-format - msgid "" - "If you check this option, pressing and holding down a key emits the same " --"character over and over again. 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." -+"character over and over again. 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 鍵：直到您鬆開按鍵之前會不斷送出 " --"Tab 字元。" -+"如果您選取這個項目，當您持續按住按鍵時會不斷重複送出同一個字元。例如，持續按" -+"住 Tab 鍵的效果就如同連續按下好幾次 Tab 鍵：直到您鬆開按鍵之前會不斷送出 Tab " -+"字元。" - - #. i18n: file kcmmiscwidget.ui line 263 - #: rc.cpp:191 -@@ -1349,16 +1364,16 @@ - msgid "" - "If supported, this option allows you to hear audible clicks from your " - "computer's speakers when you press the keys on your keyboard. This might be " --"useful if your keyboard does not have mechanical keys, or if the sound that the " --"keys make is very soft." --"

                          You can change the loudness of the key click feedback by dragging the slider " --"button or by clicking the up/down arrows on the spin box. Setting the volume to " --"0% turns off the key click." -+"useful if your keyboard does not have mechanical keys, or if the sound that " -+"the keys make is very soft.

                          You can change the loudness of the key click " -+"feedback by dragging the slider button or by clicking the up/down arrows on " -+"the spin box. Setting the volume to 0% turns off the key click." - msgstr "" --"如果能夠支援的話，這個選項能夠讓您在按鍵盤上的按鍵時聽到來自 PC " --"喇叭的聲響。當您使用非機械式鍵盤的話，或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的話，這可能是相當有用的。" --"

                          調整該拉條進行音量調整動作，把音量設定為 " --"

                          您可以拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 0% 的話，就是關閉按鍵音量的設定。" -+"如果能夠支援的話，這個選項能夠讓您在按鍵盤上的按鍵時聽到來自 PC 喇叭的聲響。" -+"當您使用非機械式鍵盤的話，或者是該鍵盤在打字輸入資料時發出的聲音相當柔軟的" -+"話，這可能是相當有用的。

                          調整該拉條進行音量調整動作，把音量設定為

                          您可以" -+"拉動滑鈕或按下飛梭方塊的上/下箭頭來改變按鍵反饋的音量。設定音量為 0% 的話，就" -+"是關閉按鍵音量的設定。" - - #. i18n: file kcmmiscwidget.ui line 282 - #: rc.cpp:197 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlocale.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlocale.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmlocale.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmlocale.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmlocale\n" - "POT-Creation-Date: 2006-08-23 02:32+0200\n" - "PO-Revision-Date: 2005-08-07 07:18+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -116,9 +116,10 @@ - - #: kcmlocale.cpp:406 - 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 "這會新增一個語系至列表。如果列表上已經有這個語系，舊的語系將會被新的取代。" -+"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 - msgid "This will remove the highlighted language from the list." -@@ -126,7 +127,8 @@ - - #: kcmlocale.cpp:413 - msgid "" --"KDE programs will be displayed in the first available language in this list.\n" -+"KDE 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." - msgstr "" - "KDE 應用程式將會以列表中第一個可用的語系顯示。\n" -@@ -134,23 +136,25 @@ - - #: kcmlocale.cpp:420 - msgid "" --"Here you can choose your country or region. The settings for languages, numbers " --"etc. will automatically switch to the corresponding values." --msgstr "您可以在這邊選擇您的國家或地區。語言、數字等等的設定將會自動切換成對應的數值。" -+"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 - msgid "" - "Here you can choose the languages that will be used by KDE. If the first " --"language in the list is not available, the second will be used, etc. If only US " --"English is available, no translations have been installed. You can get " -+"language in the list is not available, the second will be used, etc. If only " -+"US English is available, no translations have been installed. You can get " - "translation packages for many languages from the place you got KDE from." --"

                          Note that some applications may not be translated to your languages; in this " --"case, they will automatically fall back to US English." -+"

                          Note that some applications may not be translated to your languages; in " -+"this case, they will automatically fall back to US English." - msgstr "" --"您可以在這邊選擇 KDE " --"所使用的語言。如果列表中的第一個語系無法使用，會使用第二個語系代替，並以此類推。如果只有美式英語可用，可能是沒有安裝其他翻譯檔。您可以從您取得 KDE " --"的地方找到很多種語言的翻譯檔套件。" --"

                          注意有些應用程式可能沒有翻譯成您的語言；在這種情形下它們會自動回復為美式英語。" -+"您可以在這邊選擇 KDE 所使用的語言。如果列表中的第一個語系無法使用，會使用第二" -+"個語系代替，並以此類推。如果只有美式英語可用，可能是沒有安裝其他翻譯檔。您可" -+"以從您取得 KDE 的地方找到很多種語言的翻譯檔套件。

                          注意有些應用程式可能沒有" -+"翻譯成您的語言；在這種情形下它們會自動回復為美式英語。" - - #: klocalesample.cpp:52 - msgid "Numbers:" -@@ -210,20 +214,21 @@ - - #: localenum.cpp:165 - msgid "" --"Here you can define the decimal separator used to display numbers (i.e. a dot " --"or a comma in most countries)." --"

                          Note that the decimal separator used to display monetary values has to be " --"set separately (see the 'Money' tab)." -+"Here you can define the decimal separator used to display numbers (i.e. a " -+"dot or a comma in most countries).

                          Note that the decimal separator used to " -+"display monetary values has to be set separately (see the 'Money' tab)." - msgstr "" --"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。" --"

                          注意，用來顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。" -+"您可以在這邊定義顯示數字時所使用的小數點分隔符號 (一般為點號)。

                          注意，用來" -+"顯示金錢數值的小數點分隔符號必須另外設定 (請參照「金錢」頁)。" - - #: localenum.cpp:174 - msgid "" --"Here you can define the thousands separator used to display numbers." --"

                          Note that the thousands separator used to display monetary values has to be " --"set separately (see the 'Money' tab)." --msgstr "您可以在這邊定義顯示數字時所使用的千分位分隔符號。

                          注意，用來顯示金錢數值的千分位分隔符號必須另外設定 (請參照「金錢」頁)。" -+"Here you can define the thousands separator used to display numbers.

                          Note " -+"that the thousands separator used to display monetary values has to be set " -+"separately (see the 'Money' tab)." -+msgstr "" -+"您可以在這邊定義顯示數字時所使用的千分位分隔符號。

                          注意，用來顯示金錢數值的" -+"千分位分隔符號必須另外設定 (請參照「金錢」頁)。" - - #: localenum.cpp:182 - msgid "" -@@ -233,10 +238,12 @@ - - #: localenum.cpp:188 - msgid "" --"Here you can specify text used to prefix negative numbers. This should not be " --"empty, so you can distinguish positive and negative numbers. It is normally set " --"to minus (-)." --msgstr "您可以在這邊指定負數值的前置文字。這不應該是空白的，如此您才能區分正負數值。一般均使用減號 (-)。" -+"Here you can specify text used to prefix negative numbers. This should not " -+"be empty, so you can distinguish positive and negative numbers. It is " -+"normally set to minus (-)." -+msgstr "" -+"您可以在這邊指定負數值的前置文字。這不應該是空白的，如此您才能區分正負數值。" -+"一般均使用減號 (-)。" - - #: localemon.cpp:54 - msgid "Currency symbol:" -@@ -292,56 +299,68 @@ - - #: localemon.cpp:278 - msgid "" --"Here you can enter your usual currency symbol, e.g. $ or DM." --"

                          Please note that the Euro symbol may not be available on your system, " --"depending on the distribution you use." --msgstr "您可以在這邊輸入您一般使用的貨幣符號，例如 $ 或 DM 。

                          請注意，歐元符號可能無法在您的系統上使用，這與您使用的版本有關。" -+"Here you can enter your usual currency symbol, e.g. $ or DM.

                          Please note " -+"that the Euro symbol may not be available on your system, depending on the " -+"distribution you use." -+msgstr "" -+"您可以在這邊輸入您一般使用的貨幣符號，例如 $ 或 DM 。

                          請注意，歐元符號可能" -+"無法在您的系統上使用，這與您使用的版本有關。" - - #: localemon.cpp:285 - msgid "" - "Here you can define the decimal separator used to display monetary values." - "

                          Note that the decimal separator used to display other numbers has to be " - "defined separately (see the 'Numbers' tab)." --msgstr "您可以在這邊定義顯示金錢數值時的小數分隔符號。

                          注意，用於顯示其他數字的小數分隔符號必須另外定義 (請參照「數字」頁)。" -+msgstr "" -+"您可以在這邊定義顯示金錢數值時的小數分隔符號。

                          注意，用於顯示其他數字的小數" -+"分隔符號必須另外定義 (請參照「數字」頁)。" - - #: localemon.cpp:293 - msgid "" - "Here you can define the thousands separator used to display monetary values." - "

                          Note that the thousands separator used to display other numbers has to be " - "defined separately (see the 'Numbers' tab)." --msgstr "您可以在這邊定義顯示金錢數值時的千分位分隔符號。

                          注意，用於顯示其他數字的千分位分隔符號必須另外設定定義 (請參照「數字」頁)。" -+msgstr "" -+"您可以在這邊定義顯示金錢數值時的千分位分隔符號。

                          注意，用於顯示其他數字的千" -+"分位分隔符號必須另外設定定義 (請參照「數字」頁)。" - - #: localemon.cpp:301 - msgid "" --"This determines the number of fract digits for monetary values, i.e. the number " --"of digits you find behind the decimal separator. Correct value is 2 " --"for almost all people." --msgstr "這決定了要金錢數值中顯示的小數位數，也就是您可以在小數點後面看到的位數。一般而言都會設為 2。" -+"This determines the number of fract digits for monetary values, i.e. the " -+"number of digits you find behind the decimal separator. Correct " -+"value is 2 for almost all people." -+msgstr "" -+"這決定了要金錢數值中顯示的小數位數，也就是您可以在小數點後面看到的位" -+"數。一般而言都會設為 2。" - - #: localemon.cpp:308 - msgid "" --"If this option is checked, the currency sign will be prefixed (i.e. to the left " --"of the value) for all positive monetary values. If not, it will be postfixed " --"(i.e. to the right)." --msgstr "如果選擇這個選項，對所有為正數的金錢數值，貨幣符號將會被放在前面 (左邊)。否則便會被放在後面 (右邊)。" -+"If this option is checked, the currency sign will be prefixed (i.e. to the " -+"left of the value) for all positive monetary values. If not, it will be " -+"postfixed (i.e. to the right)." -+msgstr "" -+"如果選擇這個選項，對所有為正數的金錢數值，貨幣符號將會被放在前面 (左邊)。否則" -+"便會被放在後面 (右邊)。" - - #: localemon.cpp:314 - msgid "" --"If this option is checked, the currency sign will be prefixed (i.e. to the left " --"of the value) for all negative monetary values. If not, it will be postfixed " --"(i.e. to the right)." --msgstr "如果選擇這個選項，對所有為負數的金錢數值，貨幣符號將會被放在前面 (左邊)。否則便會被放在後面 (右邊)。" -+"If this option is checked, the currency sign will be prefixed (i.e. to the " -+"left of the value) for all negative monetary values. If not, it will be " -+"postfixed (i.e. to the right)." -+msgstr "" -+"如果選擇這個選項，對所有為負數的金錢數值，貨幣符號將會被放在前面 (左邊)。否則" -+"便會被放在後面 (右邊)。" - - #: localemon.cpp:320 - msgid "" --"Here you can select how a positive sign will be positioned. This only affects " --"monetary values." -+"Here you can select how a positive sign will be positioned. This only " -+"affects monetary values." - msgstr "您可以在這邊選擇正號要放在哪邊。這只會影響對金錢的顯示。" - - #: localemon.cpp:325 - msgid "" --"Here you can select how a negative sign will be positioned. This only affects " --"monetary values." -+"Here you can select how a negative sign will be positioned. This only " -+"affects monetary values." - msgstr "您可以在這邊選擇負號要放在哪邊。這只會影響對金錢的顯示。" - - #: localetime.cpp:94 -@@ -494,146 +513,80 @@ - - #: localetime.cpp:464 - msgid "" --"

                          The text in this textbox will be used to format time strings. The sequences " --"below will be replaced:

                          " --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"
                          HHThe hour as a decimal number using a 24-hour clock (00-23).
                          hHThe hour (24-hour clock) as a decimal number (0-23).
                          PHThe hour as a decimal number using a 12-hour clock (01-12).
                          pHThe hour (12-hour clock) as a decimal number (1-12).
                          MMThe minutes as a decimal number (00-59).
                          SSThe seconds as a decimal number (00-59).
                          AMPMEither \"am\" or \"pm\" according to the given time value. Noon is treated " --"as \"pm\" and midnight as \"am\".
                          " --msgstr "" --"

                          這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換：

                          " --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"
                          HH使用二位數的24小時制顯示 (00-23)。
                          hH使用24小時制顯示 (0-23)。
                          PH使用二位數的12小時制顯示 (01-12)。
                          pH使用12小時制顯示 (1-12)。
                          MM使用二位數顯示分 (00-59)。
                          SS使用二位數顯示秒 (00-59)。
                          AMPM給定「上午」或「下午」。中午被當作「下午」，而午夜當作「早上」處理。
                          " -+"

                          The text in this textbox will be used to format time strings. The " -+"sequences below will be replaced:

                          HHThe " -+"hour as a decimal number using a 24-hour clock (00-23).
                          hHThe hour (24-hour clock) as a decimal number (0-" -+"23).
                          PHThe hour as a decimal number using a " -+"12-hour clock (01-12).
                          pHThe hour (12-hour " -+"clock) as a decimal number (1-12).
                          MMThe " -+"minutes as a decimal number (00-59).
                          SSThe " -+"seconds as a decimal number (00-59).
                          AMPMEither \"am\" or \"pm\" according to the given time value. Noon is " -+"treated as \"pm\" and midnight as \"am\".
                          " -+msgstr "" -+"

                          這個文字方塊中的文字是用於指定時間字串的。下面的串列將會被置換：
                          HH使用二位數的24小時制顯示 (00-23)。
                          hH使用24小時制顯示 (0-23)。
                          PH使用二位數的12小時制顯示 (01-12)。
                          pH使用12小時制顯示 (1-12)。
                          MM使用二位數顯示分 (00-59)。
                          SS使用二位數顯示秒 (00-59)。
                          AMPM給定「上午」或「下午」。中午被當作「下午」，而" -+"午夜當作「早上」處理。
                          " - - #: localetime.cpp:487 - msgid "" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"
                          YYYYThe year with century as a decimal number.
                          YYThe year without century as a decimal number (00-99).
                          MMThe month as a decimal number (01-12).
                          mMThe month as a decimal number (1-12).
                          SHORTMONTHThe first three characters of the month name.
                          MONTHThe full month name.
                          DDThe day of month as a decimal number (01-31).
                          dDThe day of month as a decimal number (1-31).
                          SHORTWEEKDAYThe first three characters of the weekday name.
                          WEEKDAYThe full weekday name.
                          " --msgstr "" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"" --"
                          YYYY含世紀數值的年份。
                          YY不含世紀數值的年份 (00-99)。
                          MM使用二位數顯示月份 (01-12)。
                          mM使用數字顯示月份 (1-12)。
                          SHORTMONTH使用月份名稱的前三個字元顯示月份。
                          MONTH使用完整月份名稱顯示月份。
                          DD使用二位數字顯示每月日數 (01-31)。
                          dD使用數字顯示每月日數 (1-31)。
                          SHORTWEEKDAY使用星期名稱的前三個字元顯示星期。
                          WEEKDAY使用完整星期名稱顯示星期。
                          " -+"
                          YYYYThe year with century as a decimal number." -+"
                          YYThe year without century as a decimal " -+"number (00-99).
                          MMThe month as a decimal " -+"number (01-12).
                          mMThe month as a decimal " -+"number (1-12).
                          SHORTMONTHThe first three " -+"characters of the month name.
                          MONTHThe " -+"full month name.
                          DDThe day of month as a " -+"decimal number (01-31).
                          dDThe day of month " -+"as a decimal number (1-31).
                          SHORTWEEKDAYThe " -+"first three characters of the weekday name.
                          WEEKDAYThe full weekday name.
                          " -+msgstr "" -+"" - - #: localetime.cpp:508 - msgid "" - "

                          The text in this textbox will be used to format long dates. The sequences " - "below will be replaced:

                          " --msgstr "

                          這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代：

                          " -+msgstr "" -+"

                          這個文字方塊中的文字用以顯示長格式的日期。下面的串列將會被取代：

                          " - - #: localetime.cpp:514 - msgid "" --"

                          The text in this textbox will be used to format short dates. For instance, " --"this is used when listing files. The sequences below will be replaced:

                          " --msgstr "

                          這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列將會被取代：

                          " -+"

                          The text in this textbox will be used to format short dates. For " -+"instance, this is used when listing files. The sequences below will be " -+"replaced:

                          " -+msgstr "" -+"

                          這個文字方塊中的文字用以顯示短格式的日期。一般在列出檔案時使用。下面的串列" -+"將會被取代：

                          " - - #: localetime.cpp:521 - msgid "" --"

                          This option determines which day will be considered as the first one of the " --"week.

                          " -+"

                          This option determines which day will be considered as the first one of " -+"the week.

                          " - msgstr "

                          這個選擇決定了那一天會被認為是一週的第一天。

                          " - - #: localetime.cpp:528 - msgid "" --"

                          This option determines whether possessive form of month names should be used " --"in dates.

                          " -+"

                          This option determines whether possessive form of month names should be " -+"used in dates.

                          " - msgstr "

                          這個選擇決定了在日期中是否使用月名稱的所有格。

                          " - - #: localeother.cpp:48 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmmedia.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmmedia.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmmedia.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmmedia.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kcmmedia\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-01-20 15:17+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -58,7 +57,7 @@ - - #: main.cpp:100 - msgid "FIXME : Write me..." --msgstr "FIXME : 尚未完成..." -+msgstr "FIXME : 尚未完成…" - - #: managermodule.cpp:40 - msgid "No support for HAL on this system" -@@ -82,11 +81,11 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"Select this if you want to enable the Hardware Abstraction Layer " --"(http://hal.freedesktop.org/wiki/Software/hal) support." -+"Select this if you want to enable the Hardware Abstraction Layer (http://hal." -+"freedesktop.org/wiki/Software/hal) support." - msgstr "" --"如果您要打開硬體抽象層(Hardware Abstraction Layer, HAL, " --"http://hal.freedesktop.org/wiki/Software/hal) 支援，請選擇此選項。" -+"如果您要打開硬體抽象層(Hardware Abstraction Layer, HAL, http://hal." -+"freedesktop.org/wiki/Software/hal) 支援，請選擇此選項。" - - #. i18n: file managermoduleview.ui line 35 - #: rc.cpp:9 -@@ -124,16 +123,18 @@ - #: rc.cpp:24 - #, no-c-format - msgid "" --"Here is the list of the available types of medium which can be monitored. You " --"can filter the available actions by selecting a type of medium. If you want to " --"see all the actions, select \"All Mime Types\"." --msgstr "這裡是一份媒體型態的清單。您可以選取一種型態來過濾可用的動作。如果您要檢視所有可用的動作，請選擇「所有的 MIME 型態」。" -+"Here is the list of the available types of medium which can be monitored. " -+"You can filter the available actions by selecting a type of medium. If you " -+"want to see all the actions, select \"All Mime Types\"." -+msgstr "" -+"這裡是一份媒體型態的清單。您可以選取一種型態來過濾可用的動作。如果您要檢視所" -+"有可用的動作，請選擇「所有的 MIME 型態」。" - - #. i18n: file notifiermoduleview.ui line 90 - #: rc.cpp:27 - #, no-c-format - msgid "&Add..." --msgstr "新增...(&A)" -+msgstr "新增…(&A)" - - #. i18n: file notifiermoduleview.ui line 93 - #: rc.cpp:30 -@@ -151,7 +152,7 @@ - #: rc.cpp:39 - #, no-c-format - msgid "&Edit..." --msgstr "編輯...(&E)" -+msgstr "編輯…(&E)" - - #. i18n: file notifiermoduleview.ui line 115 - #: rc.cpp:42 -@@ -171,7 +172,9 @@ - msgid "" - "Click here to perform this action automatically on detection of the selected " - "medium type (this option is disabled when \"All Mime Types\" is selected)." --msgstr "按這裡可以在偵測到特定的媒體型態時自動執行這個動作，如果選取的是「所有的 MIME 型態」則會關閉這個功能。" -+msgstr "" -+"按這裡可以在偵測到特定的媒體型態時自動執行這個動作，如果選取的是「所有的 " -+"MIME 型態」則會關閉這個功能。" - - #. i18n: file notifiermoduleview.ui line 153 - #: rc.cpp:51 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnic.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnic.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnic.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnic.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kcmnic\n" - "POT-Creation-Date: 2006-12-31 02:37+0100\n" - "PO-Revision-Date: 2006-05-09 08:51+0800\n" --"Last-Translator: Tzer-Ming Liu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnotify.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnotify.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmnotify.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmnotify.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmnotify 1.16\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-12 14:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,21 +29,16 @@ - #: knotify.cpp:56 - msgid "" - "

                          System Notifications

                          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:" --"
                            " --"
                          • As the application was originally designed." --"
                          • With a beep or other noise." --"
                          • Via a popup dialog box with additional information." --"
                          • By recording the event in a logfile without any additional visual or " --"audible alert.
                          " -+"you will be notified when certain events occur. There are several choices as " -+"to how you are notified:
                          • As the application was originally designed." -+"
                          • With a beep or other noise.
                          • Via a popup dialog box with additional " -+"information.
                          • By recording the event in a logfile without any additional " -+"visual or audible alert.
                          " - msgstr "" --"

                          系統通知

                          KDE 提供您極大的控制權，可供設定當發生特定事件時系統應如何向您通知。相關的通知方式有以下幾種選擇: " --"
                            " --"
                          • 按照應用程式的原始設計方式。" --"
                          • 發出嗶聲或其他聲響。" --"
                          • 顯示即現對話方塊並帶出其他資訊。 " --"
                          • 將事件記錄至記錄檔，而不另外執行視覺或聲音警示。
                          " -+"

                          系統通知

                          KDE 提供您極大的控制權，可供設定當發生特定事件時系統應如何向" -+"您通知。相關的通知方式有以下幾種選擇:
                          • 按照應用程式的原始設計方式。" -+"
                          • 發出嗶聲或其他聲響。
                          • 顯示即現對話方塊並帶出其他資訊。
                          • 將事件記錄至" -+"記錄檔，而不另外執行視覺或聲音警示。
                          " - - #: knotify.cpp:69 - msgid "Event source:" -@@ -55,7 +50,7 @@ - - #: knotify.cpp:89 - msgid "System Notification Control Panel Module" --msgstr "系統通知控制台模組" -+msgstr "系統通知控制臺模組" - - #: knotify.cpp:92 - msgid "Original implementation" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmperformance.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmperformance.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmperformance.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmperformance.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmperformance.po\n" - "POT-Creation-Date: 2006-08-23 02:32+0200\n" - "PO-Revision-Date: 2005-05-07 18:40+0800\n" --"Last-Translator: Wong King Chi \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,73 +30,78 @@ - - #: kcmperformance.cpp:91 - msgid "" --"

                          Konqueror Performance

                          You can configure several settings that improve " --"Konqueror performance here. These include options for reusing already running " --"instances and for keeping instances preloaded." -+"

                          Konqueror Performance

                          You can configure several settings that " -+"improve Konqueror performance here. These include options for reusing " -+"already running instances and for keeping instances preloaded." - msgstr "" --"

                          Konqueror Performance

                          您可以設定數種組態來增加 Konqueror 的效能。這些組態包括重用已執行實體和預先載入實體" -+"

                          Konqueror Performance

                          您可以設定數種組態來增加 Konqueror 的效能。這些" -+"組態包括重用已執行實體和預先載入實體" - - #: konqueror.cpp:37 - msgid "" --"Disables the minimization of memory usage and allows you to make each browsing " --"activity independent from the others" -+"Disables the minimization of memory usage and allows you to make each " -+"browsing activity independent from the others" - msgstr "取消使用記憶體最小化，並允許每一個瀏覽動作獨立運作。" - - #: konqueror.cpp:40 - msgid "" - "With this option activated, only one instance of Konqueror used for file " --"browsing will exist in the memory of your computer at any moment, no matter how " --"many file browsing windows you open, thus reducing resource requirements." --"

                          Be aware that this also means that, if something goes wrong, all your file " --"browsing windows will be closed simultaneously" -+"browsing will exist in the memory of your computer at any moment, no matter " -+"how many file browsing windows you open, thus reducing resource requirements." -+"

                          Be aware that this also means that, if something goes wrong, all your " -+"file browsing windows will be closed simultaneously" - msgstr "" --"這個選項啟動後，Konqueror 瀏覽檔案時，無論您開多少瀏覽視窗，只會有一個實體存在於記憶體中，如此，便能減少資源的需求。(針對瀏覽檔案時)" --"

                          這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。" -+"這個選項啟動後，Konqueror 瀏覽檔案時，無論您開多少瀏覽視窗，只會有一個實體存" -+"在於記憶體中，如此，便能減少資源的需求。(針對瀏覽檔案時)

                          這也意味著，如果一" -+"但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。" - - #: konqueror.cpp:48 - msgid "" - "With this option activated, only one instance of Konqueror will exist in the " --"memory of your computer at any moment, no matter how many browsing windows you " --"open, thus reducing resource requirements." --"

                          Be aware that this also means that, if something goes wrong, all your " --"browsing windows will be closed simultaneously." --msgstr "" --"這個選項啟動後，無論您開多少瀏覽視窗，Konqueror 只會有一個實體存於記憶體中，如此，便能減少資源的需求。" --"

                          這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將會一併同時被關閉。" -+"memory of your computer at any moment, no matter how many browsing windows " -+"you open, thus reducing resource requirements.

                          Be aware that this also " -+"means that, if something goes wrong, all your browsing windows will be " -+"closed simultaneously." -+msgstr "" -+"這個選項啟動後，無論您開多少瀏覽視窗，Konqueror 只會有一個實體存於記憶體中，" -+"如此，便能減少資源的需求。

                          這也意味著，如果一但發生錯誤，您所有的瀏覽視窗將" -+"會一併同時被關閉。" - - #: konqueror.cpp:60 - msgid "" --"If non-zero, this option allows keeping Konqueror instances in memory after all " --"their windows have been closed, up to the number specified in this option." --"

                          When a new Konqueror instance is needed, one of these preloaded instances " --"will be reused instead, improving responsiveness at the expense of the memory " --"required by the preloaded instances." --msgstr "" --"這個選項允許 Konqueror 關掉視窗後，可以保存實體在記憶體中，保存的數量取決於這個選項的值。" --"

                          當需要一個新的 Konqueror 實體時，預先被保存在記憶體的實體可以被重用，加快回應的速度。" -+"If non-zero, this option allows keeping Konqueror instances in memory after " -+"all their windows have been closed, up to the number specified in this " -+"option.

                          When a new Konqueror instance is needed, one of these preloaded " -+"instances will be reused instead, improving responsiveness at the expense of " -+"the memory required by the preloaded instances." -+msgstr "" -+"這個選項允許 Konqueror 關掉視窗後，可以保存實體在記憶體中，保存的數量取決於這" -+"個選項的值。

                          當需要一個新的 Konqueror 實體時，預先被保存在記憶體的實體可以" -+"被重用，加快回應的速度。" - - #: konqueror.cpp:69 - msgid "" --"If enabled, an instance of Konqueror will be preloaded after the ordinary KDE " --"startup sequence." --"

                          This will make the first Konqueror window open faster, but at the expense of " --"longer KDE startup times (but you will be able to work while it is loading, so " --"you may not even notice that it is taking longer)." --msgstr "" --"這個選項啟動後，一個 Konqueror 實體會在 KDE 啓動後被預先載入。" --"

                          雖然可以減少首次啓動 Konqueror 所需的時間，但也會減慢 KDE 啓動速度。(不過，您仍然可以在載入期間使用電腦，所以您可能没有注意到)" -+"If enabled, an instance of Konqueror will be preloaded after the ordinary " -+"KDE startup sequence.

                          This will make the first Konqueror window open " -+"faster, but at the expense of longer KDE startup times (but you will be able " -+"to work while it is loading, so you may not even notice that it is taking " -+"longer)." -+msgstr "" -+"這個選項啟動後，一個 Konqueror 實體會在 KDE 啓動後被預先載入。

                          雖然可以減少" -+"首次啓動 Konqueror 所需的時間，但也會減慢 KDE 啓動速度。(不過，您仍然可以在載" -+"入期間使用電腦，所以您可能没有注意到)" - - #: konqueror.cpp:75 - msgid "" --"If enabled, KDE will always try to have one preloaded Konqueror instance ready; " --"preloading a new instance in the background whenever there is not one " --"available, so that windows will always open quickly." --"

                          Warning: In some cases, it is actually possible that this will reduce " --"perceived performance." --msgstr "" --"這個選項啟動後，在任何時候 KDE 都會盡力預留一個 Konqueror 實體，(即只要沒有 Konqueror 實體時，KDE 會在背景載入一個)這樣 " --"Konqueror 視窗在任何時候都會快速開啓。" --"

                          警告：在一些情況下，這會使性能有所下降。" -+"If enabled, KDE will always try to have one preloaded Konqueror instance " -+"ready; preloading a new instance in the background whenever there is not one " -+"available, so that windows will always open quickly.

                          Warning: In " -+"some cases, it is actually possible that this will reduce perceived " -+"performance." -+msgstr "" -+"這個選項啟動後，在任何時候 KDE 都會盡力預留一個 Konqueror 實體，(即只要沒有 " -+"Konqueror 實體時，KDE 會在背景載入一個)這樣 Konqueror 視窗在任何時候都會快速" -+"開啓。

                          警告：在一些情況下，這會使性能有所下降。" - - #. i18n: file konqueror_ui.ui line 27 - #: rc.cpp:3 -@@ -162,34 +167,37 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"WARNING: This option may in rare cases lead to various problems. Consult " --"the What's This? (Shift+F1) help for details." --msgstr "警告：在一些罕見的情況下，這個選項會導致某些問題。詳細資料請查詢「這是什麼」(Shift+F1)。" -+"WARNING: This option may in rare cases lead to various problems. " -+"Consult the What's This? (Shift+F1) help for details." -+msgstr "" -+"警告：在一些罕見的情況下，這個選項會導致某些問題。詳細資料請查詢「這是" -+"什麼」(Shift+F1)。" - - #: system.cpp:34 - msgid "" - "

                          During startup KDE 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.

                          " --"

                          This option delays the check, which avoid scanning all directories " --"containing files describing the system during KDE startup, thus making KDE " --"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.).

                          " --"

                          Changes of system configuration mostly happen by (un)installing " --"applications. It is therefore recommended to turn this option temporarily off " --"while (un)installing applications.

                          " --"

                          For this reason, usage of this option is not recommended. The KDE crash " --"handler will refuse to provide backtrace for the bugreport with this option " --"turned on (you will need to reproduce it again with this option turned off, or " --"turn on the developer mode for the crash handler).

                          " --msgstr "" --"

                          KDE 啓動時需要對系統組態進行檢查(如MIME " --"類型，已安裝的程式等)，如果組態在上一次啓動之後變更過，那麼它的快取(KsyCoCa)便需要被更新。

                          " --"

                          這個選項可以延遲檢查動作，使 KDE " --"啓動時不再對舆組態有關的目錄進行掃描。如此，便可以加快啓動速度。不過在一些罕見的情況下，變更需要在檢查之前生效，這樣做會導致某些問題(如 K " --"選單不見了程式，應用程式報告所需 MIME 類型不存在等)。

                          " --"

                          由於這種變更大部分是由安裝/反安裝應用程式所致的，所以我們建議在那時候暫時關閉選項。

                          " --"

                          正因如此，我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追蹤。(您將需要關閉選項，然後重現錯誤，或開啓錯誤控制程式的開發者模式)

                          " -+"changed since the last time, the system configuration cache (KSyCoCa) needs " -+"to be updated.

                          This option delays the check, which avoid scanning all " -+"directories containing files describing the system during KDE startup, thus " -+"making KDE 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.).

                          Changes of system " -+"configuration mostly happen by (un)installing applications. It is therefore " -+"recommended to turn this option temporarily off while (un)installing " -+"applications.

                          For this reason, usage of this option is not " -+"recommended. The KDE crash handler will refuse to provide backtrace for the " -+"bugreport with this option turned on (you will need to reproduce it again " -+"with this option turned off, or turn on the developer mode for the crash " -+"handler).

                          " -+msgstr "" -+"

                          KDE 啓動時需要對系統組態進行檢查(如MIME 類型，已安裝的程式等)，如果組態在" -+"上一次啓動之後變更過，那麼它的快取(KsyCoCa)便需要被更新。

                          這個選項可以" -+"延遲檢查動作，使 KDE 啓動時不再對舆組態有關的目錄進行掃描。如此，便可以加快啓" -+"動速度。不過在一些罕見的情況下，變更需要在檢查之前生效，這樣做會導致某些問題" -+"(如 K 選單不見了程式，應用程式報告所需 MIME 類型不存在等)。

                          由於這種變" -+"更大部分是由安裝/反安裝應用程式所致的，所以我們建議在那時候暫時關閉選項。

                          正因如此，我們不建議您使用。選項啓動時 KDE 錯誤控制程式將不會提供回溯追" -+"蹤。(您將需要關閉選項，然後重現錯誤，或開啓錯誤控制程式的開發者模式)

                          " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmprintmgr.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmprintmgr.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmprintmgr.po 2005-11-09 07:38:42.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmprintmgr.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmsamba\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-10-28 21:36+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,7 +30,8 @@ - msgid "" - "Print management as normal user\n" - "Some print management operations may need administrator privileges. Use the\n" --"\"Administrator Mode\" button below to start this print management tool with\n" -+"\"Administrator Mode\" button below to start this print management tool " -+"with\n" - "administrator privileges." - msgstr "" - "以一般使用者操作列印管理程式\n" -@@ -53,35 +54,55 @@ - #: kcmprintmgr.cpp:60 - msgid "" - "

                          Printers

                          The KDE printing manager is part of KDEPrint which is the " --"interface to the real print subsystem of your Operating System (OS). Although " --"it does add some additional functionality of its own to those subsystems, " --"KDEPrint depends on them for its functionality. Spooling and filtering tasks, " --"especially, are still done by your print subsystem, or the administrative tasks " --"(adding or modifying printers, setting access rights, etc.)" --"
                          What print features KDEPrint supports is therefore heavily dependent on " --"your chosen print subsystem. For the best support in modern printing, the KDE " --"Printing Team recommends a CUPS based printing system." -+"interface to the real print subsystem of your Operating System (OS). " -+"Although it does add some additional functionality of its own to those " -+"subsystems, KDEPrint depends on them for its functionality. Spooling and " -+"filtering tasks, especially, are still done by your print subsystem, or the " -+"administrative tasks (adding or modifying printers, setting access rights, " -+"etc.)
                          What print features KDEPrint supports is therefore heavily " -+"dependent on your chosen print subsystem. For the best support in modern " -+"printing, the KDE Printing Team recommends a CUPS based printing system." - msgstr "" --"

                          印表機

                          KDE 列印管理程式是 KDEPrint " --"的一部分，作為您的作業系統(OS)實際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能，KDEPrint " --"仍需依賴它們的功能。特別是排程與過濾工作，仍是由您的列印子系統完成，包括管理類的工作(加入或修改印表機、設定存取權限等。)" --"
                          因此 KDEPrint 支援的功能深深的受您所選的列印子系統影響。為了對現在的列印工作有最佳的支援，KDE 列印功能團隊建議使用基於 CUPS " --"的列印系統。" -+"

                          印表機

                          KDE 列印管理程式是 KDEPrint 的一部分，作為您的作業系統(OS)實" -+"際列印子系統的介面。雖然它本身的確在這些子系統上加入了某些功能，KDEPrint 仍需" -+"依賴它們的功能。特別是排程與過濾工作，仍是由您的列印子系統完成，包括管理類的" -+"工作(加入或修改印表機、設定存取權限等。)
                          因此 KDEPrint 支援的功能深深的受" -+"您所選的列印子系統影響。為了對現在的列印工作有最佳的支援，KDE 列印功能團隊建" -+"議使用基於 CUPS 的列印系統。" - - #~ msgid "&Exports" --#~ msgstr "匯出 (&E)" -+#~ msgstr "匯出(&E)" - - #~ msgid "&Imports" --#~ msgstr "匯入 (&I)" -+#~ msgstr "匯入(&I)" - - #~ msgid "&Log" --#~ msgstr "紀錄 (&L)" -+#~ msgstr "紀錄(&L)" - - #~ msgid "&Statistics" --#~ msgstr "統計 (&S)" -+#~ msgstr "統計(&S)" - --#~ msgid "The Samba and NFS Status Monitor is a front end to the programs smbstatus and showmount. Smbstatus reports on current Samba connections, and is part of the suite of Samba tools, which implements the SMB (Session Message Block) protocol, also called the NetBIOS or LanManager protocol. This protocol can be used to provide printer sharing or drive sharing services on a network including machines running the various flavors of Microsoft Windows.

                          Showmount is part of the NFS software package. NFS stands for Network File System and is the traditional UNIX way to share directories over the network. In this case the output of showmount -a localhost is parsed. On some systems showmount is in /usr/sbin, check if you have showmount in your PATH." --#~ msgstr "Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.

                          Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 showmount -a localhost 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 showmount 有在您的路徑中." -+#~ msgid "" -+#~ "The Samba and NFS Status Monitor is a front end to the programs " -+#~ "smbstatus and showmount. Smbstatus reports on current " -+#~ "Samba connections, and is part of the suite of Samba tools, which " -+#~ "implements the SMB (Session Message Block) protocol, also called the " -+#~ "NetBIOS or LanManager protocol. This protocol can be used to provide " -+#~ "printer sharing or drive sharing services on a network including machines " -+#~ "running the various flavors of Microsoft Windows.

                          Showmount is part of " -+#~ "the NFS software package. NFS stands for Network File System and is the " -+#~ "traditional UNIX way to share directories over the network. In this case " -+#~ "the output of showmount -a localhost is parsed. On some systems " -+#~ "showmount is in /usr/sbin, check if you have showmount in your PATH." -+#~ msgstr "" -+#~ "Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端" -+#~ "介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. " -+#~ "Samba 是 SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協" -+#~ "定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系" -+#~ "統.

                          Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 " -+#~ "Unix 分享檔案方法. 在這邊是使用 showmount -a localhost 來分析. 對" -+#~ "有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 showmount 有在" -+#~ "您的路徑中." - - #~ msgid "kcmsamba" - #~ msgstr "kcmsamba" -@@ -125,8 +146,17 @@ - #~ msgid "Mounted Under" - #~ msgstr "掛載於" - --#~ msgid "This list shows the Samba and NFS shared resources mounted on your system from other hosts. The \"Type\" column tells you whether the mounted resource is a Samba or an NFS type of resource. The \"Resource\" column shows the descriptive name of the shared resource. Finally, the third column, which is labeled \"Mounted under\" shows the location on your system where the shared resource is mounted." --#~ msgstr "這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, \"掛載於\" 顯示您掛載這些資源的路徑." -+#~ msgid "" -+#~ "This list shows the Samba and NFS shared resources mounted on your system " -+#~ "from other hosts. The \"Type\" column tells you whether the mounted " -+#~ "resource is a Samba or an NFS type of resource. The \"Resource\" column " -+#~ "shows the descriptive name of the shared resource. Finally, the third " -+#~ "column, which is labeled \"Mounted under\" shows the location on your " -+#~ "system where the shared resource is mounted." -+#~ msgstr "" -+#~ "這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位" -+#~ "告訴您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, " -+#~ "\"掛載於\" 顯示您掛載這些資源的路徑." - - #~ msgid "Samba log file: " - #~ msgstr "Samba 紀錄檔:" -@@ -143,23 +173,51 @@ - #~ msgid "Show closed files" - #~ msgstr "顯示關閉的檔案" - --#~ msgid "This page presents the contents of your samba log file in a friendly layout. Check that the correct log file for your computer is listed here. If you need to, correct the name or location of the log file, and then click the \"Update\" button." --#~ msgstr "這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕." -- --#~ msgid "Check this option if you want to view the details for connections opened to your computer." -+#~ msgid "" -+#~ "This page presents the contents of your samba log file in a friendly " -+#~ "layout. Check that the correct log file for your computer is listed here. " -+#~ "If you need to, correct the name or location of the log file, and then " -+#~ "click the \"Update\" button." -+#~ msgstr "" -+#~ "這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果" -+#~ "有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕." -+ -+#~ msgid "" -+#~ "Check this option if you want to view the details for connections opened " -+#~ "to your computer." - #~ msgstr "選取這個選項如果您希望檢視目前您電腦所開啟連結的詳細資料." - --#~ msgid "Check this option if you want to view the events when connections to your computer were closed." -+#~ msgid "" -+#~ "Check this option if you want to view the events when connections to your " -+#~ "computer were closed." - #~ msgstr "選取這個選項如果您希望檢視目前您電腦所關閉連結的事件." - --#~ msgid "Check this option if you want to see the files which were opened on your computer by remote users. Note that file open/close events are not logged unless the samba log level is set to at least 2 (you cannot set the log level using this module)." --#~ msgstr "選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個模組變更紀錄等級）。" -- --#~ msgid "Check this option if you want to see the events when files opened by remote users were closed. Note that file open/close events are not logged unless the samba log level is set to at least 2 (you cannot set the log level using this module)." --#~ msgstr "選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個模組變更紀錄等級）。" -- --#~ msgid "Click here to refresh the information on this page. The log file (shown above) will be read to obtain the events logged by samba." --#~ msgstr "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的事件." -+#~ msgid "" -+#~ "Check this option if you want to see the files which were opened on your " -+#~ "computer by remote users. Note that file open/close events are not logged " -+#~ "unless the samba log level is set to at least 2 (you cannot set the log " -+#~ "level using this module)." -+#~ msgstr "" -+#~ "選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關" -+#~ "閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個模組變" -+#~ "更紀錄等級）。" -+ -+#~ msgid "" -+#~ "Check this option if you want to see the events when files opened by " -+#~ "remote users were closed. Note that file open/close events are not logged " -+#~ "unless the samba log level is set to at least 2 (you cannot set the log " -+#~ "level using this module)." -+#~ msgstr "" -+#~ "選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開" -+#~ "啟/關閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個" -+#~ "模組變更紀錄等級）。" -+ -+#~ msgid "" -+#~ "Click here to refresh the information on this page. The log file (shown " -+#~ "above) will be read to obtain the events logged by samba." -+#~ msgstr "" -+#~ "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀" -+#~ "錄的事件." - - #~ msgid "Date & Time" - #~ msgstr "日期與時間" -@@ -173,8 +231,19 @@ - #~ msgid "Host/User" - #~ msgstr "主機/使用者" - --#~ msgid "This list shows details of the events logged by samba. Note that events at the file level are not logged unless you have configured the log level for samba to 2 or greater.

                          As with many other lists in KDE, you can click on a column heading to sort on that column. Click again to change the sorting direction from ascending to descending or vice versa.

                          If the list is empty, try clicking the \"Update\" button. The samba log file will be read and the list refreshed." --#~ msgstr "這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以上, 有些事件是不會被紀錄的.

                          如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序.

                          如果列表示空的, 試著按下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表." -+#~ msgid "" -+#~ "This list shows details of the events logged by samba. Note that events " -+#~ "at the file level are not logged unless you have configured the log level " -+#~ "for samba to 2 or greater.

                          As with many other lists in KDE, you can " -+#~ "click on a column heading to sort on that column. Click again to change " -+#~ "the sorting direction from ascending to descending or vice versa.

                          If " -+#~ "the list is empty, try clicking the \"Update\" button. The samba log file " -+#~ "will be read and the list refreshed." -+#~ msgstr "" -+#~ "這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 " -+#~ "以上, 有些事件是不會被紀錄的.

                          如同 KDE 中其他的列表, 您可以按下欄位的頂" -+#~ "端以依據這個欄位排序. 再按一次可以變更顯示順序.

                          如果列表示空的, 試著按" -+#~ "下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表." - - #~ msgid "CONNECTION OPENED" - #~ msgstr "*連線開啟*" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsamba.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsamba.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsamba.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsamba.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmsamba\n" - "POT-Creation-Date: 2005-07-06 01:31+0200\n" - "PO-Revision-Date: 2005-10-28 21:50+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,25 +32,25 @@ - - #: main.cpp:71 - msgid "" --"The Samba and NFS Status Monitor is a front end to the programs " --"smbstatus and showmount. Smbstatus reports on current Samba " --"connections, and is part of the suite of Samba tools, which implements the SMB " --"(Session Message Block) protocol, also called the NetBIOS or LanManager " --"protocol. This protocol can be used to provide printer sharing or drive sharing " --"services on a network including machines running the various flavors of " --"Microsoft Windows." --"

                          Showmount is part of the NFS software package. NFS stands for Network File " --"System and is the traditional UNIX way to share directories over the network. " --"In this case the output of showmount -a localhost " --"is parsed. On some systems showmount is in /usr/sbin, check if you have " --"showmount in your PATH." --msgstr "" --"Samba 與 NFS 狀態監視器是 smbstatus 與 showmount " --"的前端介面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 SMB (工作階段訊息方塊) 協定, " --"也被叫做 NetBIOS 或 LanManager 協定. 這個協定可以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統." --"

                          Showmount 是 NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這邊是使用 " --"showmount -a localhost 來分析. 對有些系統而言, showmount 是被安裝在 /usr/sbin 下面的, 請確定 " --"showmount 有在您的路徑中." -+"The Samba and NFS Status Monitor is a front end to the programs " -+"smbstatus and showmount. Smbstatus reports on current " -+"Samba connections, and is part of the suite of Samba tools, which implements " -+"the SMB (Session Message Block) protocol, also called the NetBIOS or " -+"LanManager protocol. This protocol can be used to provide printer sharing or " -+"drive sharing services on a network including machines running the various " -+"flavors of Microsoft Windows.

                          Showmount is part of the NFS software " -+"package. NFS stands for Network File System and is the traditional UNIX way " -+"to share directories over the network. In this case the output of " -+"showmount -a localhost is parsed. On some systems showmount is in /" -+"usr/sbin, check if you have showmount in your PATH." -+msgstr "" -+"Samba 與 NFS 狀態監視器是 smbstatus 與 showmount 的前端介" -+"面. Smbstatus 回報目前的 Samba 連線, 並且是 Samba 套件工具的一部份. Samba 是 " -+"SMB (工作階段訊息方塊) 協定, 也被叫做 NetBIOS 或 LanManager 協定. 這個協定可" -+"以用於提供網路上的印表機或磁碟資源分享, 包含 MS Windows 系統.

                          Showmount 是 " -+"NFS 軟體套件的一部份. NFS 基於網路檔案系統, 是傳統的 Unix 分享檔案方法. 在這" -+"邊是使用 showmount -a localhost 來分析. 對有些系統而言, showmount 是" -+"被安裝在 /usr/sbin 下面的, 請確定 showmount 有在您的路徑中." - - #: main.cpp:85 - msgid "kcmsamba" -@@ -110,15 +110,16 @@ - - #: kcmsambaimports.cpp:50 - msgid "" --"This list shows the Samba and NFS shared resources mounted on your system from " --"other hosts. The \"Type\" column tells you whether the mounted resource is a " --"Samba or an NFS type of resource. The \"Resource\" column shows the descriptive " --"name of the shared resource. Finally, the third column, which is labeled " --"\"Mounted under\" shows the location on your system where the shared resource " --"is mounted." --msgstr "" --"這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴您掛載的資源是 Samba 或 NFS. \"資源\" " --"欄位列出分享資源的名稱. 最後, \"掛載於\" 顯示您掛載這些資源的路徑." -+"This list shows the Samba and NFS shared resources mounted on your system " -+"from other hosts. The \"Type\" column tells you whether the mounted resource " -+"is a Samba or an NFS type of resource. The \"Resource\" column shows the " -+"descriptive name of the shared resource. Finally, the third column, which is " -+"labeled \"Mounted under\" shows the location on your system where the shared " -+"resource is mounted." -+msgstr "" -+"這個列表顯示您的系統掛載其他主機上 Samba 與 NFS 資源的紀錄. \"類型\" 欄位告訴" -+"您掛載的資源是 Samba 或 NFS. \"資源\" 欄位列出分享資源的名稱. 最後, \"掛載於" -+"\" 顯示您掛載這些資源的路徑." - - #: kcmsambalog.cpp:43 - msgid "Samba log file: " -@@ -143,11 +144,12 @@ - #: kcmsambalog.cpp:64 - msgid "" - "This page presents the contents of your samba log file in a friendly layout. " --"Check that the correct log file for your computer is listed here. If you need " --"to, correct the name or location of the log file, and then click the \"Update\" " --"button." -+"Check that the correct log file for your computer is listed here. If you " -+"need to, correct the name or location of the log file, and then click the " -+"\"Update\" button." - msgstr "" --"這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕." -+"這一頁列出從您的 samba 紀錄檔得到的內容. 請檢查是否使用正確的紀錄檔. 如果有必" -+"要, 請更正紀錄檔的名稱與位址, 並按下 \"更新\" 按鈕." - - #: kcmsambalog.cpp:69 - msgid "" -@@ -165,27 +167,31 @@ - msgid "" - "Check this option if you want to see the files which were opened on your " - "computer by remote users. Note that file open/close events are not logged " --"unless the samba log level is set to at least 2 (you cannot set the log level " --"using this module)." -+"unless the samba log level is set to at least 2 (you cannot set the log " -+"level using this module)." - msgstr "" --"選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 " --"以上時才會被紀錄（抱歉，您不能用這個模組變更紀錄等級）。" -+"選取這個選項如果您希望檢視遠端使用者在您電腦上開啟的檔案。注意這些開啟/關閉動" -+"作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個模組變更紀錄" -+"等級）。" - - #: kcmsambalog.cpp:81 - msgid "" - "Check this option if you want to see the events when files opened by remote " --"users were closed. Note that file open/close events are not logged unless the " --"samba log level is set to at least 2 (you cannot set the log level using this " --"module)." --msgstr "" --"選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關閉動作只有在 samba 紀錄等級在 2 " --"以上時才會被紀錄（抱歉，您不能用這個模組變更紀錄等級）。" -+"users were closed. Note that file open/close events are not logged unless " -+"the samba log level is set to at least 2 (you cannot set the log level using " -+"this module)." -+msgstr "" -+"選取這個選項如果您希望檢視遠端使用者在您電腦上關閉檔案的事件。注意這些開啟/關" -+"閉動作只有在 samba 紀錄等級在 2 以上時才會被紀錄（抱歉，您不能用這個模組變更" -+"紀錄等級）。" - - #: kcmsambalog.cpp:87 - msgid "" --"Click here to refresh the information on this page. The log file (shown above) " --"will be read to obtain the events logged by samba." --msgstr "按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的事件." -+"Click here to refresh the information on this page. The log file (shown " -+"above) will be read to obtain the events logged by samba." -+msgstr "" -+"按下這邊以更新這一頁的資訊. 紀錄檔 (上面顯示的) 將會被讀取以取得 samba 紀錄的" -+"事件." - - #: kcmsambalog.cpp:97 - msgid "Date & Time" -@@ -205,18 +211,18 @@ - - #: kcmsambalog.cpp:102 - msgid "" --"This list shows details of the events logged by samba. Note that events at the " --"file level are not logged unless you have configured the log level for samba to " --"2 or greater." --"

                          As with many other lists in KDE, you can click on a column heading to sort " --"on that column. Click again to change the sorting direction from ascending to " --"descending or vice versa." --"

                          If the list is empty, try clicking the \"Update\" button. The samba log " --"file will be read and the list refreshed." --msgstr "" --"這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以上, 有些事件是不會被紀錄的." --"

                          如同 KDE 中其他的列表, 您可以按下欄位的頂端以依據這個欄位排序. 再按一次可以變更顯示順序." --"

                          如果列表示空的, 試著按下 \"更新\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表." -+"This list shows details of the events logged by samba. Note that events at " -+"the file level are not logged unless you have configured the log level for " -+"samba to 2 or greater.

                          As with many other lists in KDE, you can click on " -+"a column heading to sort on that column. Click again to change the sorting " -+"direction from ascending to descending or vice versa.

                          If the list is " -+"empty, try clicking the \"Update\" button. The samba log file will be read " -+"and the list refreshed." -+msgstr "" -+"這編列出 samba 所紀錄的詳細事件紀錄. 注意除非您把 samba 的紀錄等級設在 2 以" -+"上, 有些事件是不會被紀錄的.

                          如同 KDE 中其他的列表, 您可以按下欄位的頂端以依" -+"據這個欄位排序. 再按一次可以變更顯示順序.

                          如果列表示空的, 試著按下 \"更新" -+"\" 按鈕. samba 紀錄檔將會重新被讀取並更新列表." - - #: kcmsambalog.cpp:218 kcmsambastatistics.cpp:153 kcmsambastatistics.cpp:204 - msgid "CONNECTION OPENED" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmscreensaver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmscreensaver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmscreensaver.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmscreensaver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kcmscreensaver\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-06-19 09:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -35,32 +34,34 @@ - #: advanceddialog.cpp:146 - msgid "" - "Specify the priority that the screensaver will run at. A higher priority may " --"mean that the screensaver runs faster, though may reduce the speed that other " --"programs run at while the screensaver is active." --msgstr "指定螢幕保護程式執行的優先權。較高的優先權代表螢幕保護程式會較快執行，但是會減低在螢幕保護程式作用的同時執行的其他程式的速度。" -+"mean that the screensaver runs faster, though may reduce the speed that " -+"other programs run at while the screensaver is active." -+msgstr "" -+"指定螢幕保護程式執行的優先權。較高的優先權代表螢幕保護程式會較快執行，但是會" -+"減低在螢幕保護程式作用的同時執行的其他程式的速度。" - - #: advanceddialog.cpp:147 - msgid "" --"The action to take when the mouse cursor is located in the top left corner of " --"the screen for 15 seconds." -+"The action to take when the mouse cursor is located in the top left corner " -+"of the screen for 15 seconds." - msgstr "當滑鼠游標位於螢幕左上角 15 秒後要進行的動作。" - - #: advanceddialog.cpp:148 - msgid "" --"The action to take when the mouse cursor is located in the top right corner of " --"the screen for 15 seconds." -+"The action to take when the mouse cursor is located in the top right corner " -+"of the screen for 15 seconds." - msgstr "當滑鼠游標位於螢幕右上角 15 秒後要進行的動作。" - - #: advanceddialog.cpp:149 - msgid "" --"The action to take when the mouse cursor is located in the bottom left corner " --"of the screen for 15 seconds." -+"The action to take when the mouse cursor is located in the bottom left " -+"corner of the screen for 15 seconds." - msgstr "當滑鼠游標位於螢幕左下角 15 秒後要進行的動作。" - - #: advanceddialog.cpp:150 - msgid "" --"The action to take when the mouse cursor is located in the bottom right corner " --"of the screen for 15 seconds." -+"The action to take when the mouse cursor is located in the bottom right " -+"corner of the screen for 15 seconds." - msgstr "當滑鼠游標位於螢幕右下角 15 秒後要進行的動作。" - - #: category_list.cpp:7 -@@ -197,19 +198,21 @@ - - #: scrnsave.cpp:89 - msgid "" --"

                          Screen Saver

                          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 " --"features enabled for your display." --"

                          Besides providing an endless variety of entertainment and preventing " --"monitor burn-in, a screen saver also gives you a simple way to lock your " --"display if you are going to leave it unattended for a while. If you want the " --"screen saver to lock the session, make sure you enable the \"Require password\" " --"feature of the screen saver; if you do not, you can still explicitly lock the " --"session using the desktop's \"Lock Session\" action." -+"

                          Screen Saver

                          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 features enabled for your display.

                          Besides providing an endless " -+"variety of entertainment and preventing monitor burn-in, a screen saver also " -+"gives you a simple way to lock your display if you are going to leave it " -+"unattended for a while. If you want the screen saver to lock the session, " -+"make sure you enable the \"Require password\" feature of the screen saver; " -+"if you do not, you can still explicitly lock the session using the desktop's " -+"\"Lock Session\" action." - msgstr "" --"

                          螢幕保護

                          這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示器的省電功能也可以啟動螢幕保護。" --"

                          此外，提供一個無止境的數值來提供娛樂與保護顯示器，同時如果您必須離開電腦一陣子，螢幕保護也提供您一個簡單的方法來鎖定您的畫面。如果您希望螢幕保護程式鎖定畫" --"面，請確定您有啟動螢幕保護程式的「需要密碼」功能；如果沒有，您仍然可以使用桌面上的「鎖定畫面」按鈕。" -+"

                          螢幕保護

                          這個模組可以讓您啟動並組態螢幕保護。注意即使您有設定您顯示" -+"器的省電功能也可以啟動螢幕保護。

                          此外，提供一個無止境的數值來提供娛樂與保護" -+"顯示器，同時如果您必須離開電腦一陣子，螢幕保護也提供您一個簡單的方法來鎖定您" -+"的畫面。如果您希望螢幕保護程式鎖定畫面，請確定您有啟動螢幕保護程式的「需要密" -+"碼」功能；如果沒有，您仍然可以使用桌面上的「鎖定畫面」按鈕。" - - #: scrnsave.cpp:132 - msgid "Screen Saver" -@@ -221,7 +224,7 @@ - - #: scrnsave.cpp:150 - msgid "&Setup..." --msgstr "設定(&S)..." -+msgstr "設定(&S)…" - - #: scrnsave.cpp:154 - msgid "Configure the screen saver's options, if any." -@@ -265,14 +268,14 @@ - - #: scrnsave.cpp:208 - msgid "" --"Prevent potential unauthorized use by requiring a password to stop the screen " --"saver." -+"Prevent potential unauthorized use by requiring a password to stop the " -+"screen saver." - msgstr "要求密碼才能停止螢幕保護程式以防止可能的非法使用。" - - #: scrnsave.cpp:216 - msgid "" --"The amount of time, after the screen saver has started, to ask for the unlock " --"password." -+"The amount of time, after the screen saver has started, to ask for the " -+"unlock password." - msgstr "一段時間，在螢幕保護程式啟動後，過了多久會要求解鎖密碼。" - - #: scrnsave.cpp:221 -@@ -309,4 +312,4 @@ - - #: scrnsave.cpp:470 - msgid "Loading..." --msgstr "載入中..." -+msgstr "載入中…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmartcard.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmartcard.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmartcard.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmartcard.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmsmartcard\n" - "POT-Creation-Date: 2006-08-23 02:32+0200\n" - "PO-Revision-Date: 2005-08-12 15:21+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -43,18 +43,18 @@ - msgid "" - "\n" - "1) The KDE daemon, 'kded' is not running. You can restart it by running the " --"command 'kdeinit' and then try reloading the KDE Control Center to see if this " --"message goes away.\n" -+"command 'kdeinit' and then try reloading the KDE Control Center to see if " -+"this message goes away.\n" - "\n" - "2) You don't appear to have smartcard support in the KDE libraries. You will " - "need to recompile the kdelibs package with libpcsclite installed." - msgstr "" - "\n" --" 1) KDE 的服務 'kded' 沒有啟動。您可以執行 'kdeinit' 來重新啟動它，然後試著重新載入 KDE " --"控制中心，來看看這個訊息是否已經消失。\n" -+" 1) KDE 的服務 'kded' 沒有啟動。您可以執行 'kdeinit' 來重新啟動它，然後試著重" -+"新載入 KDE 控制中心，來看看這個訊息是否已經消失。\n" - "\n" --" 2) 您的 KDE 函式庫可能沒有包含 smartcard 的支援。您必須重新編譯您的 KDE 函式庫套件 (kdelibs)，來增加函式庫 " --"libpcsclite。" -+" 2) 您的 KDE 函式庫可能沒有包含 smartcard 的支援。您必須重新編譯您的 KDE 函式" -+"庫套件 (kdelibs)，來增加函式庫 libpcsclite。" - - #. i18n: file smartcardbase.ui line 31 - #: rc.cpp:15 -@@ -66,7 +66,7 @@ - #: rc.cpp:18 - #, no-c-format - msgid "&Enable smartcard support" --msgstr "啟動 Smart Card 支援 (&E)" -+msgstr "啟動 Smart Card 支援(&E)" - - #. i18n: file smartcardbase.ui line 61 - #: rc.cpp:21 -@@ -80,7 +80,8 @@ - msgid "" - "In most cases you should have this enabled. It allows KDE to automatically " - "detect card insertion and reader hotplug events." --msgstr "在大部份的情況下，這個設定應該設為開啟。它允許 KDE 自動偵測卡片的熱插拔事件。" -+msgstr "" -+"在大部份的情況下，這個設定應該設為開啟。它允許 KDE 自動偵測卡片的熱插拔事件。" - - #. i18n: file smartcardbase.ui line 92 - #: rc.cpp:27 -@@ -92,15 +93,17 @@ - #: rc.cpp:30 - #, no-c-format - msgid "" --"When you insert a smartcard, KDE can automatically launch a management tool if " --"no other application attempts to use the card." --msgstr "當您插入 Smart Card 而沒有其他的程式使用這張卡片時，KDE 可以自動的啟動卡片管理工具。" -+"When you insert a smartcard, KDE can automatically launch a management tool " -+"if no other application attempts to use the card." -+msgstr "" -+"當您插入 Smart Card 而沒有其他的程式使用這張卡片時，KDE 可以自動的啟動卡片管" -+"理工具。" - - #. i18n: file smartcardbase.ui line 106 - #: rc.cpp:33 - #, no-c-format - msgid "&Beep on card insert and removal" --msgstr "在卡片插入或拔出時發出嗶聲 (&B)" -+msgstr "在卡片插入或拔出時發出嗶聲(&B)" - - #. i18n: file smartcardbase.ui line 135 - #: rc.cpp:36 -@@ -142,7 +145,8 @@ - #: rc.cpp:54 - #, no-c-format - msgid "" --"To add new readers you have to modify /etc/readers.conf file and re-start pcscd" -+"To add new readers you have to modify /etc/readers.conf file and re-start " -+"pcscd" - msgstr "您可以透過修改 /etc/readers.conf，並重新啟動 pcscd 來新增一個讀卡機" - - #: smartcard.cpp:59 -@@ -195,5 +199,5 @@ - "smartcards. These can be used for various tasks such as storing SSL " - "certificates and logging in to the system." - msgstr "" --"

                          Smart Card

                          這個模組允許您設定 KDE 來支援 Smart Card。它可以用在很多的用途上，例如存放 SSL " --"的憑證，並使用它來登入系統。" -+"

                          Smart Card

                          這個模組允許您設定 KDE 來支援 Smart Card。它可以用在很多的" -+"用途上，例如存放 SSL 的憑證，並使用它來登入系統。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmserver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmserver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmsmserver.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmsmserver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmsmsserver\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-12 15:18+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -22,8 +22,8 @@ - "whether the computer should be automatically shut down after session exit by " - "default." - msgstr "" --"

                          工作階段管理員

                          您可以在這邊組態工作階段管理員。 " --"這包含了登出時是否要經過確認、是否要在登出時儲存工作階段，以及是否要在工作階段結束後自動關機。" -+"

                          工作階段管理員

                          您可以在這邊組態工作階段管理員。 這包含了登出時是否要" -+"經過確認、是否要在登出時儲存工作階段，以及是否要在工作階段結束後自動關機。" - - #. i18n: file smserverconfigdlg.ui line 16 - #: rc.cpp:3 -@@ -41,7 +41,7 @@ - #: rc.cpp:9 - #, no-c-format - msgid "Conf&irm logout" --msgstr "確認登出 (&i)" -+msgstr "確認登出(&I)" - - #. i18n: file smserverconfigdlg.ui line 54 - #: rc.cpp:12 -@@ -68,33 +68,35 @@ - #, no-c-format - msgid "" - "
                            \n" --"
                          • Restore previous session: Will save all applications running on exit " --"and restore them when they next start up
                            • \n" --"
                          • Restore manually saved session: Allows the session to be saved at " --"any time via \"Save Session\" in the K-Menu. This means the currently started " --"applications will reappear when they next start up.
                            • \n" --"
                          • Start with an empty session: Do not save anything. Will come up with " --"an empty desktop on next start.
                            • \n" -+"
                          • Restore previous session: Will save all applications running on " -+"exit and restore them when they next start up
                            • \n" -+"
                          • Restore manually saved session: Allows the session to be saved " -+"at any time via \"Save Session\" in the K-Menu. This means the currently " -+"started applications will reappear when they next start up.
                            • \n" -+"
                          • Start with an empty session: Do not save anything. Will come up " -+"with an empty desktop on next start.
                            • \n" - "
                          " - msgstr "" - "
                            \n" --"
                          • 恢復前一個工作階段： 會在離開時儲存所有執行的應用程式並在下次啟動時將他們恢復
                            • \n" --"
                          • 恢復手動儲存的工作階段： 可以在任何時候透過 " --"K-選單中的「儲存工作階段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。
                            • \n" --"
                          • 以空的工作階段啟動： 不要儲存任何東西。下次啟動時會看到的空無一物的桌面。
                            • \n" -+"
                          • 恢復前一個工作階段： 會在離開時儲存所有執行的應用程式並在下次啟動" -+"時將他們恢復
                            • \n" -+"
                          • 恢復手動儲存的工作階段： 可以在任何時候透過 K-選單中的「儲存工作階" -+"段」來儲存工作階段。這表示目前啟動的應用程式會在下次啟動時恢復。
                            • \n" -+"
                          • 以空的工作階段啟動： 不要儲存任何東西。下次啟動時會看到的空無一物" -+"的桌面。
                            • \n" - "
                          " - - #. i18n: file smserverconfigdlg.ui line 90 - #: rc.cpp:28 - #, no-c-format - msgid "Restore &previous session" --msgstr "回復先前的工作階段 (&P)" -+msgstr "回復先前的工作階段(&P)" - - #. i18n: file smserverconfigdlg.ui line 98 - #: rc.cpp:31 - #, no-c-format - msgid "Restore &manually saved session" --msgstr "回復手動存入的工作階段 (&M)" -+msgstr "回復手動存入的工作階段(&M)" - - #. i18n: file smserverconfigdlg.ui line 106 - #: rc.cpp:34 -@@ -112,9 +114,11 @@ - #: rc.cpp:40 - #, 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 KDM." --msgstr "在這裡您可以選擇在您登出時所要執行的動作。不過這只有在您使用 KDM 來登入系統時才會生效。" -+"Here you can choose what should happen by default when you log out. This " -+"only has meaning, if you logged in through KDM." -+msgstr "" -+"在這裡您可以選擇在您登出時所要執行的動作。不過這只有在您使用 KDM 來登入系統時" -+"才會生效。" - - #. i18n: file smserverconfigdlg.ui line 130 - #: rc.cpp:43 -@@ -126,13 +130,13 @@ - #: rc.cpp:46 - #, no-c-format - msgid "&Turn off computer" --msgstr "關閉電腦 (&T)" -+msgstr "關閉電腦(&T)" - - #. i18n: file smserverconfigdlg.ui line 146 - #: rc.cpp:49 - #, no-c-format - msgid "&Restart computer" --msgstr "重新啟動電腦 (&R)" -+msgstr "重新啟動電腦(&R)" - - #. i18n: file smserverconfigdlg.ui line 156 - #: rc.cpp:52 -@@ -151,7 +155,8 @@ - #, no-c-format - msgid "" - "Here you can enter a comma-separated list of applications that should not be " --"saved in sessions, and therefore will not be started when restoring a session. " --"For example 'xterm,xconsole'." -+"saved in sessions, and therefore will not be started when restoring a " -+"session. For example 'xterm,xconsole'." - msgstr "" --"您可以在這裡輸入不想儲存在工作階段中的應用程式清單(以 , 分隔)，這樣下次恢復工作階段時它們就不會被啟動。例如「xterm,xconsole」。" -+"您可以在這裡輸入不想儲存在工作階段中的應用程式清單(以 , 分隔)，這樣下次恢復工" -+"作階段時它們就不會被啟動。例如「xterm,xconsole」。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmspellchecking.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmspellchecking.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmspellchecking.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmspellchecking.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmspellchecking\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-12 13:58+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -20,22 +20,16 @@ - - #: spellchecking.cpp:46 - msgid "" --"

                          Spell Checker

                          " --"

                          This control module allows you to configure the KDE spell checking system. " --"You can configure:" --"

                            " --"
                          • which spell checking program to use" --"
                          • which types of spelling errors are identified" --"
                          • which dictionary is used by default.
                          " --"
                          The KDE spell checking system (KSpell) provides support for two common " --"spell checking utilities: ASpell and ISpell. This allows you to share " --"dictionaries between KDE applications and non-KDE applications.

                          " -+"

                          Spell Checker

                          This control module allows you to configure the KDE " -+"spell checking system. You can configure:

                          • which spell checking " -+"program to use
                          • which types of spelling errors are identified
                          • which " -+"dictionary is used by default.

                          The KDE spell checking system " -+"(KSpell) provides support for two common spell checking utilities: ASpell " -+"and ISpell. This allows you to share dictionaries between KDE applications " -+"and non-KDE applications.

                          " - msgstr "" --"

                          拼字檢查

                          " --"

                          這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定：" --"

                            " --"
                          • 使用哪一個拼字檢查程式" --"
                          • 要辨識哪些種類的拼字錯誤" --"
                          • 內定使用哪一個字典。
                          " --"
                          KDE 拼字檢查系統（KSpell）支援兩種常見的拼字檢查工具：ASpell 與 ISpell。 因此，您在使用 KDE 應用程式與非 KDE " --"的應用程式時都可以使用相同的字典。

                          " -+"

                          拼字檢查

                          這個控制模組可讓您設定 KDE 的拼字檢查系統。您可以設定：" -+"

                          • 使用哪一個拼字檢查程式
                          • 要辨識哪些種類的拼字錯誤
                          • 內定使用哪一" -+"個字典。

                          KDE 拼字檢查系統（KSpell）支援兩種常見的拼字檢查工具：" -+"ASpell 與 ISpell。 因此，您在使用 KDE 應用程式與非 KDE 的應用程式時都可以使" -+"用相同的字典。

                          " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmstyle.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmstyle.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmstyle.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmstyle.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: kcmstyle\n" - "POT-Creation-Date: 2006-08-23 02:32+0200\n" - "PO-Revision-Date: 2005-08-13 11:14+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,7 +28,9 @@ - msgid "" - "

                          Style

                          This module allows you to modify the visual appearance of user " - "interface elements, such as the widget style and effects." --msgstr "

                          風格

                          這個模組允許您修改使用者介面元件的視覺外觀，例如 Widget 的風格及特效。" -+msgstr "" -+"

                          風格

                          這個模組允許您修改使用者介面元件的視覺外觀，例如 Widget 的風格及" -+"特效。" - - #: kcmstyle.cpp:134 - msgid "kcmstyle" -@@ -48,15 +50,15 @@ - - #: kcmstyle.cpp:171 - msgid "Con&figure..." --msgstr "設定(&F)..." -+msgstr "設定(&F)…" - - #: kcmstyle.cpp:182 - msgid "Sho&w icons on buttons" --msgstr "在按鍵上顯示圖示 (&W)" -+msgstr "在按鍵上顯示圖示(&W)" - - #: kcmstyle.cpp:184 - msgid "E&nable tooltips" --msgstr "啟動工具提示 (&N)" -+msgstr "啟動工具提示(&N)" - - #: kcmstyle.cpp:186 - msgid "Show tear-off handles in &popup menus" -@@ -68,7 +70,7 @@ - - #: kcmstyle.cpp:208 - msgid "&Enable GUI effects" --msgstr "啟動 GUI 效果 (&E)" -+msgstr "啟動 GUI 效果(&E)" - - #: kcmstyle.cpp:216 kcmstyle.cpp:224 kcmstyle.cpp:233 kcmstyle.cpp:243 - msgid "Disable" -@@ -80,7 +82,7 @@ - - #: kcmstyle.cpp:218 - msgid "Combobo&x effect:" --msgstr "Combobox 效果 (&X)：" -+msgstr "Combobox 效果(&X)：" - - #: kcmstyle.cpp:226 kcmstyle.cpp:235 - msgid "Fade" -@@ -88,7 +90,7 @@ - - #: kcmstyle.cpp:227 - msgid "&Tool tip effect:" --msgstr "工具提示效果 (&T)：" -+msgstr "工具提示效果(&T)：" - - #: kcmstyle.cpp:236 - msgid "Make Translucent" -@@ -96,7 +98,7 @@ - - #: kcmstyle.cpp:237 - msgid "&Menu effect:" --msgstr "選單效果 (&M)：" -+msgstr "選單效果(&M)：" - - #: kcmstyle.cpp:244 - msgid "Application Level" -@@ -108,7 +110,7 @@ - - #: kcmstyle.cpp:251 - msgid "Menu &drop shadow" --msgstr "選單拖曳陰影 (&D)" -+msgstr "選單拖曳陰影(&D)" - - #: kcmstyle.cpp:272 - msgid "Software Tint" -@@ -139,11 +141,11 @@ - - #: kcmstyle.cpp:295 - msgid "Menu trans&lucency type:" --msgstr "選單半透明型態 (&L)：" -+msgstr "選單半透明型態(&L)：" - - #: kcmstyle.cpp:297 - msgid "Menu &opacity:" --msgstr "選單不透明 (&O)：" -+msgstr "選單不透明(&O)：" - - #: kcmstyle.cpp:326 - msgid "High&light buttons under mouse" -@@ -151,11 +153,11 @@ - - #: kcmstyle.cpp:327 - msgid "Transparent tool&bars when moving" --msgstr "當移動時將工具列變透明 (&B)" -+msgstr "當移動時將工具列變透明(&B)" - - #: kcmstyle.cpp:332 - msgid "Text pos&ition:" --msgstr "文字位置 (&I)：" -+msgstr "文字位置(&I)：" - - #: kcmstyle.cpp:334 - msgid "Icons Only" -@@ -175,11 +177,11 @@ - - #: kcmstyle.cpp:379 - msgid "&Style" --msgstr "風格 (&S)" -+msgstr "風格(&S)" - - #: kcmstyle.cpp:380 - msgid "&Effects" --msgstr "特效選項 (&E)" -+msgstr "特效選項(&E)" - - #: kcmstyle.cpp:381 - msgid "&Toolbar" -@@ -195,18 +197,12 @@ - - #: kcmstyle.cpp:520 - msgid "" --"Selected style: %1" --"
                          " --"
                          One or more effects that you have chosen could not be applied because the " --"selected style does not support them; they have therefore been disabled." --"
                          " --"
                          " --msgstr "" --"被選取的風格：%1" --"
                          " --"
                          一個或多個特效被選取，不過因為它們不被支援，所以目前無法套用在系統上，同時這些被選取的特效將會被關閉。" --"
                          " --"
                          " -+"Selected style: %1

                          One or more effects that you have " -+"chosen could not be applied because the selected style does not support " -+"them; they have therefore been disabled.

                          " -+msgstr "" -+"被選取的風格：%1

                          一個或多個特效被選取，不過因為它們不被支" -+"援，所以目前無法套用在系統上，同時這些被選取的特效將會被關閉。

                          " - - #: kcmstyle.cpp:532 - msgid "Menu translucency is not available.
                          " -@@ -230,25 +226,32 @@ - "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 "您可以在這邊選擇一系列預先定義的介面工具樣式 (例如扭曲的按鈕). 這可能合併於主題中(額外的資訊如大理石紋等)。" -+msgstr "" -+"您可以在這邊選擇一系列預先定義的介面工具樣式 (例如扭曲的按鈕). 這可能合併於主" -+"題中(額外的資訊如大理石紋等)。" - - #: kcmstyle.cpp:1017 - msgid "" - "This area shows a preview of the currently selected style without having to " - "apply it to the whole desktop." --msgstr "這個區域讓您可以預視您所選擇的風格，而不需要將它 套用到到整個桌面才能夠檢視。" -+msgstr "" -+"這個區域讓您可以預視您所選擇的風格，而不需要將它 套用到到整個桌面才能夠檢視。" - - #: kcmstyle.cpp:1021 - msgid "" - "This page allows you to enable various widget style effects. For best " - "performance, it is advisable to disable all effects." --msgstr "這個頁面允許您啟動各種 Widget 的風格效果。為了得到更好的執行效率，您可以選擇關閉所有的特效。" -+msgstr "" -+"這個頁面允許您啟動各種 Widget 的風格效果。為了得到更好的執行效率，您可以選擇" -+"關閉所有的特效。" - - #: kcmstyle.cpp:1023 - msgid "" - "If you check this box, you can select several effects for different widgets " - "like combo boxes, menus or tooltips." --msgstr "如果您選擇了這個選項，您可以為各種 Widget 來設定特效，例如 Combo Box、選單或工具提示。" -+msgstr "" -+"如果您選擇了這個選項，您可以為各種 Widget 來設定特效，例如 Combo Box、選單或" -+"工具提示。" - - #: kcmstyle.cpp:1025 - msgid "" -@@ -283,26 +286,27 @@ - - #: kcmstyle.cpp:1034 - msgid "" --"When enabled, all popup menus will have a drop-shadow, otherwise drop-shadows " --"will not be displayed. At present, only KDE styles can have this effect " --"enabled." -+"When enabled, all popup menus will have a drop-shadow, otherwise drop-" -+"shadows will not be displayed. At present, only KDE styles can have this " -+"effect enabled." - msgstr "" --"當這個選項被選取的時候，將會在所有的 Popup 選單上產生陰影的效果，否則這些陰影效果將不會被顯示。值得一提的是，這個選項所產生的效果，只會發生在專為 " --"KDE 開發的程式上。" -+"當這個選項被選取的時候，將會在所有的 Popup 選單上產生陰影的效果，否則這些陰影" -+"效果將不會被顯示。值得一提的是，這個選項所產生的效果，只會發生在專為 KDE 開發" -+"的程式上。" - - #: kcmstyle.cpp:1037 - msgid "" - "

                          Software Tint: Alpha-blend using a flat color.

                          \n" - "

                          Software Blend: Alpha-blend using an image.

                          \n" - "XRender Blend: Use the XFree RENDER extension for image blending (if " --"available). This method may be slower than the Software routines on " --"non-accelerated displays, but may however improve performance on remote " --"displays.

                          \n" -+"available). This method may be slower than the Software routines on non-" -+"accelerated displays, but may however improve performance on remote displays." -+"

                          \n" - msgstr "" - "

                          軟體淡色：使用固定色彩做 Alpha-混色。

                          \n" - "

                          軟體混色：使用圖片做 Alpha-混色。

                          \n" --"XRender 混色： 使用 XFree RENDER " --"延伸功能做圖片混合(如果可用)。這個方法可能會比軟體或非加速的方式慢，但是可以增進遠端畫面的效能。

                          \n" -+"XRender 混色： 使用 XFree RENDER 延伸功能做圖片混合(如果可用)。這個方" -+"法可能會比軟體或非加速的方式慢，但是可以增進遠端畫面的效能。

                          \n" - - #: kcmstyle.cpp:1042 - msgid "By adjusting this slider you can control the menu effect opacity." -@@ -312,7 +316,9 @@ - msgid "" - "Note: that all widgets in this combobox do not apply to Qt-only " - "applications." --msgstr "注意：在這個 Combo Box 中的所有 Widget，不可以套用到 Qt-Only 的應用程式。" -+msgstr "" -+"注意：在這個 Combo Box 中的所有 Widget，不可以套用到 Qt-Only 的應用程" -+"式。" - - #: kcmstyle.cpp:1047 - msgid "" -@@ -330,34 +336,39 @@ - msgid "" - "If you check this option, the KDE application will offer tooltips when the " - "cursor remains over items in the toolbar." --msgstr "如果您選擇了這個選項，那麼當滑鼠停留在 KDE 應用程式工具列上的某個物件時，顯示出該物件的提示。" -+msgstr "" -+"如果您選擇了這個選項，那麼當滑鼠停留在 KDE 應用程式工具列上的某個物件時，顯示" -+"出該物件的提示。" - - #: kcmstyle.cpp:1053 - msgid "" --"

                          Icons only: Shows only icons on toolbar buttons. Best option for low " --"resolutions.

                          " --"

                          Text only: Shows only text on toolbar buttons.

                          " --"

                          Text alongside icons: Shows icons and text on toolbar buttons. Text " --"is aligned alongside the icon.

                          Text under icons: " -+"

                          Icons only: Shows only icons on toolbar buttons. Best option for " -+"low resolutions.

                          Text only: Shows only text on toolbar buttons." -+"

                          Text alongside icons: Shows icons and text on toolbar " -+"buttons. Text is aligned alongside the icon.

                          Text under icons: " - "Shows icons and text on toolbar buttons. Text is aligned below the icon." - msgstr "" --"

                          只顯示圖示：在工具列上只以圖示顯示按鍵。在低解析度的環境下，這是個不錯的選擇。

                          " --"

                          只顯示文字：在工具列上只以文字顯示按鍵。

                          " --"

                          文字顯示在圖示旁：在工具列上同時顯示文字和圖示，而文字就顯示在圖示的旁邊。

                          " --"

                          文字顯示在圖示上：在工具列上同時顯示文字和圖示，而文字就顯示在圖示之上。

                          " -+"

                          只顯示圖示：在工具列上只以圖示顯示按鍵。在低解析度的環境下，這是個" -+"不錯的選擇。

                          只顯示文字：在工具列上只以文字顯示按鍵。

                          " -+"文字顯示在圖示旁：在工具列上同時顯示文字和圖示，而文字就顯示在圖示的旁" -+"邊。

                          文字顯示在圖示上：在工具列上同時顯示文字和圖示，而文字就顯" -+"示在圖示之上。

                          " - - #: kcmstyle.cpp:1060 - msgid "" - "If you enable this option, KDE Applications will show small icons alongside " - "some important buttons." --msgstr "如果您開啟了這個選項，那麼 KDE 的應用程式將會有某些重要的按鍵旁顯示小圖示。" -+msgstr "" -+"如果您開啟了這個選項，那麼 KDE 的應用程式將會有某些重要的按鍵旁顯示小圖示。" - - #: kcmstyle.cpp:1062 - 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 " --"helpful when performing the same action multiple times." --msgstr "如果您啟用此選頂某些彈出式選單會顯示所謂的快速處理。如果您按下它們，您會看到視窗元件裡的選單。在進行多次相同的動作時這會很有幫助。" -+"handles. If you click them, you get the menu inside a widget. This can be " -+"very helpful when performing the same action multiple times." -+msgstr "" -+"如果您啟用此選頂某些彈出式選單會顯示所謂的快速處理。如果您按下它們，您會看到" -+"視窗元件裡的選單。在進行多次相同的動作時這會很有幫助。" - - #: menupreview.cpp:160 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmtaskbar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmtaskbar.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmtaskbar.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmtaskbar.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: kcmtaskbar\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2007-02-27 09:09+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -94,13 +93,14 @@ - - #: kcmtaskbar.cpp:144 - msgid "" --"

                          Taskbar

                          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 " --"the current desktop. You can also configure whether or not the Window List " --"button will be displayed." -+"

                          Taskbar

                          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 the current desktop. You can also configure whether or not the " -+"Window List button will be displayed." - msgstr "" --"

                          工作列

                          您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮動在外面(預設: 嵌入). " --"您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上的視窗" -+"

                          工作列

                          您可以在這邊組態工作列. 這包含了如工作列是否要嵌入於面板或浮" -+"動在外面(預設: 嵌入). 您也可以組態工作列是否要顯示所有的視窗或只有目前桌面上" -+"的視窗" - - #: kcmtaskbar.cpp:176 - msgid "kcmtaskbar" -@@ -161,8 +161,8 @@ - #: rc.cpp:20 - #, no-c-format - msgid "" --"Turning this option off will cause the taskbar to display only " --"the windows on the current desktop. \n" -+"Turning this option off will cause the taskbar to display only the " -+"windows on the current desktop. \n" - "\n" - "By default, this option is selected and all windows are shown." - msgstr "" -@@ -182,28 +182,30 @@ - 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 "選則這個選項會使得工作列顯示一個按鈕，當按下它時，會出現一個彈出選單顯示所有視窗的列表。" -+msgstr "" -+"選則這個選項會使得工作列顯示一個按鈕，當按下它時，會出現一個彈出選單顯示所有" -+"視窗的列表。" - - #. i18n: file kcmtaskbarui.ui line 105 - #: rc.cpp:31 - #, 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 Show all windows " --"option.\n" --"\n" --"You can set the taskbar to Never group windows, to " --"Always group windows or to group windows only " --"When the Taskbar is Full.\n" -+"window group buttons are clicked on a menu appears showing all the windows " -+"in that group. This can be especially useful with the Show all windows option.\n" -+"\n" -+"You can set the taskbar to Never group windows, to " -+"Always group windows or to group windows only When " -+"the Taskbar is Full.\n" - "\n" - "By default the taskbar groups windows when it is full." - msgstr "" --"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個選單來顯示在群組中的所有視窗。這在顯示所有視窗" --"選項中會特別有用。\n" -+"工作列可以將相近的視窗組為一個單一按鈕。當這些視窗群組按鈕被按下時會出現一個" -+"選單來顯示在群組中的所有視窗。這在顯示所有視窗選項中會特別有用。\n" - "\n" --"您可以設定工作列 永不 使用群組視窗，永遠 群組視窗或者只有 " --"當工作列已滿 時才將視窗群組起來。\n" -+"您可以設定工作列 永不 使用群組視窗，永遠 群" -+"組視窗或者只有 當工作列已滿 時才將視窗群組起來。\n" - "\n" - "預設中工作列會在已滿的情況下群組視窗。" - -@@ -223,10 +225,11 @@ - #: rc.cpp:44 - #, no-c-format - msgid "" --"Select this option if you want the taskbar to display only " --"minimized windows. \n" -+"Select this option if you want the taskbar to display only minimized " -+"windows. \n" - "\n" --"By default, this option is not selected and the taskbar will show all windows." -+"By default, this option is not selected and the taskbar will show all " -+"windows." - msgstr "" - "選取這個選項如果您希望工作列只有顯示縮到最小的視窗。\n" - "\n" -@@ -242,8 +245,8 @@ - #: rc.cpp:52 - #, no-c-format - msgid "" --"Select this option if you want window icons to appear along with their titles " --"in the taskbar.\n" -+"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 "" -@@ -304,7 +307,7 @@ - #: rc.cpp:80 - #, no-c-format - msgid "Sort alphabeticall&y by application name" --msgstr "按字母順序排序應用程式(&y)" -+msgstr "按字母順序排序應用程式(&Y)" - - #. i18n: file kcmtaskbarui.ui line 347 - #: rc.cpp:83 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmusb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmusb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmusb.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmusb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kcmusb\n" - "POT-Creation-Date: 2006-06-21 03:58+0200\n" - "PO-Revision-Date: 2005-10-29 15:45+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,8 +28,8 @@ - - #: kcmusb.cpp:34 - msgid "" --"

                          USB Devices

                          This module allows you to see the devices attached to your " --"USB bus(es)." -+"

                          USB Devices

                          This module allows you to see the devices attached to " -+"your USB bus(es)." - msgstr "

                          USB 裝置

                          這個模組可以讓您知道有什麼裝置接在您的USB bus上 ." - - #: kcmusb.cpp:38 -@@ -130,9 +130,11 @@ - - #: usbdevices.cpp:426 - msgid "" --"Could not open one or more USB controller. Make sure, you have read access to " --"all USB controllers that should be listed here." --msgstr "無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取權限。" -+"Could not open one or more USB controller. Make sure, you have read access " -+"to all USB controllers that should be listed here." -+msgstr "" -+"無法開啟一或多個 USB 控制器。請確定您對應該在此列出的所有 USB 控制器有讀取權" -+"限。" - - #: classes.i18n:1 - msgid "AT-commands" -@@ -180,7 +182,7 @@ - - #: classes.i18n:12 - msgid "Control Device" --msgstr "控制台" -+msgstr "控制臺" - - #: classes.i18n:13 - msgid "Control/Bulk" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmview1394.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmview1394.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmview1394.po 2005-10-10 17:28:03.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmview1394.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,14 +1,14 @@ - # Chinese/Traditional translation of kcmview1394. - # Woodman Tuen , 2005. --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: kcmview1394\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-27 02:32+0200\n" - "PO-Revision-Date: 2005-08-25 12:20+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -89,33 +89,24 @@ - #: view1394.cpp:65 - msgid "" - "On the right hand side you can see some information about your IEEE 1394 " --"configuration." --"
                          The meaning of the columns:" --"
                          Name: port or node name, the number can change with each bus reset" --"
                          GUID: the 64 bit GUID of the node" --"
                          Local: checked if the node is an IEEE 1394 port of your computer" --"
                          IRM: checked if the node is isochronous resource manager capable" --"
                          CRM: checked if the node is cycle master capable" --"
                          ISO: checked if the node supports isochronous transfers" --"
                          BM: checked if the node is bus manager capable" --"
                          PM: checked if the node is power management capable" --"
                          Acc: the cycle clock accuracy of the node, valid from 0 to 100" --"
                          Speed: the speed of the node" --"
                          " -+"configuration.
                          The meaning of the columns:
                          Name: port or node " -+"name, the number can change with each bus reset
                          GUID: the 64 bit " -+"GUID of the node
                          Local: checked if the node is an IEEE 1394 port " -+"of your computer
                          IRM: checked if the node is isochronous resource " -+"manager capable
                          CRM: checked if the node is cycle master " -+"capable
                          ISO: checked if the node supports isochronous " -+"transfers
                          BM: checked if the node is bus manager capable
                          PM: checked if the node is power management capable
                          Acc: the cycle " -+"clock accuracy of the node, valid from 0 to 100
                          Speed: the speed " -+"of the node
                          " - msgstr "" --"在右邊你可以看到您的 IEEE 1394的設定。" --"
                          每一欄的意思是：" --"
                          名稱：連接埠或裝置名稱，匯流排重設時可以將號碼更改" --"
                          GUID：裝置的 64 bit GUID" --"
                          本機：如裝置是在您的電腦上 IEEE 1394 連接埠則會選取" --"
                          IRM：如支援非同步資源管理" --"
                          CRM: 如支援 cycle master 則會選取" --"
                          ISO：如支援非同步傳送" --"
                          BM：如支援匯流排管理功能則會選取" --"
                          PM：如支援電源管理功能則會選取" --"
                          Acc：裝置的週期準確度，有效值由 0 至 100" --"
                          速度：裝置的速度" --"
                          " -+"在右邊你可以看到您的 IEEE 1394的設定。
                          每一欄的意思是：
                          名稱：連" -+"接埠或裝置名稱，匯流排重設時可以將號碼更改
                          GUID：裝置的 64 bit " -+"GUID
                          本機：如裝置是在您的電腦上 IEEE 1394 連接埠則會選取" -+"
                          IRM：如支援非同步資源管理
                          CRM: 如支援 cycle master 則會" -+"選取
                          ISO：如支援非同步傳送
                          BM：如支援匯流排管理功能則會選" -+"取
                          PM：如支援電源管理功能則會選取
                          Acc：裝置的週期準確度，" -+"有效值由 0 至 100
                          速度：裝置的速度
                          " - - #: view1394.cpp:196 - msgid "Port %1:\"%2\"" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmxinerama.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmxinerama.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcmxinerama.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcmxinerama.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kcmxinerama\n" - "POT-Creation-Date: 2006-08-23 02:32+0200\n" - "PO-Revision-Date: 2005-10-29 15:48+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,8 +39,8 @@ - - #: kcmxinerama.cpp:56 - msgid "" --"

                          Multiple Monitors

                          This module allows you to configure KDE support for " --"multiple monitors." -+"

                          Multiple Monitors

                          This module allows you to configure KDE support " -+"for multiple monitors." - msgstr "

                          多重螢幕

                          這個模組能讓您設定 KDE 的多重螢幕支援" - - #: kcmxinerama.cpp:74 -@@ -54,10 +54,12 @@ - - #: kcmxinerama.cpp:103 - msgid "" --"" --"

                          This module is only for configuring systems with a single desktop spread " --"across multiple monitors. You do not appear to have this configuration.

                          " --msgstr "

                          這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組

                          " -+"

                          This module is only for configuring systems with a single desktop " -+"spread across multiple monitors. You do not appear to have this " -+"configuration.

                          " -+msgstr "" -+"

                          這個模組只能在使用一個桌面於多重螢幕的系統上執行。您似乎無法使用此模組" -+"

                          " - - #: kcmxinerama.cpp:187 - msgid "Your settings will only affect newly started applications." -@@ -119,7 +121,7 @@ - #: rc.cpp:33 - #, no-c-format - msgid "&Identify All Displays" --msgstr "鑑別所有的畫面 (&A)" -+msgstr "鑑別所有的畫面(&A)" - - #. i18n: file xineramawidget.ui line 182 - #: rc.cpp:36 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcontrol.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kcontrol.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kcontrol.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kcontrol.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kcontrol\n" - "POT-Creation-Date: 2008-01-05 01:15+0100\n" - "PO-Revision-Date: 2005-10-29 16:01+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -40,7 +40,9 @@ - "Welcome to the \"KDE Control Center\", a central place to configure your " - "desktop environment. Select an item from the index on the left to load a " - "configuration module." --msgstr "歡迎使用「KDE 控制中心」，您可以在此統籌設定您的桌面環境。 請從左邊的索引中選擇一個項目，以便載入設定模組。" -+msgstr "" -+"歡迎使用「KDE 控制中心」，您可以在此統籌設定您的桌面環境。 請從左邊的索引中選" -+"擇一個項目，以便載入設定模組。" - - #: aboutwidget.cpp:53 main.cpp:108 - msgid "KDE Info Center" -@@ -52,8 +54,8 @@ - - #: aboutwidget.cpp:57 - msgid "" --"Welcome to the \"KDE Info Center\", a central place to find information about " --"your computer system." -+"Welcome to the \"KDE Info Center\", a central place to find information " -+"about your computer system." - msgstr "歡迎使用「KDE 資訙中心」，您可以在這裡找到關於您電腦系統上的資訊。" - - #: aboutwidget.cpp:61 -@@ -88,13 +90,13 @@ - - #: dockcontainer.cpp:133 - msgid "Loading..." --msgstr "載入中..." -+msgstr "載入中…" - - #: dockcontainer.cpp:201 toplevel.cpp:376 - 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 " --"changes?" -+"Do you want to apply the changes before running the new module or discard " -+"the changes?" - msgstr "" - "作用中的模組留有未儲存的變更。\n" - "執行新模組前是否要套用變更，或者忽略變更?" -@@ -102,8 +104,8 @@ - #: dockcontainer.cpp:204 toplevel.cpp:379 - msgid "" - "There are unsaved changes in the active module.\n" --"Do you want to apply the changes before exiting the Control Center or discard " --"the changes?" -+"Do you want to apply the changes before exiting the Control Center or " -+"discard the changes?" - msgstr "" - "作用中的模組留有未儲存的變更。\n" - "在離開控制中心前是否要套用變更，或者忽略變更?" -@@ -114,41 +116,37 @@ - - #: helpwidget.cpp:44 - msgid "" --"

                          Use the \"What's This?\" (Shift+F1) to get help on specific options.

                          " --"

                          To read the full manual click here.

                          " -+"

                          Use the \"What's This?\" (Shift+F1) to get help on specific options.

                          To read the full manual click here.

                          " - msgstr "" --"

                          使用「這是什麼？」 (Shift+F1) 來取得特定選項的說明。

                          " --"

                          要讀取完整的說明手冊請按 這裡。

                          " -+"

                          使用「這是什麼？」 (Shift+F1) 來取得特定選項的說明。

                          要讀取完整的說" -+"明手冊請按 這裡。

                          " - - #: helpwidget.cpp:51 - msgid "" - "

                          KDE Info Center

                          There is no quick help available for the active info " --"module." --"
                          " --"
                          Click here " --"to read the general Info Center manual." -+"module.

                          Click here to read " -+"the general Info Center manual." - msgstr "" --"

                          KDE 資訊中心

                          抱歉，作用中的資訊模組並無快速說明。" --"
                          " --"
                          請按 這裡 以讀取一般資訊中心手冊。" -+"

                          KDE 資訊中心

                          抱歉，作用中的資訊模組並無快速說明。

                          請按 這裡 以讀取一般資訊中心手冊。" - - #: helpwidget.cpp:56 - msgid "" - "

                          KDE Control Center

                          There is no quick help available for the active " --"control module." --"
                          " --"
                          Click here " --"to read the general Control Center manual." -+"control module.

                          Click here to " -+"read the general Control Center manual." - msgstr "" --"

                          KDE 控制中心

                          抱歉，作用中的控制模組並無快速說明。" --"
                          " --"
                          請按 這裡 以讀取一般控制中心手冊。" -+"

                          KDE 控制中心

                          抱歉，作用中的控制模組並無快速說明。

                          請按 這裡 以讀取一般控制中心手冊。" - - #: kcrootonly.cpp:30 - msgid "" --"You need super user privileges to run this control module." --"
                          Click on the \"Administrator Mode\" button below." --msgstr "你需要超級使用者的權限來執行這個控制模組。
                          點選下面 \"管理者模式\" 按鈕。" -+"You need super user privileges to run this control module.
                          Click on the \"Administrator Mode\" button below." -+msgstr "" -+"你需要超級使用者的權限來執行這個控制模組。
                          點選下面 \"管理者模" -+"式\" 按鈕。" - - #: main.cpp:105 - msgid "The KDE Control Center" -@@ -168,7 +166,7 @@ - - #: modules.cpp:160 - msgid "Loading..." --msgstr "載入中 ..." -+msgstr "載入中…" - - #: moduletreeview.cpp:65 - msgid "The %1 configuration group. Click to open it." -@@ -178,7 +176,8 @@ - msgid "" - "This treeview displays all available control modules. Click on one of the " - "modules to receive more detailed information." --msgstr "這個樹狀圖顯示所有可使用的控制模組。在其中一個模組上按一下來獲得更多資訊。" -+msgstr "" -+"這個樹狀圖顯示所有可使用的控制模組。在其中一個模組上按一下來獲得更多資訊。" - - #: proxywidget.cpp:54 - msgid "The currently loaded configuration module." -@@ -186,22 +185,22 @@ - - #: proxywidget.cpp:88 - msgid "" --"Changes in this module require root access." --"
                          Click the \"Administrator Mode\" button to allow modifications in this " --"module." -+"Changes in this module require root access.
                          Click the " -+"\"Administrator Mode\" button to allow modifications in this module." - msgstr "" --"變更這個模組需要具備系統管理員的權限才能夠進行！" --"
                          請點選 「管理者模式」 按鈕以便於切換到系統管理者權限來進行修改的動作。" -+"變更這個模組需要具備系統管理員的權限才能夠進行！
                          請點選 「管理者模" -+"式」 按鈕以便於切換到系統管理者權限來進行修改的動作。" - - #: proxywidget.cpp:92 - msgid "" - "This module requires special permissions, probably for system-wide " --"modifications; therefore, it is required that you provide the root password to " --"be able to change the module's properties. If you do not provide the password, " --"the module will be disabled." -+"modifications; therefore, it is required that you provide the root password " -+"to be able to change the module's properties. If you do not provide the " -+"password, the module will be disabled." - msgstr "" --"這個模組的使用需要一些額外的權限機制，以便於能夠進行一些系統面的修改動作：因此您需要提供系統管理者密碼以便能修改模組的特性。若是您不輸入系統管理者密碼的話，該模" --"組就無法使用。" -+"這個模組的使用需要一些額外的權限機制，以便於能夠進行一些系統面的修改動作：因" -+"此您需要提供系統管理者密碼以便能修改模組的特性。若是您不輸入系統管理者密碼的" -+"話，該模組就無法使用。" - - #: proxywidget.cpp:211 - msgid "&Reset" -@@ -269,11 +268,11 @@ - - #: toplevel.cpp:281 toplevel.cpp:357 - msgid "&Report Bug..." --msgstr "回報問題(&R)..." -+msgstr "回報問題(&R)…" - - #: toplevel.cpp:359 - msgid "Report Bug on Module %1..." --msgstr "回報模組 %1 的問題..." -+msgstr "回報模組 %1 的問題…" - - #: toplevel.cpp:440 - #, c-format -@@ -339,8 +338,18 @@ - #~ msgid "There was an error loading the module." - #~ msgstr "載入這個模組時有一個錯誤。" - --#~ msgid "

                          The diagnostics is:
                          %1

                          Possible reasons:

                          • An error occurred during your last KDE upgrade leaving an orphaned control module
                          • You have old third party modules lying around.

                          Check these points carefully and try to remove the module mentioned in the error message. If this fails, consider contacting your distributor or packager.

                          " --#~ msgstr "

                          診斷結果為：
                          %1

                          可能原因是：

                          • 您在上一次升級 KDE 時，有部份的控制模組沒有更新。
                          • 您的系統中存在有舊的 Third Party 模組。

                          請小心的檢查上述幾點，並試著移除在錯誤訊息中所提到的模組。如果還是失敗，請聯絡您的套件廠商，或是套件的整理者。

                          " -+#~ msgid "" -+#~ "

                          The diagnostics is:
                          %1

                          Possible reasons:

                          • An error " -+#~ "occurred during your last KDE upgrade leaving an orphaned control " -+#~ "module
                          • You have old third party modules lying around.

                          Check " -+#~ "these points carefully and try to remove the module mentioned in the " -+#~ "error message. If this fails, consider contacting your distributor or " -+#~ "packager.

                          " -+#~ msgstr "" -+#~ "

                          診斷結果為：
                          %1

                          可能原因是：

                          • 您在上一次升級 KDE " -+#~ "時，有部份的控制模組沒有更新。
                          • 您的系統中存在有舊的 Third Party 模組。" -+#~ "

                          請小心的檢查上述幾點，並試著移除在錯誤訊息中所提到的模組。如果還是" -+#~ "失敗，請聯絡您的套件廠商，或是套件的整理者。

                          " - - #~ msgid "" - #~ "There was an error loading module\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdcop.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdcop.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdcop.po 2007-07-12 10:27:45.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdcop.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kdcop\n" - "POT-Creation-Date: 2007-05-15 02:14+0200\n" - "PO-Revision-Date: 2007-04-12 12:03+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdebugdialog.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdebugdialog.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdebugdialog.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdebugdialog.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kdebugdialog\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-10-29 16:06+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdepasswd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdepasswd.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdepasswd.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdepasswd.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: KDEpasswd\n" - "POT-Creation-Date: 2005-07-09 01:31+0200\n" - "PO-Revision-Date: 2005-10-29 16:08+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,7 +32,7 @@ - - #: kdepasswd.cpp:60 - msgid "You need to be root to change the password of other users." --msgstr "您必須以root的身份來變更其他使用者的密碼" -+msgstr "您必須以root的身分來變更其他使用者的密碼" - - #: passwddlg.cpp:19 passwddlg.cpp:87 - msgid "Change Password" -@@ -69,14 +69,20 @@ - #: passwddlg.cpp:108 - msgid "" - "Your password is longer than 8 characters. On some systems, this can cause " --"problems. You can truncate the password to 8 characters, or leave it as it is." --msgstr "您的密碼超過八個字。在某些系統上，這可能會造成問題。您可以將本密碼刪節成8個字，或是不予理睬，保持這樣。" -+"problems. You can truncate the password to 8 characters, or leave it as it " -+"is." -+msgstr "" -+"您的密碼超過八個字。在某些系統上，這可能會造成問題。您可以將本密碼刪節成8個" -+"字，或是不予理睬，保持這樣。" - - #: passwddlg.cpp:111 - msgid "" - "The password is longer than 8 characters. On some systems, this can cause " --"problems. You can truncate the password to 8 characters, or leave it as it is." --msgstr "您的密碼超過八個字。在某些系統上，這可能會造成問題。您可以將本密碼刪節成8個字，或是不予理睬，保持原樣。" -+"problems. You can truncate the password to 8 characters, or leave it as it " -+"is." -+msgstr "" -+"您的密碼超過八個字。在某些系統上，這可能會造成問題。您可以將本密碼刪節成8個" -+"字，或是不予理睬，保持原樣。" - - #: passwddlg.cpp:115 - msgid "Password Too Long" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprintfax.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprintfax.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprintfax.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprintfax.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kdeprintfax\n" - "POT-Creation-Date: 2006-04-28 03:54+0200\n" - "PO-Revision-Date: 2006-06-19 09:34+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,11 +27,11 @@ - - #: confsystem.cpp:61 - msgid "Fax &server (if any):" --msgstr "傳真伺服器 (如果有的話) (&S):" -+msgstr "傳真伺服器 (如果有的話)(&S):" - - #: confsystem.cpp:62 - msgid "&Fax/Modem device:" --msgstr "傳真/數據機裝置 (&F):" -+msgstr "傳真/數據機裝置(&F):" - - #: confsystem.cpp:65 - msgid "Standard Modem Port" -@@ -62,15 +61,15 @@ - - #: faxctrl.cpp:471 - msgid "Sending fax to %1..." --msgstr "以傳真方式寄送至 %1..." -+msgstr "以傳真方式寄送至 %1…" - - #: faxctrl.cpp:482 - msgid "Skipping %1..." --msgstr "略過 %1..." -+msgstr "略過 %1…" - - #: faxctrl.cpp:500 - msgid "Filtering %1..." --msgstr "過濾 %1..." -+msgstr "過濾 %1…" - - #: faxctrl.cpp:618 - msgid "Fax log" -@@ -110,23 +109,23 @@ - - #: conffax.cpp:48 - msgid "&Resolution:" --msgstr "解析度 (&R):" -+msgstr "解析度(&R):" - - #: conffax.cpp:50 - msgid "&Paper size:" --msgstr "紙張大小 (&P):" -+msgstr "紙張大小(&P):" - - #: confgeneral.cpp:41 - msgid "&Name:" --msgstr "名稱 (&N):" -+msgstr "名稱(&N):" - - #: confgeneral.cpp:43 - msgid "&Company:" --msgstr "公司 (&C):" -+msgstr "公司(&C):" - - #: confgeneral.cpp:45 - msgid "N&umber:" --msgstr "電話 (&U):" -+msgstr "電話(&U):" - - #: confgeneral.cpp:48 - msgid "Replace international prefix '+' with:" -@@ -280,7 +279,7 @@ - - #: kdeprintfax.cpp:82 - msgid "F&iles:" --msgstr "文件 (&I):" -+msgstr "文件(&I):" - - #: kdeprintfax.cpp:89 - msgid "Enterprise" -@@ -300,7 +299,7 @@ - - #: kdeprintfax.cpp:107 - msgid "&Comment:" --msgstr "說明 (&C):" -+msgstr "說明(&C):" - - #: kdeprintfax.cpp:118 - msgid "Sched&ule:" -@@ -324,7 +323,7 @@ - - #: kdeprintfax.cpp:172 kdeprintfax.cpp:252 - msgid "Processing..." --msgstr "處理中..." -+msgstr "處理中…" - - #: kdeprintfax.cpp:173 kdeprintfax.cpp:402 - msgid "Idle" -@@ -336,35 +335,35 @@ - - #: kdeprintfax.cpp:191 - msgid "&Add File..." --msgstr "新增檔案... (&A)" -+msgstr "新增檔案…(&A)" - - #: kdeprintfax.cpp:192 - msgid "&Remove File" --msgstr "移除檔案 (&R)" -+msgstr "移除檔案(&R)" - - #: kdeprintfax.cpp:193 - msgid "&Send Fax" --msgstr "寄出傳真 (&S)" -+msgstr "寄出傳真(&S)" - - #: kdeprintfax.cpp:194 - msgid "A&bort" --msgstr "中斷 (&B)" -+msgstr "中斷(&B)" - - #: kdeprintfax.cpp:195 - msgid "A&ddress Book" --msgstr "通訊錄 (&D)" -+msgstr "通訊錄(&D)" - - #: kdeprintfax.cpp:196 - msgid "V&iew Log" --msgstr "檢視日誌檔 (&I)" -+msgstr "檢視日誌檔(&I)" - - #: kdeprintfax.cpp:197 - msgid "Vi&ew File" --msgstr "檢視檔案 (&E)" -+msgstr "檢視檔案(&E)" - - #: kdeprintfax.cpp:198 - msgid "&New Fax Recipient..." --msgstr "新增傳真收件者(&N)..." -+msgstr "新增傳真收件者(&N)…" - - #: kdeprintfax.cpp:245 - msgid "No file to fax." -@@ -397,11 +396,11 @@ - - #: kdeprintfax.cpp:565 - msgid "&Number:" --msgstr "電話 (&N):" -+msgstr "電話(&N):" - - #: kdeprintfax.cpp:566 - msgid "N&ame:" --msgstr "名稱 (&A):" -+msgstr "名稱(&A):" - - #: kdeprintfax.cpp:567 - msgid "&Enterprise:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprint_part.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprint_part.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdeprint_part.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdeprint_part.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kdeprint_part\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2002-10-08 11:51+1000\n" --"Last-Translator: Ben Wu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (Traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesktop.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesktop.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesktop.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesktop.po 2011-11-11 15:45:17.000000000 +0100 -@@ -14,7 +14,7 @@ - "Project-Id-Version: kdesktop\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2007-11-09 14:32+0800\n" --"Last-Translator: Chih-Wei Huang \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,8 +27,8 @@ - - #: lock/autologout.cc:40 - msgid "" --"To prevent being logged out, resume using this session by moving the mouse " --"or pressing a key." -+"To prevent being logged out, resume using this session by moving the " -+"mouse or pressing a key." - msgstr "要避免被強制登出，請移動滑鼠或按下一鍵來恢復工作階段。" - - #: lock/autologout.cc:80 -@@ -48,7 +48,7 @@ - - #: lock/lockdlg.cc:93 - msgid "Sw&itch User..." --msgstr "切換使用者(&I)..." -+msgstr "切換使用者(&I)…" - - #: lock/lockdlg.cc:94 - msgid "Unl&ock" -@@ -72,19 +72,18 @@ - - #: lock/lockdlg.cc:526 - msgid "" --"You have chosen to open another desktop session instead of resuming the current " --"one." --"
                          The current session will be hidden and a new login screen will be " --"displayed." --"
                          An F-key is assigned to each session; F%1 is usually assigned to the first " --"session, F%2 to the second session and so on. You can switch between sessions " --"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, " --"the KDE Panel and Desktop menus have actions for switching between sessions." --msgstr "" --"您已經選擇要開啟一個新的工作階段，而不繼續使用目前的。" --"
                          目前的階段會被隱藏起來，並顯示一個新的登入畫面。" --"
                          一個F-key會被指定到各個階段，如F%1指定到第一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key " --"在各個階段之間切換。另外，KDE Panel 和桌面選單會在切換期間作適當的改變。" -+"You have chosen to open another desktop session instead of resuming the " -+"current one.
                          The current session will be hidden and a new login screen " -+"will be displayed.
                          An F-key is assigned to each session; F%1 is usually " -+"assigned to the first session, F%2 to the second session and so on. You can " -+"switch between sessions by pressing Ctrl, Alt and the appropriate F-key at " -+"the same time. Additionally, the KDE Panel and Desktop menus have actions " -+"for switching between sessions." -+msgstr "" -+"您已經選擇要開啟一個新的工作階段，而不繼續使用目前的。
                          目前的階段會被隱藏" -+"起來，並顯示一個新的登入畫面。
                          一個F-key會被指定到各個階段，如F%1指定到第" -+"一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key 在各個階段之間" -+"切換。另外，KDE Panel 和桌面選單會在切換期間作適當的改變。" - - #: krootwm.cc:842 lock/lockdlg.cc:539 - msgid "&Start New Session" -@@ -113,10 +112,8 @@ - msgstr "開始新的工作階段(&N)" - - #: lock/lockprocess.cc:742 --msgid "" --"Will not lock the session, as unlocking would be impossible:\n" --msgstr "" --"由於不能解除鎖定，所以將不會鎖定這個工作階段：\n" -+msgid "Will not lock the session, as unlocking would be impossible:\n" -+msgstr "由於不能解除鎖定，所以將不會鎖定這個工作階段：\n" - - #: lock/lockprocess.cc:746 - msgid "Cannot start kcheckpass." -@@ -160,7 +157,7 @@ - - #: desktop.cc:789 - msgid "&Save to Desktop..." --msgstr "儲存到桌面(&S)..." -+msgstr "儲存到桌面(&S)…" - - #: desktop.cc:791 - msgid "Set as &Wallpaper" -@@ -178,8 +175,8 @@ - msgid "" - "Could not log out properly.\n" - "The session manager cannot be contacted. You can try to force a shutdown by " --"pressing Ctrl+Alt+Backspace; note, however, that your current session will not " --"be saved with a forced shutdown." -+"pressing Ctrl+Alt+Backspace; note, however, that your current session will " -+"not be saved with a forced shutdown." - msgstr "" - "無法順利的登出。\n" - "無法聯絡工作階段管理員。您可以嘗試按下 Ctrl-Alt-Backspace\n" -@@ -187,9 +184,11 @@ - - #: init.cc:68 - msgid "" --"%1 is a file, but KDE needs it to be a directory; move it to %2.orig and create " --"directory?" --msgstr "%1 是一個檔案，但 KDE 需要它的位置作一個目錄; 把它移至 %2.orig 然後建立目錄，好嗎?" -+"%1 is a file, but KDE needs it to be a directory; move it to %2.orig and " -+"create directory?" -+msgstr "" -+"%1 是一個檔案，但 KDE 需要它的位置作一個目錄; 把它移至 %2.orig 然後建立目錄，" -+"好嗎?" - - #: init.cc:68 - msgid "Move It" -@@ -201,8 +200,8 @@ - - #: init.cc:82 - msgid "" --"Could not create directory %1; check for permissions or reconfigure the desktop " --"to use another path." -+"Could not create directory %1; check for permissions or reconfigure the " -+"desktop to use another path." - msgstr "無法建立目錄 %1; 請檢查權限或設定桌面使用另一路徑。" - - #: kdiconview.cc:437 -@@ -219,11 +218,15 @@ - - #: krootwm.cc:133 - msgid "Run Command..." --msgstr "執行命令..." -+msgstr "執行命令…" -+ -+#: krootwm.cc:135 (Trinity Specific) -+msgid "Open Terminal Here..." -+msgstr "此處開啟終端機…" - - #: krootwm.cc:137 - msgid "Configure Desktop..." --msgstr "設定桌面..." -+msgstr "設定桌面…" - - #: krootwm.cc:139 krootwm.cc:364 - msgid "Disable Desktop Menu" -@@ -289,7 +292,7 @@ - - #: krootwm.cc:192 - msgid "Log Out \"%1\"..." --msgstr "登出 \"%1\" ..." -+msgstr "登出 \"%1\"…" - - #: krootwm.cc:198 - msgid "Start New Session" -@@ -337,18 +340,17 @@ - - #: krootwm.cc:830 - msgid "" --"

                          You have chosen to open another desktop session." --"
                          The current session will be hidden and a new login screen will be " --"displayed." --"
                          An F-key is assigned to each session; F%1 is usually assigned to the first " --"session, F%2 to the second session and so on. You can switch between sessions " --"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, " --"the KDE Panel and Desktop menus have actions for switching between sessions.

                          " --msgstr "" --"您已經選擇要開啟另一個工作階段。" --"
                          目前的階段會被隱藏起來，並顯示一個新的登入畫面。" --"
                          一個F-key會被指定到各個階段，如F%1指定到第一個、F%2指定到第二個...如此類推。您還可以按下 Ctrl+Alt+F-key " --"在各個階段之間切換。另外，KDE Panel 和桌面選單會在切換期間作適當的改變。" -+"

                          You have chosen to open another desktop session.
                          The current session " -+"will be hidden and a new login screen will be displayed.
                          An F-key is " -+"assigned to each session; F%1 is usually assigned to the first session, F%2 " -+"to the second session and so on. You can switch between sessions by pressing " -+"Ctrl, Alt and the appropriate F-key at the same time. Additionally, the KDE " -+"Panel and Desktop menus have actions for switching between sessions.

                          " -+msgstr "" -+"您已經選擇要開啟另一個工作階段。
                          目前的階段會被隱藏起來，並顯示一個新的登" -+"入畫面。
                          一個F-key會被指定到各個階段，如F%1指定到第一個、F%2指定到第二" -+"個...如此類推。您還可以按下 Ctrl+Alt+F-key 在各個階段之間切換。另外，KDE " -+"Panel 和桌面選單會在切換期間作適當的改變。" - - #: krootwm.cc:841 - msgid "Warning - New Session" -@@ -410,7 +412,7 @@ - - #: kdesktopbindings.cpp:39 - msgid "Halt without Confirmation" --msgstr "無須確認直接關閉這台電腦" -+msgstr "無須確認直接關閉這臺電腦" - - #: kdesktopbindings.cpp:40 - msgid "Reboot without Confirmation" -@@ -429,10 +431,8 @@ - msgstr "使用者 %1 在這個系統中不存在。" - - #: minicli.cpp:402 --msgid "" --"You do not exist.\n" --msgstr "" --"您不存在!\n" -+msgid "You do not exist.\n" -+msgstr "您不存在!\n" - - #: minicli.cpp:427 - msgid "Incorrect password; please try again." -@@ -472,7 +472,8 @@ - "misbehaves, the system might hang unrecoverably.\n" - "Are you sure you want to continue?" - msgstr "" --"執行程式在即時級別可能非常危險。如果程式運作不當，系統可能會當掉並且無法恢復。\n" -+"執行程式在即時級別可能非常危險。如果程式運作不當，系統可能會當掉並且無法恢" -+"復。\n" - "\n" - "您確定要繼續嗎？" - -@@ -494,24 +495,27 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"Select whether realtime scheduling should be enabled for the application. " --"The scheduler governs which process will run and which will have to wait. Two " --"schedulers are available:\n" -+"Select whether realtime scheduling should be enabled for the " -+"application. The scheduler governs which process will run and which will " -+"have to wait. Two schedulers are available:\n" - "
                            \n" - "
                          • Normal: This is the standard, timesharing scheduler. It will " - "divide fairly the available processing time between all processes.
                            • \n" - "
                          • Realtime:This scheduler will run your application uninterrupted " - "until it gives up the processor. This can be dangerous. An application that " --"does not give up the processor might hang the system. You need root's password " --"to use the scheduler.
                            • \n" -+"does not give up the processor might hang the system. You need root's " -+"password to use the scheduler.\n" - "
                          \n" - "                          " - msgstr "" --"您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等待。有兩種排程器可供選擇：\n" -+"您可以選擇為該程式使用哪種排程器。排程器決定該執行哪個程序和哪些程序要等" -+"待。有兩種排程器可供選擇：\n" - "
                            \n" --"
                          • 普通： 這是標準的時間分享排程器。它平均分配可用的處理時間給所有的程序。
                            • \n" --"
                          • 即時： 該排程器將不中斷地執行程式，直到它釋放處理器。這可能是危險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root " --"的密碼才能使用該排程器。
                            • \n" -+"
                          • 普通： 這是標準的時間分享排程器。它平均分配可用的處理時間給所有" -+"的程序。
                            • \n" -+"
                          • 即時： 該排程器將不中斷地執行程式，直到它釋放處理器。這可能是危" -+"險的──不釋放處理器的程式可能會導致系統當機。需要有管理者 root 的密碼才能使用" -+"該排程器。
                            • \n" - "
                          \n" - "                          " - -@@ -525,7 +529,7 @@ - #: rc.cpp:17 rc.cpp:47 - #, no-c-format - msgid "Enter the user you want to run the application as here." --msgstr "在這裏輸入您執行程式使用的使用者身份。" -+msgstr "在這裏輸入您執行程式使用的使用者身分。" - - #. i18n: file minicli_ui.ui line 224 - #: rc.cpp:20 rc.cpp:26 -@@ -551,7 +555,8 @@ - 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 "如果您要執行的程式是文字模式的，請點選該選項。該程式將在模擬終端視窗中運行。" -+msgstr "" -+"如果您要執行的程式是文字模式的，請點選該選項。該程式將在模擬終端視窗中運行。" - - #. i18n: file minicli_ui.ui line 279 - #: rc.cpp:35 -@@ -564,9 +569,12 @@ - #, no-c-format - msgid "" - "The priority that the command will be run with can be set here. From left to " --"right, it goes from low to high. The center position is the default value. For " --"priorities higher than the default, you will need to provide the root password." --msgstr "這裏可以設定優先級。愈左愈低，愈右愈高。中間位置是預設值。要設定比預設值高的優先級，就需要管理者 root 的密碼。" -+"right, it goes from low to high. The center position is the default value. " -+"For 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 -@@ -578,10 +586,12 @@ - #: rc.cpp:44 - #, no-c-format - msgid "" --"Check this option if you want to run the application with a different priority. " --"A higher priority tells the operating system to give more processing time to " --"your application." --msgstr "如果您要用不同優先級執行該程式，請啟用該選項。指定較高優先級可以讓系統分配更多的處理時間給該程式。" -+"Check this option if you want to run the application with a different " -+"priority. A higher priority tells the operating system to give more " -+"processing time to your application." -+msgstr "" -+"如果您要用不同優先級執行該程式，請啟用該選項。指定較高優先級可以讓系統分配更" -+"多的處理時間給該程式。" - - #. i18n: file minicli_ui.ui line 356 - #: rc.cpp:50 -@@ -605,12 +615,14 @@ - #: rc.cpp:68 - #, no-c-format - msgid "" --"Check this option if you want to run the application with a different user id. " --"Every process has a user id associated with it. This id code determines file " --"access and other permissions. The password of the user is required to do this." -+"Check this option if you want to run the application with a different user " -+"id. Every process has a user id associated with it. This id code determines " -+"file access and other permissions. The password of the user is required to " -+"do this." - msgstr "" --"如果您要以另外一個使用者的身份來執行這個程式，請點選該選項。每一個所執行的程式都會紀錄這是誰所執行的。這決定了是誰執行這個程式，就有該執行者擁有的權限環境。該選" --"項需要輸入使用者的密碼。" -+"如果您要以另外一個使用者的身分來執行這個程式，請點選該選項。每一個所執行的程" -+"式都會紀錄這是誰所執行的。這決定了是誰執行這個程式，就有該執行者擁有的權限環" -+"境。該選項需要輸入使用者的密碼。" - - #. i18n: file minicli_ui.ui line 470 - #: rc.cpp:71 -@@ -622,10 +634,12 @@ - #: rc.cpp:74 rc.cpp:77 - #, 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 " --"\"~/.kderc\"." --msgstr "輸入您要執行的命令或您要開啟的資源的地址。這可以是一個遠端 URL 如“www.kde.org”或本地的如“~/.kderc”" -+"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 \"~/.kderc\"." -+msgstr "" -+"輸入您要執行的命令或您要開啟的資源的地址。這可以是一個遠端 URL 如“www.kde." -+"org”或本地的如“~/.kderc”" - - #. i18n: file minicli_ui.ui line 533 - #: rc.cpp:80 -@@ -644,8 +658,8 @@ - #: rc.cpp:86 - #, no-c-format - msgid "" --"If you want the same background settings to be applied to all desktops enable " --"this option." -+"If you want the same background settings to be applied to all desktops " -+"enable this option." - msgstr "如果您希望同樣的背景設定套用到所有桌面，請開啟這選項。" - - #. i18n: file kdesktop.kcfg line 16 -@@ -699,12 +713,12 @@ - #: rc.cpp:110 - #, no-c-format - msgid "" --"Here you can enter how much memory KDE should use for caching the " --"background(s). If you have different backgrounds for the different desktops " --"caching can make switching desktops smoother at the expense of higher memory " --"use." -+"Here you can enter how much memory KDE should use for caching the background" -+"(s). If you have different backgrounds for the different desktops caching " -+"can make switching desktops smoother at the expense of higher memory use." - msgstr "" --"在這裏您可以告訴 KDE 該分配多少記憶體作背景快取。如果您在不同的桌面擁有不同的背景，您可以把快取的記憶體用量調多一些來使切換桌面時更流暢。" -+"在這裏您可以告訴 KDE 該分配多少記憶體作背景快取。如果您在不同的桌面擁有不同的" -+"背景，您可以把快取的記憶體用量調多一些來使切換桌面時更流暢。" - - #. i18n: file kdesktop.kcfg line 38 - #: rc.cpp:113 -@@ -719,7 +733,9 @@ - "Uncheck this option if you do not want to have icons on the desktop. Without " - "icons the desktop will be somewhat faster but you will no longer be able to " - "drag files to the desktop." --msgstr "如果您不希望在桌面顯示圖示，請關閉這選項。桌面沒有圖示的話它會快一些，但您將無法把檔案拖曳到桌面。" -+msgstr "" -+"如果您不希望在桌面顯示圖示，請關閉這選項。桌面沒有圖示的話它會快一些，但您將" -+"無法把檔案拖曳到桌面。" - - #. i18n: file kdesktop.kcfg line 43 - #: rc.cpp:119 -@@ -736,8 +752,9 @@ - "like netscape that check the root window for running instances, disable this " - "option." - msgstr "" --"如果您要使用像 xsnow, xpenguin 或 xmountain 等需要在桌面繪圖的 X11 程式，您可以開啟這選項。但要是如 netscape " --"般會檢查根視窗以取得執行中實體的程式發生問題，請關閉這選項。" -+"如果您要使用像 xsnow, xpenguin 或 xmountain 等需要在桌面繪圖的 X11 程式，您可" -+"以開啟這選項。但要是如 netscape 般會檢查根視窗以取得執行中實體的程式發生問" -+"題，請關閉這選項。" - - #. i18n: file kdesktop.kcfg line 55 - #: rc.cpp:125 -@@ -769,8 +786,8 @@ - #: rc.cpp:137 - #, no-c-format - msgid "" --"You can switch between the virtual desktops by using the mouse wheel over the " --"desktop background." -+"You can switch between the virtual desktops by using the mouse wheel over " -+"the desktop background." - msgstr "您可以在桌面背景使用滑鼠滾輪，以在虛擬桌面之間切換。" - - #. i18n: file kdesktop.kcfg line 83 -@@ -809,8 +826,8 @@ - #: rc.cpp:155 - #, no-c-format - msgid "" --"You can choose what happens when you click the middle button of your pointing " --"device on the desktop." -+"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 -@@ -868,9 +885,11 @@ - #, no-c-format - msgid "" - "Check here to enable a shadow outline around the desktop font. This also " --"improves the readability of the desktop text against backgrounds of a similar " --"color." --msgstr "按這裏啟用桌面字型的陰影輪廓。這也可以在文字和背景顏色差不多的時候增加文字的可讀性。" -+"improves the readability of the desktop text against backgrounds of a " -+"similar color." -+msgstr "" -+"按這裏啟用桌面字型的陰影輪廓。這也可以在文字和背景顏色差不多的時候增加文字的" -+"可讀性。" - - #. i18n: file kdesktop.kcfg line 145 - #: rc.cpp:185 -@@ -884,15 +903,16 @@ - msgid "" - "

                          If you check this option, any files in your desktop directory that begin " - "with a period (.) will be shown. Usually, such files contain configuration " --"information, and remain hidden from view.

                          \\n" --"

                          For example, files which are named \\\".directory\\\" are plain text files " --"which contain information for Konqueror, such as the icon to use in displaying " --"a directory, the order in which files should be sorted, etc. You should not " --"change or delete these files unless you know what you are doing.

                          " --msgstr "" --"

                          如果您開啟這選項，那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一般來說，它們都包含了配置資訊，並且被隱藏起來。

                          " --"\\n例如名為\\\".directory\\\"的檔案是一些包含了 Konqueror " --"資訊的純文字檔案。它們包含了如代表目錄的圖示、檔案排列的樣式等。除非您清楚自己在做什麼事，否則您不應碰這些檔案。

                          " -+"information, and remain hidden from view.

                          \\n

                          For example, files which " -+"are named \\\".directory\\\" are plain text files which contain information " -+"for Konqueror, such as the icon to use in displaying a directory, the order " -+"in which files should be sorted, etc. You should not change or delete these " -+"files unless you know what you are doing.

                          " -+msgstr "" -+"

                          如果您開啟這選項，那麼所有在桌面目錄中以點(.)開頭的檔案都會被顯示出來。一" -+"般來說，它們都包含了配置資訊，並且被隱藏起來。

                          \\n例如名為\\\".directory\\" -+"\"的檔案是一些包含了 Konqueror 資訊的純文字檔案。它們包含了如代表目錄的圖示、" -+"檔案排列的樣式等。除非您清楚自己在做什麼事，否則您不應碰這些檔案。

                          " - - #. i18n: file kdesktop.kcfg line 150 - #: rc.cpp:191 -@@ -931,7 +951,9 @@ - msgid "" - "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, " - "NameCaseInsensitive = 1, Size = 2, Type = 3, Date = 4." --msgstr "設定排列準則。可用的選項為 區分大小寫 = 0, 不分大小寫 = 1, 大小 = 2, 類型 = 3, 日期 = 4" -+msgstr "" -+"設定排列準則。可用的選項為 區分大小寫 = 0, 不分大小寫 = 1, 大小 = 2, 類型 = " -+"3, 日期 = 4" - - #. i18n: file kdesktop.kcfg line 176 - #: rc.cpp:212 -@@ -969,11 +991,13 @@ - #: rc.cpp:230 - #, no-c-format - msgid "" --"If this option is selected, applications will not have their menu bar attached " --"to their own window anymore. Instead, there is one menu bar at the top of the " --"screen which shows the menus of the currently active application. You might " --"recognize this behavior from Mac OS." --msgstr "這個選項開啟後，應用程式的選單列不會再在它們的視窗裏。在螢幕頂端會顯示目前使用的應用程式的選單列。您可從 Mac OS 中找到這種風格。" -+"If this option is selected, applications will not have their menu bar " -+"attached to their own window anymore. Instead, there is one menu bar at the " -+"top of the screen which shows the menus of the currently active application. " -+"You might recognize this behavior from Mac OS." -+msgstr "" -+"這個選項開啟後，應用程式的選單列不會再在它們的視窗裏。在螢幕頂端會顯示目前使" -+"用的應用程式的選單列。您可從 Mac OS 中找到這種風格。" - - #. i18n: file kdesktop.kcfg line 218 - #: rc.cpp:233 -@@ -1026,7 +1050,21 @@ - "Usually the screen saver is suspended when display power saving kicks in,\n" - " as nothing can be seen on the screen anyway, obviously. However, some " - "screen savers\n" --" actually perform useful computations, so it is not desirable to suspend " --"them." -+" actually perform useful computations, so it is not desirable to " -+"suspend them." - msgstr "" --"通常當顯示器的省電裝置作用時，螢幕保護程式應該被暫停，因為將看不到任何的畫面。不過，某些螢幕保護程式實際上會進行有用的計算，這種情況下就不該暫停它。" -+"通常當顯示器的省電裝置作用時，螢幕保護程式應該被暫停，因為將看不到任何的畫" -+"面。不過，某些螢幕保護程式實際上會進行有用的計算，這種情況下就不該暫停它。" -+ -+#, fuzzy -+#~ msgid "Disable screen saver during presentation or TV" -+#~ msgstr "Bildschirmschoner während Präsentation/TV deaktivieren" -+ -+#, fuzzy -+#~ msgid "" -+#~ "Enable this option if you want to disable the screen saver while watching " -+#~ "TV or movies." -+#~ msgstr "" -+#~ "Aktivieren Sie diese Einstellung, wenn der Bildschirmschoner während " -+#~ "einer Präsentation oder wenn Sie am Computer fernsehen, nicht starten " -+#~ "soll." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesud.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesud.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesud.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesud.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kdesud 1.1\n" - "POT-Creation-Date: 2005-07-23 01:32+0200\n" - "PO-Revision-Date: 2001-08-27 17:07+CST\n" --"Last-Translator: TopTech Localization Team \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: TopTech Localization Team \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesu.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdesu.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdesu.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kdesu\n" - "POT-Creation-Date: 2007-11-14 01:15+0100\n" - "PO-Revision-Date: 2006-08-10 10:52+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -96,10 +95,8 @@ - msgstr "沒有指定指令。" - - #: kdesu.cpp:344 --msgid "" --"Su returned with an error.\n" --msgstr "" --"Su 回傳錯誤。\n" -+msgid "Su returned with an error.\n" -+msgstr "Su 回傳錯誤。\n" - - #: kdesu.cpp:365 - msgid "Command:" -@@ -126,17 +123,22 @@ - 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 的密碼，或是按「忽略」繼續保持目前的權限。" -+msgstr "" -+"你要求的動作需要 root 權限。請在下面輸入 root 的密碼，或是按「忽略」繼續保持" -+"目前的權限。" - - #: sudlg.cpp:40 - 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\" 的密碼，或是按「忽略」繼續保持目前的權限。" -+"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 - msgid "&Ignore" --msgstr "忽略 (&I)" -+msgstr "忽略(&I)" - - #: sudlg.cpp:64 - msgid "Conversation with su failed." -@@ -153,8 +155,8 @@ - #: sudlg.cpp:80 - 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 " --"program." -+"on some systems, you need to be in a special group (often: wheel) to use " -+"this program." - msgstr "" - "你不允許使用「su」；\n" - " 有些系統上，你必須屬於特定的群組（經常是： wheel ）才能使用這個程式。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdialog.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdialog.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdialog.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdialog.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kdialog\n" - "POT-Creation-Date: 2006-04-27 03:54+0200\n" - "PO-Revision-Date: 2005-10-29 20:14+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -131,7 +131,8 @@ - - #: kdialog.cpp:94 - msgid "" --"Allows the --getopenurl and --getopenfilename options to return multiple files" -+"Allows the --getopenurl and --getopenfilename options to return multiple " -+"files" - msgstr "允許 --getopenurl 與 --getopenfilename 選項傳回多個檔案" - - #: kdialog.cpp:95 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmconfig.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kdmconfig\n" - "POT-Creation-Date: 2007-11-17 01:14+0100\n" - "PO-Revision-Date: 2005-10-29 20:31+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,49 +16,39 @@ - - #: background.cpp:47 - msgid "E&nable background" --msgstr "啟動背景 (&N)" -+msgstr "啟動背景(&N)" - - #: background.cpp:49 - msgid "" --"If this is checked, KDM will use the settings below for the background. If it " --"is disabled, you have to look after the background yourself. This is done by " --"running some program (possibly xsetroot) in the script specified in the Setup= " --"option in kdmrc (usually Xsetup)." --msgstr "" --"如果這個選項被選取了，KDM 將會使用下面關於背景的設定。如果停用它，您就必須自己管理背景。這是利用在設定中指定命令稿執行某些程式(可能是 " --"xsetroot)來完成的 = kdmrc (通常是 Xsetup)中的選項。" -+"If this is checked, KDM will use the settings below for the background. If " -+"it is disabled, you have to look after the background yourself. This is done " -+"by running some program (possibly xsetroot) in the script specified in the " -+"Setup= option in kdmrc (usually Xsetup)." -+msgstr "" -+"如果這個選項被選取了，KDM 將會使用下面關於背景的設定。如果停用它，您就必須自" -+"己管理背景。這是利用在設定中指定命令稿執行某些程式(可能是 xsetroot)來完成的 " -+"= kdmrc (通常是 Xsetup)中的選項。" - - #: kdm-appear.cpp:71 - msgid "&Greeting:" --msgstr "問候 (&G):" -+msgstr "問候(&G):" - - #: kdm-appear.cpp:76 - msgid "" --"This is the \"headline\" for KDM's login window. You may want to put some nice " --"greeting or information about the operating system here." --"

                          KDM will substitute the following character pairs with the respective " --"contents:" --"
                          " --"

                            " --"
                          • %d -> current display
                            • " --"
                          • %h -> host name, possibly with domain name
                            • " --"
                          • %n -> node name, most probably the host name without domain name
                            • " --"
                          • %s -> the operating system
                            • " --"
                          • %r -> the operating system's version
                            • " --"
                          • %m -> the machine (hardware) type
                            • " --"
                          • %% -> a single %
                          " --msgstr "" --"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系統的相關資訊。" --"

                          KDM 會將下列字元替代為個別的內容：" --"
                          " --"

                            " --"
                          • %d -> 目前的顯示
                            • " --"
                          • %h -> 主機名稱，可能會加上網域名稱
                            • " --"
                          • %n -> 節點名稱，通常是去掉網域名稱的主機名稱
                            • " --"
                          • %s -> 作業系統
                            • " --"
                          • %r -> 作業系統的版本
                            • " --"
                          • %m -> 電腦（硬體）類型
                            • " --"
                          • %% -> 單獨的 %
                          " -+"This is the \"headline\" for KDM's login window. You may want to put some " -+"nice greeting or information about the operating system here.

                          KDM will " -+"substitute the following character pairs with the respective contents:" -+"

                          • %d -> current display
                          • %h -> host name, possibly with " -+"domain name
                          • %n -> node name, most probably the host name without " -+"domain name
                          • %s -> the operating system
                          • %r -> the operating " -+"system's version
                          • %m -> the machine (hardware) type
                          • %% -> a " -+"single %
                          " -+msgstr "" -+"這是 KDM 登入視窗中的「標題」。您可能會想要在這裏放一些不錯的歡迎詞或者作業系" -+"統的相關資訊。

                          KDM 會將下列字元替代為個別的內容：

                          • %d -> 目前的顯" -+"示
                          • %h -> 主機名稱，可能會加上網域名稱
                          • %n -> 節點名稱，通常是" -+"去掉網域名稱的主機名稱
                          • %s -> 作業系統
                          • %r -> 作業系統的版本
                          • %m -> 電腦（硬體）類型
                          • %% -> 單獨的 %
                          " - - #: kdm-appear.cpp:95 - msgid "Logo area:" -@@ -72,15 +62,16 @@ - - #: kdm-appear.cpp:100 - msgid "Show cloc&k" --msgstr "顯示時鐘 (&K)" -+msgstr "顯示時鐘(&K)" - - #: kdm-appear.cpp:101 - msgid "Sho&w logo" --msgstr "顯示標誌 (&W)" -+msgstr "顯示標誌(&W)" - - #: kdm-appear.cpp:113 - msgid "" --"You can choose to display a custom logo (see below), a clock or no logo at all." -+"You can choose to display a custom logo (see below), a clock or no logo at " -+"all." - msgstr "您可以選擇顯示自訂標題 (詳下述) 或時鐘或不要標題" - - #: kdm-appear.cpp:119 -@@ -89,9 +80,10 @@ - - #: kdm-appear.cpp:129 - msgid "" --"Click here to choose an image that KDM will display. You can also drag and drop " --"an image onto this button (e.g. from Konqueror)." --msgstr "按下這邊以選擇一個 KDM 要顯示的影像. 您也可以拖曳一個影像到這個按鈕上. " -+"Click here to choose an image that KDM will display. You can also drag and " -+"drop an image onto this button (e.g. from Konqueror)." -+msgstr "" -+"按下這邊以選擇一個 KDM 要顯示的影像. 您也可以拖曳一個影像到這個按鈕上. " - - #: kdm-appear.cpp:141 - msgid "Position:" -@@ -99,11 +91,11 @@ - - #: kdm-appear.cpp:144 - msgid "&X:" --msgstr "X 座標 (&X)：" -+msgstr "X 座標(&X)：" - - #: kdm-appear.cpp:151 - msgid "&Y:" --msgstr "Y 座標 (&Y)：" -+msgstr "Y 座標(&Y)：" - - #: kdm-appear.cpp:158 - msgid "" -@@ -125,7 +117,7 @@ - - #: kdm-appear.cpp:189 - msgid "&Color scheme:" --msgstr "顏色 (&C)：" -+msgstr "顏色(&C)：" - - #: kdm-appear.cpp:193 - msgid "You can choose a basic Color Scheme here that will be used by KDM only." -@@ -164,7 +156,9 @@ - msgid "" - "Here you can choose the language used by KDM. This setting does not affect a " - "user's personal settings; that will take effect after login." --msgstr "您可以在這邊選擇 KDM 所使用的語言。這個設定不會影響使用者登入後的個人設定；它會在登入後才生效。" -+msgstr "" -+"您可以在這邊選擇 KDM 所使用的語言。這個設定不會影響使用者登入後的個人設定；它" -+"會在登入後才生效。" - - #: kdm-appear.cpp:264 - msgid "without name" -@@ -188,12 +182,11 @@ - #: kdm-appear.cpp:504 - msgid "" - "

                          KDM - Appearance

                          Here you can configure the basic appearance of the " --"KDM login manager, i.e. a greeting string, an icon etc." --"

                          For further refinement of KDM's appearance, see the \"Font\" and " --"\"Background\" tabs." -+"KDM login manager, i.e. a greeting string, an icon etc.

                          For further " -+"refinement of KDM's appearance, see the \"Font\" and \"Background\" tabs." - msgstr "" --"

                          KDM - 外觀

                          您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊息, 圖示等等." --"

                          對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤." -+"

                          KDM - 外觀

                          您可以在這編組態基本的 KDM 登入管理員顯示, 例如: 問候訊" -+"息, 圖示等等.

                          對於更進一步的微調, 請參見 \"字型\" 與 \"背景\" 標籤." - - #: kdm-font.cpp:46 - msgid "&General:" -@@ -211,7 +204,8 @@ - - #: kdm-font.cpp:57 - msgid "" --"This changes the font which is used for failure messages in the login manager." -+"This changes the font which is used for failure messages in the login " -+"manager." - msgstr "這會改變在登入管理程式中用於安全模式訊息的字型。" - - #: kdm-font.cpp:62 -@@ -231,8 +225,8 @@ - "If you check this box and your X-Server has the Xft extension, fonts will be " - "antialiased (smoothed) in the login dialog." - msgstr "" --"當您選擇了這個選項，同時您的 X-Server 也有 Xft 擴充模組，那麼在您登錄視窗中的字形，將會使用 AntiAliased (smoothed) " --"的功能。" -+"當您選擇了這個選項，同時您的 X-Server 也有 Xft 擴充模組，那麼在您登錄視窗中的" -+"字形，將會使用 AntiAliased (smoothed) 的功能。" - - #: kdm-shut.cpp:49 - msgid "Allow Shutdown" -@@ -260,20 +254,17 @@ - - #: kdm-shut.cpp:63 - msgid "" --"Here you can select who is allowed to shutdown the computer using KDM. You can " --"specify different values for local (console) and remote displays. Possible " --"values are:" --"

                            " --"
                          • Everybody: everybody can shutdown the computer using KDM
                            • " --"
                          • Only root: KDM will only allow shutdown after the user has entered " --"the root password
                            • " --"
                          • Nobody: nobody can shutdown the computer using KDM
                          " --msgstr "" --"您可以在這邊設定哪些使用者允許使用 KDM 關閉這台電腦。可選擇的項目有: " --"
                            " --"
                          • 所有人: 所有使用者都可以使用透過 KDM 關閉這台電腦。
                            • " --"
                          • 系統管理者: 只允許輸入 root 密碼後才能夠進行關閉這台電腦。
                            • " --"
                          • 都不允許: 不允許任何人使用 KDM 關閉這台電腦。
                          " -+"Here you can select who is allowed to shutdown the computer using KDM. You " -+"can specify different values for local (console) and remote displays. " -+"Possible values are:
                          • Everybody: everybody can shutdown the " -+"computer using KDM
                          • Only root: KDM will only allow shutdown " -+"after the user has entered the root password
                          • Nobody: " -+"nobody can shutdown the computer using KDM
                          " -+msgstr "" -+"您可以在這邊設定哪些使用者允許使用 KDM 關閉這臺電腦。可選擇的項目有:
                            " -+"
                          • 所有人: 所有使用者都可以使用透過 KDM 關閉這臺電腦。
                            • " -+"
                          • 系統管理者: 只允許輸入 root 密碼後才能夠進行關閉這臺電腦。
                            • " -+"
                          • 都不允許: 不允許任何人使用 KDM 關閉這臺電腦。
                          " - - #: kdm-shut.cpp:71 - msgid "Commands" -@@ -315,7 +306,7 @@ - - #: kdm-shut.cpp:100 - msgid "Enable boot options in the \"Shutdown...\" dialog." --msgstr "在「關機...」對話盒內啟用開機選項的功能。" -+msgstr "在「關機…」對話盒內啟用開機選項的功能。" - - #: kdm-users.cpp:81 - #, c-format -@@ -324,18 +315,19 @@ - - #: kdm-users.cpp:88 - msgid "System U&IDs" --msgstr "系統 UID (&I)" -+msgstr "系統 UID(&I)" - - #: kdm-users.cpp:89 - msgid "" --"Users with a UID (numerical user identification) outside this range will not be " --"listed by KDM and this setup dialog. Note that users with the UID 0 (typically " --"root) are not affected by this and must be explicitly hidden in \"Not hidden\" " --"mode." --msgstr "" --"KDM 只會列出定義在此範圍內的使用者的識別碼 UID（numerical user identification）。超過了這個範圍之外的 UID 將不會被 " --"KDM 和這個設定視窗列出。請注意，當使用者的 UID 為 0 時（通常是 " --"root），是不會受到影響的。除非您在「不隱藏」的模式設定中，明確的定義它必須被隱藏。" -+"Users with a UID (numerical user identification) outside this range will not " -+"be listed by KDM and this setup dialog. Note that users with the UID 0 " -+"(typically root) are not affected by this and must be explicitly hidden in " -+"\"Not hidden\" mode." -+msgstr "" -+"KDM 只會列出定義在此範圍內的使用者的識別碼 UID（numerical user " -+"identification）。超過了這個範圍之外的 UID 將不會被 KDM 和這個設定視窗列出。" -+"請注意，當使用者的 UID 為 0 時（通常是 root），是不會受到影響的。除非您在「不" -+"隱藏」的模式設定中，明確的定義它必須被隱藏。" - - #: kdm-users.cpp:94 - msgid "Below:" -@@ -355,9 +347,11 @@ - - #: kdm-users.cpp:113 - msgid "" --"If this option is checked, KDM will show a list of users, so users can click on " --"their name or image rather than typing in their login." --msgstr "如果選擇了這個選項，KDM 將會顯示使用者列表，使用者在登入時可以點選他們的名稱或影像而不需要輸入使用者名稱。" -+"If this option is checked, KDM will show a list of users, so users can click " -+"on their name or image rather than typing in their login." -+msgstr "" -+"如果選擇了這個選項，KDM 將會顯示使用者列表，使用者在登入時可以點選他們的名稱" -+"或影像而不需要輸入使用者名稱。" - - #: kdm-users.cpp:115 - msgid "Autocompletion" -@@ -380,18 +374,21 @@ - "only the checked users. If checked, select all non-system users, except the " - "checked ones." - msgstr "" --"這個選項指定使用者在「選擇使用者與群組」中如何選擇「顯示列表」與「自動補齊」：如果沒有核取，只會選擇被核取的使用者。如果核取，會選擇除了核取的使用者之外，所有的" --"非系統管理使用者。" -+"這個選項指定使用者在「選擇使用者與群組」中如何選擇「顯示列表」與「自動補" -+"齊」：如果沒有核取，只會選擇被核取的使用者。如果核取，會選擇除了核取的使用者" -+"之外，所有的非系統管理使用者。" - - #: kdm-users.cpp:123 - msgid "Sor&t users" --msgstr "使用者排序 (&T)" -+msgstr "使用者排序(&T)" - - #: kdm-users.cpp:125 - msgid "" --"If this is checked, KDM will alphabetically sort the user list. Otherwise users " --"are listed in the order they appear in the password file." --msgstr "如果這個選項被選取了之後，KDM 將會依照字母的先後順序來為使用者列表排序，否則使用者列表將會依照使用者在密碼檔內的順序來顯示。" -+"If this is checked, KDM will alphabetically sort the user list. Otherwise " -+"users are listed in the order they appear in the password file." -+msgstr "" -+"如果這個選項被選取了之後，KDM 將會依照字母的先後順序來為使用者列表排序，否則" -+"使用者列表將會依照使用者在密碼檔內的順序來顯示。" - - #: kdm-users.cpp:129 - msgid "S&elect users and groups:" -@@ -405,7 +402,9 @@ - msgid "" - "KDM will show all checked users. Entries denoted with '@' are user groups. " - "Checking a group is like checking all users in that group." --msgstr "KDE 會顯示所有核取的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。" -+msgstr "" -+"KDE 會顯示所有核取的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群" -+"組中所有的使用者。" - - #: kdm-users.cpp:140 - msgid "Hidden Users" -@@ -415,7 +414,9 @@ - msgid "" - "KDM will show all non-checked non-system users. Entries denoted with '@' are " - "user groups. Checking a group is like checking all users in that group." --msgstr "KDE 會顯示所有未核取的非系統管理使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。" -+msgstr "" -+"KDE 會顯示所有未核取的非系統管理使用者。標示「@」的項目是使用者群組。核取群組" -+"就如同核取群組中所有的使用者。" - - #: kdm-users.cpp:149 - msgid "User Image Source" -@@ -426,11 +427,13 @@ - "Here you can specify where KDM will obtain the images that represent users. " - "\"Admin\" represents the global folder; these are the pictures you can set " - "below. \"User\" means that KDM should read the user's $HOME/.face.icon file. " --"The two selections in the middle define the order of preference if both sources " --"are available." -+"The two selections in the middle define the order of preference if both " -+"sources are available." - msgstr "" --"這裡您可以設定 KDM 可以從哪裡找到代表使用者的圖示。「Admin」代表使用通用的目錄；下方這些是您可以設定的圖示。而「User」代表 KDM " --"必須讀取使用者 $HOME/.face.icon 的這個圖示。在中間的兩個選擇區則定義了當兩種來源都可以使用的時候優先使用的順序。" -+"這裡您可以設定 KDM 可以從哪裡找到代表使用者的圖示。「Admin」代表使用通用的目" -+"錄；下方這些是您可以設定的圖示。而「User」代表 KDM 必須讀取使用者 $HOME/." -+"face.icon 的這個圖示。在中間的兩個選擇區則定義了當兩種來源都可以使用的時候優" -+"先使用的順序。" - - #: kdm-users.cpp:156 - msgid "Admin" -@@ -469,7 +472,9 @@ - "Here you can see the image assigned to the user selected in the combo box " - "above. Click on the image button to select from a list of images or drag and " - "drop your own image on to the button (e.g. from Konqueror)." --msgstr "您可以在這邊看到使用者名稱與所指定的對應影像。您可以按下影像按鈕以選擇其他的影像，或拖曳一個影像到這邊。" -+msgstr "" -+"您可以在這邊看到使用者名稱與所指定的對應影像。您可以按下影像按鈕以選擇其他的" -+"影像，或拖曳一個影像到這邊。" - - #: kdm-users.cpp:178 - msgid "Unset" -@@ -508,17 +513,15 @@ - - #: kdm-conv.cpp:47 - msgid "" --"" --"
                          Attention!" --"
                          Read help!
                          " --msgstr "" --"" --"
                          注意！" --"
                          請閱讀說明！
                          " -+"
                          Attention!
                          Read help!
                          " -+msgstr "" -+"
                          注意！
                          請閱讀說明！                          " - - #: kdm-conv.cpp:51 - msgid "Enable Au&to-Login" --msgstr "啟用自動登入 (&T)" -+msgstr "啟用自動登入(&T)" - - #: kdm-conv.cpp:55 - msgid "" -@@ -564,7 +567,9 @@ - msgid "" - "Normally, automatic login is performed only when KDM starts up. If this is " - "checked, automatic login will kick in after finishing a session as well." --msgstr "通常，自動登入只有在 KDM 啟動時才運作。如果核取此項，自動登入也會在工作階段結束時運作。" -+msgstr "" -+"通常，自動登入只有在 KDM 啟動時才運作。如果核取此項，自動登入也會在工作階段結" -+"束時運作。" - - #: kdm-conv.cpp:87 - msgid "Loc&k session" -@@ -573,9 +578,11 @@ - #: kdm-conv.cpp:89 - msgid "" - "If checked, the automatically started session will be locked immediately " --"(provided it is a KDE session). This can be used to obtain a super-fast login " --"restricted to one user." --msgstr "如果選擇，自動啟動的工作階段會立刻被鎖定(如果它是 KDE 工作階段。這可用在限制單一使用者的超快速登入上。" -+"(provided it is a KDE session). This can be used to obtain a super-fast " -+"login restricted to one user." -+msgstr "" -+"如果選擇，自動啟動的工作階段會立刻被鎖定(如果它是 KDE 工作階段。這可用在限制" -+"單一使用者的超快速登入上。" - - #: kdm-conv.cpp:94 - msgid "Preselect User" -@@ -595,7 +602,9 @@ - msgid "" - "Preselect the user that logged in previously. Use this if this computer is " - "usually used several consecutive times by one user." --msgstr "預先選取先前登入的使用者。當您經常的使用同一個使用者來登入這部電腦時，您可以考慮使用這個功能。" -+msgstr "" -+"預先選取先前登入的使用者。當您經常的使用同一個使用者來登入這部電腦時，您可以" -+"考慮使用這個功能。" - - #: kdm-conv.cpp:103 - msgid "Specif&y" -@@ -603,8 +612,8 @@ - - #: kdm-conv.cpp:104 - msgid "" --"Preselect the user specified in the combo box below. Use this if this computer " --"is predominantly used by a certain user." -+"Preselect the user specified in the combo box below. Use this if this " -+"computer is predominantly used by a certain user." - msgstr "預先" - - #: kdm-conv.cpp:108 -@@ -613,9 +622,11 @@ - - #: kdm-conv.cpp:110 - msgid "" --"Select the user to be preselected for login. This box is editable, so you can " --"specify an arbitrary non-existent user to mislead possible attackers." --msgstr "選取一個使用者來為預設的登入帳號。這是可以編輯的，所以您可以設定一個不存在的使用者，來誤導可能攻擊您機器的人。" -+"Select the user to be preselected for login. This box is editable, so you " -+"can specify an arbitrary non-existent user to mislead possible attackers." -+msgstr "" -+"選取一個使用者來為預設的登入帳號。這是可以編輯的，所以您可以設定一個不存在的" -+"使用者，來誤導可能攻擊您機器的人。" - - #: kdm-conv.cpp:119 - msgid "Focus pass&word" -@@ -623,10 +634,12 @@ - - #: kdm-conv.cpp:120 - msgid "" --"When this option is on, KDM will place the cursor in the password field instead " --"of the user field after preselecting a user. Use this to save one key press per " --"login, if the preselection usually does not need to be changed." --msgstr "當這個項目啟用後，KDM 會把游標停留在密碼輸入欄位的地方，而不是停留在系統預先送出要自動登入的使用者欄位處。這可以簡化一些登入動作。" -+"When this option is on, KDM will place the cursor in the password field " -+"instead of the user field after preselecting a user. Use this to save one " -+"key press per login, if the preselection usually does not need to be changed." -+msgstr "" -+"當這個項目啟用後，KDM 會把游標停留在密碼輸入欄位的地方，而不是停留在系統預先" -+"送出要自動登入的使用者欄位處。這可以簡化一些登入動作。" - - #: kdm-conv.cpp:126 - msgid "Enable Password-&Less Logins" -@@ -635,35 +648,40 @@ - #: kdm-conv.cpp:129 - msgid "" - "When this option is checked, the checked users from the list below will be " --"allowed to log in without entering their password. This applies only to KDM's " --"graphical login. Think twice before enabling this!" --msgstr "當選取這個選項, 右邊列表中的使用這可以不需要輸入密碼而登入. 這只會套用在 KDM 的圖形介面登入. 請三思而後啟動!" -+"allowed to log in without entering their password. This applies only to " -+"KDM's graphical login. Think twice before enabling this!" -+msgstr "" -+"當選取這個選項, 右邊列表中的使用這可以不需要輸入密碼而登入. 這只會套用在 KDM " -+"的圖形介面登入. 請三思而後啟動!" - - #: kdm-conv.cpp:136 - msgid "No password re&quired for:" --msgstr "不需要密碼 (&Q)" -+msgstr "不需要密碼(&Q)" - - #: kdm-conv.cpp:142 - msgid "" - "Check all users you want to allow a password-less login for. Entries denoted " --"with '@' are user groups. Checking a group is like checking all users in that " --"group." --msgstr "核取所有您允許不使用密碼登入的使用者。標示「@」的項目是使用者群組。核取群組就如同核取群組中所有的使用者。" -+"with '@' are user groups. Checking a group is like checking all users in " -+"that group." -+msgstr "" -+"核取所有您允許不使用密碼登入的使用者。標示「@」的項目是使用者群組。核取群組就" -+"如同核取群組中所有的使用者。" - - #: kdm-conv.cpp:149 - msgid "Automatically log in again after &X server crash" --msgstr "在 X 伺服器關閉後自動重新登入 (&G)" -+msgstr "在 X 伺服器關閉後自動重新登入(&G)" - - #: kdm-conv.cpp:150 - msgid "" --"When this option is on, a user will be logged in again automatically when their " --"session is interrupted by an X server crash; note that this can open a security " --"hole: if you use a screen locker than KDE's integrated one, this will make " --"circumventing a password-secured screen lock possible." --msgstr "" --"如果這個選項是啟動的話，那麼當使用者的視窗管理程式因為 X-Server 的 Crash " --"而中斷時，將會自動的再行登入；請注意這個選項會造成系統在安全上的漏洞：如果您使用其他的非整合在 KDE 中的螢幕鎖定程式 (Screen " --"Locker)，那麼這將會是當螢幕鎖定程式，在解除鎖定時詢問密碼的一種迴避方式。" -+"When this option is on, a user will be logged in again automatically when " -+"their session is interrupted by an X server crash; note that this can open a " -+"security hole: if you use a screen locker than KDE's integrated one, this " -+"will make circumventing a password-secured screen lock possible." -+msgstr "" -+"如果這個選項是啟動的話，那麼當使用者的視窗管理程式因為 X-Server 的 Crash 而中" -+"斷時，將會自動的再行登入；請注意這個選項會造成系統在安全上的漏洞：如果您使用" -+"其他的非整合在 KDE 中的螢幕鎖定程式 (Screen Locker)，那麼這將會是當螢幕鎖定程" -+"式，在解除鎖定時詢問密碼的一種迴避方式。" - - #: main.cpp:67 - msgid "" -@@ -697,41 +715,40 @@ - - #: main.cpp:96 - msgid "" --"

                          Login Manager

                          In this module you can configure the various aspects of " --"the KDE Login Manager. This includes the look and feel as well as the users " --"that can be selected for login. Note that you can only make changes if you run " --"the module with superuser rights. If you have not started the KDE Control " --"Center with superuser rights (which is absolutely the right thing to do, by the " --"way), click on the Modify button to acquire superuser rights. You will " --"be asked for the superuser password." --"

                          Appearance

                          On this tab page, you can configure how the Login Manager " --"should look, which language it should use, and which GUI style it should use. " --"The language settings made here have no influence on the user's language " --"settings." -+"

                          Login Manager

                          In this module you can configure the various aspects " -+"of the KDE Login Manager. This includes the look and feel as well as the " -+"users that can be selected for login. Note that you can only make changes if " -+"you run the module with superuser rights. If you have not started the KDE " -+"Control Center with superuser rights (which is absolutely the right thing to " -+"do, by the way), click on the Modify button to acquire superuser " -+"rights. You will be asked for the superuser password.

                          Appearance

                          On " -+"this tab page, you can configure how the Login Manager should look, which " -+"language it should use, and which GUI style it should use. The language " -+"settings made here have no influence on the user's language settings." - "

                          Font

                          Here you can choose the fonts that the Login Manager should use " --"for various purposes like greetings and user names. " --"

                          Background

                          If you want to set a special background for the login " --"screen, this is where to do it." --"

                          Shutdown

                          Here you can specify who is allowed to shutdown/reboot the " --"machine and whether a boot manager should be used." --"

                          Users

                          On this tab page, you can select which users the Login Manager " --"will offer you for logging in." --"

                          Convenience

                          Here you can specify a user to be logged in automatically, " --"users not needing to provide a password to log in, and other convenience " --"features." --"
                          Note, that these settings are security holes by their nature, so use them " --"very carefully." --msgstr "" --"

                          登入管理員

                          在這個模組之中，您可以設定由 KDE " --"登入管理員所接受的變數。這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個模組。如果您沒有使用超級使用者的權限，來啟動 KDE " --"的控制中心（當然，這是正確的作法），您可以按下變更 (Modify)按鈕以取得管理者權限。同時，您將被詢問超級使用者密碼。" --"

                          外觀

                          在這個標籤頁，您可以設定登入管理員的外觀、使用的語言，以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。" --"

                          字型

                          您可以在這邊選擇字型，讓登入管理員使用不同的字型，例如問候語及使用者名稱。" --"

                          背景

                          如果您希望為登入畫面設定特定的背景，在這邊可以完成您的願望。" --"

                          關機

                          您可以在這裡設定誰能夠停止、重新啟動這部機器，以及是否使用開機管理程式。" --"

                          使用者

                          在這個標籤頁，您可以選擇登入管理員所要提供的使用者清單，以供您在登入系統時使用。" --"

                          便利設施

                          您可以在這邊指定能自動登入的使用者，不需要提供密碼就可以登入的使用者，以及其他給懶人使用的功能。 " --"
                          注意：這些選項的性質可說是個系統安全上的漏洞，請非常您一定要小心的使用。" -+"for various purposes like greetings and user names.

                          Background

                          If " -+"you want to set a special background for the login screen, this is where to " -+"do it.

                          Shutdown

                          Here you can specify who is allowed to shutdown/" -+"reboot the machine and whether a boot manager should be used.

                          UsersOn this tab page, you can select which users the Login Manager will offer " -+"you for logging in.

                          Convenience

                          Here you can specify a user to be " -+"logged in automatically, users not needing to provide a password to log in, " -+"and other convenience features.
                          Note, that these settings are security " -+"holes by their nature, so use them very carefully." -+msgstr "" -+"

                          登入管理員

                          在這個模組之中，您可以設定由 KDE 登入管理員所接受的變數。" -+"這包括了使用者登入時所能選擇的外觀與感覺。請注意您只能以管理者的權限執行這個" -+"模組。如果您沒有使用超級使用者的權限，來啟動 KDE 的控制中心（當然，這是正確的" -+"作法），您可以按下變更 (Modify)按鈕以取得管理者權限。同時，您將被詢" -+"問超級使用者密碼。

                          外觀

                          在這個標籤頁，您可以設定登入管理員的外觀、使" -+"用的語言，以及 GUI 樣式。語言設定與使用者的語言設定並不會互相衝突。

                          字型您可以在這邊選擇字型，讓登入管理員使用不同的字型，例如問候語及使用者名稱。" -+"

                          背景

                          如果您希望為登入畫面設定特定的背景，在這邊可以完成您的願望。

                          " -+"關機

                          您可以在這裡設定誰能夠停止、重新啟動這部機器，以及是否使用開機管理程" -+"式。

                          使用者

                          在這個標籤頁，您可以選擇登入管理員所要提供的使用者清單，以" -+"供您在登入系統時使用。

                          便利設施

                          您可以在這邊指定能自動登入的使用者，不" -+"需要提供密碼就可以登入的使用者，以及其他給懶人使用的功能。
                          注意：這些選項" -+"的性質可說是個系統安全上的漏洞，請非常您一定要小心的使用。" - - #: main.cpp:186 - msgid "A&ppearance" -@@ -755,7 +772,7 @@ - - #: main.cpp:210 - msgid "Con&venience" --msgstr "便利設施 (&V)" -+msgstr "便利設施(&V)" - - #: _translatorinfo.cpp:1 - msgid "" -@@ -770,7 +787,7 @@ - msgstr "kenduest@i18n.linux.org.tw,paladin@ms1.hinet.net" - - #~ msgid "&None" --#~ msgstr "無 (&N)" -+#~ msgstr "無(&N)" - - #~ msgid "LILO" - #~ msgstr "LILO" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmgreet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmgreet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kdmgreet.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kdmgreet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,8 +13,7 @@ - "Project-Id-Version: kdmgreet\n" - "POT-Creation-Date: 2007-12-08 01:14+0100\n" - "PO-Revision-Date: 2006-06-21 08:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -86,7 +85,7 @@ - - #: kchooser.cpp:85 - msgid "&Accept" --msgstr "接受 (&A)" -+msgstr "接受(&A)" - - #: kchooser.cpp:87 - msgid "&Refresh" -@@ -94,7 +93,7 @@ - - #: kchooser.cpp:95 kgreeter.cpp:694 - msgid "&Menu" --msgstr "選單 (&M)" -+msgstr "選單(&M)" - - #: kchooser.cpp:177 - msgid "" -@@ -145,7 +144,7 @@ - - #: kgreeter.cpp:724 kgreeter.cpp:865 - msgid "Session &Type" --msgstr "工作階段類型 (&T):" -+msgstr "工作階段類型(&T):" - - #: kgreeter.cpp:729 kgreeter.cpp:871 - msgid "&Authentication Method" -@@ -153,7 +152,7 @@ - - #: kgreeter.cpp:734 kgreeter.cpp:876 - msgid "&Remote Login" --msgstr "遠端登入 (&R)" -+msgstr "遠端登入(&R)" - - #: kgreeter.cpp:812 - msgid "Login Failed." -@@ -161,7 +160,7 @@ - - #: kconsole.cpp:75 - msgid "Cannot open console" --msgstr "無法開啟主控台" -+msgstr "無法開啟主控臺" - - #: kconsole.cpp:159 - msgid "" -@@ -169,7 +168,7 @@ - "*** Cannot open console log source ***" - msgstr "" - "\n" --"*** 無法開啟主控台的記錄來源 ***" -+"*** 無法開啟主控臺的記錄來源 ***" - - #: kgdialog.cpp:61 - msgid "Sw&itch User" -@@ -177,19 +176,19 @@ - - #: kgdialog.cpp:73 - msgid "R&estart X Server" --msgstr "重新啟動 X 伺服器 (&E)" -+msgstr "重新啟動 X 伺服器(&E)" - - #: kgdialog.cpp:73 - msgid "Clos&e Connection" --msgstr "主控台連線" -+msgstr "主控臺連線" - - #: kgdialog.cpp:84 - msgid "Co&nsole Login" --msgstr "主控台登入 (&N)" -+msgstr "主控臺登入(&N)" - - #: kgdialog.cpp:87 - msgid "&Shutdown..." --msgstr "關機 (&S)..." -+msgstr "關機(&S)…" - - #: kgdialog.cpp:227 - msgid "" -@@ -282,17 +281,15 @@ - msgstr "驗證失敗" - - #: kgverify.cpp:695 --msgid "" --"Authenticated user (%1) does not match requested user (%2).\n" --msgstr "" --"已驗證的使用者(%1)不符合要求的使用者(%2)。\n" -+msgid "Authenticated user (%1) does not match requested user (%2).\n" -+msgstr "已驗證的使用者(%1)不符合要求的使用者(%2)。\n" - - #: kgverify.cpp:988 - #, c-format - msgid "" - "_n: Automatic login in 1 second...\n" - "Automatic login in %n seconds..." --msgstr "於 %n 秒後自動登入..." -+msgstr "於 %n 秒後自動登入…" - - #: kgverify.cpp:997 - msgid "Warning: Caps Lock on" -@@ -308,7 +305,7 @@ - - #: kgverify.cpp:1038 - msgid "Theme not usable with authentication method '%1'." --msgstr "佈景主題不可用於驗證方式 '%1'。" -+msgstr "布景主題不可用於驗證方式 '%1'。" - - #: kgverify.cpp:1093 - msgid "Changing authentication token" -@@ -320,7 +317,7 @@ - - #: kdmshutdown.cpp:123 kdmshutdown.cpp:516 - msgid "&Schedule..." --msgstr "工作排程(&S)..." -+msgstr "工作排程(&S)…" - - #: kdmshutdown.cpp:246 - msgid "Shutdown Type" -@@ -328,11 +325,11 @@ - - #: kdmshutdown.cpp:250 - msgid "&Turn off computer" --msgstr "關閉電腦 (&T)" -+msgstr "關閉電腦(&T)" - - #: kdmshutdown.cpp:254 - msgid "&Restart computer" --msgstr "重新啟動電腦 (&R)" -+msgstr "重新啟動電腦(&R)" - - #: kdmshutdown.cpp:282 - msgid "Scheduling" -@@ -360,11 +357,11 @@ - - #: kdmshutdown.cpp:482 - msgid "&Turn Off Computer" --msgstr "關閉電腦 (&T)" -+msgstr "關閉電腦(&T)" - - #: kdmshutdown.cpp:489 - msgid "&Restart Computer" --msgstr "重新啟動電腦 (&R)" -+msgstr "重新啟動電腦(&R)" - - #: kdmshutdown.cpp:504 - msgid "" -@@ -378,7 +375,7 @@ - - #: kdmshutdown.cpp:611 - msgid "Switch to Console" --msgstr "切換至主控台" -+msgstr "切換至主控臺" - - #: kdmshutdown.cpp:613 - msgid "Restart Computer" -@@ -434,7 +431,7 @@ - - #: kdmshutdown.cpp:691 - msgid "console user" --msgstr "主控台使用者" -+msgstr "主控臺使用者" - - #: kdmshutdown.cpp:693 - msgid "control socket" -@@ -546,9 +543,9 @@ - #: themer/kdmthemer.cpp:67 - #, c-format - msgid "Cannot open theme file %1" --msgstr "無法開啟佈景主題檔案 %1" -+msgstr "無法開啟布景主題檔案 %1" - - #: themer/kdmthemer.cpp:71 - #, c-format - msgid "Cannot parse theme file %1" --msgstr "無法分析佈景主題檔案 %1" -+msgstr "無法分析布景主題檔案 %1" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfindpart.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfindpart.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfindpart.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfindpart.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kfindpart\n" - "POT-Creation-Date: 2006-10-10 02:32+0200\n" - "PO-Revision-Date: 2006-06-19 09:51+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,7 +38,7 @@ - - #: kfinddlg.cpp:54 - msgid "AMiddleLengthText..." --msgstr "AMiddleLengthText..." -+msgstr "AMiddleLengthText…" - - #: kfinddlg.cpp:55 kfinddlg.cpp:177 - msgid "Ready." -@@ -54,7 +53,7 @@ - - #: kfinddlg.cpp:152 - msgid "Searching..." --msgstr "正在搜尋..." -+msgstr "正在搜尋…" - - #: kfinddlg.cpp:179 - msgid "Aborted." -@@ -98,7 +97,7 @@ - - #: kftabdlg.cpp:71 - msgid "&Browse..." --msgstr "瀏覽(&B)..." -+msgstr "瀏覽(&B)…" - - #: kftabdlg.cpp:72 - msgid "&Use files index" -@@ -106,44 +105,33 @@ - - #: kftabdlg.cpp:90 - msgid "" --"Enter the filename you are looking for. " --"
                          Alternatives may be separated by a semicolon \";\"." --"
                          " --"
                          The filename may contain the following special characters:" --"
                            " --"
                          • ? matches any single character
                            • " --"
                          • * matches zero or more of any characters
                            • " --"
                          • [...] matches any of the characters in braces
                          " --"
                          Example searches:" --"
                            " --"
                          • *.kwd;*.txt finds all files ending with .kwd or .txt
                            • " --"
                          • go[dt] finds god and got
                            • " --"
                          • Hel?o finds all files that start with \"Hel\" and end with \"o\", " --"having one character in between
                            • " --"
                          • My Document.kwd finds a file of exactly that name
                          " -+"Enter the filename you are looking for.
                          Alternatives may be " -+"separated by a semicolon \";\".

                          The filename may contain the " -+"following special characters:
                          • ? matches any single character
                          • * matches zero or more of any characters
                          • [...] " -+"matches any of the characters in braces

                          Example searches:" -+"
                          • *.kwd;*.txt finds all files ending with .kwd or .txt
                          • go[dt] finds god and got
                          • Hel?o finds all files " -+"that start with \"Hel\" and end with \"o\", having one character in between
                          • My Document.kwd finds a file of exactly that name
                          " - msgstr "" --"輸入你所要找的檔案名稱。" --"
                          多個名稱可以使用分號「;」隔開。" --"
                          " --"
                          檔案名稱中可以包含下列特殊字元：" --"
                            " --"
                          • ? 比對任何單一字元
                            • " --"
                          • * 比對零個或多個任意字元
                            • " --"
                          • [...] 比對任何在中括號中的字元
                          " --"
                          搜尋範例:" --"
                            " --"
                          • *.kwd;*.txt 找尋所有檔名結尾為 .kwd 或是 .txt 的檔案。
                            • " --"
                          • go[dt] 找到檔案 god 與 got
                            • " --"
                          • Hel?o 找出所有以「Hel」起頭且以「o」結尾，且其中只有一個字元的所有檔案
                            • " --"
                          • My Document.kwd 找到一個檔名完全相符的檔案
                          " -+"輸入你所要找的檔案名稱。
                          多個名稱可以使用分號「;」隔開。

                          檔案名" -+"稱中可以包含下列特殊字元：
                          • ? 比對任何單一字元
                          • * " -+"比對零個或多個任意字元
                          • [...] 比對任何在中括號中的字元

                            • 搜尋範例:
                            • *.kwd;*.txt 找尋所有檔名結尾為 .kwd 或是 .txt " -+"的檔案。
                            • go[dt] 找到檔案 god 與 got
                            • Hel?o 找出" -+"所有以「Hel」起頭且以「o」結尾，且其中只有一個字元的所有檔案
                            • My " -+"Document.kwd 找到一個檔名完全相符的檔案
                            " - - #: kftabdlg.cpp:111 - msgid "" --"This lets you use the files' index created by the slocate " --"package to speed-up the search; remember to update the index from time to time " -+"This lets you use the files' index created by the slocate package " -+"to speed-up the search; remember to update the index from time to time " - "(using updatedb)." - msgstr "" --"這讓您使用slocate所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔案索引(使用updatedb)。" -+"這讓您使用slocate所建立的檔案索引包來加速搜尋。 別忘了要不時更新檔" -+"案索引(使用updatedb)。" - - #: kftabdlg.cpp:147 - msgid "Find all files created or &modified:" -@@ -238,7 +226,9 @@ - "If specified, only files that contain this text are found. Note that not " - "all file types from the list above are supported. Please refer to the " - "documentation for a list of supported file types." --msgstr "如果選擇此項，只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都有支援。請參考文件，以得知所支援的檔案格 式。" -+msgstr "" -+"如果選擇此項，只會找到包含這些文字的檔案。請注意並非所有 上列的檔案格式都" -+"有支援。請參考文件，以得知所支援的檔案格 式。" - - #: kftabdlg.cpp:264 - msgid "Case s&ensitive" -@@ -256,11 +246,13 @@ - msgid "" - "This lets you search in any type of file, even those that usually do not " - "contain text (for example program files and images)." --msgstr "這讓您在檔任何格式的檔案中搜尋，儘管這些檔案常常不包含文字(例如程式檔或圖像檔) " -+msgstr "" -+"這讓您在檔任何格式的檔案中搜尋，儘管這些檔案常常不包含文字(例如程式檔或圖" -+"像檔) " - - #: kftabdlg.cpp:277 - msgid "&Edit..." --msgstr "編輯 (&E)" -+msgstr "編輯(&E)" - - #: kftabdlg.cpp:282 - msgid "fo&r:" -@@ -268,7 +260,7 @@ - - #: kftabdlg.cpp:283 - msgid "Search &metainfo sections:" --msgstr "搜尋檔案的格式資訊 (&M)：" -+msgstr "搜尋檔案的格式資訊(&M)：" - - #: kftabdlg.cpp:286 - msgid "All Files & Folders" -@@ -284,7 +276,7 @@ - - #: kftabdlg.cpp:290 - msgid "Special Files (Sockets, Device Files, ...)" --msgstr "特別檔案 (Sockets, 設備檔案, ...)" -+msgstr "特別檔案 (Sockets, 設備檔案,…)" - - #: kftabdlg.cpp:291 - msgid "Executable Files" -@@ -308,46 +300,37 @@ - - #: kftabdlg.cpp:343 - msgid "Name/&Location" --msgstr "名稱/位置 (&L)" -+msgstr "名稱/位置(&L)" - - #: kftabdlg.cpp:344 - msgid "C&ontents" --msgstr "內容 (&O)" -+msgstr "內容(&O)" - - #: kftabdlg.cpp:345 - msgid "&Properties" --msgstr "選項 (&P)" -+msgstr "選項(&P)" - - #: kftabdlg.cpp:350 - msgid "" --"Search within files' specific comments/metainfo" --"
                            These are some examples:" --"
                            " --"
                              " --"
                            • Audio files (mp3...) Search in id3 tag for a title, an album
                              • " --"
                            • Images (png...) Search images with a special resolution, " --"comment...
                            " -+"Search within files' specific comments/metainfo
                            These are some " -+"examples:
                            • Audio files (mp3...) Search in id3 tag for a " -+"title, an album
                            • Images (png...) Search images with a special " -+"resolution, comment...
                            " - msgstr "" --"搜尋檔案的備註或格式資訊" --"
                            這裡有一些範例：" --"
                            " --"
                              " --"
                            • 音訊檔案 (mp3...)搜尋 mp3 檔案內的 id3 標籤資訊， 例如歌名、專輯名稱...
                              • " --"
                            • 影像檔案 (png...)依照所定義的解析度、 備註等來搜尋影像檔案
                            " -+"搜尋檔案的備註或格式資訊
                            這裡有一些範例：
                            • 音訊檔案 " -+"(mp3...)搜尋 mp3 檔案內的 id3 標籤資訊， 例如歌名、專輯名稱...
                            • 影像檔案 (png...)依照所定義的解析度、 備註等來搜尋影像檔案
                            " - - #: kftabdlg.cpp:358 - msgid "" --"If specified, search only in this field" --"
                            " --"
                              " --"
                            • Audio files (mp3...) This can be Title, Album...
                              • " --"
                            • Images (png...) Search only in Resolution, Bitdepth...
                            " -+"If specified, search only in this field
                            • Audio files " -+"(mp3...) This can be Title, Album...
                            • Images (png...) " -+"Search only in Resolution, Bitdepth...
                            " - msgstr "" --"如果這個選項被設定了，那麼只會搜尋這個欄位內的內容。" --"
                            " --"
                              " --"
                            • 音訊檔案(mp3...)這可以是歌名、 專輯、...
                              • " --"
                            • 影像檔案 (png...)只會依照解析度、 色階、...搜尋
                            " -+"如果這個選項被設定了，那麼只會搜尋這個欄位內的內容。
                            • 音訊檔" -+"案(mp3...)這可以是歌名、 專輯、...
                            • 影像檔案 (png...)只會依" -+"照解析度、 色階、...搜尋
                            " - - #: kftabdlg.cpp:552 - msgid "Unable to search within a period which is less than a minute." -@@ -415,11 +398,11 @@ - - #: kfwin.cpp:124 - msgid "First Matching Line" --msgstr "符合的第一行" -+msgstr "符合的第一列" - - #: kfwin.cpp:194 - msgid "Save Results As" --msgstr "儲存結果為..." -+msgstr "儲存結果為…" - - #: kfwin.cpp:219 - msgid "Unable to save results." -@@ -430,10 +413,8 @@ - msgstr "KFind 結果檔案" - - #: kfwin.cpp:259 --msgid "" --"Results were saved to file\n" --msgstr "" --"搜尋結果被存到檔案\n" -+msgid "Results were saved to file\n" -+msgstr "搜尋結果被存到檔案\n" - - #: kfwin.cpp:289 - #, c-format -@@ -454,7 +435,7 @@ - - #: kfwin.cpp:418 - msgid "Open With..." --msgstr "用...開啟" -+msgstr "用…開啟" - - #: kfwin.cpp:424 - msgid "Selected Files" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfmclient.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfmclient.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfmclient.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfmclient.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfmclient\n" - "POT-Creation-Date: 2006-08-04 03:58+0200\n" - "PO-Revision-Date: 2005-10-30 09:02+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -64,7 +64,8 @@ - #: kfmclient.cc:89 - msgid "" - " # If 'mimetype' is specified, it will be used to determine the\n" --" # component that Konqueror should use. For instance, set it to\n" -+" # component that Konqueror should use. For instance, set it " -+"to\n" - " # text/html for a web page, to make it appear faster\n" - "\n" - msgstr "" -@@ -90,14 +91,15 @@ - msgid "" - " kfmclient openProfile 'profile' ['url']\n" - " # Opens a window using the given profile.\n" --" # 'profile' is a file under " --"~/.kde/share/apps/konqueror/profiles.\n" -+" # 'profile' is a file under ~/.kde/share/apps/konqueror/" -+"profiles.\n" - " # 'url' is an optional URL to open.\n" - "\n" - msgstr "" - " kfmclient openProfile 'profile' ['url']\n" - " # 給一個個人化設定檔來開啟一個視窗。\n" --" # 個人化設定檔是一個檔案在 ~/.kde/share/apps/konqueror/profiles.\n" -+" # 個人化設定檔是一個檔案在 ~/.kde/share/apps/konqueror/" -+"profiles.\n" - " # 'url' 是要開啟的一個選擇性的 URL。\n" - "\n" - -@@ -282,32 +284,24 @@ - "\n" - - #: kfmclient.cc:405 --msgid "" --"Profile %1 not found\n" --msgstr "" --"無法找到 profile %1\n" -+msgid "Profile %1 not found\n" -+msgstr "無法找到 profile %1\n" - - #: kfmclient.cc:434 --msgid "" --"Syntax Error: Not enough arguments\n" --msgstr "" --"語法錯誤: 參數過少\n" -+msgid "Syntax Error: Not enough arguments\n" -+msgstr "語法錯誤: 參數過少\n" - - #: kfmclient.cc:439 --msgid "" --"Syntax Error: Too many arguments\n" --msgstr "" --"語法錯誤: 參數過多\n" -+msgid "Syntax Error: Too many arguments\n" -+msgstr "語法錯誤: 參數過多\n" - - #: kfmclient.cc:559 - msgid "Unable to download from an invalid URL." - msgstr "無法從無效的 URL 下載。" - - #: kfmclient.cc:623 --msgid "" --"Syntax Error: Unknown command '%1'\n" --msgstr "" --"語法錯誤: 未知的命令 '%1'\n" -+msgid "Syntax Error: Unknown command '%1'\n" -+msgstr "語法錯誤: 未知的命令 '%1'\n" - - #~ msgid "" - #~ " kfmclient selectDesktopIcons x y w h add\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfontinst.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kfontinst.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kfontinst.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kfontinst.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfontinst\n" - "POT-Creation-Date: 2008-06-16 02:37+0200\n" - "PO-Revision-Date: 2005-10-31 21:34+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,14 +32,15 @@ - - #: kcmfontinst/KCmFontInst.cpp:157 kcmfontinst/KCmFontInst.cpp:220 - msgid "Add Fonts..." --msgstr "新增字型..." -+msgstr "新增字型…" - - #: kcmfontinst/KCmFontInst.cpp:172 - msgid "" --"The fonts shown are your personal fonts." --"
                            To see (and install) system-wide fonts, click on the \"Administrator Mode\" " --"button below." --msgstr "顯示的字型是您的個人字型。
                            要查看(和安裝)系統層級的字型，請按下方的「系統管理者模式」按鈕。" -+"The fonts shown are your personal fonts.
                            To see (and install) " -+"system-wide fonts, click on the \"Administrator Mode\" button below." -+msgstr "" -+"顯示的字型是您的個人字型。
                            要查看(和安裝)系統層級的字型，請按下方的" -+"「系統管理者模式」按鈕。" - - #: kcmfontinst/KCmFontInst.cpp:213 - msgid "Show Bitmap Fonts" -@@ -47,43 +48,41 @@ - - #: kcmfontinst/KCmFontInst.cpp:234 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: kcmfontinst/KCmFontInst.cpp:238 - msgid "Print..." --msgstr "列印..." -+msgstr "列印…" - - #: kcmfontinst/KCmFontInst.cpp:317 - msgid "" --"

                            Font Installer

                            " --"

                            This module allows you to install TrueType, Type1, and Bitmap fonts.

                            " --"

                            You may also install fonts using Konqueror: type fonts:/ into Konqueror's " --"location bar and this will display your installed fonts. To install a font, " --"simply copy one into the folder.

                            " --msgstr "" --"

                            字型安裝程式

                            " --"

                            這個模組用來安裝 TrueType、Type1 以及Bitmap字型。

                            " --"

                            您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 " --"fonts:/，就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到此資料夾即可。

                            " -+"

                            Font Installer

                            This module allows you to install TrueType, " -+"Type1, and Bitmap fonts.

                            You may also install fonts using Konqueror: " -+"type fonts:/ into Konqueror's location bar and this will display your " -+"installed fonts. To install a font, simply copy one into the folder.

                            " -+msgstr "" -+"

                            字型安裝程式

                            這個模組用來安裝 TrueType、Type1 以及Bitmap字型。

                            您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 fonts:/，" -+"就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到此資料夾即可。

                            " - - #: kcmfontinst/KCmFontInst.cpp:324 - msgid "" --"

                            Font Installer

                            " --"

                            This module allows you to install TrueType, Type1, and Bitmap fonts.

                            " --"

                            You may also install fonts using Konqueror: type fonts:/ into Konqueror's " --"location bar and this will display your installed fonts. To install a font, " --"simply copy it into the appropriate folder - \"Personal\" for fonts available " --"to just yourself, or \"System\" for system-wide fonts (available to all).

                            " --"

                            NOTE: As you are not logged in as \"root\", any fonts installed will " --"only be available to you. To install fonts system-wide, use the \"Administrator " --"Mode\" button to run this module as \"root\".

                            " --msgstr "" --"

                            字型安裝程式

                            " --"

                            這個模組用來安裝TrueType、Type1 以及Bitmap字型。

                            " --"

                            您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 " --"fonts:/，就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到適當的資料夾即可─「個人」代表只供您自己使用的字型，而「系統」則是全系統的字型（所有人" --"皆可用）。

                            " --"

                            注意：當您不是以「root」登入時，任何安裝的字型都只有您能用。要安裝全系統的字型，請使用「系統管理者模式」按鈕來以「root」執行此模組。" -+"

                            Font Installer

                            This module allows you to install TrueType, " -+"Type1, and Bitmap fonts.

                            You may also install fonts using Konqueror: " -+"type fonts:/ into Konqueror's location bar and this will display your " -+"installed fonts. To install a font, simply copy it into the appropriate " -+"folder - \"Personal\" for fonts available to just yourself, or \"System\" " -+"for system-wide fonts (available to all).

                            NOTE: As you are not " -+"logged in as \"root\", any fonts installed will only be available to you. To " -+"install fonts system-wide, use the \"Administrator Mode\" button to run this " -+"module as \"root\".

                            " -+msgstr "" -+"

                            字型安裝程式

                            這個模組用來安裝TrueType、Type1 以及Bitmap字型。

                            您也可以利用 Konqueror 來安裝 字型：在 Konqueror 的位址列鍵入 fonts:/，" -+"就會顯示出您目前已安裝的字型。要安裝新字型，只要複製一份到適當的資料夾即可─" -+"「個人」代表只供您自己使用的字型，而「系統」則是全系統的字型（所有人皆可" -+"用）。

                            注意：當您不是以「root」登入時，任何安裝的字型都只有您能" -+"用。要安裝全系統的字型，請使用「系統管理者模式」按鈕來以「root」執行此模組。" - "

                            " - - #: kcmfontinst/KCmFontInst.cpp:421 -@@ -154,19 +153,17 @@ - #: kcmfontinst/KCmFontInst.cpp:611 - msgid "" - "

                            Please note that any open applications will need to be restarted in order " --"for any changes to be noticed." --"

                            " --"

                            (You will also have to restart this application in order to use its print " --"function on any newly installed fonts.)

                            " --msgstr "" --"

                            請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。" --"

                            " --"

                            (您也必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)

                            " -+"for any changes to be noticed.

                            (You will also have to restart this " -+"application in order to use its print function on any newly installed fonts.)" -+"

                            " -+msgstr "" -+"

                            請注意任何已開啟的應用程式將須要重新啟動才能反應出所做的變更。

                            (您也" -+"必須重新啟動這個應用程式才能讓新安裝的字型使用其列印功能。)

                            " - - #: kcmfontinst/KCmFontInst.cpp:615 - msgid "" --"Please note that any open applications will need to be restarted in order for " --"any changes to be noticed." -+"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 -@@ -243,19 +240,17 @@ - - #: kcmfontinst/SettingsDialog.cpp:52 - msgid "" --"

                            Modern applications use a system called \"FontConfig\" to obtain the list of " --"fonts. Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the " --"previous \"core X fonts\" mechanism for this.

                            " --"

                            Selecting this option will inform the installer to create the necessary " --"files so that these older applications can use the fonts you install.

                            " --"

                            Please note, however, that this will slow down the installation process." --"

                            " --msgstr "" --"

                            現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式像 OpenOffice 1.x、GIMP 1.x " --"等等則使用過去的「core X fonts」來達到目的。

                            " --"

                            選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的字型。

                            " --"

                            然而，請您注意這會降低安裝過程的速度。" --"

                            " -+"

                            Modern applications use a system called \"FontConfig\" to obtain the list " -+"of fonts. Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the " -+"previous \"core X fonts\" mechanism for this.

                            Selecting this option " -+"will inform the installer to create the necessary files so that these older " -+"applications can use the fonts you install.

                            Please note, however, that " -+"this will slow down the installation process.

                            " -+msgstr "" -+"

                            現代的應用程式使用稱為「FontConfig」的系統來獲得字型清單。較舊的應用程式" -+"像 OpenOffice 1.x、GIMP 1.x 等等則使用過去的「core X fonts」來達到目的。

                            選擇這個選項會通知安裝程式建立必要的檔案以便那些舊程式可以使用您所安裝的" -+"字型。

                            然而，請您注意這會降低安裝過程的速度。

                            " - - #: kcmfontinst/SettingsDialog.cpp:57 - msgid "Configure fonts for Ghostscript" -@@ -263,31 +258,33 @@ - - #: kcmfontinst/SettingsDialog.cpp:58 - msgid "" --"

                            When printing, most applications create what is know as PostScript. This is " --"then sent to a special application, named Ghostscript, which can interpret the " --"PostScript and send the appropriate instructions to your printer. If your " --"application does not embed whatever fonts it uses into the PostScript, then " --"Ghostscript needs to be informed as to which fonts you have installed, and " --"where they are located.

                            " --"

                            Selecting this option will create the necessary Ghostscript config files.

                            " --"

                            Please note, however, that this will also slow down the installation " --"process.

                            " --"

                            As most applications can, and do, embed the fonts into the PostScript before " --"sending this to Ghostscript, this option can safely be disabled." --msgstr "" --"

                            在列印時，大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式，其名為 Ghostscript，它能解譯 PostScript " --"並送出正確的指令到您的印表機。如果您的應用程式沒有內嵌任何 PostScript 使用的字型，那就需要通知 Ghostscript " --"您已安裝何種字型以及安裝在何處。

                            " --"

                            選擇這個選項會建立必要的 Ghostscript 設定檔。

                            " --"

                            請注意，這會減低安裝過程的速度。

                            " --"

                            當大部分應用程式在送出資料到 Ghostscript 之前都可以，並確實內嵌字型到 PostScript，您便可以安心停用這個選項。" -+"

                            When printing, most applications create what is know as PostScript. This " -+"is then sent to a special application, named Ghostscript, which can " -+"interpret the PostScript and send the appropriate instructions to your " -+"printer. If your application does not embed whatever fonts it uses into the " -+"PostScript, then Ghostscript needs to be informed as to which fonts you have " -+"installed, and where they are located.

                            Selecting this option will " -+"create the necessary Ghostscript config files.

                            Please note, however, " -+"that this will also slow down the installation process.

                            As most " -+"applications can, and do, embed the fonts into the PostScript before sending " -+"this to Ghostscript, this option can safely be disabled." -+msgstr "" -+"

                            在列印時，大多數應用程式都是使用 PostScript。亦即將其送至特定的應用程式，" -+"其名為 Ghostscript，它能解譯 PostScript 並送出正確的指令到您的印表機。如果您" -+"的應用程式沒有內嵌任何 PostScript 使用的字型，那就需要通知 Ghostscript 您已安" -+"裝何種字型以及安裝在何處。

                            選擇這個選項會建立必要的 Ghostscript 設定" -+"檔。

                            請注意，這會減低安裝過程的速度。

                            當大部分應用程式在送出資料" -+"到 Ghostscript 之前都可以，並確實內嵌字型到 PostScript，您便可以安心停用這個" -+"選項。" - - #: kcmfontinst/SettingsDialog.cpp:84 - msgid "" --"You have enabled a previously disabled option. Would you like the config files " --"updated now? (Normally they are only updated upon installing, or removing, a " --"font.)" --msgstr "您已經啟用一個原本停用的選項。您是否希望設定檔現在就更新？(它們通常只有在安裝或移除字型時才會更新。)" -+"You have enabled a previously disabled option. Would you like the config " -+"files updated now? (Normally they are only updated upon installing, or " -+"removing, a font.)" -+msgstr "" -+"您已經啟用一個原本停用的選項。您是否希望設定檔現在就更新？(它們通常只有在安裝" -+"或移除字型時才會更新。)" - - #: kcmfontinst/SettingsDialog.cpp:86 - msgid "Update" -@@ -335,17 +332,17 @@ - msgstr "抱歉，字型不能重新命名。" - - #: kio/KioFonts.cpp:1920 --msgid "" --"Incorrect password.\n" --msgstr "" --"密碼錯誤。\n" -+msgid "Incorrect password.\n" -+msgstr "密碼錯誤。\n" - - #: kio/KioFonts.cpp:1963 - msgid "" --"Do you wish to install the font into \"%1\" (in which case the font will only " --"be usable by you), or \"%2\" (the font will be usable by all users - but you " --"will need to know the administrator's password)?" --msgstr "您想要將字型安裝在「%1」(只有您可以使用)，或是「%2」(讓全部使 用者使用，不過您需要管理者密碼才能安裝) ？" -+"Do you wish to install the font into \"%1\" (in which case the font will " -+"only be usable by you), or \"%2\" (the font will be usable by all users - " -+"but you will need to know the administrator's password)?" -+msgstr "" -+"您想要將字型安裝在「%1」(只有您可以使用)，或是「%2」(讓全部使 用者使用，不過" -+"您需要管理者密碼才能安裝) ？" - - #: kio/KioFonts.cpp:1968 - msgid "Where to Install" -@@ -361,51 +358,43 @@ - - #: kio/KioFonts.cpp:2146 - msgid "" --"

                            Only fonts may be installed.

                            " --"

                            If installing a fonts package (*%1), then extract the components, and " --"install individually.

                            " --msgstr "

                            只有要被安裝的字型。

                            如果安裝一個字型套件 (*%1)，則解開其元件並各別安裝。

                            " -+"

                            Only fonts may be installed.

                            If installing a fonts package (*%1), " -+"then extract the components, and install individually.

                            " -+msgstr "" -+"

                            只有要被安裝的字型。

                            如果安裝一個字型套件 (*%1)，則解開其元件並各別" -+"安裝。

                            " - - #: kio/KioFonts.cpp:2309 - msgid "" - "

                            This font is located in a file alongside other fonts; in order to proceed " --"with the moving they will all have to be moved. The other affected fonts " --"are:

                            " --"
                              %1
                            " --"

                            \n" -+"with the moving they will all have to be moved. The other affected fonts are:" -+"

                              %1

                            \n" - " Do you wish to move all of these?

                            " - msgstr "" --"

                            這個字型位於一個包含其他字型的檔案；為了進行這次移動的動作其他所有字型也會被移動。其他會被影響的字型有：

                            " --"
                              %1
                            " --"

                            \n" -+"

                            這個字型位於一個包含其他字型的檔案；為了進行這次移動的動作其他所有字型也會" -+"被移動。其他會被影響的字型有：

                              %1

                            \n" - "您是否希望移動它們全部？

                            " - - #: kio/KioFonts.cpp:2314 - msgid "" - "

                            This font is located in a file alongside other fonts; in order to proceed " - "with the copying they will all have to be copied. The other affected fonts " --"are:

                            " --"
                              %1
                            " --"

                            \n" -+"are:

                              %1

                            \n" - " Do you wish to copy all of these?

                            " - msgstr "" --"

                            這個字型位於一個包含其他字型的檔案；為了進行這次複製的動作其他所有字型也會被複製。其他會被影響的字型有：

                            " --"
                              %1
                            " --"

                            \n" -+"

                            這個字型位於一個包含其他字型的檔案；為了進行這次複製的動作其他所有字型也會" -+"被複製。其他會被影響的字型有：

                              %1

                            \n" - "您是否希望複製它們全部？

                            " - - #: kio/KioFonts.cpp:2318 - msgid "" - "

                            This font is located in a file alongside other fonts; in order to proceed " - "with the deleting they will all have to be deleted. The other affected fonts " --"are:

                            " --"
                              %1
                            " --"

                            \n" -+"are:

                              %1

                            \n" - " Do you wish to delete all of these?

                            " - msgstr "" --"

                            這個字型位於一個包含其他字型的檔案；為了進行這次刪除的動作其他所有字型也會被刪除。其他會被影響的字型有：

                            " --"
                              %1
                            " --"

                            \n" -+"

                            這個字型位於一個包含其他字型的檔案；為了進行這次刪除的動作其他所有字型也會" -+"被刪除。其他會被影響的字型有：

                              %1

                            \n" - "您是否希望刪除它們全部？

                            " - - #: kio/KioFonts.cpp:2391 -@@ -461,11 +450,11 @@ - - #: viewpart/FontViewPart.cpp:94 - msgid "Install..." --msgstr "安裝..." -+msgstr "安裝…" - - #: viewpart/FontViewPart.cpp:110 - msgid "Change Text..." --msgstr "改變文字..." -+msgstr "改變文字…" - - #: viewpart/FontViewPart.cpp:208 - msgid "" -@@ -632,8 +621,14 @@ - #~ msgid "Disable" - #~ msgstr "停用" - --#~ msgid "

                            NOTE: As you are not logged in as \"root\", any fonts installed will only be available to you. To install fonts system wide, use the \"Administrator Mode\" button to run this module as \"root\".

                            " --#~ msgstr "

                            注意：由於您並未以\"root\"身份登入，所安裝的字型 只有你可以使用。如果您想要安裝字型讓整個系統使用，請按 \"Administrator Mode\"鍵，以\"root\"身份來執行本模組。" -+#~ msgid "" -+#~ "

                            NOTE: As you are not logged in as \"root\", any fonts installed " -+#~ "will only be available to you. To install fonts system wide, use the " -+#~ "\"Administrator Mode\" button to run this module as \"root\".

                            " -+#~ msgstr "" -+#~ "

                            注意：由於您並未以\"root\"身分登入，所安裝的字型 只有你可以使" -+#~ "用。如果您想要安裝字型讓整個系統使用，請按 \"Administrator Mode\"鍵，以" -+#~ "\"root\"身分來執行本模組。" - - #, fuzzy - #~ msgid "" -@@ -713,12 +708,22 @@ - #~ "請將這個字型改名/停用。" - - #, fuzzy --#~ msgid "You cannot create a folder named \"CID\", \"encodings\", \"util\", \"%1\", or \"%2\", - as these are special system folders (\"CID\" is for \"CID\" fonts - these are not handled - and \"encodings\" and \"util\" are for X11 encoding files" --#~ msgstr "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾， 因為他們是特定的系統資料夾(\"CID\"是給\"CID\"字型使用， 不該由此處理，而\"encodings\"和\"util\"是X11的編碼 檔案。" -+#~ msgid "" -+#~ "You cannot create a folder named \"CID\", \"encodings\", \"util\", \"%1" -+#~ "\", or \"%2\", - as these are special system folders (\"CID\" is for \"CID" -+#~ "\" fonts - these are not handled - and \"encodings\" and \"util\" " -+#~ "are for X11 encoding files" -+#~ msgstr "" -+#~ "您無法新增名為\"CID\"、\"encodings\"、或是\"util\"的資料夾， 因為他們是特" -+#~ "定的系統資料夾(\"CID\"是給\"CID\"字型使用， 不該由此處理，而" -+#~ "\"encodings\"和\"util\"是X11的編碼 檔案。" - - #, fuzzy --#~ msgid "You cannot create a folder named \"kde-override\", \"%1\", or \"%2\", as these are special KDE folders." --#~ msgstr "您無法新增名為\"kde-override\"的資料夾，因為這是KDE的一個特定 資料夾。" -+#~ msgid "" -+#~ "You cannot create a folder named \"kde-override\", \"%1\", or \"%2\", as " -+#~ "these are special KDE folders." -+#~ msgstr "" -+#~ "您無法新增名為\"kde-override\"的資料夾，因為這是KDE的一個特定 資料夾。" - - #~ msgid "" - #~ "A hidden/disabled folder (starting with a '.') already exists.\n" -@@ -743,7 +748,7 @@ - #~ msgstr "%1:%2 已經安裝了!" - - #~ msgid "Loading file..." --#~ msgstr "載入檔案..." -+#~ msgstr "載入檔案…" - - #~ msgid "Install Fonts" - #~ msgstr "安裝字型" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_classic.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_classic.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_classic.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_classic.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kgreet_classic\n" - "POT-Creation-Date: 2007-12-16 01:17+0100\n" - "PO-Revision-Date: 2006-01-20 15:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_winbind.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_winbind.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kgreet_winbind.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kgreet_winbind.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kgreet_winbind\n" - "POT-Creation-Date: 2007-12-16 01:17+0100\n" - "PO-Revision-Date: 2006-01-20 15:24+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khelpcenter.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khelpcenter.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khelpcenter.po 2007-07-12 10:27:45.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khelpcenter.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: khelpcenter\n" - "POT-Creation-Date: 2007-05-19 02:14+0200\n" - "PO-Revision-Date: 2005-10-31 21:34+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -131,15 +131,16 @@ - - #: glossary.cpp:147 - msgid "Rebuilding cache..." --msgstr "正在重建快取..." -+msgstr "正在重建快取…" - - #: glossary.cpp:177 - msgid "Rebuilding cache... done." --msgstr "正在重建快取...完成。" -+msgstr "正在重建快取…完成。" - - #: glossary.cpp:272 - msgid "" --"Unable to show selected glossary entry: unable to open file 'glossary.html.in'!" -+"Unable to show selected glossary entry: unable to open file 'glossary.html." -+"in'!" - msgstr "無法顯示選擇的辭典項目：無法開啟檔案 'glossary.html.in'！" - - #: glossary.cpp:277 -@@ -156,9 +157,10 @@ - - #: htmlsearchconfig.cpp:51 - msgid "" --"The fulltext search feature makes use of the ht://dig HTML search engine. You " --"can get ht://dig at the" --msgstr "全文搜尋的功能使用了 ht://dig HTML 搜尋引擎。您可以在下列位址取得 ht://dig：" -+"The fulltext search feature makes use of the ht://dig HTML search engine. " -+"You can get ht://dig at the" -+msgstr "" -+"全文搜尋的功能使用了 ht://dig HTML 搜尋引擎。您可以在下列位址取得 ht://dig：" - - #: htmlsearchconfig.cpp:57 - msgid "Information about where to get the ht://dig package." -@@ -249,8 +251,7 @@ - msgid "" - "To create an index check the box in the list and press the\n" - "\"Build Index\" button.\n" --msgstr "" --"要建立一份索引，請選取清單中的方格，然後按下\"建立索引\"。\n" -+msgstr "要建立一份索引，請選取清單中的方格，然後按下\"建立索引\"。\n" - - #: kcmhelpcenter.cpp:278 - msgid "Search Scope" -@@ -262,7 +263,7 @@ - - #: kcmhelpcenter.cpp:293 - msgid "Change..." --msgstr "更改..." -+msgstr "更改…" - - #: kcmhelpcenter.cpp:312 - msgid "The folder %1 does not exist; unable to create index." -@@ -273,10 +274,8 @@ - msgstr "沒有找到" - - #: kcmhelpcenter.cpp:397 --msgid "" --"Document '%1' (%2):\n" --msgstr "" --"文件 '%1' (%2)：\n" -+msgid "Document '%1' (%2):\n" -+msgstr "文件 '%1' (%2)：\n" - - #: kcmhelpcenter.cpp:402 - msgid "No document type." -@@ -365,11 +364,11 @@ - - #: mainwindow.cpp:230 - msgid "&Last Search Result" --msgstr "上一個搜尋結果 (&L)" -+msgstr "上一個搜尋結果(&L)" - - #: mainwindow.cpp:235 - msgid "Build Search Index..." --msgstr "建立搜尋索引..." -+msgstr "建立搜尋索引…" - - #: mainwindow.cpp:243 - msgid "Show Search Error Log" -@@ -377,7 +376,7 @@ - - #: mainwindow.cpp:250 - msgid "Configure Fonts..." --msgstr "設定字型..." -+msgstr "設定字型…" - - #: mainwindow.cpp:251 - msgid "Increase Font Sizes" -@@ -494,7 +493,7 @@ - - #: searchwidget.cpp:59 - msgid "&Method:" --msgstr "方式 (&M)：" -+msgstr "方式(&M)：" - - #: searchwidget.cpp:73 - msgid "Max. &results:" -@@ -510,7 +509,7 @@ - - #: searchwidget.cpp:97 - msgid "Build Search &Index..." --msgstr "建立搜尋索引(&I)..." -+msgstr "建立搜尋索引(&I)…" - - #: searchwidget.cpp:352 - msgid "Custom" -@@ -547,7 +546,8 @@ - #: view.cpp:122 - msgid "" - "KDE is a powerful graphical desktop environment for UNIX workstations. A\n" --"KDE desktop combines ease of use, contemporary functionality and outstanding\n" -+"KDE desktop combines ease of use, contemporary functionality and " -+"outstanding\n" - "graphical design with the technological superiority of the UNIX operating\n" - "system." - msgstr "" -@@ -618,7 +618,7 @@ - #~ msgstr "HTML 搜尋" - - #~ msgid "Create Search &Index..." --#~ msgstr "建立搜尋索引 (&I)..." -+#~ msgstr "建立搜尋索引(&I)…" - - #, fuzzy - #~ msgid "Index directory:" -@@ -631,8 +631,12 @@ - #~ msgid "Indexing '%1'." - #~ msgstr "索引 '%1'。" - --#~ msgid "

                            Help Index

                            With this control module you configure and build the index files required by the search function of the help center." --#~ msgstr "

                            輔助索引

                            這個控制模組可以讓您設定並建立，在輔助中心的搜尋功能中，所需要的索引檔。" -+#~ msgid "" -+#~ "

                            Help Index

                            With this control module you configure and build the " -+#~ "index files required by the search function of the help center." -+#~ msgstr "" -+#~ "

                            輔助索引

                            這個控制模組可以讓您設定並建立，在輔助中心的搜尋功能中，" -+#~ "所需要的索引檔。" - - #~ msgid "KCMHelpCenter" - #~ msgstr "KCMHelpCenter" -@@ -646,13 +650,19 @@ - #~ msgid "Browse info pages" - #~ msgstr "瀏覽資訊頁" - --#~ msgid "One or more files containing info nodes belonging to the subject '%1' do(es) not exist." -+#~ msgid "" -+#~ "One or more files containing info nodes belonging to the subject '%1' do" -+#~ "(es) not exist." - #~ msgstr "一個或多個包含關於主題 '%1' 的 Info Node 並未存在。" - --#~ msgid "Info nodes belonging to the subject '%1' seem to be not ordered in a hierarchy." -+#~ msgid "" -+#~ "Info nodes belonging to the subject '%1' seem to be not ordered in a " -+#~ "hierarchy." - #~ msgstr "關於主題 '%1' 的 Info Node，在階層中看起來並未被排序過。" - --#~ msgid "An unknown error occurred while creating the hierarchy of info nodes belonging to the subject '%1'." -+#~ msgid "" -+#~ "An unknown error occurred while creating the hierarchy of info nodes " -+#~ "belonging to the subject '%1'." - #~ msgstr "當建立關於主題 '%1' 的 Info Node 階層時，發生無法預期的錯誤。" - - #~ msgid "Cannot Create Hierarchy of Info Nodes" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khotkeys.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khotkeys.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khotkeys.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khotkeys.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: khotkeys\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-11-01 21:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -48,7 +48,7 @@ - #: rc.cpp:18 rc.cpp:39 rc.cpp:170 rc.cpp:225 - #, no-c-format - msgid "&Modify..." --msgstr "修改(&M)..." -+msgstr "修改(&M)…" - - #. i18n: file kcontrol/ui/actions_listview_widget_ui.ui line 30 - #: kcontrol/tab_widget.cpp:425 rc.cpp:27 -@@ -108,7 +108,7 @@ - #: rc.cpp:69 - #, no-c-format - msgid "Import New Actions..." --msgstr "匯入新的動作..." -+msgstr "匯入新的動作…" - - #. i18n: file kcontrol/ui/general_tab_ui.ui line 30 - #: rc.cpp:72 -@@ -132,7 +132,7 @@ - #: rc.cpp:87 rc.cpp:90 rc.cpp:93 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file kcontrol/ui/gestures_settings_tab_ui.ui line 24 - #: rc.cpp:96 -@@ -168,15 +168,17 @@ - #: rc.cpp:111 - #, no-c-format - msgid "" --"

                            This module allows configuring input actions, like mouse gestures, keyboard " --"shortcuts for performing commands, launching applications or DCOP calls, and " --"similar.

                            \n" --"

                            NOTE: If you are not an experienced user, you should be careful with " --"modifying the actions, and should limit your changes mainly to " --"enabling/disabling actions, and changing triggers.

                            " -+"

                            This module allows configuring input actions, like mouse gestures, " -+"keyboard shortcuts for performing commands, launching applications or DCOP " -+"calls, and similar.

                            \n" -+"

                            NOTE: If you are not an experienced user, you should be careful " -+"with modifying the actions, and should limit your changes mainly to enabling/" -+"disabling actions, and changing triggers.

                            " - msgstr "" --"

                            這個模組允許配置輸入的動作，如滑鼠手勢，鍵盤快速鍵完成指令，起動應用程式或 DCOP 呼叫，及諸如此類的。

                            \n" --"

                            注意：如果您不是有經驗的使用者，在修改這些動作時要小心，主要就是要有節制地對啟動/關閉動作和觸發器進行變更。

                            " -+"

                            這個模組允許配置輸入的動作，如滑鼠手勢，鍵盤快速鍵完成指令，起動應用程式" -+"或 DCOP 呼叫，及諸如此類的。

                            \n" -+"

                            注意：如果您不是有經驗的使用者，在修改這些動作時要小心，主要就是要" -+"有節制地對啟動/關閉動作和觸發器進行變更。

                            " - - #. i18n: file kcontrol/ui/keyboard_input_widget_ui.ui line 16 - #: rc.cpp:115 -@@ -194,7 +196,7 @@ - #: rc.cpp:121 - #, no-c-format - msgid "Modify..." --msgstr "修改..." -+msgstr "修改…" - - #. i18n: file kcontrol/ui/keyboard_input_widget_ui.ui line 76 - #: rc.cpp:124 -@@ -206,20 +208,19 @@ - #: rc.cpp:127 - #, no-c-format - msgid "" --"Specify the window where the keyboard input should be sent to:" --"
                              \n" -+"Specify the window where the keyboard input should be sent to:
                                \n" - "
                              • Action window: The window where the triggering action happened; " --"this is usually the currently active window, except for mouse gesture triggers " --"- where it is the window under mouse - and window triggers -where it is the " --"window triggering the action.
                                • \n" -+"this is usually the currently active window, except for mouse gesture " -+"triggers - where it is the window under mouse - and window triggers -where " -+"it is the window triggering the action.\n" - "
                              • Active window: The currently active window.
                                • \n" - "
                              • Specific window: Any window matching the given criteria.
                                • \n" - "
                              " - msgstr "" --"指定鍵盤輸入應送出至哪個視窗：" --"
                                \n" --"
                              • 動作視窗： " --"觸發動作發生的視窗；這通常是目前作用中視窗，除了滑鼠手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。
                                • \n" -+"指定鍵盤輸入應送出至哪個視窗：
                                  \n" -+"
                                • 動作視窗： 觸發動作發生的視窗；這通常是目前作用中視窗，除了滑鼠" -+"手勢觸發─它是發生於該滑鼠之下的視窗─與視窗觸發─它是由觸發該動作的視窗。\n" - "
                                • 作用中視窗： 目前作用中的視窗
                                  • \n" - "
                                • 指定的視窗： 任何合於指定條件的視窗。
                                  • \n" - "
                                " -@@ -282,7 +283,7 @@ - #: rc.cpp:161 - #, no-c-format - msgid "&Browse..." --msgstr "瀏覽(&B)..." -+msgstr "瀏覽(&B)…" - - #. i18n: file kcontrol/ui/voice_input_widget_ui.ui line 46 - #: rc.cpp:179 -@@ -306,10 +307,12 @@ - #: rc.cpp:188 - #, no-c-format - msgid "" --"In order to trigger a spoken action, you have to press the key (or combination " --"of keys) configured below, speak the command and then press the same key again " --"once you have finished speaking." --msgstr "為了觸發語音動作，您須要按下下面設定的按鍵(或組合鍵)，說話，並且在您說完語音指令後再按一次相同的快速鍵" -+"In order to trigger a spoken action, you have to press the key (or " -+"combination of keys) configured below, speak the command and then press the " -+"same key again once you have finished speaking." -+msgstr "" -+"為了觸發語音動作，您須要按下下面設定的按鍵(或組合鍵)，說話，並且在您說完語音" -+"指令後再按一次相同的快速鍵" - - #. i18n: file kcontrol/ui/voice_settings_tab_ui.ui line 43 - #: rc.cpp:191 -@@ -331,7 +334,8 @@ - "mode: \n" - "make sure Full duplex is checked in your Sound System options." - msgstr "" --"注意： 要讓語音辨識功能正確執行，您須要有能正常運作的 arts，並使用全雙工模式： \n" -+"注意： 要讓語音辨識功能正確執行，您須要有能正常運作的 arts，並" -+"使用全雙工模式： \n" - "請確定您的 聲音伺服器 選項中的 全雙工 核取方塊已核取。" - - #. i18n: file kcontrol/ui/window_trigger_widget_ui.ui line 30 -@@ -516,16 +520,18 @@ - - #: shared/settings.cpp:70 - msgid "" --"This \"actions\" file has already been imported before. Are you sure you want " --"to import it again?" -+"This \"actions\" file has already been imported before. Are you sure you " -+"want to import it again?" - msgstr "這個「動作」以前就匯入過了。您是否確定要再次匯入它們？" - - #: shared/settings.cpp:81 - msgid "" - "This \"actions\" file has no ImportId field and therefore it cannot be " --"determined whether or not it has been imported already. Are you sure you want " --"to import it?" --msgstr "這個「動作」沒有 ImportId 欄位因此無法確認是否已經匯入過了。您是否確定要匯入它們？" -+"determined whether or not it has been imported already. Are you sure you " -+"want to import it?" -+msgstr "" -+"這個「動作」沒有 ImportId 欄位因此無法確認是否已經匯入過了。您是否確定要匯入" -+"它們？" - - #: kcontrol/menuedit.cpp:95 shared/settings.cpp:250 - msgid "These entries were created using Menu Editor." -@@ -565,31 +571,31 @@ - - #: kcontrol/action_list_widget.cpp:46 - msgid "Command/URL..." --msgstr "命令/URL..." -+msgstr "命令/URL…" - - #: kcontrol/action_list_widget.cpp:47 - msgid "K-Menu Entry..." --msgstr "K-選單 條目..." -+msgstr "K-選單 條目…" - - #: kcontrol/action_list_widget.cpp:48 - msgid "DCOP Call..." --msgstr "DCOP 呼叫..." -+msgstr "DCOP 呼叫…" - - #: kcontrol/action_list_widget.cpp:49 - msgid "Keyboard Input..." --msgstr "鍵盤輸入..." -+msgstr "鍵盤輸入…" - - #: kcontrol/action_list_widget.cpp:50 - msgid "Activate Window..." --msgstr "動用視窗..." -+msgstr "動用視窗…" - - #: kcontrol/condition_list_widget.cpp:47 - msgid "Active Window..." --msgstr "動用中的視窗..." -+msgstr "動用中的視窗…" - - #: kcontrol/condition_list_widget.cpp:48 - msgid "Existing Window..." --msgstr "存在的視窗..." -+msgstr "存在的視窗…" - - #: kcontrol/condition_list_widget.cpp:159 - msgid "" -@@ -653,22 +659,25 @@ - - #: kcontrol/gesturerecordpage.cpp:35 - msgid "" --"Draw the gesture you would like to record below. Press and hold the left mouse " --"button while drawing, and release when you have finished.\n" -+"Draw the gesture you would like to record below. Press and hold the left " -+"mouse button while drawing, and release when you have finished.\n" - "\n" --"You will be required to draw the gesture 3 times. After each drawing, if they " --"match, the indicators below will change to represent which step you are on.\n" -+"You will be required to draw the gesture 3 times. After each drawing, if " -+"they match, the indicators below will change to represent which step you are " -+"on.\n" - "\n" --"If at any point they do not match, you will be required to restart. If you want " --"to force a restart, use the reset button below.\n" -+"If at any point they do not match, you will be required to restart. If you " -+"want to force a restart, use the reset button below.\n" - "\n" - "Draw here:" - msgstr "" - "在下方繪畫出您要紀錄的手勢。繪畫時要按住滑鼠左鍵，當您完成時再放開。\n" - "\n" --"您需要繪畫手勢三次。如果有符合的話，在每次畫完後，下方的指示會改變並顯示出您所在的步驟。\n" -+"您需要繪畫手勢三次。如果有符合的話，在每次畫完後，下方的指示會改變並顯示出您" -+"所在的步驟。\n" - "\n" --"如果有任何特點沒有相符合，您將被要求重新開始。如果您要強制重新開始，就使用下方的重設按鈕。\n" -+"如果有任何特點沒有相符合，您將被要求重新開始。如果您要強制重新開始，就使用下" -+"方的重設按鈕。\n" - "\n" - "在這裡繪畫:" - -@@ -740,8 +749,8 @@ - - #: kcontrol/kcmkhotkeys.cpp:283 - msgid "" --"Import of the specified file failed. Most probably the file is not a valid file " --"with actions." -+"Import of the specified file failed. Most probably the file is not a valid " -+"file with actions." - msgstr "匯入指定的檔案失敗。很可能這不是個有效的附動作檔案。" - - #: kcontrol/menuedit.cpp:236 kcontrol/menuedit.cpp:237 -@@ -811,11 +820,11 @@ - - #: kcontrol/triggers_tab.cpp:53 - msgid "Window Trigger..." --msgstr "視窗觸發器..." -+msgstr "視窗觸發器…" - - #: kcontrol/triggers_tab.cpp:56 - msgid "Voice Trigger..." --msgstr "語音觸發器..." -+msgstr "語音觸發器…" - - #: kcontrol/triggers_tab.cpp:226 - msgid "Select keyboard shortcut:" -@@ -823,7 +832,7 @@ - - #: kcontrol/voicerecorder.cpp:74 - msgid "Recording..." --msgstr "錄音中..." -+msgstr "錄音中…" - - #: kcontrol/voicerecorder.cpp:124 - msgid "" -@@ -842,8 +851,8 @@ - - #: kcontrol/voicerecordpage.cpp:31 - msgid "" --"Enter a code for the sound (e.g. the word you are saying) and record the same " --"word twice." -+"Enter a code for the sound (e.g. the word you are saying) and record the " -+"same word twice." - msgstr "輸入此語音的代號（如：您所說的單字）然後錄製同一個單字兩次" - - #: kcontrol/voicerecordpage.cpp:81 -@@ -852,13 +861,13 @@ - - #: kcontrol/voicerecordpage.cpp:89 - msgid "" --"%1" --"
                                One of the sound references is not correct                                " -+"%1
                                One of the sound references is not correct                                " - msgstr "%1
                                其中一個語音參照不正確                                " - - #: kcontrol/windowdef_list_widget.cpp:45 - msgid "Simple Window..." --msgstr "簡易視窗..." -+msgstr "簡易視窗…" - - #: _translatorinfo.cpp:1 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khtmlkttsd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/khtmlkttsd.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/khtmlkttsd.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/khtmlkttsd.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: khtmlkttsd\n" - "POT-Creation-Date: 2006-01-04 03:13+0100\n" - "PO-Revision-Date: 2006-01-20 15:27+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kickermenu_kate.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kickermenu_kate.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kickermenu_kate.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kickermenu_kate.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kickermenu_kate\n" - "POT-Creation-Date: 2006-11-16 02:36+0100\n" - "PO-Revision-Date: 2006-11-20 09:13+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -40,8 +39,8 @@ - - #: katesessionmenu.cpp:120 - msgid "" --"An unnamed session will not be saved automatically. Do you want to create such " --"a session?" -+"An unnamed session will not be saved automatically. Do you want to create " -+"such a session?" - msgstr "未命名的工作階段將不會被自動儲存。您確定要建立這樣的工作階段嗎？" - - #: katesessionmenu.cpp:122 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kicker.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kicker.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kicker.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kicker\n" - "POT-Creation-Date: 2008-08-19 01:16+0200\n" - "PO-Revision-Date: 2007-02-27 09:10+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -87,8 +86,8 @@ - - #: core/extensionmanager.cpp:117 - msgid "" --"The KDE panel (kicker) could not load the main panel due to a problem with your " --"installation. " -+"The KDE panel (kicker) could not load the main panel due to a problem with " -+"your installation. " - msgstr "由於您安裝上的問題 KDE 面板(kicker)無法載入主面板。" - - #: core/extensionmanager.cpp:119 -@@ -129,11 +128,11 @@ - - #: core/panelextension.cpp:341 - msgid "Add &Applet to Menubar..." --msgstr "加入小程式到選單列(&A)..." -+msgstr "加入小程式到選單列(&A)…" - - #: core/panelextension.cpp:342 - msgid "Add &Applet to Panel..." --msgstr "加入小程式到面板(&A)..." -+msgstr "加入小程式到面板(&A)…" - - #: core/panelextension.cpp:345 - msgid "Add Appli&cation to Menubar" -@@ -169,7 +168,7 @@ - - #: core/panelextension.cpp:380 - msgid "&Configure Panel..." --msgstr "設定面板 (&C)..." -+msgstr "設定面板(&C)…" - - #: ui/addapplet.cpp:234 - msgid "Add Applet" -@@ -181,46 +180,46 @@ - - #: ui/appletop_mnu.cpp:51 - msgid "&Move %1 Menu" --msgstr "移動 %1 選單 (&M)" -+msgstr "移動 %1 選單(&M)" - - #: ui/appletop_mnu.cpp:52 - msgid "&Move %1 Button" --msgstr "移動 %1 按鈕 (&M)" -+msgstr "移動 %1 按鈕(&M)" - - #: ui/appletop_mnu.cpp:53 - #, c-format - msgid "&Move %1" --msgstr "移動 %1 (&M)" -+msgstr "移動 %1(&M)" - - #: ui/appletop_mnu.cpp:75 - msgid "&Remove %1 Menu" --msgstr "刪除 %1 選單 (&R)" -+msgstr "刪除 %1 選單(&R)" - - #: ui/appletop_mnu.cpp:76 - msgid "&Remove %1 Button" --msgstr "移除 %1 按鈕 (&R)" -+msgstr "移除 %1 按鈕(&R)" - - #: ui/appletop_mnu.cpp:77 - #, c-format - msgid "&Remove %1" --msgstr "移除 %1 (&R)" -+msgstr "移除 %1(&R)" - - #: ui/appletop_mnu.cpp:91 ui/extensionop_mnu.cpp:43 - msgid "Report &Bug..." --msgstr "回報問題(&B)..." -+msgstr "回報問題(&B)…" - - #: ui/appletop_mnu.cpp:105 - #, c-format - msgid "&About %1" --msgstr "關於 %1 (&A)" -+msgstr "關於 %1(&A)" - - #: ui/appletop_mnu.cpp:125 - msgid "&Configure %1 Button..." --msgstr "設定 %1 按鈕(&C)..." -+msgstr "設定 %1 按鈕(&C)…" - - #: ui/appletop_mnu.cpp:130 ui/extensionop_mnu.cpp:62 - msgid "&Configure %1..." --msgstr "設定 %1 (&C)..." -+msgstr "設定 %1(&C)…" - - #: ui/appletop_mnu.cpp:143 - msgid "Applet Menu" -@@ -256,7 +255,7 @@ - - #: ui/browser_dlg.cpp:63 - msgid "&Browse..." --msgstr "瀏覽 (&B)..." -+msgstr "瀏覽(&B)…" - - #: ui/browser_dlg.cpp:87 - msgid "Select Folder" -@@ -328,7 +327,7 @@ - - #: ui/k_mnu.cpp:280 - msgid "Run Command..." --msgstr "執行命令..." -+msgstr "執行命令…" - - #: ui/k_mnu.cpp:289 - msgid "Switch User" -@@ -344,7 +343,7 @@ - - #: ui/k_mnu.cpp:311 - msgid "Log Out..." --msgstr "登出..." -+msgstr "登出…" - - #: ui/k_mnu.cpp:364 - msgid "Lock Current && Start New Session" -@@ -356,18 +355,17 @@ - - #: ui/k_mnu.cpp:397 - msgid "" --"

                                You have chosen to open another desktop session." --"
                                The current session will be hidden and a new login screen will be " --"displayed." --"
                                An F-key is assigned to each session; F%1 is usually assigned to the first " --"session, F%2 to the second session and so on. You can switch between sessions " --"by pressing Ctrl, Alt and the appropriate F-key at the same time. Additionally, " --"the KDE Panel and Desktop menus have actions for switching between sessions.

                                " -+"

                                You have chosen to open another desktop session.
                                The current session " -+"will be hidden and a new login screen will be displayed.
                                An F-key is " -+"assigned to each session; F%1 is usually assigned to the first session, F%2 " -+"to the second session and so on. You can switch between sessions by pressing " -+"Ctrl, Alt and the appropriate F-key at the same time. Additionally, the KDE " -+"Panel and Desktop menus have actions for switching between sessions.

                                " - msgstr "" --"

                                您選項了其他的工作階段。" --"
                                目前的工作階段將會被隱藏，同時顯示新的登入視窗。" --"
                                功能鍵可以用來切換不同的工作階段；F%1 通常設定為第一個工作階段，而 F%2為第二個，其他的依此類推。您可以同時按下 " --"CTRL、ALT，以及功能鍵來切換你的工作階段。此外，KDE 面板和桌面選單也提供在工作階段之間切換的動作。

                                " -+"

                                您選項了其他的工作階段。
                                目前的工作階段將會被隱藏，同時顯示新的登入視" -+"窗。
                                功能鍵可以用來切換不同的工作階段；F%1 通常設定為第一個工作階段，而 F%" -+"2為第二個，其他的依此類推。您可以同時按下 CTRL、ALT，以及功能鍵來切換你的工作" -+"階段。此外，KDE 面板和桌面選單也提供在工作階段之間切換的動作。

                                " - - #: ui/k_mnu.cpp:408 - msgid "Warning - New Session" -@@ -536,8 +534,8 @@ - #: rc.cpp:24 - #, no-c-format - msgid "" --"This is the applet list. Select an applet and click on Add to panel " --"to add it" -+"This is the applet list. Select an applet and click on Add to panel to add it" - msgstr "這是小程式清單。選擇一個小程式並按 加入至面板 來加入它" - - #. i18n: file ui/appletview.ui line 156 -@@ -550,9 +548,12 @@ - #: rc.cpp:33 rc.cpp:58 - #, 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 中，您就須要提供絕對路徑。" -+"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/nonKDEButtonSettings.ui line 38 - #: rc.cpp:36 -@@ -582,8 +583,8 @@ - #: rc.cpp:47 - #, 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." -+"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/nonKDEButtonSettings.ui line 75 -@@ -615,9 +616,11 @@ - #, no-c-format - msgid "" - "Whether this panel actually exists or not. Primarily to work around the fact " --"that KConfigXT won't write a config file unless there is at least one " --"non-default entry." --msgstr "這個面板是否存在。主要是修正 KConfigXT 在沒有至少一個非預設項目時不會寫入設定檔案。" -+"that KConfigXT won't write a config file unless there is at least one non-" -+"default entry." -+msgstr "" -+"這個面板是否存在。主要是修正 KConfigXT 在沒有至少一個非預設項目時不會寫入設定" -+"檔案。" - - #. i18n: file core/extensionSettings.kcfg line 18 - #: rc.cpp:82 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_finger.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_finger.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_finger.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_finger.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kio_finger\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2001-08-27 17:07+CST\n" --"Last-Translator: Tung-Han Hsieh \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_fish.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_fish.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_fish.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_fish.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kio_fish\n" - "POT-Creation-Date: 2006-11-05 02:34+0100\n" - "PO-Revision-Date: 2005-11-02 21:46+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,11 +16,11 @@ - - #: fish.cpp:317 - msgid "Connecting..." --msgstr "連線中..." -+msgstr "連線中…" - - #: fish.cpp:570 - msgid "Initiating protocol..." --msgstr "初始化通訊協定中..." -+msgstr "初始化通訊協定中…" - - #: fish.cpp:604 - msgid "Local Login" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_floppy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_floppy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_floppy.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_floppy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -4,7 +4,7 @@ - "Project-Id-Version: kio_floppy\n" - "POT-Creation-Date: 2005-09-21 02:57+0200\n" - "PO-Revision-Date: 2005-11-02 22:15+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -40,8 +40,8 @@ - #: kio_floppy.cpp:218 - msgid "" - "Could not access %1.\n" --"There is probably no disk in the drive %2 or you do not have enough permissions " --"to access the drive." -+"There is probably no disk in the drive %2 or you do not have enough " -+"permissions to access the drive." - msgstr "" - "無法存取 %1。\n" - "可能在磁碟機 %2中沒有磁片或是你沒有足夠的權限存取磁碟機。" -@@ -58,8 +58,8 @@ - msgid "" - "Could not access %1.\n" - "Make sure the floppy in drive %2 is a DOS-formatted floppy disk \n" --"and that the permissions of the device file (e.g. /dev/fd0) are set correctly " --"(e.g. rwxrwxrwx)." -+"and that the permissions of the device file (e.g. /dev/fd0) are set " -+"correctly (e.g. rwxrwxrwx)." - msgstr "" - "無法存取 %1。\n" - "請確認磁碟機 %2 中的磁碟片是 DOS 格式化的磁片\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_home.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_home.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_home.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_home.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_home\n" - "POT-Creation-Date: 2006-04-28 03:54+0200\n" - "PO-Revision-Date: 2006-01-20 15:27+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_ldap.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_ldap.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_ldap.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_ldap.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_ldap\n" - "POT-Creation-Date: 2007-11-01 01:14+0100\n" - "PO-Revision-Date: 2006-01-20 15:29+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -36,7 +35,7 @@ - - #: kio_ldap.cpp:524 - msgid "site:" --msgstr "站台：" -+msgstr "站臺：" - - #: kio_ldap.cpp:551 kio_ldap.cpp:686 - msgid "Invalid authorization information." -@@ -66,4 +65,4 @@ - #: kio_ldap.cpp:1033 - #, c-format - msgid "Invalid LDIF file in line %1." --msgstr "LDIF 檔案內容第 %1 行語法錯誤。" -+msgstr "LDIF 檔案內容第 %1 列語法錯誤。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_mac.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_mac.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_mac.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_mac.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kio_mac\n" - "POT-Creation-Date: 2005-09-21 02:57+0200\n" - "PO-Revision-Date: 2005-11-03 18:49+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -35,7 +35,8 @@ - - #: kio_mac.cpp:201 - msgid "" --"hpls did not exit normally - please ensure you have installed the hfsplus tools" -+"hpls did not exit normally - please ensure you have installed the hfsplus " -+"tools" - msgstr "hpls 並未正常結束─請確定您是否已安裝 hfsplus 工具組" - - #: kio_mac.cpp:288 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_man.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_man.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_man.po 2007-07-12 10:27:45.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_man.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kio_man\n" - "POT-Creation-Date: 2007-05-29 02:15+0200\n" - "PO-Revision-Date: 2005-11-04 18:55+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,19 +28,16 @@ - - #: kio_man.cpp:465 - msgid "" --"No man page matching to %1 found." --"
                                " --"
                                Check that you have not mistyped the name of the page that you want.\n" --"Be careful that you must take care about upper case and lower case characters!" --"
                                If everything looks correct, then perhaps you need to set a better search " --"path for man pages, be it by the environment variable MANPATH or a matching " --"file in the directory /etc ." -+"No man page matching to %1 found.

                                Check that you have not mistyped " -+"the name of the page that you want.\n" -+"Be careful that you must take care about upper case and lower case " -+"characters!
                                If everything looks correct, then perhaps you need to set a " -+"better search path for man pages, be it by the environment variable MANPATH " -+"or a matching file in the directory /etc ." - msgstr "" --"找不到符合 %1 的 man page。" --"
                                " --"
                                請檢查您是否打錯您所要頁面的名稱。\n" --"請注意您必須確認大寫與小寫字母！" --"
                                如果一切看來都正確，可能您得設定一個更好的 man page 搜尋路徑，可用 MANPATH 環境變數或在 /etc 目錄中符合的檔案來設定。" -+"找不到符合 %1 的 man page。

                                請檢查您是否打錯您所要頁面的名稱。\n" -+"請注意您必須確認大寫與小寫字母！
                                如果一切看來都正確，可能您得設定一個更好" -+"的 man page 搜尋路徑，可用 MANPATH 環境變數或在 /etc 目錄中符合的檔案來設定。" - - #: kio_man.cpp:496 - msgid "Open of %1 failed." -@@ -63,7 +60,9 @@ - "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 "注意：如果您以您的語言來閱讀 man page，請小心它可能包含一些錯誤和缺漏。如果對此有疑慮，您應該使用英語版本。" -+msgstr "" -+"注意：如果您以您的語言來閱讀 man page，請小心它可能包含一些錯誤和缺漏。如果對" -+"此有疑慮，您應該使用英語版本。" - - #: kio_man.cpp:723 - msgid "User Commands" -@@ -134,14 +133,20 @@ - "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 KDE." --msgstr "抱歉，您的系統並未安裝 sgm2roff。請確認您有正確安裝上該程式套件，並確認 PATH 環境變數內能夠找到該程式項目。" -+msgstr "" -+"抱歉，您的系統並未安裝 sgm2roff。請確認您有正確安裝上該程式套件，並確認 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 KDE." --#~ msgstr "找不到與 %1 相符的 man page。您可以在開始 KDE 之前藉由設定環境變數MANPATH 延伸搜尋路徑，以便於進一步提供更多 manpage 放置的目錄位置。" -+#~ msgid "" -+#~ "No man page matching to %1 found. You can extend the search path by " -+#~ "setting the environment variable MANPATH before starting KDE." -+#~ msgstr "" -+#~ "找不到與 %1 相符的 man page。您可以在開始 KDE 之前藉由設定環境變數MANPATH " -+#~ "延伸搜尋路徑，以便於進一步提供更多 manpage 放置的目錄位置。" - - #~ msgid "

                                UNIX Manual Index

                                " - #~ msgstr "

                                Unix 使用手冊目錄

                                " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_media.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_media.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_media.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_media.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kio_media\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2007-11-26 15:09+0800\n" --"Last-Translator: Chih-Wei Huang \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -84,8 +84,8 @@ - #: rc.cpp:15 - #, no-c-format - msgid "" --"Attempts to chown or chmod files do not return errors, although they fail. Use " --"with caution!" -+"Attempts to chown or chmod files do not return errors, although they fail. " -+"Use with caution!" - msgstr "對檔案做 chown 或 chmod 不要回報錯誤。請小心使用！" - - #. i18n: file propsdlgplugin/propertiespagegui.ui line 76 -@@ -122,10 +122,12 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"Under what directory this file system shall be mounted. Please note that there " --"is no guarantee that the system will respect your wish. For one the directory " --"has to be below /media - and it does not yet have to exist." --msgstr "這個檔案系統要掛載在哪個目錄之下。請注意，這不保證系統會照您所希望的做。目錄應在 /media 之下，但不必存在。" -+"Under what directory this file system shall be mounted. Please note that " -+"there is no guarantee that the system will respect your wish. For one the " -+"directory has to be below /media - and it does not yet have to exist." -+msgstr "" -+"這個檔案系統要掛載在哪個目錄之下。請注意，這不保證系統會照您所希望的做。目錄" -+"應在 /media 之下，但不必存在。" - - #. i18n: file propsdlgplugin/propertiespagegui.ui line 130 - #: rc.cpp:36 -@@ -170,7 +172,9 @@ - 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 "UTF8 是 8 位元的萬用字元集（Unicode），可安全用於檔案系統中。這個選項可以開啟檔案系統對 UTF8 的支援。" -+msgstr "" -+"UTF8 是 8 位元的萬用字元集（Unicode），可安全用於檔案系統中。這個選項可以開啟" -+"檔案系統對 UTF8 的支援。" - - #. i18n: file propsdlgplugin/propertiespagegui.ui line 186 - #: rc.cpp:57 -@@ -207,21 +211,23 @@ - "its metadata being committed to the journal.\n" - "\n" - "

                                Write Back

                                \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." -+" 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 "" - "

                                指定檔案資料使用日誌模式。Metadata 永遠會使用。

                                \n" - "\n" - "

                                所有資料

                                \n" --" 所有的資料都會在寫入主要檔案系統前先提交給日誌。這個狀況速度最滿，但是資料安全性最高。\n" -+" 所有的資料都會在寫入主要檔案系統前先提交給日誌。這個狀況速度最滿，但" -+"是資料安全性最高。\n" - "

                                強制依序

                                \n" - " 所有資料先強制寫入主要檔案系統後，才將它的 metadata 提交到日誌中。\n" - "

                                寫回

                                \n" --" 不保存資料順序─資料可能在 metadata " --"提交到日誌之後才寫入主檔案系統。據說這樣是最快的。它保證內部檔案系統的完整度，但是在當機之後，檔案系統中的可能是舊資料，並且會做修復的動作。" -+" 不保存資料順序─資料可能在 metadata 提交到日誌之後才寫入主檔案系統。據" -+"說這樣是最快的。它保證內部檔案系統的完整度，但是在當機之後，檔案系統中的可能" -+"是舊資料，並且會做修復的動作。" - - #. i18n: file propsdlgplugin/propertiespagegui.ui line 226 - #: rc.cpp:78 -@@ -251,8 +257,8 @@ - #: rc.cpp:102 rc.cpp:129 - #, no-c-format - msgid "" --"

                                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 " -+"

                                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.

                                \n" - "\n" - "

                                Lower

                                \n" -@@ -264,21 +270,26 @@ - "short name is not all upper case.\n" - "\n" - "

                                Windows NT

                                \n" --"Display the shortname as is; store a long name when the short name is not all " --"lower case or all upper case.\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" - "

                                Mixed

                                \n" --"Display the short name as is; store a long name when the short name is not all " --"upper case." -+"Display the short name as is; store a long name when the short name is not " -+"all upper case." - msgstr "" --"

                                定義建立與顯示 8.3 格式檔名時的行為。如果檔案有長檔名，會優先顯示長檔名。

                                \n" -+"

                                定義建立與顯示 8.3 格式檔名時的行為。如果檔案有長檔名，會優先顯示長檔名。" -+"

                                \n" - "\n" --"

                                強制小寫

                                顯示短檔名時將名稱強制改為小寫；若短檔名不是全部都大寫時，則儲存到長檔名中。\n" -+"

                                強制小寫

                                顯示短檔名時將名稱強制改為小寫；若短檔名不是全部都大" -+"寫時，則儲存到長檔名中。\n" - "\n" --"

                                Windows 95

                                顯示短檔名時將名稱強制改為大寫；若短檔名不是全部都大寫時，則儲存到長檔名中。\n" -+"

                                Windows 95

                                顯示短檔名時將名稱強制改為大寫；若短檔名不是全部都" -+"大寫時，則儲存到長檔名中。\n" - "\n" --"

                                Windows NT

                                將短檔名照原來的樣子顯示；若短檔名不是全部大寫或全部小寫時，則儲存到長檔名中。\n" --"

                                混合模式

                                將短檔名照原來的樣子顯示；若短檔名不是全部都大寫時，則儲存到長檔名中。" -+"

                                Windows NT

                                將短檔名照原來的樣子顯示；若短檔名不是全部大寫或全" -+"部小寫時，則儲存到長檔名中。\n" -+"

                                混合模式

                                將短檔名照原來的樣子顯示；若短檔名不是全部都大寫時，" -+"則儲存到長檔名中。" - - #. i18n: file propsdlgplugin/propertiespagegui.ui line 294 - #: rc.cpp:117 -@@ -435,16 +446,19 @@ - - #: mediamanager/halbackend.cpp:1042 - 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 "此外，系統偵測到底下的程式仍然在使用此裝置。您必須先將它們關閉，或改變它們的工作目錄，才能卸載此裝置。" -+"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 - msgid "" --"Unfortunately, the device %1 (%2) named '%3' " --"and currently mounted at %4 could not be unmounted. " --msgstr "不幸地，裝置 %1（%2）名為 %3 目前掛載於 %4 無法卸載。" -+"Unfortunately, the device %1 (%2) named '%3' and currently " -+"mounted at %4 could not be unmounted. " -+msgstr "" -+"不幸地，裝置 %1（%2）名為 %3 目前掛載於 %4 無法卸載。" - - #: mediamanager/halbackend.cpp:1071 - msgid "The following error was returned by umount command:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nfs.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nfs.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nfs.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nfs.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kio_nfs\n" - "POT-Creation-Date: 2005-06-10 01:24+0200\n" - "PO-Revision-Date: 2005-11-04 19:02+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nntp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nntp.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_nntp.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_nntp.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kio_nntp\n" - "POT-Creation-Date: 2005-06-20 01:29+0200\n" - "PO-Revision-Date: 2005-11-04 19:08+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_pop3.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_pop3.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_pop3.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_pop3.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kio_pop3\n" - "POT-Creation-Date: 2007-07-17 01:45+0200\n" - "PO-Revision-Date: 2005-11-04 19:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,10 +30,8 @@ - "\"%1\"" - - #: pop3.cc:305 --msgid "" --"Could not send to server.\n" --msgstr "" --"無法傳送給伺服器。\n" -+msgid "Could not send to server.\n" -+msgstr "無法傳送給伺服器。\n" - - #: pop3.cc:360 pop3.cc:419 pop3.cc:616 - msgid "No authentication details supplied." -@@ -41,19 +39,20 @@ - - #: pop3.cc:397 - msgid "" --"Login via APOP failed. The server %1 may not support APOP, although it claims " --"to support it, or the password may be wrong.\n" -+"Login via APOP failed. The server %1 may not support APOP, although it " -+"claims to support it, or the password may be wrong.\n" - "\n" - "%2" - msgstr "" --"透過 APOP 登入失敗。伺服器 %1 可能不支援 APOP 協定，雖然它宣稱有支援，或者您所提供的密碼是錯誤的。\n" -+"透過 APOP 登入失敗。伺服器 %1 可能不支援 APOP 協定，雖然它宣稱有支援，或者您" -+"所提供的密碼是錯誤的。\n" - "\n" - "%2" - - #: pop3.cc:585 - msgid "" --"Login via SASL (%1) failed. The server may not support %2, or the password may " --"be wrong.\n" -+"Login via SASL (%1) failed. The server may not support %2, or the password " -+"may be wrong.\n" - "\n" - "%3" - msgstr "" -@@ -115,7 +114,9 @@ - msgid "" - "Your POP3 server claims to support TLS but negotiation was unsuccessful. You " - "can disable TLS in KDE using the crypto settings module." --msgstr "您的 POP3 伺服器宣稱支援 TLS 但協定商議失敗。您可以在 KDE 中使用 crypto 設定模組將 TLS 關掉。" -+msgstr "" -+"您的 POP3 伺服器宣稱支援 TLS 但協定商議失敗。您可以在 KDE 中使用 crypto 設定" -+"模組將 TLS 關掉。" - - #: pop3.cc:746 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_print.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_print.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_print.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_print.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kio_print\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-17 10:07+0800\n" --"Last-Translator: Tsung-Chien Ho \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_remote.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_remote.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_remote.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_remote.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_remote\n" - "POT-Creation-Date: 2006-04-28 03:54+0200\n" - "PO-Revision-Date: 2006-01-20 15:30+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_settings.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_settings.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_settings.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_settings.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_settings\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-20 15:30+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_sftp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_sftp.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_sftp.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_sftp.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kio_sftp\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-04 19:26+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -96,7 +96,8 @@ - - #: kio_sftp.cpp:1068 - msgid "" --"Unknown error was encountered while copying the file to '%1'. Please try again." -+"Unknown error was encountered while copying the file to '%1'. Please try " -+"again." - msgstr "當複製檔案到「%1」遇到不明錯誤。請再試一次。" - - #: kio_sftp.cpp:1318 -@@ -163,9 +164,10 @@ - - #: 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'。" -+"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 "" -@@ -198,14 +200,15 @@ - "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" -+"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" -+"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，" -+"你應該在連線前先檢驗識別碼。識別碼：\n" - "%2\n" - "\n" - "請使用 \"%3\" 正確的識別鍵值來關閉這個訊息的出現。" -@@ -215,8 +218,8 @@ - "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 " -+"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" -@@ -224,7 +227,8 @@ - msgstr "" - "警告：遠端伺服器 '%1' 的識別碼更改！\n" - "\n" --"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，你應該在連線前先檢驗識別碼。識別碼：\n" -+"可能您的連線被竊聴了，也有可能是伺服器管理員修改了伺服器的識別碼。不管如何，" -+"你應該在連線前先檢驗識別碼。識別碼：\n" - "%2\n" - "\n" - "您要接受這個新的鍵值，並使用它來進行連線嗎？" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smb.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kio_smb\n" - "POT-Creation-Date: 2005-11-08 02:45+0100\n" - "PO-Revision-Date: 2005-11-04 22:05+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -56,8 +56,8 @@ - - #: kio_smb_browse.cpp:242 - msgid "" --"Unable to find any workgroups in your local network. This might be caused by an " --"enabled firewall." -+"Unable to find any workgroups in your local network. This might be caused by " -+"an enabled firewall." - msgstr "無法在您的本地網路發現任何工作群組。這可能是由於使用了防火牆造成的。" - - #: kio_smb_browse.cpp:249 -@@ -85,24 +85,28 @@ - - #: kio_smb_browse.cpp:291 - msgid "" --"The given name could not be resolved to a unique server. Make sure your network " --"is setup without any name conflicts between names used by Windows and by UNIX " --"name resolution." --msgstr "無法將指定的名稱解析為特定的伺服器。請確定您的網路設定跟 Windows 與 UNIX 解析之間使用的名稱沒有衝突。" -+"The given name could not be resolved to a unique server. Make sure your " -+"network is setup without any name conflicts between names used by Windows " -+"and by UNIX name resolution." -+msgstr "" -+"無法將指定的名稱解析為特定的伺服器。請確定您的網路設定跟 Windows 與 UNIX 解析" -+"之間使用的名稱沒有衝突。" - - #: kio_smb_browse.cpp:297 - msgid "" --"libsmbclient reported an error, but did not specify what the problem is. This " --"might indicate a severe problem with your network - but also might indicate a " --"problem with libsmbclient.\n" --"If you want to help us, please provide a tcpdump of the network interface while " --"you try to browse (be aware that it might contain private data, so do not post " --"it if you are unsure about that - you can send it privately to the developers " --"if they ask for it)" -+"libsmbclient reported an error, but did not specify what the problem is. " -+"This might indicate a severe problem with your network - but also might " -+"indicate a problem with libsmbclient.\n" -+"If you want to help us, please provide a tcpdump of the network interface " -+"while you try to browse (be aware that it might contain private data, so do " -+"not post it if you are unsure about that - you can send it privately to the " -+"developers if they ask for it)" - msgstr "" --"libsmbclient 報告了一個錯誤，但並未指出問題為何。這有可能是您網路中的伺服器出現問題─但是也可能是libsmbclient 的問題。\n" --"如果您想協助我們，請您提供您嘗試瀏覽網路的 tcpdump " --"資料。(請注意其中可能包含私人資料，如果您不確定請勿公開散佈。如果程式開發者跟您要求相關資料，您可以私底下Email給他)" -+"libsmbclient 報告了一個錯誤，但並未指出問題為何。這有可能是您網路中的伺服器出" -+"現問題─但是也可能是libsmbclient 的問題。\n" -+"如果您想協助我們，請您提供您嘗試瀏覽網路的 tcpdump 資料。(請注意其中可能包含" -+"私人資料，如果您不確定請勿公開散布。如果程式開發者跟您要求相關資料，您可以私" -+"底下Email給他)" - - #: kio_smb_browse.cpp:308 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smtp.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smtp.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_smtp.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_smtp.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kio_smtp\n" - "POT-Creation-Date: 2007-07-17 01:45+0200\n" - "PO-Revision-Date: 2005-11-05 08:47+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -15,7 +15,8 @@ - - #: command.cc:138 - msgid "" --"The server rejected both EHLO and HELO commands as unknown or unimplemented.\n" -+"The server rejected both EHLO and HELO commands as unknown or " -+"unimplemented.\n" - "Please contact the server's system administrator." - msgstr "" - "該伺服器對 EHLO 與 HELO 指令以未知或未實作拒絕。\n" -@@ -33,7 +34,9 @@ - msgid "" - "Your SMTP server does not support TLS. Disable TLS, if you want to connect " - "without encryption." --msgstr "您的郵件主機並不支援 TLS。如果你希望在沒有加密的情況下進行連線，請關閉 TLS 選項。" -+msgstr "" -+"您的郵件主機並不支援 TLS。如果你希望在沒有加密的情況下進行連線，請關閉 TLS 選" -+"項。" - - #: command.cc:186 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_system.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_system.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_system.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_system.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_system\n" - "POT-Creation-Date: 2006-04-28 03:54+0200\n" - "PO-Revision-Date: 2006-01-20 15:31+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_tar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_tar.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_tar.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_tar.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_tar\n" - "POT-Creation-Date: 2007-09-22 01:12+0200\n" - "PO-Revision-Date: 2006-01-20 15:35+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_thumbnail.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_thumbnail.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_thumbnail.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_thumbnail.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_thumbnail\n" - "POT-Creation-Date: 2005-06-03 01:23+0200\n" - "PO-Revision-Date: 2006-01-20 16:10+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_trash.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_trash.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kio_trash.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kio_trash.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kio_trash\n" - "POT-Creation-Date: 2006-11-07 02:35+0100\n" - "PO-Revision-Date: 2006-01-20 16:29+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,11 +32,12 @@ - #: ktrash.cpp:43 - msgid "" - "Helper program to handle the KDE trash can\n" --"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' " --"trash:/\"" -+"Note: to move files to the trash, do not use ktrash, but \"kfmclient move " -+"'url' trash:/\"" - msgstr "" - "協助使用 KDE 資源回收桶的程式\n" --"注意：要移動檔案到資源回收桶，不要用 ktrash，而要使用 \"kfmclient move 'url' trash:/\"" -+"注意：要移動檔案到資源回收桶，不要用 ktrash，而要使用 \"kfmclient move 'url' " -+"trash:/\"" - - #: kio_trash.cpp:46 - msgid "Protocol name" -@@ -55,10 +55,13 @@ - - #: kio_trash.cpp:116 - 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 不存在，所以無法回復這個檔案。您可以重新建立該目錄，或是把這個檔案拖曳到別處去存放。" -+"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 不存在，所以無法回復這個檔案。您可以重新建立該目錄，或是把這個檔案拖" -+"曳到別處去存放。" - - #: kio_trash.cpp:145 - msgid "This file is already in the trash bin." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kjobviewer.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kjobviewer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kjobviewer.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kjobviewer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kjobviewer\n" - "POT-Creation-Date: 2006-03-12 03:46+0100\n" - "PO-Revision-Date: 2005-11-05 08:51+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/klipper.po kde-i18n-zh_TW-3.5.10/messages/kdebase/klipper.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/klipper.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/klipper.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: klipper\n" - "POT-Creation-Date: 2006-06-17 03:59+0200\n" - "PO-Revision-Date: 2006-06-19 10:13+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -37,7 +36,7 @@ - - #: configdialog.cpp:52 - msgid "Ac&tions" --msgstr "動作(&t)" -+msgstr "動作(&T)" - - #: configdialog.cpp:55 - msgid "Global &Shortcuts" -@@ -57,13 +56,14 @@ - - #: configdialog.cpp:105 - msgid "" --"Sometimes, the selected text has some whitespace at the end, which, if loaded " --"as URL in a browser would cause an error. Enabling this option removes any " --"whitespace at the beginning or end of the selected string (the original " --"clipboard contents will not be modified)." -+"Sometimes, the selected text has some whitespace at the end, which, if " -+"loaded as URL in a browser would cause an error. Enabling this option " -+"removes any whitespace at the beginning or end of the selected string (the " -+"original clipboard contents will not be modified)." - msgstr "" --"有時，在你所選取的文字的最後會有空白字元，如果是一個網址的話， 這樣的空白字元可能會造成瀏覽器出現錯誤。啟動這個選項，可以移除 " --"你所選取的文字頭尾的空白字元。（但是剪貼簿中的原始內容不會更改）" -+"有時，在你所選取的文字的最後會有空白字元，如果是一個網址的話， 這樣的空白字元" -+"可能會造成瀏覽器出現錯誤。啟動這個選項，可以移除 你所選取的文字頭尾的空白字" -+"元。（但是剪貼簿中的原始內容不會更改）" - - #: configdialog.cpp:107 - msgid "&Replay actions on an item selected from history" -@@ -75,9 +75,12 @@ - - #: configdialog.cpp:112 - msgid "" --"Selecting this option has the effect, that the clipboard can never be emptied. " --"E.g. when an application exits, the clipboard would usually be emptied." --msgstr "啟動這個選項會讓剪貼簿不被清空。因為，當程式結束時，常常會清空 剪貼簿中的資料。" -+"Selecting this option has the effect, that the clipboard can never be " -+"emptied. E.g. when an application exits, the clipboard would usually be " -+"emptied." -+msgstr "" -+"啟動這個選項會讓剪貼簿不被清空。因為，當程式結束時，常常會清空 剪貼簿中的資" -+"料。" - - #: configdialog.cpp:117 - msgid "&Ignore selection" -@@ -87,7 +90,9 @@ - msgid "" - "This option prevents the selection being recorded in the clipboard history. " - "Only explicit clipboard changes are recorded." --msgstr "這個選項會讓「選取」不被紀錄在剪貼簿的歷史紀錄中。只有「剪貼」的動作才會被紀錄。" -+msgstr "" -+"這個選項會讓「選取」不被紀錄在剪貼簿的歷史紀錄中。只有「剪貼」的動作才會被紀" -+"錄。" - - #: configdialog.cpp:123 - msgid "Clipboard/Selection Behavior" -@@ -96,24 +101,17 @@ - #: configdialog.cpp:127 - msgid "" - "There are two different clipboard buffers available:" --"
                                " --"
                                Clipboard is filled by selecting something and pressing Ctrl+C, or " --"by clicking \"Copy\" in a toolbar or menubar." --"
                                " --"
                                Selection is available immediately after selecting some text. The " --"only way to access the selection is to press the middle mouse button." --"
                                " --"
                                You can configure the relationship between Clipboard and Selection.                                " -+"

                                Clipboard is filled by selecting something and pressing Ctrl" -+"+C, or by clicking \"Copy\" in a toolbar or menubar.

                                Selection " -+"is available immediately after selecting some text. The only way to access " -+"the selection is to press the middle mouse button.

                                You can configure " -+"the relationship between Clipboard and Selection." - msgstr "" --"有兩種不同的剪貼簿緩衝區可供使用：" --"
                                " --"
                                剪貼簿 當選取了某個物件，然後按 Ctrl+C 或是" --"
                                在工具列或選單列上選「複製」物件會被放在這裡。" --"
                                " --"
                                選取區 當選取了某個物件，它便會馬上被儲存在此。" --"
                                按滑鼠中鍵可以讀取已經選取的物件。" --"
                                " --"
                                你也可以自己設定剪貼簿和選取區之間的關係。                                " -+"有兩種不同的剪貼簿緩衝區可供使用：

                                剪貼簿 當選取了某個物" -+"件，然後按 Ctrl+C 或是
                                在工具列或選單列上選「複製」物件會被放在這裡。" -+"

                                選取區 當選取了某個物件，它便會馬上被儲存在此。
                                按滑鼠中鍵" -+"可以讀取已經選取的物件。

                                你也可以自己設定剪貼簿和選取區之間的關係。" - - #: configdialog.cpp:138 - msgid "Sy&nchronize contents of the clipboard and the selection" -@@ -121,8 +119,8 @@ - - #: configdialog.cpp:141 - msgid "" --"Selecting this option synchronizes these two buffers, so they work the same way " --"as in KDE 1.x and 2.x." -+"Selecting this option synchronizes these two buffers, so they work the same " -+"way as in KDE 1.x and 2.x." - msgstr "啟動這個選項會同步化這兩個緩衝區，就像在 KDE 1.x 和 KDE 1.x 一樣。" - - #: configdialog.cpp:145 -@@ -131,13 +129,15 @@ - - #: configdialog.cpp:148 - msgid "" --"Using this option will only set the selection when highlighting something and " --"the clipboard when choosing e.g. \"Copy\" in a menubar." --msgstr "開啟這個選項，當你選取某些東西時不會自動放進剪貼簿，而是要在 選單選 \"複製\" 才會放進剪貼簿。" -+"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 - msgid "Tim&eout for action popups:" --msgstr "動作彈跳選單的逾時時間 (&e):" -+msgstr "動作彈跳選單的逾時時間(&E):" - - #: configdialog.cpp:157 - msgid " sec" -@@ -149,7 +149,7 @@ - - #: configdialog.cpp:161 - msgid "C&lipboard history size:" --msgstr "剪貼簿歷史紀錄大小 (&l)" -+msgstr "剪貼簿歷史紀錄大小(&L)" - - #: configdialog.cpp:183 - msgid "" -@@ -171,26 +171,26 @@ - - #: configdialog.cpp:286 - msgid "&Use graphical editor for editing regular expressions" --msgstr "使用圖型編輯器來編輯正規表示法 (&U)" -+msgstr "使用圖型編輯器來編輯正規表示法(&U)" - - #: configdialog.cpp:295 - msgid "&Add Action" --msgstr "新增動作 (&A)" -+msgstr "新增動作(&A)" - - #: configdialog.cpp:298 - msgid "&Delete Action" --msgstr "刪除動作 (&D)" -+msgstr "刪除動作(&D)" - - #: configdialog.cpp:301 - #, c-format - msgid "" --"Click on a highlighted item's column to change it. \"%s\" in a command will be " --"replaced with the clipboard contents." -+"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 - msgid "Advanced..." --msgstr "進階..." -+msgstr "進階…" - - #: configdialog.cpp:332 - msgid "Add Command" -@@ -214,7 +214,7 @@ - - #: configdialog.cpp:367 - msgid "" --msgstr "啟動動作 (&a)" -+msgstr "啟動動作(&A)" - - #: configdialog.cpp:407 - msgid "Advanced Settings" -@@ -222,25 +222,20 @@ - - #: configdialog.cpp:424 - msgid "D&isable Actions for Windows of Type WM_CLASS" --msgstr "關閉型態為 WM_CLASS 的視窗行為 (&i)" -+msgstr "關閉型態為 WM_CLASS 的視窗行為(&I)" - - #: configdialog.cpp:427 - msgid "" - "This lets you specify windows in which Klipper should not invoke " --"\"actions\". Use" --"
                                " --"
                                " --"
                                xprop | grep WM_CLASS
                                " --"
                                in a terminal to find out the WM_CLASS of a window. Next, click on the " --"window you want to examine. The first string it outputs after the equal sign is " --"the one you need to enter here.                                " -+"\"actions\". Use

                                xprop | grep WM_CLASS

                                in " -+"a terminal to find out the WM_CLASS of a window. Next, click on the window " -+"you want to examine. The first string it outputs after the equal sign is the " -+"one you need to enter here.                                " - msgstr "" - "這讓你指定在哪些視窗中 Klipper 不應該呼叫「動作」。在終端機中使用" --"
                                " --"
                                " --"
                                xprop | grep WM_CLASS
                                " --"
                                來找出一個視窗的 WM_CLASS。" --"
                                接下來，選擇您所想檢驗的視窗。在等號之後出現的第一個字串便是你應該在這裡輸入的字串。                                " -+"

                                xprop | grep WM_CLASS

                                來找出一個視窗的 " -+"WM_CLASS。
                                接下來，選擇您所想檢驗的視窗。在等號之後出現的第一個字串便是你" -+"應該在這裡輸入的字串。" - - #: klipperbindings.cpp:29 - msgid "Clipboard" -@@ -314,11 +309,11 @@ - - #: toplevel.cpp:647 - msgid "Enable &Actions" --msgstr "啟動動作 (&A)" -+msgstr "啟動動作(&A)" - - #: toplevel.cpp:651 - msgid "&Actions Enabled" --msgstr "動作已啟動 (&A)" -+msgstr "動作已啟動(&A)" - - #: toplevel.cpp:1089 - msgid "KDE cut & paste history utility" -@@ -358,7 +353,7 @@ - - #: urlgrabber.cpp:199 - msgid "&Edit Contents..." --msgstr "編輯內容 (&E) ..." -+msgstr "編輯內容(&E)…" - - #: urlgrabber.cpp:262 - msgid "Edit Contents" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kmenuapplet\n" - "POT-Creation-Date: 2008-08-11 01:16+0200\n" - "PO-Revision-Date: 2005-11-05 10:50+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuedit.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuedit.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kmenuedit.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kmenuedit.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kmenuedit 1.4\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-05 13:28+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,8 +30,8 @@ - "Following the command, you can have several place holders which will be " - "replaced with the actual values when the actual program is run:\n" - "%f - a single file name\n" --"%F - a list of files; use for applications that can open several local files at " --"once\n" -+"%F - a list of files; use for applications that can open several local files " -+"at once\n" - "%u - a single URL\n" - "%U - a list of URLs\n" - "%d - the folder of the file to open\n" -@@ -132,11 +132,11 @@ - - #: kmenuedit.cpp:65 - msgid "&New Submenu..." --msgstr "新增子選單(&N)..." -+msgstr "新增子選單(&N)…" - - #: kmenuedit.cpp:66 - msgid "New &Item..." --msgstr "新增項目(&I)..." -+msgstr "新增項目(&I)…" - - #: kmenuedit.cpp:68 - msgid "New S&eparator" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kminipagerapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kminipagerapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kminipagerapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kminipagerapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kminipagerapplet\n" - "POT-Creation-Date: 2008-08-18 01:16+0200\n" - "PO-Revision-Date: 2006-05-18 10:52+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,7 +26,7 @@ - - #: pagerapplet.cpp:689 - msgid "Pager Layout" --msgstr "呼叫器佈局" -+msgstr "呼叫器布局" - - #: pagerapplet.cpp:693 - msgid "&Automatic" -@@ -105,7 +104,7 @@ - - #: pagerapplet.cpp:724 - msgid "&Configure Desktops..." --msgstr "設定桌面(&C)..." -+msgstr "設定桌面(&C)…" - - #: pagerbutton.cpp:807 - #, c-format -@@ -173,7 +172,7 @@ - #: rc.cpp:27 - #, no-c-format - msgid "Number of rows to arrange the desktop previews into" --msgstr "安排桌面預覽行數" -+msgstr "安排桌面預覽列數" - - #. i18n: file pagersettings.kcfg line 49 - #: rc.cpp:30 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/knetattach.po kde-i18n-zh_TW-3.5.10/messages/kdebase/knetattach.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/knetattach.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/knetattach.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: knetattach\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-01-20 16:20+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -98,9 +97,10 @@ - #: rc.cpp:30 - #, no-c-format - msgid "" --"Enter a name for this %1 as well as the server address, port and folder " --"path to use and press the Next button." --msgstr "輸入 %1 的名稱及伺服器位址，埠號與資料夾路徑，然後按「下一步」。" -+"Enter a name for this %1 as well as the server address, port and " -+"folder path to use and press the Next button." -+msgstr "" -+"輸入 %1 的名稱及伺服器位址，埠號與資料夾路徑，然後按「下一步」。" - - #. i18n: file knetattach.ui line 215 - #: rc.cpp:33 -@@ -152,29 +152,36 @@ - msgid "" - "Enter a name for this WebFolder as well as a server address, port and " - "folder path to use and press the Save & Connect button." --msgstr "輸入這個 Web資料夾 的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲存並連線」。" -+msgstr "" -+"輸入這個 Web資料夾 的名稱及伺服器位址、埠號與資料夾路徑，然後按下「" -+"儲存並連線」。" - - #: knetattach.ui.h:42 - msgid "" --"Enter a name for this Secure shell connection " --"as well as a server address, port and folder path to use and press the " --"Save & Connect button." --msgstr "輸入這個SSH 連線的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲存並連線」。" -+"Enter a name for this Secure shell connection as well as a server " -+"address, port and folder path to use and press the Save & Connect " -+"button." -+msgstr "" -+"輸入這個SSH 連線的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲" -+"存並連線」。" - - #: knetattach.ui.h:44 - msgid "" --"Enter a name for this File Transfer Protocol connection " --"as well as a server address and folder path to use and press the " --"Save & Connect button." --msgstr "輸入這個FTP 連線的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲存並連線」。" -+"Enter a name for this File Transfer Protocol connection as well as a " -+"server address and folder path to use and press the Save & Connect " -+"button." -+msgstr "" -+"輸入這個FTP 連線的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲" -+"存並連線」。" - - #: knetattach.ui.h:46 - msgid "" --"Enter a name for this Microsoft Windows network drive " --"as well as a server address and folder path to use and press the " --"Save & Connect button." -+"Enter a name for this Microsoft Windows network drive as well as a " -+"server address and folder path to use and press the Save & Connect " -+"button." - msgstr "" --"輸入這個Microsoft Windows 網路磁碟機的名稱及伺服器位址、埠號與資料夾路徑，然後按下「儲存並連線」。" -+"輸入這個Microsoft Windows 網路磁碟機的名稱及伺服器位址、埠號與資料夾" -+"路徑，然後按下「儲存並連線」。" - - #: knetattach.ui.h:161 - msgid "Unable to connect to server. Please check your settings and try again." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konqueror.po kde-i18n-zh_TW-3.5.10/messages/kdebase/konqueror.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konqueror.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/konqueror.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,7 +13,7 @@ - "Project-Id-Version: konqueror\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2007-06-25 08:13+0800\n" --"Last-Translator: Franklin Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -68,7 +68,9 @@ - msgid "" - "If this option is checked, Konqueror will open a new window when you open a " - "folder, rather than showing that folder's contents in the current window." --msgstr "如果核取此選項，Konqueror 在您開啟一個資料夾會開啟一個新視窗，而不是在目前的視窗顯示該資料夾的內容。" -+msgstr "" -+"如果核取此選項，Konqueror 在您開啟一個資料夾會開啟一個新視窗，而不是在目前的" -+"視窗顯示該資料夾的內容。" - - #. i18n: file konqueror.kcfg line 20 - #: about/konq_aboutpage.cc:124 rc.cpp:75 -@@ -80,11 +82,12 @@ - #: rc.cpp:78 - #, no-c-format - 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, " -+"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 "" --"這是在 \\\"Home\\\" 按鈕被按下時 Konqueror 會跳至的 URL (例：資料夾或網頁)。這通常是您的家目錄，標有 (~) 符號。" -+"這是在 \\\"Home\\\" 按鈕被按下時 Konqueror 會跳至的 URL (例：資料夾或網頁)。" -+"這通常是您的家目錄，標有 (~) 符號。" - - #. i18n: file konqueror.kcfg line 26 - #: rc.cpp:81 -@@ -96,9 +99,11 @@ - #: rc.cpp:84 - #, no-c-format - 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" --msgstr "在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示關於該檔案額外資訊的彈出視窗" -+"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" -+msgstr "" -+"在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示關於該檔案額外資訊的彈出" -+"視窗" - - #. i18n: file konqueror.kcfg line 38 - #: rc.cpp:87 -@@ -110,9 +115,11 @@ - #: rc.cpp:90 - #, no-c-format - 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 "在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示含有該檔案較大預覽的彈出視窗" -+"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 "" -+"在這裡您可以控制當滑鼠移到一個檔案上方時，是否要顯示含有該檔案較大預覽的彈出" -+"視窗" - - #. i18n: file konqueror.kcfg line 44 - #: rc.cpp:93 -@@ -124,8 +131,8 @@ - #: rc.cpp:96 - #, no-c-format - msgid "" --"Checking this option will allow files to be renamed by clicking directly on the " --"icon name." -+"Checking this option will allow files to be renamed by clicking directly on " -+"the icon name." - msgstr "核取此選項會允許直接點選圖示名稱來為檔案重新命名。" - - #. i18n: file konqueror.kcfg line 50 -@@ -138,12 +145,14 @@ - #: rc.cpp:102 - #, no-c-format - msgid "" --"Uncheck this if you do not want 'Delete' menu commands to be displayed on the " --"desktop and in the file manager's menus and context menus. You can still delete " --"files when hidden by holding the Shift key while calling 'Move to Trash'." --msgstr "" --"如果您不想讓「刪除」選單指令顯示在桌面和檔案管理程式的選單和快顯選單中，請核消此選項。在隱藏後您仍然可以在使用「移至資源回收桶」時按住 Shift " --"鍵來刪除檔案。" -+"Uncheck this if you do not want 'Delete' menu commands to be displayed on " -+"the desktop and in the file manager's menus and context menus. You can still " -+"delete files when hidden by holding the Shift key while calling 'Move to " -+"Trash'." -+msgstr "" -+"如果您不想讓「刪除」選單指令顯示在桌面和檔案管理程式的選單和快顯選單中，請核" -+"消此選項。在隱藏後您仍然可以在使用「移至資源回收桶」時按住 Shift 鍵來刪除檔" -+"案。" - - #. i18n: file konqueror.kcfg line 57 - #: rc.cpp:105 -@@ -173,16 +182,18 @@ - #: rc.cpp:117 - #, no-c-format - msgid "" --"This option tells Konqueror whether to ask for a confirmation when you move the " --"file to your trash folder, from where it can be recovered very easily." --msgstr "這個選項告訴 Konqueror 當您將檔案移至您的資源回收桶資料夾時(以便能輕易的回復)是否要求確認。" -+"This option tells Konqueror whether to ask for a confirmation when you move " -+"the file to your trash folder, from where it can be recovered very easily." -+msgstr "" -+"這個選項告訴 Konqueror 當您將檔案移至您的資源回收桶資料夾時(以便能輕易的回復)" -+"是否要求確認。" - - #. i18n: file konqueror.kcfg line 615 - #: rc.cpp:120 - #, no-c-format - msgid "" --"This option tells Konqueror whether to ask for a confirmation when you simply " --"delete the file." -+"This option tells Konqueror whether to ask for a confirmation when you " -+"simply delete the file." - msgstr "這個選項告訴 Konqueror 當您直接刪除檔案時是否要求確認。" - - #. i18n: file iconview/konq_iconview.rc line 5 -@@ -315,7 +326,7 @@ - #: rc.cpp:366 rc.cpp:372 - #, no-c-format - msgid "Choose Font..." --msgstr "選擇字型..." -+msgstr "選擇字型…" - - #. i18n: file sidebar/trees/history_module/history_dlg.ui line 133 - #: rc.cpp:369 -@@ -339,8 +350,8 @@ - #: rc.cpp:381 - #, no-c-format - msgid "" --"Shows the number of times visited and the dates of the first and last visits, " --"in addition to the URL" -+"Shows the number of times visited and the dates of the first and last " -+"visits, in addition to the URL" - msgstr "除了網址外同時顯示您光臨的次數與第一次與最近一次光臨的日期" - - #. i18n: file sidebar/trees/history_module/history_dlg.ui line 183 -@@ -382,7 +393,7 @@ - - #: konq_factory.cc:220 - msgid "Web browser, file manager, ..." --msgstr "網頁瀏覽器，檔案管理員，..." -+msgstr "網頁瀏覽器，檔案管理員，…" - - #: konq_factory.cc:222 - msgid "(c) 1999-2005, The Konqueror developers" -@@ -495,12 +506,13 @@ - 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 " --"automatically update to show the current directory. This is especially useful " --"with different types of views, such as a directory tree with an icon view or " --"detailed view, and possibly a terminal emulator window." --msgstr "" --"選取此方塊為至少兩個「連結」的檢視。如此一來，當你在其中一個檢視中改變目錄時，另一個連結到它的檢視將會自動地更新顯示目前目錄。當使用不同的檢視，例如終端模擬視窗" --"、圖示的樹狀目錄或清單時，這將會特別有用。" -+"automatically update to show the current directory. This is especially " -+"useful with different types of views, such as a directory tree with an icon " -+"view or detailed view, and possibly a terminal emulator window." -+msgstr "" -+"選取此方塊為至少兩個「連結」的檢視。如此一來，當你在其中一個檢視中改變目錄" -+"時，另一個連結到它的檢視將會自動地更新顯示目前目錄。當使用不同的檢視，例如終" -+"端模擬視窗、圖示的樹狀目錄或清單時，這將會特別有用。" - - #: konq_frame.cc:148 - msgid "Close View" -@@ -555,8 +567,8 @@ - - #: konq_main.cc:46 - msgid "" --"For URLs that point to files, opens the directory and selects the file, instead " --"of opening the actual file" -+"For URLs that point to files, opens the directory and selects the file, " -+"instead of opening the actual file" - msgstr "對指向檔案的 URL，開啟其目錄並選擇該檔案，而非直接開啟實際的檔案" - - #: konq_main.cc:47 -@@ -583,8 +595,8 @@ - - #: konq_mainwindow.cc:583 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." -+"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 -@@ -708,7 +720,7 @@ - - #: konq_mainwindow.cc:3705 - msgid "&Edit File Type..." --msgstr "編輯檔案類型(&E)..." -+msgstr "編輯檔案類型(&E)…" - - #: konq_mainwindow.cc:3707 sidebar/trees/history_module/history_module.cpp:78 - msgid "New &Window" -@@ -720,11 +732,11 @@ - - #: konq_mainwindow.cc:3709 - msgid "Send &Link Address..." --msgstr "傳送連結位址(&L)..." -+msgstr "傳送連結位址(&L)…" - - #: konq_mainwindow.cc:3710 - msgid "S&end File..." --msgstr "寄出檔案...(&E)" -+msgstr "寄出檔案…(&E)" - - #: konq_mainwindow.cc:3713 - msgid "Open &Terminal" -@@ -732,11 +744,11 @@ - - #: konq_mainwindow.cc:3715 - msgid "&Open Location..." --msgstr "開啟位置(&O)..." -+msgstr "開啟位置(&O)…" - - #: konq_mainwindow.cc:3717 - msgid "&Find File..." --msgstr "尋找檔案(&F)..." -+msgstr "尋找檔案(&F)…" - - #: konq_mainwindow.cc:3722 - msgid "&Use index.html" -@@ -792,11 +804,11 @@ - - #: konq_mainwindow.cc:3762 - msgid "Most Often Visited" --msgstr "最常去的站台" -+msgstr "最常去的站臺" - - #: konq_mainwindow.cc:3769 konq_mainwindow.cc:4335 - msgid "&Save View Profile..." --msgstr "儲存檢視設定檔(&S)..." -+msgstr "儲存檢視設定檔(&S)…" - - #: konq_mainwindow.cc:3770 - msgid "Save View Changes per &Folder" -@@ -808,7 +820,7 @@ - - #: konq_mainwindow.cc:3792 - msgid "Configure Extensions..." --msgstr "設定延伸功能..." -+msgstr "設定延伸功能…" - - #: konq_mainwindow.cc:3793 - msgid "Configure Spell Checking..." -@@ -869,7 +881,7 @@ - - #: konq_mainwindow.cc:3821 - msgid "C&onfigure View Profiles..." --msgstr "配置檢視設定(&O)..." -+msgstr "配置檢視設定(&O)…" - - #: konq_mainwindow.cc:3822 - msgid "Load &View Profile" -@@ -933,10 +945,11 @@ - - #: konq_mainwindow.cc:3915 - msgid "" --"Enter the parent folder" --"

                                For instance, if the current location is file:/home/%1 clicking this button " --"will take you to file:/home." --msgstr "進入母目錄

                                例如，目前的位置是 file:/home/%1 按下此按鈕會將您帶到 file:/home。" -+"Enter the parent folder

                                For instance, if the current location is file:/" -+"home/%1 clicking this button will take you to file:/home." -+msgstr "" -+"進入母目錄

                                例如，目前的位置是 file:/home/%1 按下此按鈕會將您帶到 file:/" -+"home。" - - #: konq_mainwindow.cc:3918 - msgid "Enter the parent folder" -@@ -960,12 +973,12 @@ - - #: konq_mainwindow.cc:3926 - msgid "" --"Navigate to your 'Home Location'" --"

                                You can configure the location this button takes you to in the " --"KDE Control Center, under File Manager/Behavior." -+"Navigate to your 'Home Location'

                                You can configure the location this " -+"button takes you to in the KDE Control Center, under File Manager/Behavior." - msgstr "" --"帶領您到您的「家位置」" --"

                                您可以從KDE 控制中心裡的檔案管理員/行為中設定此按鈕會帶您去的位置。" -+"帶領您到您的「家位置」

                                您可以從KDE 控制中心裡的檔案管理員/" -+"行為中設定此按鈕會帶您去的位置。" - - #: konq_mainwindow.cc:3929 - msgid "Navigate to your 'Home Location'" -@@ -973,10 +986,12 @@ - - #: konq_mainwindow.cc:3931 - msgid "" --"Reload the currently displayed document" --"

                                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 "重新載入目前顯示的文件

                                這個功能在已載入的網頁有所變更時可用來更新網頁，如此才能讓變更顯現出來。" -+"Reload the currently displayed document

                                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 "" -+"重新載入目前顯示的文件

                                這個功能在已載入的網頁有所變更時可用來更新網頁，如此" -+"才能讓變更顯現出來。" - - #: konq_mainwindow.cc:3934 - msgid "Reload the currently displayed document" -@@ -984,10 +999,12 @@ - - #: konq_mainwindow.cc:3936 - msgid "" --"Reload all currently displayed documents in tabs" --"

                                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 "重新載入目前分頁中顯示的文件

                                這個功能在已載入的網頁有所變更時需要更新網頁，如此才能讓變更顯現出來。" -+"Reload all currently displayed documents in tabs

                                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 "" -+"重新載入目前分頁中顯示的文件

                                這個功能在已載入的網頁有所變更時需要更新網頁，" -+"如此才能讓變更顯現出來。" - - #: konq_mainwindow.cc:3939 - msgid "Reload all currently displayed document in tabs" -@@ -995,10 +1012,11 @@ - - #: konq_mainwindow.cc:3941 - msgid "" --"Stop loading the document" --"

                                All network transfers will be stopped and Konqueror will display the content " --"that has been received so far." --msgstr "停止載入文件

                                所有網路的傳輸會被停止，而 Konqueror 則會顯示到此時所接收到的內容。" -+"Stop loading the document

                                All network transfers will be stopped and " -+"Konqueror will display the content that has been received so far." -+msgstr "" -+"停止載入文件

                                所有網路的傳輸會被停止，而 Konqueror 則會顯示到此時所接收到的" -+"內容。" - - #: konq_mainwindow.cc:3944 - msgid "Stop loading the document" -@@ -1006,10 +1024,12 @@ - - #: konq_mainwindow.cc:3946 - msgid "" --"Cut the currently selected text or item(s) and move it to the system clipboard" --"

                                This makes it available to the Paste command in Konqueror and other " --"KDE applications." --msgstr "剪下目前選取的文字或項目，並移至系統剪貼簿

                                這樣就可以在 Konqueror 和其他 KDE 應用程式中使用 貼上 命令。" -+"Cut the currently selected text or item(s) and move it to the system " -+"clipboard

                                This makes it available to the Paste command in " -+"Konqueror and other KDE applications." -+msgstr "" -+"剪下目前選取的文字或項目，並移至系統剪貼簿

                                這樣就可以在 Konqueror 和其他 " -+"KDE 應用程式中使用 貼上 命令。" - - #: konq_mainwindow.cc:3950 - msgid "Move the selected text or item(s) to the clipboard" -@@ -1017,10 +1037,12 @@ - - #: konq_mainwindow.cc:3952 - msgid "" --"Copy the currently selected text or item(s) to the system clipboard" --"

                                This makes it available to the Paste command in Konqueror and other " --"KDE applications." --msgstr "複製目前選取的文字或項目至系統剪貼簿

                                這樣就可以在 Konqueror 和其他 KDE 應用程式中使用 貼上 命令。" -+"Copy the currently selected text or item(s) to the system clipboard

                                This " -+"makes it available to the Paste command in Konqueror and other KDE " -+"applications." -+msgstr "" -+"複製目前選取的文字或項目至系統剪貼簿

                                這樣就可以在 Konqueror 和其他 KDE 應用" -+"程式中使用 貼上 命令。" - - #: konq_mainwindow.cc:3956 - msgid "Copy the selected text or item(s) to the clipboard" -@@ -1028,9 +1050,11 @@ - - #: konq_mainwindow.cc:3958 - msgid "" --"Paste the previously cut or copied clipboard contents" --"

                                This also works for text copied or cut from other KDE applications." --msgstr "貼上先前已剪下或複製的剪貼簿內容

                                此功能也可用於從其他 KDE 應用程式複製或剪下的文字。" -+"Paste the previously cut or copied clipboard contents

                                This also works for " -+"text copied or cut from other KDE applications." -+msgstr "" -+"貼上先前已剪下或複製的剪貼簿內容

                                此功能也可用於從其他 KDE 應用程式複製或剪" -+"下的文字。" - - #: konq_mainwindow.cc:3961 - msgid "Paste the clipboard contents" -@@ -1038,15 +1062,14 @@ - - #: konq_mainwindow.cc:3963 - msgid "" --"Print the currently displayed document" --"

                                You will be presented with a dialog where you can set various options, such " --"as the number of copies to print and which printer to use." --"

                                This dialog also provides access to special KDE printing services such as " --"creating a PDF file from the current document." --msgstr "" --"列印目前顯示的文件" --"

                                您會看到一個對話盒讓您可以設定各種選項，如要印列的份數或要使用哪臺印表機。" --"

                                此對話盒也提供對特殊 KDE 列印服務的存取，像是自目前的文件建立 PDF 檔案。" -+"Print the currently displayed document

                                You will be presented with a dialog " -+"where you can set various options, such as the number of copies to print and " -+"which printer to use.

                                This dialog also provides access to special KDE " -+"printing services such as creating a PDF file from the current document." -+msgstr "" -+"列印目前顯示的文件

                                您會看到一個對話盒讓您可以設定各種選項，如要印列的份數或" -+"要使用哪臺印表機。

                                此對話盒也提供對特殊 KDE 列印服務的存取，像是自目前的文" -+"件建立 PDF 檔案。" - - #: konq_mainwindow.cc:3969 - msgid "Print the current document" -@@ -1060,13 +1083,15 @@ - msgid "" - "A locked view cannot change folders. Use in combination with 'link view' to " - "explore many files from one folder" --msgstr "在鎖定的檢視下不能更改資料夾。請使用「連結檢視」以瀏覽資料夾中的多個檔案" -+msgstr "" -+"在鎖定的檢視下不能更改資料夾。請使用「連結檢視」以瀏覽資料夾中的多個檔案" - - #: konq_mainwindow.cc:3977 - msgid "" --"Sets the view as 'linked'. A linked view follows folder changes made in other " --"linked views." --msgstr "設定此檢視為 \"linked\"。一個連結的檢視將會因目錄其他連結檢視變更而跟著變動。" -+"Sets the view as 'linked'. A linked view follows folder changes made in " -+"other linked views." -+msgstr "" -+"設定此檢視為 \"linked\"。一個連結的檢視將會因目錄其他連結檢視變更而跟著變動。" - - #: konq_mainwindow.cc:4001 - #: sidebar/trees/bookmark_module/bookmark_module.cpp:71 -@@ -1087,19 +1112,19 @@ - - #: konq_mainwindow.cc:4175 - msgid "Copy &Files..." --msgstr "複製檔案(&F)..." -+msgstr "複製檔案(&F)…" - - #: konq_mainwindow.cc:4176 - msgid "M&ove Files..." --msgstr "移動檔案(&O)..." -+msgstr "移動檔案(&O)…" - - #: konq_mainwindow.cc:4180 - msgid "Create Folder..." --msgstr "建立資料夾..." -+msgstr "建立資料夾…" - - #: konq_mainwindow.cc:4334 - msgid "&Save View Profile \"%1\"..." --msgstr "儲存檢視設定檔\"%1\"(&S)..." -+msgstr "儲存檢視設定檔\"%1\"(&S)…" - - #: konq_mainwindow.cc:4674 - msgid "Open in T&his Window" -@@ -1209,13 +1234,15 @@ - 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 " --"left corner of the tab is configurable. You can also use keyboard shortcuts to " --"navigate through tabs. The text on the tab is the title of the website " -+"left corner of the tab is configurable. You can also use keyboard shortcuts " -+"to navigate through tabs. The text on the tab is the title of the website " - "currently open in it, put your mouse over the tab too see the full title in " - "case it was truncated to fit the tab size." - msgstr "" --"這一列包含目前開啟的分頁清單。按下分頁可使它成為作用中。用來在分頁左上角顯示關閉按鈕以代替網站圖示的選項是可以設定的。您也可以使用快捷鍵來瀏覽各分頁。在分頁上的" --"文字是它目前所開啟的網站的標題，由於它會被截短以符合分頁大小，您可以把滑鼠移至分頁上來檢視完整的標題。" -+"這一列包含目前開啟的分頁清單。按下分頁可使它成為作用中。用來在分頁左上角顯示" -+"關閉按鈕以代替網站圖示的選項是可以設定的。您也可以使用快捷鍵來瀏覽各分頁。在" -+"分頁上的文字是它目前所開啟的網站的標題，由於它會被截短以符合分頁大小，您可以" -+"把滑鼠移至分頁上來檢視完整的標題。" - - #: konq_tabs.cc:89 - msgid "&Reload Tab" -@@ -1250,7 +1277,9 @@ - "The page you are trying to view is the result of posted form data. If you " - "resend the data, any action the form carried out (such as search or online " - "purchase) will be repeated. " --msgstr "您嘗試檢視的網頁是送出表單資料的結果。如果您重新送出資料，此 表單所進行的任何動作（像是搜尋或線上購物）都會重覆一次。" -+msgstr "" -+"您嘗試檢視的網頁是送出表單資料的結果。如果您重新送出資料，此 表單所進行的任何" -+"動作（像是搜尋或線上購物）都會重覆一次。" - - #: konq_view.cc:1359 - msgid "Resend" -@@ -1342,11 +1371,11 @@ - - #: iconview/konq_iconview.cc:305 listview/konq_listview.cc:668 - msgid "Se&lect..." --msgstr "選取(&L)..." -+msgstr "選取(&L)…" - - #: iconview/konq_iconview.cc:307 listview/konq_listview.cc:669 - msgid "Unselect..." --msgstr "不選取..." -+msgstr "不選取…" - - #: iconview/konq_iconview.cc:310 listview/konq_listview.cc:671 - msgid "Unselect All" -@@ -1585,7 +1614,7 @@ - - #: keditbookmarks/actionsimpl.cpp:120 - msgid "Chan&ge Icon..." --msgstr "變更圖示(&g)..." -+msgstr "變更圖示(&G)…" - - #: keditbookmarks/actionsimpl.cpp:123 - msgid "Update Favicon" -@@ -1597,7 +1626,7 @@ - - #: keditbookmarks/actionsimpl.cpp:129 - msgid "&New Folder..." --msgstr "新增資料夾(&N)..." -+msgstr "新增資料夾(&N)…" - - #: keditbookmarks/actionsimpl.cpp:132 - msgid "&New Bookmark" -@@ -1657,31 +1686,31 @@ - - #: keditbookmarks/actionsimpl.cpp:178 - msgid "Import &Netscape Bookmarks..." --msgstr "匯入 Netscape 書籤...(&N)" -+msgstr "匯入 Netscape 書籤…(&N)" - - #: keditbookmarks/actionsimpl.cpp:181 - msgid "Import &Opera Bookmarks..." --msgstr "匯入 &Opera 書籤..." -+msgstr "匯入 &Opera 書籤…" - - #: keditbookmarks/actionsimpl.cpp:184 - msgid "Import All &Crash Sessions as Bookmarks..." --msgstr "匯入所有的 &Crash Sessions 為書籤..." -+msgstr "匯入所有的 &Crash Sessions 為書籤…" - - #: keditbookmarks/actionsimpl.cpp:187 - msgid "Import &Galeon Bookmarks..." --msgstr "匯入 &Galeon 書籤..." -+msgstr "匯入 &Galeon 書籤…" - - #: keditbookmarks/actionsimpl.cpp:190 - msgid "Import &KDE2/KDE3 Bookmarks..." --msgstr "匯入 &KDE2/KDE3 書籤..." -+msgstr "匯入 &KDE2/KDE3 書籤…" - - #: keditbookmarks/actionsimpl.cpp:193 - msgid "Import &IE Bookmarks..." --msgstr "匯入 &IE 書籤..." -+msgstr "匯入 &IE 書籤…" - - #: keditbookmarks/actionsimpl.cpp:196 - msgid "Import &Mozilla Bookmarks..." --msgstr "匯入 &Mozilla 書籤..." -+msgstr "匯入 &Mozilla 書籤…" - - #: keditbookmarks/actionsimpl.cpp:199 - msgid "Export to &Netscape Bookmarks" -@@ -1689,19 +1718,19 @@ - - #: keditbookmarks/actionsimpl.cpp:202 - msgid "Export to &Opera Bookmarks..." --msgstr "匯出成 &Opera 書籤..." -+msgstr "匯出成 &Opera 書籤…" - - #: keditbookmarks/actionsimpl.cpp:205 - msgid "Export to &HTML Bookmarks..." --msgstr "匯出成 &HTML 書籤..." -+msgstr "匯出成 &HTML 書籤…" - - #: keditbookmarks/actionsimpl.cpp:208 - msgid "Export to &IE Bookmarks..." --msgstr "匯出成 &IE 書籤..." -+msgstr "匯出成 &IE 書籤…" - - #: keditbookmarks/actionsimpl.cpp:211 - msgid "Export to &Mozilla Bookmarks..." --msgstr "匯出成 &Mozilla 書籤..." -+msgstr "匯出成 &Mozilla 書籤…" - - #: keditbookmarks/actionsimpl.cpp:249 - msgid "*.html|HTML Bookmark Listing" -@@ -1821,7 +1850,7 @@ - - #: keditbookmarks/favicons.cpp:86 - msgid "Updating favicon..." --msgstr "更新 Favicon..." -+msgstr "更新 Favicon…" - - #: keditbookmarks/favicons.cpp:95 - msgid "Local file" -@@ -1957,11 +1986,12 @@ - - #: keditbookmarks/main.cpp:96 - msgid "" --"Another instance of %1 is already running, do you really want to open another " --"instance or continue work in the same instance?\n" -+"Another instance of %1 is already running, do you really want to open " -+"another instance or continue work in the same instance?\n" - "Please note that, unfortunately, duplicate views are read-only." - msgstr "" --"另一個 %1 的實體已經在執行，您要開啟另一個實體，或是在相同的實體下繼續工作？\n" -+"另一個 %1 的實體已經在執行，您要開啟另一個實體，或是在相同的實體下繼續工" -+"作？\n" - "請注意，重複的檢視是唯讀的。" - - #: keditbookmarks/main.cpp:100 -@@ -2002,7 +2032,7 @@ - - #: keditbookmarks/testlink.cpp:98 keditbookmarks/testlink.cpp:101 - msgid "Checking..." --msgstr "檢查中..." -+msgstr "檢查中…" - - #: keditbookmarks/testlink.cpp:266 - msgid "Error " -@@ -2018,8 +2048,8 @@ - - #: keditbookmarks/toplevel.cpp:215 - msgid "" --"Reset Quick Search" --"
                                Resets the quick search so that all bookmarks are shown again." -+"Reset Quick Search
                                Resets the quick search so that all bookmarks " -+"are shown again." - msgstr "重新設定快速搜尋
                                重新設定快速搜尋以使所有的書籤再次顯示。" - - #: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:33 -@@ -2110,33 +2140,39 @@ - - #: about/konq_aboutpage.cc:185 - 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 讓工作與管理您的檔案變得容易。您可以在瀏覽本地端與網路資料夾的同時享受像多功能的邊列與檔案預覽這類進階的功能。" -+"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 - 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. http://www.kde.org) 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 也是功能完整且易於使用的網頁瀏覽器，可供您瀏覽網際網路。只要在位址列輸入您要瀏覽的網路位址（例如 http://www.kde.org）並按下 Enter 鍵，或從您的書籤選單中選擇一個項目。" -+"use to explore the Internet. Enter the address (e.g. http://www.kde.org) 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 也是功能完整且易於使用的網頁瀏覽器，可供您瀏覽網際網路。只要在位址" -+"列輸入您要瀏覽的網路位址（例如 http://www.kde." -+"org）並按下 Enter 鍵，或從您的書籤選單中選擇一個項目。" - - #: about/konq_aboutpage.cc:194 - msgid "" - "To return to the previous location, press the back button in the toolbar. " --msgstr "如果您要回到前一個位置，可按下工具列上的「上一頁」按鈕 。" -+msgstr "" -+"如果您要回到前一個位置，可按下工具列上的「上一頁」按鈕 。" - - #: about/konq_aboutpage.cc:197 - msgid "" - "To quickly go to your Home folder press the home button ." --msgstr "如果您要快速移至家目錄，可按下工具列上的「家」按鈕 。" -+msgstr "" -+"如果您要快速移至家目錄，可按下工具列上的「家」按鈕 。" - - #: about/konq_aboutpage.cc:199 - msgid "" -@@ -2145,14 +2181,15 @@ - - #: about/konq_aboutpage.cc:201 - msgid "" --"Tuning Tip: If you want the Konqueror web browser to start faster, you " --"can turn off this information screen by clicking here" --". You can re-enable it by choosing the Help -> Konqueror Introduction menu " -+"Tuning Tip: If you want the Konqueror web browser to start faster, " -+"you can turn off this information screen by clicking here. You can re-enable it by choosing the Help -> Konqueror Introduction menu " - "option, and then pressing Settings -> Save View Profile \"Web Browsing\"." - msgstr "" --"微調小密訣： 如果您希望讓 Konqueror 瀏覽器啟動更快些，您可以單擊 這裡 " --"來關閉這個訊息畫面。您也可以經由選擇「說明」->「Konqueror 征服家簡介」來重新開啟它，並且從「設定」->" --"「儲存檢視設定檔“Web Browsing”」來儲存。" -+"微調小密訣： 如果您希望讓 Konqueror 瀏覽器啟動更快些，您可以單擊 這裡 來關閉這個訊息畫面。您也可以經由選擇「說明」->" -+"「Konqueror 征服家簡介」來重新開啟它，並且從「設定」->「儲存檢視設定檔“Web " -+"Browsing”」來儲存。" - - #: about/konq_aboutpage.cc:206 - msgid "Next: Tips & Tricks" -@@ -2160,16 +2197,17 @@ - - #: about/konq_aboutpage.cc:241 - msgid "" --"Konqueror is designed to embrace and support Internet standards. The aim is to " --"fully implement the officially sanctioned standards from organizations such as " --"the W3 and OASIS, while also adding extra support for other common usability " --"features that arise as de facto standards across the Internet. Along with this " --"support, for such functions as favicons, Internet Keywords, and " --"XBEL bookmarks, Konqueror also implements:" -+"Konqueror is designed to embrace and support Internet standards. The aim is " -+"to fully implement the officially sanctioned standards from organizations " -+"such as the W3 and OASIS, while also adding extra support for other common " -+"usability features that arise as de facto standards across the Internet. " -+"Along with this support, for such functions as favicons, Internet Keywords, " -+"and XBEL bookmarks, Konqueror also implements:" - msgstr "" - "Konqueror 征服家支援網際網路的標準，目標是完整的實作由國際組織如 W3 與 OASIS " --"等所認可的正式標準。同時也額外加入了其它常見而有用的網際網路業界標準(de facto standards)。此外，Konqueror 也支援 " --"favicons、關鍵字以及 XBEL 書籤 等的功能， Konqueror 也實作了：" -+"等所認可的正式標準。同時也額外加入了其它常見而有用的網際網路業界標準(de " -+"facto standards)。此外，Konqueror 也支援 favicons、關鍵字以及 XBEL 書籤 等的功能， Konqueror 也實作了：" - - #: about/konq_aboutpage.cc:248 - msgid "Web Browsing" -@@ -2185,10 +2223,11 @@ - - #: about/konq_aboutpage.cc:251 - msgid "" --"DOM (Level 1, partially Level 2) based " --"HTML 4.01" -+"DOM (Level 1, partially Level 2) based HTML 4.01" - msgstr "" --"DOM (Level 1, 部分 Level 2) 基於 HTML 4.01" -+"DOM (Level 1, 部分 Level 2) 基於 HTML " -+"4.01" - - #: about/konq_aboutpage.cc:253 about/konq_aboutpage.cc:255 - #: about/konq_aboutpage.cc:267 about/konq_aboutpage.cc:272 -@@ -2211,8 +2250,8 @@ - - #: about/konq_aboutpage.cc:258 - msgid "" --"JavaScript enabled (globally). Configure JavaScript here" --"." -+"JavaScript enabled (globally). Configure JavaScript here." - msgstr "Javascript 已被啟用（全域）。在這邊可以設定。" - - #: about/konq_aboutpage.cc:259 -@@ -2221,11 +2260,11 @@ - - #: about/konq_aboutpage.cc:260 - msgid "" --"JDK 1.2.0 (Java 2) compatible VM (Blackdown, " --"IBM or Sun)" -+"JDK 1.2.0 (Java 2) compatible VM (Blackdown, IBM or Sun)" - msgstr "" --"JDK 1.2.0 (Java 2) 相容虛擬機器 (Blackdown, IBM " --"或 Sun)" -+"JDK 1.2.0 (Java 2) 相容虛擬機器 (Blackdown, IBM 或 Sun)" - - #: about/konq_aboutpage.cc:262 - msgid "Enable Java (globally) here." -@@ -2233,13 +2272,14 @@ - - #: about/konq_aboutpage.cc:263 - msgid "" --"Netscape Communicator® plugins " --"(for viewing Flash®, Real" --"®Audio, Real®Video, etc.)" --msgstr "" --"Netscape Communicator® 外掛程式 " --"(用於檢視Flash®, Real" --"®Audio, Real®Video, etc.)" -+"Netscape Communicator® plugins (for " -+"viewing Flash®, Real®Audio, Real®Video, etc.)" -+msgstr "" -+"Netscape Communicator® 外掛程式 (用於檢視" -+"Flash®, Real®Audio, Real®Video, etc.)" - - #: about/konq_aboutpage.cc:268 - msgid "Secure Sockets Layer" -@@ -2287,7 +2327,7 @@ - - #: about/konq_aboutpage.cc:282 - msgid "and many more..." --msgstr "以及 更多其他的..." -+msgstr "以及 更多其他的…" - - #: about/konq_aboutpage.cc:283 - msgid "URL-Completion" -@@ -2315,68 +2355,78 @@ - - #: about/konq_aboutpage.cc:338 - msgid "" --"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can search " --"the Internet, using Google, for the search phrase \"KDE\". 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 " --"create your own Web-Shortcuts." --msgstr "" --"使用網際網路關鍵字與網頁捷徑：輸入「gg: KDE」可以使用 google " --"在網際網路找尋「KDE」一詞。目前有許多預先定義的網頁捷徑可以找到某些關鍵字。而且您也可以 建立您自己的 網頁捷徑。" -+"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: KDE\" one can " -+"search the Internet, using Google, for the search phrase \"KDE\". 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 create your own Web-Shortcuts." -+msgstr "" -+"使用網際網路關鍵字與網頁捷徑：輸入「gg: KDE」可以使用 google 在網際網路找尋" -+"「KDE」一詞。目前有許多預先定義的網頁捷徑可以找到某些關鍵字。而且您也可以 建立您自己的 網頁捷徑。" - - #: about/konq_aboutpage.cc:343 - msgid "" --"Use the magnifier button " --"in the toolbar to increase the font size on your web page." --msgstr "使用工具列中的放大鏡按鈕 來增加網頁的字型大小。" -+"Use the magnifier button in the " -+"toolbar to increase the font size on your web page." -+msgstr "" -+"使用工具列中的放大鏡按鈕 來增加網頁的" -+"字型大小。" - - #: about/konq_aboutpage.cc:345 - 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 " --" in the toolbar." -+"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 in the toolbar." - msgstr "" --"當您要貼上新的位址到位置工具列，您可藉由按下工具列中的這個黑箭頭與白十字 " --"來清除目前的內容。" -+"當您要貼上新的位址到位置工具列，您可藉由按下工具列中的這個黑箭頭與白十字 " -+" 來清除目前的內容。" - - #: about/konq_aboutpage.cc:349 - 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 "希望把目前瀏覽的網頁連結位址放置到您桌面上，只要用滑鼠按住位置工具列左邊的“位置”標籤，然後拖曳到桌面上放開，然後選擇建立連結就可以完成了。" -+"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 - msgid "" --"You can also find " --"\"Full-Screen Mode\" in the Settings menu. This feature is very useful for " --"\"Talk\" sessions." -+"You can also find \"Full-Screen Mode" -+"\" in the Settings menu. This feature is very useful for \"Talk\" sessions." - msgstr "" --"您也可以在設定選單找到 「全螢幕模式」。對於常上「聊天室」的人是很有用的。" -+"您也可以在設定選單找到 「全螢幕模" -+"式」。對於常上「聊天室」的人是很有用的。" - - #: about/konq_aboutpage.cc:355 - msgid "" --"Divide et impera (lat. \"Divide and conquer\") - by splitting a window into two " --"parts (e.g. Window -> " --"Split View Left/Right) you can make Konqueror appear the way you like. You can " --"even load some example view-profiles (e.g. Midnight Commander), or create your " -+"Divide et impera (lat. \"Divide and conquer\") - by splitting a window into " -+"two parts (e.g. Window -> Split View " -+"Left/Right) you can make Konqueror appear the way you like. You can even " -+"load some example view-profiles (e.g. Midnight Commander), or create your " - "own ones." - msgstr "" --"分割並控制(雙關語) - 分割視窗成二個區域（例如：視窗 -> " --"分割檢視左/右）您可以讓 Konqueror 變成您希望的樣子。您甚至可以載入一些範例設定（如 Minight-Commander），或者自己建立。" -+"分割並控制(雙關語) - 分割視窗成二個區域（例如：視窗 -> 分割檢視左/右）您可以讓 Konqueror 變成您希望的樣子。" -+"您甚至可以載入一些範例設定（如 Minight-Commander），或者自己建立。" - - #: about/konq_aboutpage.cc:360 - msgid "" --"Use the user-agent 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 "如果網站要求您使用其他的瀏覽器，請使用 使用者代理 功能（別忘了向他們抱怨！）" -+"Use the user-agent 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 "" -+"如果網站要求您使用其他的瀏覽器，請使用 使用者代理 功能（別" -+"忘了向他們抱怨！）" - - #: about/konq_aboutpage.cc:363 - msgid "" - "The History in your SideBar ensures " - "that you can keep track of the pages you have visited recently." --msgstr "在邊列上的 紀錄，可以讓您追蹤最近所瀏覽過的網頁。" -+msgstr "" -+"在邊列上的 紀錄，可以讓您追蹤最近所瀏" -+"覽過的網頁。" - - #: about/konq_aboutpage.cc:365 - msgid "" -@@ -2385,11 +2435,12 @@ - - #: about/konq_aboutpage.cc:367 - msgid "" --"Advanced users will appreciate the Konsole which you can embed into Konqueror " --"(Window -> Show Terminal Emulator)." -+"Advanced users will appreciate the Konsole which you can embed into " -+"Konqueror (Window -> Show Terminal " -+"Emulator)." - msgstr "" --"進階的使用者會很高興能把 Konsole 嵌入 Konqueror（視窗 -> " --"顯示終端機模擬）。" -+"進階的使用者會很高興能把 Konsole 嵌入 Konqueror（視窗 -> 顯示終端機模擬）。" - - #: about/konq_aboutpage.cc:370 - msgid "" -@@ -2448,7 +2499,7 @@ - - #: shellcmdplugin/kshellcmdplugin.cpp:36 - msgid "&Execute Shell Command..." --msgstr "執行 Shell 命令(&E)..." -+msgstr "執行 Shell 命令(&E)…" - - #: shellcmdplugin/kshellcmdplugin.cpp:51 - msgid "Executing shell commands works only on local directories." -@@ -2506,17 +2557,11 @@ - - #: sidebar/trees/history_module/history_item.cpp:121 - msgid "" --"" --"

                                %4
                                " --"
                                Last visited: %1" --"
                                First visited: %2" --"
                                Number of times visited: %3" --msgstr "" --"" --"
                                %4
                                " --"
                                最近一次參觀： %1" --"
                                第一次參觀： %2" --"
                                參觀次數： %3                                " -+"
                                %4
                                Last visited: %1
                                First visited: %" -+"2
                                Number of times visited: %3                                " -+msgstr "" -+"
                                %4
                                最近一次參觀： %1
                                第一次參觀： %2
                                參" -+"觀次數： %3                                " - - #: sidebar/trees/history_module/kcmhistory.cpp:68 - #: sidebar/trees/history_module/kcmhistory.cpp:73 -@@ -2604,7 +2649,7 @@ - - #: sidebar/trees/konq_sidebartree.cpp:903 - msgid "&Create New Folder..." --msgstr "建立新資料夾(&C)..." -+msgstr "建立新資料夾(&C)…" - - #: sidebar/trees/konq_sidebartree.cpp:909 - msgid "Delete Link" -@@ -2628,9 +2673,12 @@ - - #: sidebar/sidebar_widget.cpp:122 - msgid "" --"This removes all your entries from the sidebar and adds the system default " --"ones.
                                This procedure is irreversible
                                Do you want to proceed?                                " --msgstr "這會將所有您的項目自邊列移除，並且加上系統的預設項目。
                                這個程序是不能反悔的
                                您是否要繼續執行？                                " -+"This removes all your entries from the sidebar and adds the system " -+"default ones.
                                This procedure is irreversible
                                Do you want to " -+"proceed?                                " -+msgstr "" -+"這會將所有您的項目自邊列移除，並且加上系統的預設項目。
                                這個程序是不" -+"能反悔的
                                您是否要繼續執行？                                " - - #: sidebar/sidebar_widget.cpp:277 - msgid "Add New" -@@ -2682,10 +2730,12 @@ - - #: sidebar/sidebar_widget.cpp:634 - 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 "您已經隱藏導覽面板設定按鈕。要讓它再次出現，在導覽面板的任何部分 單擊滑鼠右鍵並選擇“顯示設定按鈕”。" -+"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 - msgid "Configure Sidebar" -@@ -2693,15 +2743,15 @@ - - #: sidebar/sidebar_widget.cpp:858 - msgid "Set Name..." --msgstr "設定名稱..." -+msgstr "設定名稱…" - - #: sidebar/sidebar_widget.cpp:859 - msgid "Set URL..." --msgstr "設定 URL..." -+msgstr "設定 URL…" - - #: sidebar/sidebar_widget.cpp:860 - msgid "Set Icon..." --msgstr "設定圖示..." -+msgstr "設定圖示…" - - #: sidebar/sidebar_widget.cpp:864 - msgid "Configure Navigation Panel" -@@ -2750,5 +2800,5 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"shyue@sonoma.com.tw,cwhuang@linux.org.tw,kenduest@i18n.linux.org.tw," --"pesder.liao@msa.hinet.net,b8802046@mail.ntust.edu.tw" -+"shyue@sonoma.com.tw,cwhuang@linux.org.tw,kenduest@i18n.linux.org.tw,pesder." -+"liao@msa.hinet.net,b8802046@mail.ntust.edu.tw" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/konsole.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/konsole.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/konsole.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: konsole\n" - "POT-Creation-Date: 2007-08-03 01:12+0200\n" - "PO-Revision-Date: 2007-01-26 08:36+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -128,11 +127,11 @@ - - #: konsole.cpp:627 konsole_part.cpp:368 - msgid "Se&lect..." --msgstr "選擇(&L)..." -+msgstr "選擇(&L)…" - - #: konsole.cpp:633 - msgid "&Install Bitmap..." --msgstr "安裝點陣字(&I)..." -+msgstr "安裝點陣字(&I)…" - - #: konsole.cpp:641 konsole_part.cpp:372 - msgid "&Encoding" -@@ -152,19 +151,19 @@ - - #: konsole.cpp:661 - msgid "40x15 (&Small)" --msgstr "40x15 (小型) (&S)" -+msgstr "40x15 (小型)(&S)" - - #: konsole.cpp:662 - msgid "80x24 (&VT100)" --msgstr "80x24 (&VT100)" -+msgstr "80x24(&VT100)" - - #: konsole.cpp:663 - msgid "80x25 (&IBM PC)" --msgstr "80x25 (&IBM PC)" -+msgstr "80x25(&IBM PC)" - - #: konsole.cpp:664 - msgid "80x40 (&XTerm)" --msgstr "80x40 (&XTerm)" -+msgstr "80x40(&XTerm)" - - #: konsole.cpp:665 - msgid "80x52 (IBM V&GA)" -@@ -172,11 +171,11 @@ - - #: konsole.cpp:667 - msgid "&Custom..." --msgstr "自訂(&C)..." -+msgstr "自訂(&C)…" - - #: konsole.cpp:672 - msgid "Hist&ory..." --msgstr "歷史紀錄(&O)..." -+msgstr "歷史紀錄(&O)…" - - #: konsole.cpp:678 konsole_part.cpp:447 - msgid "&Save as Default" -@@ -204,7 +203,7 @@ - - #: konsole.cpp:797 konsole.cpp:1080 - msgid "&Rename Session..." --msgstr "更名工作階段(&R)..." -+msgstr "更名工作階段(&R)…" - - #: konsole.cpp:801 konsole.cpp:1089 - msgid "Monitor for &Activity" -@@ -228,7 +227,7 @@ - - #: konsole.cpp:816 - msgid "Select &Tab Color..." --msgstr "選擇分頁色彩(&T)..." -+msgstr "選擇分頁色彩(&T)…" - - #: konsole.cpp:820 - msgid "Switch to Tab" -@@ -296,7 +295,7 @@ - - #: konsole.cpp:1053 - msgid "&Find in History..." --msgstr "搜尋歷史紀錄(&F)..." -+msgstr "搜尋歷史紀錄(&F)…" - - #: konsole.cpp:1061 - msgid "Find Pre&vious" -@@ -304,7 +303,7 @@ - - #: konsole.cpp:1065 - msgid "S&ave History As..." --msgstr "儲存歷史紀錄至(&A)..." -+msgstr "儲存歷史紀錄至(&A)…" - - #: konsole.cpp:1069 - msgid "Clear &History" -@@ -316,7 +315,7 @@ - - #: konsole.cpp:1084 - msgid "&ZModem Upload..." --msgstr "&ZModem 上傳..." -+msgstr "&ZModem 上傳…" - - #: konsole.cpp:1104 - msgid "Hide &Menubar" -@@ -324,11 +323,11 @@ - - #: konsole.cpp:1110 - msgid "Save Sessions &Profile..." --msgstr "儲存工作階段組態(&P)..." -+msgstr "儲存工作階段組態(&P)…" - - #: konsole.cpp:1121 - msgid "&Print Screen..." --msgstr "列印螢幕(&P)..." -+msgstr "列印螢幕(&P)…" - - #: konsole.cpp:1126 - msgid "New Session" -@@ -377,8 +376,8 @@ - - #: konsole.cpp:1196 - msgid "" --"You have open sessions (besides the current one). These will be killed if you " --"continue.\n" -+"You have open sessions (besides the current one). These will be killed if " -+"you continue.\n" - "Are you sure you want to quit?" - msgstr "" - "您還有其他使用中的工作階段 (除了正在使用的這個以外)。\n" -@@ -394,7 +393,9 @@ - msgid "" - "The application running in Konsole does not respond to the close request. Do " - "you want Konsole to close anyway?" --msgstr "目前於 Konsole 內執行的程式沒有正確回應所以無法正常讓它結束。您確定要關閉 Konsole 程式？" -+msgstr "" -+"目前於 Konsole 內執行的程式沒有正確回應所以無法正常讓它結束。您確定要關閉 " -+"Konsole 程式？" - - #: konsole.cpp:1234 - msgid "Application Does Not Respond" -@@ -411,11 +412,11 @@ - #: konsole.cpp:1809 - 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 " --"want to install the fonts listed below into fonts:/Personal?" -+"installed. After installation, you must restart Konsole to use them. Do " -+"you want to install the fonts listed below into fonts:/Personal?" - msgstr "" --"如果您想要使用 Konsole 隨附的點陣字型，就必須安裝它們。安裝完成後，您必須重新啟動 Konsole 才能使用它們。您是否想要將下列字型安裝到 " --"fonts:/Personal？" -+"如果您想要使用 Konsole 隨附的點陣字型，就必須安裝它們。安裝完成後，您必須重新" -+"啟動 Konsole 才能使用它們。您是否想要將下列字型安裝到 fonts:/Personal？" - - #: konsole.cpp:1811 - msgid "Install Bitmap Fonts?" -@@ -439,19 +440,20 @@ - - #: konsole.cpp:2034 - msgid "" --"You have chosen one or more Ctrl+ combinations to be used as shortcuts. As " --"a result these key combinations will no longer be passed to the command shell " --"or to applications that run inside Konsole. This can have the unintended " --"consequence that functionality that would otherwise be bound to these key " --"combinations is no longer accessible.\n" -+"You have chosen one or more Ctrl+ combinations to be used as shortcuts. " -+"As a result these key combinations will no longer be passed to the command " -+"shell or to applications that run inside Konsole. This can have the " -+"unintended consequence that functionality that would otherwise be bound to " -+"these key combinations is no longer accessible.\n" - "\n" --"You may wish to reconsider your choice of keys and use Alt+Ctrl+ " --"or Ctrl+Shift+ instead.\n" -+"You may wish to reconsider your choice of keys and use Alt+Ctrl+ or Ctrl" -+"+Shift+ instead.\n" - "\n" - "You are currently using the following Ctrl+ combinations:" - msgstr "" --"您已經選擇一或多個 Ctrl+ 組合來做為捷徑鍵。如此一來這些組合鍵就不再具有命令 shell 或在 Konsole " --"中執行的應用程式的功能。這可能不是您所樂意見到的，但是除非把這些組合鍵取消否則無法避免。\n" -+"您已經選擇一或多個 Ctrl+ 組合來做為捷徑鍵。如此一來這些組合鍵就不再具有" -+"命令 shell 或在 Konsole 中執行的應用程式的功能。這可能不是您所樂意見到的，但" -+"是除非把這些組合鍵取消否則無法避免。\n" - "\n" - "您可以會想考慮您所選擇的按鍵並使用 Alt+Ctrl+ 或 Ctrl+Shift+代替。\n" - "\n" -@@ -489,7 +491,7 @@ - - #: konsole.cpp:3461 - msgid "New Shell at Bookmark" --msgstr "開啟新 Shell 於書籤..." -+msgstr "開啟新 Shell 於書籤…" - - #: konsole.cpp:3464 - msgid "Shell at Bookmark" -@@ -520,7 +522,7 @@ - - #: konsole.cpp:3835 - msgid "&Number of lines: " --msgstr "行數(&N):" -+msgstr "列數(&N):" - - #: konsole.cpp:3839 konsole_part.cpp:984 - msgid "" -@@ -561,10 +563,8 @@ - msgstr "儲存歷史紀錄" - - #: konsole.cpp:4040 --msgid "" --"This is not a local file.\n" --msgstr "" --"這不是本地檔案。\n" -+msgid "This is not a local file.\n" -+msgstr "這不是本地檔案。\n" - - #: konsole.cpp:4050 - msgid "" -@@ -646,7 +646,7 @@ - - #: konsole.cpp:4184 konsole_part.cpp:991 - msgid "Number of lines:" --msgstr "行數:" -+msgstr "列數:" - - #: konsole.cpp:4212 - msgid "As ®ular expression" -@@ -654,7 +654,7 @@ - - #: konsole.cpp:4215 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: konsole_part.cpp:92 main.cpp:168 - msgid "Konsole" -@@ -662,11 +662,11 @@ - - #: konsole_part.cpp:399 - msgid "&History..." --msgstr "歷史紀錄(&H)..." -+msgstr "歷史紀錄(&H)…" - - #: konsole_part.cpp:405 - msgid "Li&ne Spacing" --msgstr "行距(&N)" -+msgstr "列距(&N)" - - #: konsole_part.cpp:411 - msgid "&0" -@@ -718,7 +718,7 @@ - - #: konsole_part.cpp:435 - msgid "Wor&d Connectors..." --msgstr "單字分隔(&D)..." -+msgstr "單字分隔(&D)…" - - #: konsole_part.cpp:441 - msgid "&Use Konsole's Settings" -@@ -937,16 +937,12 @@ - "上面的列表只包括我能夠保留記錄的部分貢獻者。" - - #: main.cpp:337 --msgid "" --"You can't use BOTH -ls and -e.\n" --msgstr "" --"您不能同時使用 -ls 與 -e。\n" -+msgid "You can't use BOTH -ls and -e.\n" -+msgstr "您不能同時使用 -ls 與 -e。\n" - - #: main.cpp:464 --msgid "" --"expected --vt_sz <#columns>x<#lines> e.g. 80x40\n" --msgstr "" --"期望 --vt_sz <#列>x<#行> 例如. 80x40\n" -+msgid "expected --vt_sz <#columns>x<#lines> e.g. 80x40\n" -+msgstr "期望 --vt_sz <#列>x<#行> 例如. 80x40\n" - - #: printsettings.cpp:32 - msgid "Printer &friendly mode (black text, no background)" -@@ -1066,12 +1062,12 @@ - - #: session.cpp:137 - msgid "" --"Konsole is unable to open a PTY (pseudo teletype). It is likely that this is " --"due to an incorrect configuration of the PTY devices. Konsole needs to have " --"read/write access to the PTY devices." -+"Konsole is unable to open a PTY (pseudo teletype). It is likely that this " -+"is due to an incorrect configuration of the PTY devices. Konsole needs to " -+"have read/write access to the PTY devices." - msgstr "" --"Konsole 無法開啟 PTY (pseudo teletype)。這可能是由於 PTY 裝置的組態不正確。Konsole 需要對 PTY " --"裝置有讀取/寫入權限。" -+"Konsole 無法開啟 PTY (pseudo teletype)。這可能是由於 PTY 裝置的組態不正確。" -+"Konsole 需要對 PTY 裝置有讀取/寫入權限。" - - #: session.cpp:138 - msgid "A Fatal Error Has Occurred" -@@ -1117,8 +1113,7 @@ - msgid "" - "

                                ...that right-clicking on any tab allows for the changing of the tab text " - "color?\n" --msgstr "" --"

                                ...是否允許在任何分頁以滑鼠右擊來變更分頁文字色彩？\n" -+msgstr "

                                …是否允許在任何分頁以滑鼠右擊來變更分頁文字色彩？\n" - - #: tips.cpp:8 - msgid "" -@@ -1128,35 +1123,32 @@ - "

                                ...分頁文字色彩是否可以代碼 \\e[28;COLORt (COLOR: 0-16,777,215)變更？\n" - - #: tips.cpp:13 --msgid "" --"

                                ...that the code \\e[8;ROW;COLUMNt will resize Konsole?\n" --msgstr "" --"

                                ...是否可以代碼 \\e[8;ROW;COLUMNt 改變 Konsole 大小？\n" -+msgid "

                                ...that the code \\e[8;ROW;COLUMNt will resize Konsole?\n" -+msgstr "

                                …是否可以代碼 \\e[8;ROW;COLUMNt 改變 Konsole 大小？\n" - - #: tips.cpp:18 - msgid "" --"

                                ...that you can start a new standard session by pressing the \"New\" button " --"in the tabbar?\n" -+"

                                ...that you can start a new standard session by pressing the \"New\" " -+"button in the tabbar?\n" - msgstr "" --"

                                ...知道您可以按在 Konsole 工作列上的「新增」按扭來啟動一個新的標準工作階段嗎？\n" -+"

                                ...知道您可以按在 Konsole 工作列上的「新增」按扭來啟動一個新的標準工作階段" -+"嗎？\n" - - #: tips.cpp:23 - msgid "" --"

                                ...that pressing and holding the \"New\" button on the tabbar will display a " --"menu of sessions to select?\n" -+"

                                ...that pressing and holding the \"New\" button on the tabbar will " -+"display a menu of sessions to select?\n" - msgstr "" - "

                                ...知道按住在分頁列上的「新增」按鈕不放會顯示選取工作階段的選單嗎？\n" - - #: tips.cpp:28 --msgid "" --"

                                ...that pressing Ctrl+Alt+N will start a new standard session?\n" --msgstr "" --"

                                ...知道按 Ctrl+Alt+N 會啟動一個新的標準工作階段嗎？\n" -+msgid "

                                ...that pressing Ctrl+Alt+N will start a new standard session?\n" -+msgstr "

                                …知道按 Ctrl+Alt+N 會啟動一個新的標準工作階段嗎？\n" - - #: tips.cpp:33 - msgid "" --"

                                ...that you can cycle through the Konsole sessions by holding down the Shift " --"key and\n" -+"

                                ...that you can cycle through the Konsole sessions by holding down the " -+"Shift key and\n" - "pressing the Left or Right Arrow keys?\n" - msgstr "" - "

                                ...知道您可以按住 Shift 鍵再按左右箭咀鍵來穿梭各 Konsole 工作階段嗎？\n" -@@ -1177,7 +1169,8 @@ - msgid "" - "

                                ...that you can rename your Konsole sessions by clicking with the right " - "mouse\n" --"button and selecting \"Rename session\"? The change will be reflected in the\n" -+"button and selecting \"Rename session\"? The change will be reflected in " -+"the\n" - "Konsole tabbar, making it easier to remember the content of the session.\n" - msgstr "" - "

                                ...知道您可以按滑鼠右鍵再選「變更工作階段名稱」\n" -@@ -1191,10 +1184,8 @@ - "

                                ...知道您可以雙擊 Konsole 分頁列上的按鈕來變更 Konsole 工作階段名稱嗎？\n" - - #: tips.cpp:59 --msgid "" --"

                                ...that you can activate the menu with the Ctrl+Alt+M shortcut?\n" --msgstr "" --"

                                ...知道您可以按快捷鍵 Ctrl+Alt+M 來觸動選單嗎？\n" -+msgid "

                                ...that you can activate the menu with the Ctrl+Alt+M shortcut?\n" -+msgstr "

                                …知道您可以按快捷鍵 Ctrl+Alt+M 來觸動選單嗎？\n" - - #: tips.cpp:64 - msgid "" -@@ -1208,7 +1199,8 @@ - "

                                ...that you can create your own session types by using the session \n" - "editor which you can find under \"Settings->Configure Konsole...\"?\n" - msgstr "" --"

                                ...知道您可以用工作階段編輯器 (可以在「設定值->設定 Konsole...」 裡找到) \n" -+"

                                ...知道您可以用工作階段編輯器 (可以在「設定值->設定 Konsole...」 裡找" -+"到) \n" - "來建立自己的新工作階段類型？\n" - - #: tips.cpp:75 -@@ -1223,8 +1215,8 @@ - - #: tips.cpp:82 - msgid "" --"

                                ...that you can move a session by holding down the middle mouse button over " --"the tab?\n" -+"

                                ...that you can move a session by holding down the middle mouse button " -+"over the tab?\n" - "

                                \n" - msgstr "" - "

                                ...知道您可以在 Konsole 分頁列上按住滑鼠中鍵來移動工作階段嗎？\n" -@@ -1232,8 +1224,8 @@ - - #: tips.cpp:88 - msgid "" --"

                                ...that you can reorder the session tabs with \"View->" --"Move Session Left/Right\" menu\n" -+"

                                ...that you can reorder the session tabs with \"View->Move Session Left/" -+"Right\" menu\n" - "commands or by holding down the Shift and Ctrl keys and pressing the Left or " - "Right \n" - "Arrow keys?\n" -@@ -1246,8 +1238,8 @@ - - #: tips.cpp:96 - msgid "" --"

                                ...that you can scroll pagewise in the history by holding down the Shift key " --"\n" -+"

                                ...that you can scroll pagewise in the history by holding down the Shift " -+"key \n" - "and pressing the Page Up or Page Down keys?\n" - msgstr "" - "

                                ...知道您可以在歷史紀錄中按住 Shift 鍵再按 Page Up 或 Page Down\n" -@@ -1255,8 +1247,8 @@ - - #: tips.cpp:102 - msgid "" --"

                                ...that you can scroll linewise in the history by holding down the Shift key " --"\n" -+"

                                ...that you can scroll linewise in the history by holding down the Shift " -+"key \n" - "and pressing the Up or Down Arrow keys?\n" - msgstr "" - "

                                ...知道您可以在歷史紀錄中按住 Shift 鍵並按上下箭咀鍵來逐行捲動嗎？\n" -@@ -1265,8 +1257,7 @@ - msgid "" - "

                                ...that you can insert the clipboard by holding down the Shift key and \n" - "pressing the Insert key?\n" --msgstr "" --"

                                ...知道您可以按住 Shift 鍵再按 Insert 鍵來插入剪貼薄的內容嗎？\n" -+msgstr "

                                …知道您可以按住 Shift 鍵再按 Insert 鍵來插入剪貼薄的內容嗎？\n" - - #: tips.cpp:114 - msgid "" -@@ -1286,24 +1277,23 @@ - - #: tips.cpp:126 - msgid "" --"

                                ...that you can turn off the terminal size hint under \"Settings->" --"Configure Konsole...\"?\n" --msgstr "" --"

                                ...知道您可以在「設定值->設定 Konsole...」 下關閉終端機大小提示？\n" -+"

                                ...that you can turn off the terminal size hint under \"Settings-" -+">Configure Konsole...\"?\n" -+msgstr "

                                …知道您可以在「設定值->設定 Konsole...」 下關閉終端機大小提示？\n" - - #: tips.cpp:131 - msgid "" - "

                                ...that pressing Ctrl while selecting text will let Konsole ignore line " - "breaks?\n" --msgstr "" --"

                                ...知道您可以在選擇文字時按住 Ctrl 鍵可以讓 Konsole 忽略跳行嗎？\n" -+msgstr "

                                …知道您可以在選擇文字時按住 Ctrl 鍵可以讓 Konsole 忽略跳行嗎？\n" - - #: tips.cpp:136 - msgid "" --"

                                ...that pressing the Ctrl and Alt keys while selecting text will let Konsole " --"select columns?\n" -+"

                                ...that pressing the Ctrl and Alt keys while selecting text will let " -+"Konsole select columns?\n" - msgstr "" --"

                                ...知道您可以在選擇文字時按住 Ctrl 鍵與 Alt 鍵可以讓 Konsole 依欄選擇嗎？\n" -+"

                                ...知道您可以在選擇文字時按住 Ctrl 鍵與 Alt 鍵可以讓 Konsole 依欄選擇" -+"嗎？\n" - - #: tips.cpp:141 - msgid "" -@@ -1315,7 +1305,8 @@ - - #: tips.cpp:147 - msgid "" --"

                                ...that when a program evaluates the left mouse button you can still select\n" -+"

                                ...that when a program evaluates the left mouse button you can still " -+"select\n" - "text while pressing the Shift key?\n" - msgstr "" - "

                                ...知道當一個程式會吃掉滑鼠左鍵時，您仍可\n" -@@ -1323,26 +1314,32 @@ - - #: tips.cpp:153 - msgid "" --"

                                ...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" -+"

                                ...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" - msgstr "" - "

                                ...知道您可以讓 Konsole 用當前目錄名作為視窗標題嗎？\n" --"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]' 放進您的~/.bashrc 中。\n" -+"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]' 放進您的~/." -+"bashrc 中。\n" - - #: tips.cpp:159 - msgid "" --"

                                ...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" -+"

                                ...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" - msgstr "" - "

                                ...知道您可以讓 Konsole 用當前目錄名作為視窗標題嗎？\n" --"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' 放進您的~/.bashrc 中。\n" -+"用 Bash 的話，請將 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' 放進您的~/." -+"bashrc 中。\n" - - #: tips.cpp:165 - msgid "" --"

                                ...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 " --"~/.bashrc, then\n" -+"

                                ...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 ~/.bashrc, then\n" - "Konsole can bookmark it, and session management will remember your current " - "working directory\n" - "on non-Linux systems too?\n" -@@ -1374,8 +1371,8 @@ - - #: tips.cpp:187 - msgid "" --"

                                ...that if you drag & drop a URL into a Konsole window you are presented " --"with a\n" -+"

                                ...that if you drag & 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" -@@ -1388,10 +1385,10 @@ - - #: tips.cpp:195 - msgid "" --"

                                ...that the \"Settings->Configure Shortcuts...\" dialog allows you to define " --"keyboard shortcuts for actions\n" --"not shown in the menu, like activating menu, changing font and for listing and " --"switching sessions?\n" -+"

                                ...that the \"Settings->Configure Shortcuts...\" dialog allows you to " -+"define keyboard shortcuts for actions\n" -+"not shown in the menu, like activating menu, changing font and for listing " -+"and switching sessions?\n" - msgstr "" - "

                                ...「設定值->設定捷徑鍵」對話盒允許您定義選單中沒顯示的動作的捷徑鍵，\n" - "像作用選單、改變字型與列出並切換工作階段？\n" -@@ -1402,7 +1399,8 @@ - "tabbar or in an empty tabbar space displays a menu where you can set several " - "tab options?\n" - msgstr "" --"

                                ...在分頁列左上角的「新增」按鈕或在分頁列的空白空間按右鍵會否出現讓您設定各類分頁選項的選單？\n" -+"

                                ...在分頁列左上角的「新增」按鈕或在分頁列的空白空間按右鍵會否出現讓您設定" -+"各類分頁選項的選單？\n" - - #: zmodem_dialog.cpp:28 - msgid "&Stop" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kpager.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpager.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kpager.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kpager 1.7\n" - "POT-Creation-Date: 2006-08-16 04:04+0200\n" - "PO-Revision-Date: 2005-11-08 19:59+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-tw \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -63,7 +63,7 @@ - - #: config.cpp:80 - msgid "Layout" --msgstr "佈局" -+msgstr "布局" - - #: config.cpp:84 - msgid "Classical" -@@ -109,7 +109,7 @@ - #~ msgstr "KPager 設定" - - #~ msgid "Configure Pager..." --#~ msgstr "組態呼叫器..." -+#~ msgstr "組態呼叫器…" - - #~ msgid "Create pager as a child of specified parent window" - #~ msgstr "將呼叫迄建立為指定視窗的子視窗" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpersonalizer.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kpersonalizer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kpersonalizer.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kpersonalizer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kpersonalizer\n" - "POT-Creation-Date: 2005-09-03 02:36+0200\n" - "PO-Revision-Date: 2005-08-11 16:26+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -117,7 +117,7 @@ - - #: kpersonalizer.cpp:71 - msgid "Step 2: I want it my Way..." --msgstr "第二步：我要我的風格..." -+msgstr "第二步：我要我的風格…" - - #: kpersonalizer.cpp:75 - msgid "Step 3: Eyecandy-O-Meter" -@@ -125,7 +125,7 @@ - - #: kpersonalizer.cpp:79 - msgid "Step 4: Everybody loves Themes" --msgstr "第四步：每個人都愛佈景主題" -+msgstr "第四步：每個人都愛布景主題" - - #: kpersonalizer.cpp:83 - msgid "Step 5: Time to Refine" -@@ -137,24 +137,22 @@ - - #: kpersonalizer.cpp:152 - msgid "" --"

                                Are you sure you want to quit the Desktop Settings Wizard?

                                " --"

                                The Desktop Settings Wizard helps you to configure the KDE desktop to your " --"personal liking.

                                " --"

                                Click Cancel to return and finish your setup.

                                " --msgstr "" --"

                                您確定要離開桌面設定精靈？

                                " --"

                                桌面設定精靈幫助您設定 KDE 桌面以符合您的個人喜好。

                                " --"

                                按下「取消」返回並完成您的設定。

                                " -+"

                                Are you sure you want to quit the Desktop Settings Wizard?

                                The " -+"Desktop Settings Wizard helps you to configure the KDE desktop to your " -+"personal liking.

                                Click Cancel to return and finish your setup." -+msgstr "" -+"

                                您確定要離開桌面設定精靈？

                                桌面設定精靈幫助您設定 KDE 桌面以符合您的" -+"個人喜好。

                                按下「取消」返回並完成您的設定。

                                " - - #: kpersonalizer.cpp:156 - msgid "" --"

                                Are you sure you want to quit the Desktop Settings Wizard?

                                " --"

                                If yes, click Quit and all changes will be lost." --"
                                If not, click Cancel to return and finish your setup.

                                " --msgstr "" --"

                                您確定要離開桌面設定精靈？

                                " --"

                                如果是，請按「離開」而所有變更將會遺失。" --"
                                如果不是，請按「取消」返回並完成您的設定。

                                " -+"

                                Are you sure you want to quit the Desktop Settings Wizard?

                                If yes, " -+"click Quit and all changes will be lost.
                                If not, click Cancel to return and finish your setup.

                                " -+msgstr "" -+"

                                您確定要離開桌面設定精靈？

                                如果是，請按「離開」而所有變更將會" -+"遺失。
                                如果不是，請按「取消」返回並完成您的設定。

                                " - - #: kpersonalizer.cpp:160 - msgid "All Changes Will Be Lost" -@@ -162,67 +160,47 @@ - - #: kospage.cpp:352 - msgid "" --"Window activation: Focus on click" --"
                                Titlebar double-click: Shade window" --"
                                Mouse selection: Single click" --"
                                Application startup notification: busy cursor" --"
                                Keyboard scheme: KDE default" --"
                                " --msgstr "" --"視窗生效： 單擊才聚焦" --"
                                雙擊標題列：隱藏視窗" --"
                                滑鼠選擇： 單擊" --"
                                應用程式啟動通知： 忙碌的游標 " --"
                                鍵盤組合： KDE 預設" --"
                                " -+"Window activation: Focus on click
                                Titlebar double-click:" -+" Shade window
                                Mouse selection: Single click
                                Application startup notification: busy cursor
                                Keyboard scheme: KDE default
                                " -+msgstr "" -+"視窗生效： 單擊才聚焦
                                雙擊標題列：隱藏視窗
                                滑鼠選擇： 單擊
                                應用程式啟動通知： 忙碌的" -+"游標
                                鍵盤組合： KDE 預設
                                " - - #: kospage.cpp:364 - msgid "" --"Window activation: Focus follows mouse" --"
                                Titlebar double-click: Shade window" --"
                                Mouse selection: Single click" --"
                                Application startup notification: none" --"
                                Keyboard scheme: UNIX" --"
                                " --msgstr "" --"視窗生效： 單擊才聚焦" --"
                                雙擊標題列：將視窗移到最後" --"
                                滑鼠選擇： 單擊" --"
                                應用程式啟動通知：無 " --"
                                鍵盤組合：UNIX" --"
                                " -+"Window activation: Focus follows mouse
                                Titlebar double-" -+"click: Shade window
                                Mouse selection: Single click
                                Application startup notification: none
                                Keyboard " -+"scheme: UNIX
                                " -+msgstr "" -+"視窗生效： 單擊才聚焦
                                雙擊標題列：將視窗移到最後
                                滑鼠選擇： 單擊
                                應用程式啟動通知：無 " -+"
                                鍵盤組合：UNIX
                                " - - #: kospage.cpp:376 - msgid "" --"Window activation: Focus on click" --"
                                Titlebar double-click: Maximize window" --"
                                Mouse selection: Double click" --"
                                Application startup notification: busy cursor" --"
                                Keyboard scheme: Windows" --"
                                " --msgstr "" --"視窗生效： 單擊才聚焦" --"
                                雙擊標題列：視窗最大化" --"
                                滑鼠選擇： 雙擊" --"
                                應用程式啟動通知： 忙碌的游標 " --"
                                鍵盤組合： Windows" --"
                                " -+"Window activation: Focus on click
                                Titlebar double-click:" -+" Maximize window
                                Mouse selection: Double click
                                Application startup notification: busy cursor
                                Keyboard scheme: Windows
                                " -+msgstr "" -+"視窗生效： 單擊才聚焦
                                雙擊標題列：視窗最大化
                                滑鼠選擇： 雙擊
                                應用程式啟動通知： 忙碌的" -+"游標
                                鍵盤組合： Windows
                                " - - #: kospage.cpp:388 - msgid "" --"Window activation: Focus on click" --"
                                Titlebar double-click: Shade window" --"
                                Mouse selection: Single click" --"
                                Application startup notification: none" --"
                                Keyboard scheme: Mac" --"
                                " --msgstr "" --"視窗生效： 單擊才聚焦" --"
                                雙擊標題列：隱藏視窗" --"
                                滑鼠選擇： 單擊" --"
                                應用程式啟動通知： 無 " --"
                                鍵盤組合： Mac" --"
                                " -+"Window activation: Focus on click
                                Titlebar double-click:" -+" Shade window
                                Mouse selection: Single click
                                Application startup notification: none
                                Keyboard " -+"scheme: Mac
                                " -+msgstr "" -+"視窗生效： 單擊才聚焦
                                雙擊標題列：隱藏視窗
                                滑鼠選擇： 單擊
                                應用程式啟動通知： 無 " -+"
                                鍵盤組合： Mac
                                " - - #: keyecandypage.cpp:67 - msgid "Features" -@@ -262,7 +240,7 @@ - - #: keyecandypage.cpp:90 - msgid "Sound Theme" --msgstr "音效佈景主題" -+msgstr "音效布景主題" - - #: keyecandypage.cpp:96 - msgid "Large Desktop Icons" -@@ -318,19 +296,22 @@ - "desktop in five quick, easy steps. You can set things like your country (for " - "date and time formats, etc.), language, desktop behavior and more.

                                \n" - "

                                You will be able to change all the settings later using the KDE Control " --"Center. You may choose to postpone your personalization until later by clicking " --"on Skip Wizard. 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.

                                \n" -+"Center. You may choose to postpone your personalization until later by " -+"clicking on Skip Wizard. 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.

                                \n" - "

                                If you already like your KDE configuration and wish to quit the Wizard, " - "click Skip Wizard, then Quit.

                                " - msgstr "" --"

                                個人化工具將透過五個快速、簡單的步驟，協助您設定好 KDE " --"基本的組態。您可以設定像是您的國家（用來設定時間與日期等等的格式）、語系、桌面行為以及其他。

                                \n" --"

                                您可以在稍後使用 KDE " --"控制中心來變更所有的設定。您也可以選擇按下「略過精靈」來暫停個人化工具的執行。到目前為止所作的任何變更，將會被取消，除了國家與語言設定之外。儘管如" --"此，我們還是建議新使用者使用個人化工具這個簡單的方法。

                                \n" --"

                                如果您已經喜歡您的 KDE 設定，並且希望離開個人化工具，按下「略過精靈」，然後「離開」。

                                " -+"

                                個人化工具將透過五個快速、簡單的步驟，協助您設定好 KDE 基本的組態。您可以" -+"設定像是您的國家（用來設定時間與日期等等的格式）、語系、桌面行為以及其他。 \n" -+"

                                您可以在稍後使用 KDE 控制中心來變更所有的設定。您也可以選擇按下「略過精" -+"靈」來暫停個人化工具的執行。到目前為止所作的任何變更，將會被取消，除了國" -+"家與語言設定之外。儘管如此，我們還是建議新使用者使用個人化工具這個簡單的方" -+"法。

                                \n" -+"

                                如果您已經喜歡您的 KDE 設定，並且希望離開個人化工具，按下「略過精靈」，然後「離開」。

                                " - - #. i18n: file kcountrypagedlg.ui line 100 - #: rc.cpp:11 -@@ -348,15 +329,17 @@ - #: rc.cpp:17 - #, no-c-format - msgid "" --"

                                KDE 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.

                                \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." --msgstr "" --"

                                KDE 提供許多動人的視覺效果，像是平滑的字體、檔案管理員檔案預覽或者動畫式選單。然而所有的漂亮的效果，都將付出些許的效能成本。

                                \n" --"如果您有一個較快的、新的處理器，您可以開啟所有的功能。但如果您使用較慢的處理器，少用一些漂亮的效果將有助於您的桌面有更佳的反應速度。" -+"

                                KDE 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.

                                \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." -+msgstr "" -+"

                                KDE 提供許多動人的視覺效果，像是平滑的字體、檔案管理員檔案預覽或者動畫式選" -+"單。然而所有的漂亮的效果，都將付出些許的效能成本。

                                \n" -+"如果您有一個較快的、新的處理器，您可以開啟所有的功能。但如果您使用較慢的處理" -+"器，少用一些漂亮的效果將有助於您的桌面有更佳的反應速度。" - - #. i18n: file keyecandypagedlg.ui line 96 - #: rc.cpp:21 -@@ -436,13 +419,11 @@ - #: rc.cpp:56 - #, no-c-format - msgid "" --"System Behavior" --"
                                \n" -+"System Behavior
                                \n" - "Graphical User Interfaces behave differently on various Operating Systems.\n" - "KDE allows you to customize its behavior according to your needs." - msgstr "" --"系統行為" --"
                                \n" -+"系統行為
                                \n" - "不同作業系統的圖形化使用者介面行為都有些不同。\n" - "KDE 允許您自訂您符合您需要的行為。 " - -@@ -450,8 +431,8 @@ - #: rc.cpp:61 - #, no-c-format - msgid "" --"For motion impaired users, KDE provides keyboard gestures to activate special " --"keyboard settings." -+"For motion impaired users, KDE provides keyboard gestures to activate " -+"special keyboard settings." - msgstr "對於行動不便的使用者，KDE 提供鍵盤筆勢來使用特殊的鍵盤設定值。" - - #. i18n: file kospagedlg.ui line 179 -@@ -465,11 +446,12 @@ - #, no-c-format - msgid "" - "

                                Finished

                                \n" --"

                                After closing this dialog you can always restart this Wizard by choosing the " --"entry Desktop Settings Wizard from the Settings menu.

                                " -+"

                                After closing this dialog you can always restart this Wizard by choosing " -+"the entry Desktop Settings Wizard from the Settings menu.

                                " - msgstr "" - "

                                完成

                                \n" --"

                                在關閉這個對話框後，您也可以隨時藉由按下設定選單的「桌面設定精靈」這個項目來重新啟動這個精靈。

                                " -+"

                                在關閉這個對話框後，您也可以隨時藉由按下設定選單的「桌面設定精靈」" -+"這個項目來重新啟動這個精靈。

                                " - - #. i18n: file krefinepagedlg.ui line 81 - #: rc.cpp:71 -@@ -477,7 +459,9 @@ - msgid "" - "You can refine the settings you made by starting the KDE Control Center by " - "choosing the entry Control Center in the K menu." --msgstr "您可以選擇在 K 警方選單中的「控制中心」項目來啟動 KDE 控制中心，並在此重新調整您的設定。" -+msgstr "" -+"您可以選擇在 K 警方選單中的「控制中心」項目來啟動 KDE 控制中心，並在此" -+"重新調整您的設定。" - - #. i18n: file krefinepagedlg.ui line 133 - #: rc.cpp:74 -@@ -495,8 +479,8 @@ - #: rc.cpp:80 - #, no-c-format - msgid "" --"Please choose the way your computer should look by selecting one of the items " --"below." -+"Please choose the way your computer should look by selecting one of the " -+"items below." - msgstr "請在下方的項目中選擇您要的外觀。" - - #. i18n: file kstylepagedlg.ui line 89 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kprinter.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kprinter.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kprinter.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kprinter.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: kprinter\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-25 16:20+0800\n" --"Last-Translator: Frank Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -34,7 +34,7 @@ - - #: main.cpp:37 - msgid "Job output mode (gui, console, none)" --msgstr "工作輸出模式 (圖形介面, 控制台, 沒有)" -+msgstr "工作輸出模式 (圖形介面, 控制臺, 沒有)" - - #: main.cpp:38 - msgid "Print system to use (lpd, cups)" -@@ -92,8 +92,8 @@ - - #: printwrapper.cpp:196 - msgid "" --"When using '--nodialog', you must at least specify one file to print or use the " --"'--stdin' flag." -+"When using '--nodialog', you must at least specify one file to print or use " -+"the '--stdin' flag." - msgstr "使用 --nodialog 的時候，您至少要指定一個檔案，或是用 --stdin。" - - #: printwrapper.cpp:245 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krandr.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krandr.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krandr.po 2007-01-15 10:56:31.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krandr.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: krandr\n" - "POT-Creation-Date: 2006-11-08 02:34+0100\n" - "PO-Revision-Date: 2005-11-08 21:11+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,8 +31,8 @@ - "update to version 4.3 or greater. You need the X Resize And Rotate extension " - "(RANDR) version 1.1 or greater to use this feature." - msgstr "" --"您的 X 伺服器無法支援更改螢幕大小及旋轉。請更新至 4.3 以上的版本。您需要 X Resize And Rotate extension " --"(RANDR) 1.1 以上的版本才能使用本程式。" -+"您的 X 伺服器無法支援更改螢幕大小及旋轉。請更新至 4.3 以上的版本。您需要 " -+"X Resize And Rotate extension (RANDR) 1.1 以上的版本才能使用本程式。" - - #: krandrmodule.cpp:91 - msgid "Settings for screen:" -@@ -45,8 +45,8 @@ - - #: krandrmodule.cpp:100 - msgid "" --"The screen whose settings you would like to change can be selected using this " --"drop-down list." -+"The screen whose settings you would like to change can be selected using " -+"this drop-down list." - msgstr "請利用此下拉選單來選擇您要更改的螢幕" - - #: krandrmodule.cpp:109 -@@ -83,8 +83,8 @@ - - #: krandrmodule.cpp:130 - msgid "" --"If this option is enabled the size and orientation settings will be used when " --"KDE starts." -+"If this option is enabled the size and orientation settings will be used " -+"when KDE starts." - msgstr "選取此選項後，當 KDE 開始時即會使用螢幕的大小及顯示方向的設定" - - #: krandrmodule.cpp:135 -@@ -93,9 +93,10 @@ - - #: krandrmodule.cpp:137 - msgid "" --"If this option is enabled, options set by the system tray applet will be saved " --"and loaded when KDE starts instead of being temporary." --msgstr "選取此選項後，此工作列程式的設定將會從 KDE 開始時即運作。選項將不會是暫時性的" -+"If this option is enabled, options set by the system tray applet will be " -+"saved and loaded when KDE starts instead of being temporary." -+msgstr "" -+"選取此選項後，此工作列程式的設定將會從 KDE 開始時即運作。選項將不會是暫時性的" - - #: krandrmodule.cpp:174 krandrtray.cpp:149 - msgid "%1 x %2" -@@ -111,7 +112,7 @@ - - #: krandrtray.cpp:94 - msgid "Configure Display..." --msgstr "設定螢幕..." -+msgstr "設定螢幕…" - - #: krandrtray.cpp:117 - msgid "Screen configuration has changed" -@@ -162,18 +163,21 @@ - - #: randr.cpp:163 - msgid "&Accept Configuration" --msgstr "接受新設定 (&A)" -+msgstr "接受新設定(&A)" - - #: randr.cpp:164 - msgid "&Return to Previous Configuration" --msgstr "回到原本設定 (&R)" -+msgstr "回到原本設定(&R)" - - #: randr.cpp:166 - 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 秒之後畫面將回復到之前的設定。" -+"configuration. In 15 seconds the display will revert to your previous " -+"settings." -+msgstr "" -+"您的畫面顯示方向，大小以及更新速率已經更改至新的設定。請確認您是否要保留新的" -+"設定。在 15 秒之後畫面將回復到之前的設定。" - - #: randr.cpp:197 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krdb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krdb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krdb.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krdb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: krdb\n" - "POT-Creation-Date: 2006-05-17 03:54+0200\n" - "PO-Revision-Date: 2005-11-08 21:12+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -18,7 +18,8 @@ - "# created by KDE, %1\n" - "#\n" - "# If you do not want KDE to override your GTK settings, select\n" --"# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" -+"# Appearance & Themes -> Colors in the Control Center and disable the " -+"checkbox\n" - "# \"Apply colors to non-KDE applications\"\n" - "#\n" - "#\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kreadconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kreadconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kreadconfig.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kreadconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: kreadconfig\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-08 21:27+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh_l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krunapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/krunapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/krunapplet.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/krunapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -4,7 +4,7 @@ - "Project-Id-Version: krunapplet\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-08 21:28+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,11 +31,12 @@ - msgid "" - "Unable to log out properly.\n" - "The session manager cannot be contacted. You can try to force a shutdown by " --"pressing Ctrl+Alt+Backspace. Note, however, that your current session will not " --"be saved with a forced shutdown." -+"pressing Ctrl+Alt+Backspace. Note, however, that your current session will " -+"not be saved with a forced shutdown." - msgstr "" - "無法正確登出。\n" --"無法連繫工作階段管理員。您可以嘗試按下 Ctrl+Alt+Backspace 以嘗試強制關閉。注意，強制關閉將無法儲存您目前的工作階段。" -+"無法連繫工作階段管理員。您可以嘗試按下 Ctrl+Alt+Backspace 以嘗試強制關閉。注" -+"意，強制關閉將無法儲存您目前的工作階段。" - - #: runapplet.cpp:268 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kscreensaver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kscreensaver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kscreensaver.po 2007-05-14 12:22:55.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kscreensaver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kscreensaver\n" - "POT-Creation-Date: 2007-01-26 02:37+0100\n" - "PO-Revision-Date: 2005-11-08 21:47+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksmserver.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksmserver.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksmserver.po 2007-05-14 12:22:55.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksmserver.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: ksmserver\n" - "POT-Creation-Date: 2007-03-07 02:42+0100\n" - "PO-Revision-Date: 2007-03-13 14:26+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -77,14 +76,42 @@ - - #: shutdowndlg.cpp:136 - msgid "&Turn Off Computer" --msgstr "關閉電腦 (&T)" -+msgstr "關閉電腦(&T)" - - #: shutdowndlg.cpp:144 - msgid "&Restart Computer" --msgstr "重新啟動電腦 (&R)" -+msgstr "重新啟動電腦(&R)" - - #: shutdowndlg.cpp:164 - msgid "" - "_: current option in boot loader\n" - " (current)" --msgstr " (current)" -+msgstr " (當前)" -+ -+#: shutdowndlg.cpp:321 -+msgid "Log out" -+msgstr "登出" -+ -+#: shutdowndlg.cpp:423 -+msgid "&Suspend" -+msgstr "懸置(&S)" -+ -+#: shutdowndlg.cpp:444 -+msgid "&Hibernate" -+msgstr "休眠(&H)" -+ -+#: shutdowndlg.cpp:461 -+msgid "&Restart" -+msgstr "重新啟動(&R)" -+ -+#: shutdowndlg.cpp:496 -+msgid "&Turn Off" -+msgstr "關機(&T)" -+ -+#: shutdowndlg.cpp:561 -+msgid "&Suspend Computer" -+msgstr "懸置電腦(&S)" -+ -+#: shutdowndlg.cpp:569 -+msgid "&Hibernate Computer" -+msgstr "休眠電腦(&H)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplash.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplash.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplash.po 2006-10-01 18:34:17.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplash.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: ksplash\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-08-14 14:26+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -45,7 +44,7 @@ - - #: main.cpp:34 - msgid "Override theme" --msgstr "覆蓋佈景主題" -+msgstr "覆蓋布景主題" - - #: main.cpp:35 - msgid "Do not attempt to start DCOP server" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplashthemes.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplashthemes.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksplashthemes.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksplashthemes.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: ksplashthemes\n" - "POT-Creation-Date: 2006-08-24 02:34+0200\n" - "PO-Revision-Date: 2006-08-14 14:27+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,7 +28,7 @@ - - #: installer.cpp:107 - msgid "Add..." --msgstr "加入..." -+msgstr "加入…" - - #: installer.cpp:115 - msgid "Test" -@@ -41,11 +40,11 @@ - - #: installer.cpp:307 - msgid "Failed to remove theme '%1'" --msgstr "移除佈景主題「%1」失敗" -+msgstr "移除布景主題「%1」失敗" - - #: installer.cpp:332 installer.cpp:397 - msgid "(Could not load theme)" --msgstr "(無法載入佈景主題)" -+msgstr "(無法載入布景主題)" - - #: installer.cpp:364 - msgid "Name: %1
                                " -@@ -74,11 +73,11 @@ - - #: installer.cpp:379 - msgid "This theme requires the plugin %1 which is not installed." --msgstr "這個佈景主題需要的外掛程式 %1 尚未安裝。" -+msgstr "這個布景主題需要的外掛程式 %1 尚未安裝。" - - #: installer.cpp:386 - msgid "Could not load theme configuration file." --msgstr "無法載入佈景主題組態檔案。" -+msgstr "無法載入布景主題組態檔案。" - - #: installer.cpp:406 - msgid "No preview available." -@@ -86,11 +85,11 @@ - - #: installer.cpp:420 - msgid "KSplash Theme Files" --msgstr "KSplash 佈景主題檔案" -+msgstr "KSplash 布景主題檔案" - - #: installer.cpp:421 - msgid "Add Theme" --msgstr "加入佈景主題" -+msgstr "加入布景主題" - - #: installer.cpp:474 - msgid "Unable to start ksplashsimple." -@@ -102,7 +101,7 @@ - - #: main.cpp:57 - msgid "&Theme Installer" --msgstr "佈景主題安裝程式(&T)" -+msgstr "布景主題安裝程式(&T)" - - #: main.cpp:64 - msgid "KDE splash screen theme manager" -@@ -118,7 +117,7 @@ - - #: main.cpp:71 - msgid "KDE Theme Manager authors" --msgstr "KDE 佈景主題管理程式作者" -+msgstr "KDE 布景主題管理程式作者" - - #: main.cpp:71 - msgid "Original installer code" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstart.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kstart.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstart.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kstart.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,7 +10,7 @@ - "Project-Id-Version: kstart\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-11-09 19:07+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -122,7 +122,8 @@ - #: kstart.cpp:290 - msgid "" - "Utility to launch applications with special window properties \n" --"such as iconified, maximized, a certain virtual desktop, a special decoration\n" -+"such as iconified, maximized, a certain virtual desktop, a special " -+"decoration\n" - "and so on." - msgstr "" - "用來啟動特殊視窗內容的啟動程式工具\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstyle_keramik_config.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kstyle_keramik_config.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kstyle_keramik_config.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kstyle_keramik_config.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kstyle_keramik_config\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-20 16:22+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksysguard.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksysguard.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksysguard.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksysguard.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: ksysguard\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2006-12-06 10:00+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +30,8 @@ - msgid "" - "The file %1 does not contain a valid worksheet definition, which must have a " - "document type 'KSysGuardWorkSheet'." --msgstr "檔案 %1 不包含有效的工作表定義，其中必須有“KsysGuardWorkSheet”的文件類型。" -+msgstr "" -+"檔案 %1 不包含有效的工作表定義，其中必須有“KsysGuardWorkSheet”的文件類型。" - - #: WorkSheet.cc:125 - msgid "The file %1 has an invalid worksheet size." -@@ -139,9 +139,11 @@ - - #: ksgrd/HostConnector.cc:77 - msgid "" --"Select this if you want to connect to a ksysguard daemon that is running on the " --"machine you want to connect to, and is listening for client requests." --msgstr "如果您想要連線到在您要連接的機器上執行並聽取客戶端要求ksysguard 伺服程式，請選擇此項。" -+"Select this if you want to connect to a ksysguard daemon that is running on " -+"the machine you want to connect to, and is listening for client requests." -+msgstr "" -+"如果您想要連線到在您要連接的機器上執行並聽取客戶端要求ksysguard 伺服程式，請" -+"選擇此項。" - - #: ksgrd/HostConnector.cc:80 - msgid "Custom command" -@@ -219,7 +221,7 @@ - - #: ksgrd/StyleSettings.cc:91 - msgid "Change Color..." --msgstr "改變顏色..." -+msgstr "改變顏色…" - - #: ksgrd/StyleSettings.cc:166 - #, c-format -@@ -579,7 +581,9 @@ - msgid "" - "This is your work space. It holds your worksheets. You need to create a new " - "worksheet (Menu File->New) before you can drag sensors here." --msgstr "這是您的工作空間。他保存您的工作表。在您能拖曳新的偵測器前， 您必須建立新的工作表（選單 檔案 -> 新增）。" -+msgstr "" -+"這是您的工作空間。他保存您的工作表。在您能拖曳新的偵測器前， 您必須建立新的工" -+"作表（選單 檔案 -> 新增）。" - - #: Workspace.cc:105 ksysguard.cc:176 - msgid "Process Table" -@@ -804,7 +808,7 @@ - - #: SensorDisplayLib/ProcessList.cc:825 - msgid "Renice Process..." --msgstr "調整程序優先值..." -+msgstr "調整程序優先值…" - - #: SensorDisplayLib/ProcessList.cc:873 - msgid "" -@@ -850,8 +854,8 @@ - #: SensorDisplayLib/DancingBarsSettings.cc:67 - #: SensorDisplayLib/FancyPlotterSettings.cc:95 - msgid "" --"Enter the minimum value for the display here. If both values are 0, automatic " --"range detection is enabled." -+"Enter the minimum value for the display here. If both values are 0, " -+"automatic range detection is enabled." - msgstr "在這邊輸入顯示的最小值。如果二個數值都是 0 ，將會啟用自動偵測範圍。" - - #: SensorDisplayLib/DancingBarsSettings.cc:71 -@@ -862,8 +866,8 @@ - #: SensorDisplayLib/DancingBarsSettings.cc:75 - #: SensorDisplayLib/FancyPlotterSettings.cc:105 - msgid "" --"Enter the maximum value for the display here. If both values are 0, automatic " --"range detection is enabled." -+"Enter the maximum value for the display here. If both values are 0, " -+"automatic range detection is enabled." - msgstr "在這邊輸入顯示的最大值。如果二個數值都是 0 ，將會啟用自動偵測範圍。" - - #. i18n: file ./SensorDisplayLib/MultiMeterSettingsWidget.ui line 61 -@@ -927,10 +931,12 @@ - - #: SensorDisplayLib/DancingBarsSettings.cc:154 - msgid "" --"This determines the size of the font used to print a label underneath the bars. " --"Bars are automatically suppressed if text becomes too large, so it is advisable " --"to use a small font size here." --msgstr "這個會偵測顯示在長條圖下面的字型大小。如果字型太大的話長條圖將會自動隱藏，所以我們建議你使用較小的字型大小。" -+"This determines the size of the font used to print a label underneath the " -+"bars. Bars are automatically suppressed if text becomes too large, so it is " -+"advisable to use a small font size here." -+msgstr "" -+"這個會偵測顯示在長條圖下面的字型大小。如果字型太大的話長條圖將會自動隱藏，所" -+"以我們建議你使用較小的字型大小。" - - #: SensorDisplayLib/DancingBarsSettings.cc:161 - #: SensorDisplayLib/FancyPlotterSettings.cc:224 -@@ -964,7 +970,7 @@ - - #: SensorDisplayLib/DancingBarsSettings.cc:174 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: SensorDisplayLib/DancingBarsSettings.cc:176 - msgid "Push this button to configure the label." -@@ -1022,9 +1028,11 @@ - #: SensorDisplayLib/FancyPlotterSettings.cc:86 - msgid "" - "Check this box if you want the display range to adapt dynamically to the " --"currently displayed values; if you do not check this, you have to specify the " --"range you want in the fields below." --msgstr "如果你想要顯示的範圍自動對應目前能夠顯示的數值，請核取此方塊；如果你沒有核取，那麼你必須在下面的欄位中指定您想要的範圍。" -+"currently displayed values; if you do not check this, you have to specify " -+"the range you want in the fields below." -+msgstr "" -+"如果你想要顯示的範圍自動對應目前能夠顯示的數值，請核取此方塊；如果你沒有核" -+"取，那麼你必須在下面的欄位中指定您想要的範圍。" - - #: SensorDisplayLib/FancyPlotterSettings.cc:111 - msgid "Horizontal Scale" -@@ -1092,7 +1100,7 @@ - msgid "" - "Check this box if horizontal lines should be decorated with the values they " - "mark." --msgstr "如果水平線應該依照其標記的數值來佈置，請核取此方塊。" -+msgstr "如果水平線應該依照其標記的數值來布置，請核取此方塊。" - - #: SensorDisplayLib/FancyPlotterSettings.cc:185 - msgid "Top bar" -@@ -1102,7 +1110,9 @@ - msgid "" - "Check this to active the display title bar. This is probably only useful for " - "applet displays. The bar is only visible if the display is large enough." --msgstr "選取這個以啟動標題列。這大概只有在顯示小程式的時候有用。這個長條只在顯示夠大的時候看的到。" -+msgstr "" -+"選取這個以啟動標題列。這大概只有在顯示小程式的時候有用。這個長條只在顯示夠大" -+"的時候看的到。" - - #. i18n: file ./SensorDisplayLib/MultiMeterSettingsWidget.ui line 206 - #: SensorDisplayLib/FancyPlotterSettings.cc:193 rc.cpp:87 rc.cpp:102 -@@ -1125,7 +1135,7 @@ - - #: SensorDisplayLib/FancyPlotterSettings.cc:242 - msgid "Set Color..." --msgstr "設定色彩..." -+msgstr "設定色彩…" - - #: SensorDisplayLib/FancyPlotterSettings.cc:244 - msgid "Push this button to configure the color of the sensor in the diagram." -@@ -1157,7 +1167,7 @@ - - #: SensorDisplayLib/SensorDisplay.cc:169 - msgid "&Setup Update Interval..." --msgstr "設定更新間隔(&S)..." -+msgstr "設定更新間隔(&S)…" - - #: SensorDisplayLib/SensorDisplay.cc:171 - msgid "&Continue Update" -@@ -1169,15 +1179,14 @@ - - #: SensorDisplayLib/SensorDisplay.cc:240 - msgid "" --"" --"

                                This is a sensor display. To customize a sensor display click and hold the " --"right mouse button on either the frame or the display box and select the " --"Properties entry from the popup menu. Select Remove " -+"

                                This is a sensor display. To customize a sensor display click and " -+"hold the right mouse button on either the frame or the display box and " -+"select the Properties entry from the popup menu. Select Remove " - "to delete the display from the worksheet.

                                %1                                " - msgstr "" --"" --"

                                這是偵測器顯示。要自訂一個偵測器顯示，在外框或顯示方塊上按下並按住滑鼠右鍵並選擇跳出選單中的 內容 項目。選擇 移除 " --"可以從工作表中刪除顯示。

                                %1                                " -+"

                                這是偵測器顯示。要自訂一個偵測器顯示，在外框或顯示方塊上按下並按住滑鼠" -+"右鍵並選擇跳出選單中的 內容 項目。選擇 移除 可以從工作表中刪除" -+"顯示。

                                %1                                " - - #: SensorDisplayLib/SensorLogger.cc:136 - msgid "Logging" -@@ -1207,7 +1216,7 @@ - - #: SensorDisplayLib/SensorLogger.cc:384 - msgid "&Edit Sensor..." --msgstr "編輯偵測器(&E)..." -+msgstr "編輯偵測器(&E)…" - - #: SensorDisplayLib/SensorLogger.cc:396 - msgid "St&op Logging" -@@ -1262,9 +1271,11 @@ - #: SensorDisplayLib/DummyDisplay.cc:38 - msgid "" - "This is an empty space in a worksheet. Drag a sensor from the Sensor Browser " --"and drop it here. A sensor display will appear that allows you to monitor the " --"values of the sensor over time." --msgstr "這是工作表的空白空間。從偵測器瀏覽器拖曳一個偵測器到這邊。偵測器將會出現並讓您可以隨時監控這個偵測器的數值。" -+"and drop it here. A sensor display will appear that allows you to monitor " -+"the values of the sensor over time." -+msgstr "" -+"這是工作表的空白空間。從偵測器瀏覽器拖曳一個偵測器到這邊。偵測器將會出現並讓" -+"您可以隨時監控這個偵測器的數值。" - - #: SensorDisplayLib/ProcessController.cc:54 - msgid "Name" -@@ -1458,7 +1469,7 @@ - #: rc.cpp:150 - #, no-c-format - msgid "Select Font..." --msgstr "選擇字型..." -+msgstr "選擇字型…" - - #. i18n: file ./SensorDisplayLib/LogFileSettings.ui line 199 - #: rc.cpp:153 -@@ -1518,15 +1529,16 @@ - - #: KSysGuardApplet.cc:242 KSysGuardApplet.cc:394 - msgid "" --"The KSysGuard applet does not support displaying of this type of sensor. Please " --"choose another sensor." -+"The KSysGuard applet does not support displaying of this type of sensor. " -+"Please choose another sensor." - msgstr "KSysGuard 小程式不支援此類型偵測器的顯示。請選擇其他偵測器。" - - #: KSysGuardApplet.cc:334 - msgid "" - "The file %1 does not contain a valid applet definition, which must have a " - "document type 'KSysGuardApplet'." --msgstr "檔案 %1 不包含有效的工作表定義，其中必須有“KSysGuardApplet”的文件類型。" -+msgstr "" -+"檔案 %1 不包含有效的工作表定義，其中必須有“KSysGuardApplet”的文件類型。" - - #: KSysGuardApplet.cc:488 - msgid "Drag sensors from the KDE System Guard into this cell." -@@ -1546,14 +1558,15 @@ - - #: SensorBrowser.cc:88 - msgid "" --"The sensor browser lists the connected hosts and the sensors that they provide. " --"Click and drag sensors into drop zones of a worksheet or the panel applet. A " --"display will appear that visualizes the values provided by the sensor. Some " --"sensor displays can display values of multiple sensors. Simply drag other " --"sensors on to the display to add more sensors." -+"The sensor browser lists the connected hosts and the sensors that they " -+"provide. Click and drag sensors into drop zones of a worksheet or the panel " -+"applet. A display will appear that visualizes the values provided by the " -+"sensor. Some sensor displays can display values of multiple sensors. Simply " -+"drag other sensors on to the display to add more sensors." - msgstr "" --"偵測器瀏覽器列出目前連線的主機與他們所提供的偵測器。拖曳偵測器到工作表或面板小程式。顯示器將出現偵測器並提供視覺化顯示的數值。有些偵測器顯示可以顯示多個偵測器的" --"數值。只要拖曳其他的偵測器到顯示器上便可以增加偵測器。" -+"偵測器瀏覽器列出目前連線的主機與他們所提供的偵測器。拖曳偵測器到工作表或面板" -+"小程式。顯示器將出現偵測器並提供視覺化顯示的數值。有些偵測器顯示可以顯示多個" -+"偵測器的數值。只要拖曳其他的偵測器到顯示器上便可以增加偵測器。" - - #: SensorBrowser.cc:148 - msgid "Drag sensors to empty fields in a worksheet." -@@ -1581,15 +1594,15 @@ - - #: ksysguard.cc:108 - msgid "&New Worksheet..." --msgstr "新增工作表(&N)..." -+msgstr "新增工作表(&N)…" - - #: ksysguard.cc:111 - msgid "Import Worksheet..." --msgstr "匯入工作表..." -+msgstr "匯入工作表…" - - #: ksysguard.cc:114 - msgid "&Import Recent Worksheet" --msgstr "匯入最近的工作表(&I)..." -+msgstr "匯入最近的工作表(&I)…" - - #: ksysguard.cc:117 - msgid "&Remove Worksheet" -@@ -1597,11 +1610,11 @@ - - #: ksysguard.cc:120 - msgid "&Export Worksheet..." --msgstr "匯出工作表(&E)..." -+msgstr "匯出工作表(&E)…" - - #: ksysguard.cc:125 - msgid "C&onnect Host..." --msgstr "連接主機(&O)..." -+msgstr "連接主機(&O)…" - - #: ksysguard.cc:127 - msgid "D&isconnect Host" -@@ -1617,7 +1630,7 @@ - - #: ksysguard.cc:140 - msgid "Configure &Style..." --msgstr "設定風格(&S)..." -+msgstr "設定風格(&S)…" - - #: ksysguard.cc:157 - msgid "Do you really want to restore the default worksheets?" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystemtrayapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystemtrayapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystemtrayapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystemtrayapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -3,7 +3,7 @@ - "Project-Id-Version: ksystemtrayapplet\n" - "POT-Creation-Date: 2008-08-14 01:16+0200\n" - "PO-Revision-Date: 2005-11-09 21:53+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh_l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -23,7 +23,7 @@ - - #: systemtrayapplet.cpp:726 - msgid "Configure System Tray..." --msgstr "設定系統匣..." -+msgstr "設定系統匣…" - - #~ msgid "Lock the desktop" - #~ msgstr "鎖定桌面" -@@ -35,4 +35,4 @@ - #~ msgstr "鎖住螢幕" - - #~ msgid "&Logout..." --#~ msgstr "登出(&L)..." -+#~ msgstr "登出(&L)…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystraycmd.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystraycmd.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ksystraycmd.po 2006-10-01 18:34:18.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ksystraycmd.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: ksystraycmd\n" - "POT-Creation-Date: 2006-08-12 04:01+0200\n" - "PO-Revision-Date: 2006-01-24 15:40+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -15,10 +14,8 @@ - "X-Generator: KBabel 1.10.2\n" - - #: ksystraycmd.cpp:60 --msgid "" --"No window matching pattern '%1' and no command specified.\n" --msgstr "" --"沒有視窗符合樣式 %1，也沒有指定命令。\n" -+msgid "No window matching pattern '%1' and no command specified.\n" -+msgstr "沒有視窗符合樣式 %1，也沒有指定命令。\n" - - #: ksystraycmd.cpp:67 - msgid "KSysTrayCmd: KShellProcess cannot find a shell." -@@ -80,7 +77,8 @@ - msgid "" - "Keep the tray icon even if the client exits. This option\n" - "has no effect unless startonshow is specified." --msgstr "即使客戶端離開也保持在系統閘。除非指定 startonshow 否則此選項不會發生作用。" -+msgstr "" -+"即使客戶端離開也保持在系統閘。除非指定 startonshow 否則此選項不會發生作用。" - - #: main.cpp:39 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kthememanager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kthememanager.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kthememanager.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kthememanager.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,14 +1,14 @@ - # Chinese/Traditional translation of kthememanager. - # Woodman Tuen , 2005. --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: kthememanager\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-25 14:31+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,62 +28,62 @@ - - #: knewthemedlg.cpp:28 - msgid "New Theme" --msgstr "新增佈景主題" -+msgstr "新增布景主題" - - #: kthememanager.cpp:49 - msgid "KDE Theme Manager" --msgstr "KDE 佈景主題管理員" -+msgstr "KDE 布景主題管理員" - - #: kthememanager.cpp:50 kthememanager.cpp:56 - msgid "" - "This control module handles installing, removing and creating visual KDE " - "themes." --msgstr "本處控制模組負責安裝、移除及建立 KDE 視覺佈景主題。" -+msgstr "本處控制模組負責安裝、移除及建立 KDE 視覺布景主題。" - - #: kthememanager.cpp:219 - msgid "Theme Files" --msgstr "佈景主題檔案" -+msgstr "布景主題檔案" - - #: kthememanager.cpp:220 - msgid "Select Theme File" --msgstr "選取佈景主題檔案" -+msgstr "選取布景主題檔案" - - #: kthememanager.cpp:254 - msgid "Do you really want to remove the theme %1?" --msgstr "您真的要移除佈景主題 %1？" -+msgstr "您真的要移除布景主題 %1？" - - #: kthememanager.cpp:255 - msgid "Remove Theme" --msgstr "移除佈景主題" -+msgstr "移除布景主題" - - #: kthememanager.cpp:277 - msgid "My Theme" --msgstr "我的佈景主題" -+msgstr "我的布景主題" - - #: kthememanager.cpp:288 - msgid "Theme %1 already exists." --msgstr "佈景主題 %1 已經存在。" -+msgstr "布景主題 %1 已經存在。" - - #: kthememanager.cpp:308 - #, c-format - msgid "Your theme has been successfully created in %1." --msgstr "您的佈景主題成功在 %1 建立。" -+msgstr "您的布景主題成功在 %1 建立。" - - #: kthememanager.cpp:309 - msgid "Theme Created" --msgstr "佈景主題已建立" -+msgstr "布景主題已建立" - - #: kthememanager.cpp:311 - msgid "An error occurred while creating your theme." --msgstr "建位您的佈景主題時發生錯誤。" -+msgstr "建位您的布景主題時發生錯誤。" - - #: kthememanager.cpp:312 - msgid "Theme Not Created" --msgstr "佈景主題沒有建立" -+msgstr "布景主題沒有建立" - - #: kthememanager.cpp:339 - msgid "This theme does not contain a preview." --msgstr "這佈景主題不包含預覽。" -+msgstr "這布景主題不包含預覽。" - - #: kthememanager.cpp:344 - msgid "Author: %1
                                Email: %2
                                Version: %3
                                Homepage: %4" -@@ -93,13 +93,13 @@ - #: rc.cpp:3 - #, no-c-format - msgid "Choose your visual KDE theme:" --msgstr "選擇您的 KDE 視覺佈景主題：" -+msgstr "選擇您的 KDE 視覺布景主題：" - - #. i18n: file kthemedlg.ui line 75 - #: rc.cpp:6 - #, no-c-format - msgid "Get new themes..." --msgstr "取得新的佈景主題....." -+msgstr "取得新的布景主題….." - - #. i18n: file kthemedlg.ui line 78 - #: rc.cpp:9 -@@ -111,37 +111,37 @@ - #: rc.cpp:12 - #, no-c-format - msgid "Go to the KDE themes website" --msgstr "前往 KDE 佈景主題網站" -+msgstr "前往 KDE 布景主題網站" - - #. i18n: file kthemedlg.ui line 121 - #: rc.cpp:15 - #, no-c-format - msgid "&Remove Theme" --msgstr "移除佈景主題(&R)" -+msgstr "移除布景主題(&R)" - - #. i18n: file kthemedlg.ui line 129 - #: rc.cpp:18 - #, no-c-format - msgid "Create &New Theme..." --msgstr "建立新的佈景主題(&N)..." -+msgstr "建立新的布景主題(&N)…" - - #. i18n: file kthemedlg.ui line 137 - #: rc.cpp:21 - #, no-c-format - msgid "&Install New Theme..." --msgstr "安裝新的佈景主題(&I)..." -+msgstr "安裝新的布景主題(&I)…" - - #. i18n: file kthemedlg.ui line 143 - #: rc.cpp:24 - #, no-c-format - msgid "Theme" --msgstr "佈景主題" -+msgstr "布景主題" - - #. i18n: file kthemedlg.ui line 191 - #: rc.cpp:27 - #, no-c-format - msgid "Customize your theme:" --msgstr "自訂您的佈景主題：" -+msgstr "自訂您的布景主題：" - - #. i18n: file kthemedlg.ui line 236 - #: rc.cpp:30 -@@ -189,13 +189,13 @@ - #: rc.cpp:51 - #, no-c-format - msgid "Customize the icon theme" --msgstr "自訂圖示佈景" -+msgstr "自訂圖示布景" - - #. i18n: file kthemedlg.ui line 399 - #: rc.cpp:57 - #, no-c-format - msgid "Customize the font theme" --msgstr "自訂字型佈景" -+msgstr "自訂字型布景" - - #. i18n: file kthemedlg.ui line 436 - #: rc.cpp:60 -@@ -213,7 +213,7 @@ - #: rc.cpp:66 - #, no-c-format - msgid "&Theme name:" --msgstr "佈景主題名稱(&T)" -+msgstr "布景主題名稱(&T)" - - #. i18n: file newthemewidget.ui line 36 - #: rc.cpp:69 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ktip.po kde-i18n-zh_TW-3.5.10/messages/kdebase/ktip.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/ktip.po 2007-01-15 10:56:32.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/ktip.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: ktip\n" - "POT-Creation-Date: 2006-11-23 02:35+0100\n" - "PO-Revision-Date: 2006-11-24 16:33+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -110,8 +109,8 @@ - "thus reach the desktop itself by clicking on the desktop icon on the\n" - "panel.

                                \n" - "

                                If you do not currently have the icon there, you can add it by right " --"clicking on the panel, and then selecting Add to Panel->Special Button->" --"Desktop Access.\n" -+"clicking on the panel, and then selecting Add to Panel->Special Button-" -+">Desktop Access.\n" - "
                                \n" - "

                                \n" - "\n" -@@ -121,7 +120,8 @@ - "您可以馬上最小化所有目前在桌面上的視窗\n" - "並且藉著按下面板上的桌面圖示可以馬上顯示\n" - "桌面。

                                \n" --"

                                如果您目前還看不到該按鈕，您可以在面板上按滑鼠右鍵並選擇「加入至面板->特殊按鈕->顯示桌面」來加入它。\n" -+"

                                如果您目前還看不到該按鈕，您可以在面板上按滑鼠右鍵並選擇「加入至面板->特殊" -+"按鈕->顯示桌面」來加入它。\n" - "
                                \n" - "

                                \n" - "\n" -@@ -164,9 +164,11 @@ - "
                                \n" - msgstr "" - "

                                \n" --"預設會在進入 KDE 時自動啟動且會在面板右端的系統匣停留的應用程式 Klipper，會保留一些已選擇的文字區域。這些文字可以擷取來使用甚至（例如在 URL " --"的情況下）執行。

                                \n" --"

                                您可以在Klipper 手冊找到更多關於使用 Klipper 的資訊

                                \n" -+"預設會在進入 KDE 時自動啟動且會在面板右端的系統匣停留的應用程式 Klipper，會保" -+"留一些已選擇的文字區域。這些文字可以擷取來使用甚至（例如在 URL 的情況下）執" -+"行。

                                \n" -+"

                                您可以在Klipper 手冊找到更多關於使用 " -+"Klipper 的資訊

                                \n" - "
                                \n" - "
                                \n" - "\n" -@@ -177,8 +179,7 @@ - "

                                \n" - "The window list, which is accessible via an icon on the panel, provides a\n" - "quick overview of all windows on all virtual desktops. Alternatively,\n" --"press Alt+F5 to display the window list.

                                " --"
                                \n" -+"press Alt+F5 to display the window list.


                                \n" - "
                                \n" - "\n" - "
                                \n" -@@ -186,8 +187,7 @@ - "

                                \n" - "可經由面板上的圖示來使用的視窗列表，它能\n" - "提供所有虛擬桌面上所有視窗的快速檢視。另外，\n" --"按 Alt+F5 可以顯示視窗列表。

                                " --"
                                \n" -+"按 Alt+F5 可以顯示視窗列表。


                                \n" - "
                                \n" - "\n" - "
                                \n" -@@ -211,10 +211,8 @@ - "\"print:/manager\"... -- \"Type where?\",\n" - " you may ask. Type it...

                                \n" - "
                                  \n" --" " --"
                                • ...either in Konqueror's address field,
                                  • \n" --" " --"
                                • ...or in a Run Command dialog,\n" -+"
                                • ...either in Konqueror's address field,
                                  • \n" -+"
                                • ...or in a Run Command dialog,\n" - " opened by pressing Alt+F2.
                                  • \n" - "
                                \n" - "

                                \n" -@@ -226,10 +224,8 @@ - "「print:/manager」... -- 您會問：\n" - "「在哪裡輸入？」，您可以輸入到...

                                \n" - "
                                  \n" --" " --"
                                • ...可以是 Konqueror 的 位址欄 ，
                                  • \n" --" " --"
                                • ...或者是 執行命令 對話盒，\n" -+"
                                • ...可以是 Konqueror 的 位址欄 ，
                                  • \n" -+"
                                • ...或者是 執行命令 對話盒，\n" - " 可以用按 [Alt+F2]開啟之。
                                  • \n" - "
                                \n" - "

                                \n" -@@ -242,31 +238,28 @@ - "

                                \n" - "Double-clicking on the titlebar of any window \"shades\" it, which means\n" - "that only the titlebar stays visible. Double-clicking the titlebar a\n" --"second time will make the window visible again." --"
                                \n" -+"second time will make the window visible again.
                                \n" - "Of course, you can change this behavior within the Control Center.\n" - "

                                \n" - "

                                For more information about ways to manipulate windows in KDE, take\n" --"a look at " --"the KDE User Guide.

                                \n" -+"a look at the KDE User Guide.

                                \n" - msgstr "" - "

                                \n" - "雙擊任何視窗的標題列可以「遮蓋」視窗，\n" - "亦即只有標題列是看得到的。再次雙擊標題列\n" --"會令視窗再次出現。" --"
                                \n" -+"會令視窗再次出現。
                                \n" - "當然，你可以使用控制中心來改變這個行為模式。\n" - "

                                \n" - "

                                需要更多關於在 KDE 中管理視窗的資訊，請查閱\n" --"KDE 使用者指南" --"。

                                \n" -+"KDE 使用者指" -+"南。

                                \n" - - #: tips.cpp:127 - msgid "" - "

                                \n" - "You can cycle through the windows on a virtual desktop by holding the\n" --"Alt key and pressing Tab or Shift+Tab.

                                " --"
                                \n" -+"Alt key and pressing Tab or Shift+Tab.


                                \n" - "

                                \n" - "

                                For more information, see the KDE\n" -@@ -274,8 +267,7 @@ - msgstr "" - "

                                \n" - "你可以藉著按住 Alt 鍵然後按 Tab 鍵或 Shift+Tab 鍵\n" --"來輪流切換同一個虛擬桌面上的視窗。

                                " --"
                                \n" -+"來輪流切換同一個虛擬桌面上的視窗。


                                \n" - "

                                \n" - "

                                需要更多資訊，請查閱 KDE\n" -@@ -284,7 +276,8 @@ - #: tips.cpp:138 - msgid "" - "

                                \n" --"You can assign keyboard shortcuts to your favorite applications in the\n" -+"You can assign keyboard shortcuts to your favorite applications in " -+"the\n" - "KDE menu editor (K-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" -@@ -304,8 +297,8 @@ - "of desktops\" slider in the Control Center (Desktop->Multiple Desktops).\n" - "

                                \n" - "

                                For more information about using virtual desktops, look at the\n" -+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-" -+"desktops\">the\n" - "KDE User Guide.

                                \n" - msgstr "" - "

                                \n" -@@ -313,15 +306,16 @@ - "的數目」滑動鈕來設定虛擬桌面的數目。\n" - "

                                \n" - "

                                需要更多關於使用虛擬桌面的資訊，請查閱\n" -+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-" -+"desktops\">\n" - "KDE 使用者指南。

                                \n" - - #: tips.cpp:159 - msgid "" - "

                                The KDE project was founded in October 1996 and had its first release,\n" - "1.0, on July 12, 1998.

                                \n" --"

                                You can support the KDE project with work (programming, designing,\n" -+"

                                You can support the KDE project with work (programming, " -+"designing,\n" - "documenting, proof-reading, translating, etc.) and financial or\n" - "hardware donations. Please contact kde-ev@kde.org\n" -@@ -341,41 +335,25 @@ - #: tips.cpp:172 - msgid "" - "

                                KDE provides some shortcuts to change the size of a window:

                                \n" --"
                          YYYY含世紀數值的年份。
                          YY不含世紀數值的年份 (00-99)。
                          MM使用二位數顯示月份 (01-12)。
                          mM使用數字顯示月份 (1-12)。
                          SHORTMONTH使用月份名稱的前三個字元顯示月份。
                          MONTH使用完整月份名稱顯示月份。
                          DD使用二位數字顯示每月日數 (01-31)。
                          dD使用數字顯示每月日數 (1-31)。
                          SHORTWEEKDAY使用星期名稱的前三個字元顯示星期。
                          WEEKDAY使用完整星期名稱顯示星期。
                          " --"\n" --"\t" --"\n" --"" --"\n" --"\t\t" --"\n" --"" --"\n" --"\t" --"\n" --"" --"\n" --"\t" --"\n" -+"
                          To maximize a window...click the maximize button...
                          ...full-screen,...with the left mouse button
                          ...vertically only,...with the middle mouse button
                          ...horizontally only,...with the right mouse button
                          \n" -+"\t\n" -+"\n" -+"\t\t\n" -+"\n" -+"\t\n" -+"\n" -+"\t\n" - "
                          To maximize a window...click the maximize button...
                          ...full-screen,...with the left mouse button
                          ...vertically only,...with the middle mouse button
                          ...horizontally only,...with the right mouse button
                          \n" - msgstr "" - "

                          KDE 提供了一些鍵盤捷徑來改變視窗的大小：

                          \n" --"" --"\n" --"\t" --"\n" --"" --"\n" --"\t\t" --"\n" --"" --"\n" --"\t" --"\n" --"" --"\n" --"\t" --"\n" -+"
                          要將視窗最大化...按下最大化按鈕...
                          ...佔滿整個螢幕，...使用左滑鼠鍵
                          ...只是垂直方向，...使用中滑鼠鍵
                          ...只是水平方向，...使用右滑鼠鍵
                          \n" -+"\t\n" -+"\n" -+"\t\t\n" -+"\n" -+"\t\n" -+"\n" -+"\t\n" - "
                          要將視窗最大化...按下最大化按鈕...
                          ...佔滿整個螢幕，...使用左滑鼠鍵
                          ...只是垂直方向，...使用中滑鼠鍵
                          ...只是水平方向，...使用右滑鼠鍵
                          \n" - - #: tips.cpp:186 -@@ -457,16 +435,14 @@ - "language well suited to desktop development. The KDE object model\n" - "extends the power of C++ even further. See\n" - " http://developer.kde.org/\n" --"for details.

                          " --"
                          \n" -+"for details.


                          \n" - "
                          \n" - msgstr "" - "

                          \n" - "KDE 是建立在設計良好的 C++ 基礎上。C++ 是一個很適合桌面開發的\n" - "程式語言。KDE 的物件模組更進一步的擴充 C++ 的功能。詳情請見 \n" - "http://developer.kde.org/。\n" --"

                          " --"
                          \n" -+"


                          \n" - "
                          \n" - - #: tips.cpp:239 -@@ -487,16 +463,16 @@ - "You can cycle through the virtual desktops by holding the Ctrl key and\n" - "pressing Tab or Shift+Tab.

                          \n" - "

                          For more information about using virtual desktops, look at the\n" -+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-" -+"desktops\">the\n" - "KDE User Guide.

                          \n" - msgstr "" - "

                          \n" - "您可以按住 Ctrl 鍵並按下 Tab 或 Shift+Tab 來循迴\n" - "各虛擬桌面。

                          \n" - "

                          需要更多使用虛擬桌面的相關資訊，請查閱 \n" -+"href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-" -+"desktops\">\n" - "KDE 使用者指南。

                          \n" - - #: tips.cpp:257 -@@ -585,19 +561,18 @@ - #: tips.cpp:309 - msgid "" - "

                          \n" --"Need comprehensive info about KDEPrinting?" --"

                          \n" -+"Need comprehensive info about KDEPrinting?

                          \n" - "

                          Type help:/kdeprint/ into a Konqueror address field\n" - "and get the\n" --" " --"KDEPrint Handbook\n" --"displayed.

                          " --"

                          This, plus more material (like a\n" -+" KDEPrint " -+"Handbook\n" -+"displayed.

                          This, plus more material (like a\n" - " FAQ, various\n" --" Tutorials,\n" -+" Tutorials,\n" - "a \"TipsNTricks\" section and the\n" --" " --"kdeprint mailing list)\n" -+" kdeprint " -+"mailing list)\n" - " are available at\n" - "printing.kde.org...\n" - "

                          \n" -@@ -605,18 +580,17 @@ - "\n" - msgstr "" - "

                          \n" --"需要更多關於 KDEPrinting 的資訊？" --"

                          \n" -+"需要更多關於 KDEPrinting 的資訊？

                          \n" - "

                          在 Konqueror 位址欄輸入 help:/kdeprint/\n" - "就可以看到\n" --" KDEPrint 手冊\n" --"

                          " --"

                          更多的資料（如\n" -+" KDEPrint 手冊\n" -+"

                          更多的資料（如\n" - " FAQ ，各種的\n" - " 教學，\n" - "「TipsNTricks」文件和\n" --" kdeprint 通信論壇" --"）\n" -+" kdeprint 通信論" -+"壇）\n" - "可以在printing.kde.org...找到\n" - "

                          \n" - "
                          \n" -@@ -650,14 +624,12 @@ - msgid "" - "

                          \n" - "If you need to kill some time, KDE comes with an extensive collection\n" --"of games.

                          " --"
                          \n" -+"of games.


                          \n" - "
                          \n" - "\n" - msgstr "" - "

                          \n" --"如果想消磨時間，可以玩附隨 KDE 的大量遊戲。

                          " --"
                          \n" -+"如果想消磨時間，可以玩附隨 KDE 的大量遊戲。


                          \n" - "
                          \n" - "\n" - -@@ -667,7 +639,8 @@ - "desktop by dragging a graphics image from a Konqueror window to the\n" - "desktop background.

                          \n" - msgstr "" --"

                          由 Konqueror 視窗拖曳圖像到桌面背景可快速改變背景圖像。

                          \n" -+"

                          由 Konqueror 視窗拖曳圖像到桌面背景可快速改變背景圖像。\n" - - #: tips.cpp:360 - msgid "" -@@ -682,8 +655,8 @@ - msgid "" - "

                          \n" - "A fast way to get your favorite application onto your panel is to\n" --"right-click the panel (Panel Menu) and select Add to Panel->Application->" --"whatever.\n" -+"right-click the panel (Panel Menu) and select Add to Panel->Application-" -+">whatever.\n" - "

                          \n" - msgstr "" - "

                          \n" -@@ -746,10 +719,10 @@ - #: tips.cpp:409 - msgid "" - "

                          \n" --"If you know its name, you can execute any program by pressing\n" -+"If you know its name, you can execute any program by " -+"pressing\n" - "Alt+F2\n" --"and entering the program name in the command-line window provided." --"

                          \n" -+"and entering the program name in the command-line window provided.

                          \n" - "
                          \n" - "

                          \n" - "\n" -@@ -757,8 +730,7 @@ - "

                          \n" - "如果知道程式名稱，您可以按\n" - " Alt+F2 \n" --"並在提供的命令輸入列視窗內輸入程式名稱來執行任何程式。" --"

                          \n" -+"並在提供的命令輸入列視窗內輸入程式名稱來執行任何程式。

                          \n" - "
                          \n" - "

                          \n" - "\n" -@@ -769,8 +741,7 @@ - "You can browse any URL by pressing\n" - "Alt+F2 and entering the URL in the\n" - "command-line window provided.\n" --"

                          " --"
                          \n" -+"


                          \n" - "
                          \n" - "\n" - msgstr "" -@@ -778,8 +749,7 @@ - "按 Alt+F2 並在提供的\n" - "指令輸入欄視窗內輸入 URL 就可以\n" - "瀏覽任何 URL。\n" --"

                          " --"
                          \n" -+"


                          \n" - "
                          \n" - "\n" - -@@ -805,16 +775,14 @@ - "You can access a man page by entering a\n" - "hash mark (#) and the name of the man page wherever you can enter\n" - "a URL, like in the location field of the web browser or the\n" --"Alt+F2 command-line.

                          " --"
                          \n" -+"Alt+F2 command-line.


                          \n" - "
                          \n" - "\n" - msgstr "" - "

                          \n" - "只要是能輸入 URL 的地方，例如網頁瀏覽器的位置欄或是 Alt+F2\n" - " 命令列中，輸入井號（#）然後跟隨 man 手冊頁的名稱\n" --"就可以瀏覽 man 手冊頁。

                          " --"
                          \n" -+"就可以瀏覽 man 手冊頁。


                          \n" - "
                          \n" - "\n" - -@@ -843,18 +811,16 @@ - #: tips.cpp:465 - msgid "" - "

                          \n" --"If you cannot access the titlebar, you can still move a window" --"\n" -+"If you cannot access the titlebar, you can still move a window\n" - "on the screen by holding the Alt key, clicking anywhere into the window\n" --"and \"dragging\" it with the mouse.

                          " --"
                          \n" -+"and \"dragging\" it with the mouse.


                          \n" - "

                          Of course, you can change this behavior by using the Control Center.

                          \n" - msgstr "" - "

                          \n" - "如果無法取得標題列，你仍然可以按著 Alt 鍵不放，\n" - "再以滑鼠按下視窗內的任何地方並「拖曳」它來在\n" --"螢幕中移動視窗。

                          " --"
                          \n" -+"螢幕中移動視窗。


                          \n" - "

                          當然，您可以使用控制中心來改變這個行為模式。

                          \n" - - #: tips.cpp:474 -@@ -863,8 +829,8 @@ - "

                          Then use 'kprinter' as \"print command\".\n" - "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n" - " StarOffice, OpenOffice.org, any GNOME application and many more...

                          \n" --"

                          See " --"printing.kde.org\n" -+"

                          See printing." -+"kde.org\n" - "for more detailed hints...\n" - "

                          \n" - "
                          \n" -@@ -875,8 +841,8 @@ - "

                          那麼就使用「kprinter」做為「列印命令」吧。\n" - "它可以相容 Netscape、Mozilla、Galeon、gv、Acrobat Reader、\n" - "StarOffice、OpenOffice.org，任何 GNOME 程式以及更多...

                          \n" --"

                          查閱 " --"printing.kde.org \n" -+"

                          查閱 printing." -+"kde.org \n" - "以取得更詳細的提示...\n" - "

                          \n" - "
                          \n" -@@ -886,7 +852,8 @@ - #: tips.cpp:488 - msgid "" - "

                          \n" --"You can resize a window on the screen by holding the Alt key,\n" -+"You can resize a window on the screen by holding the Alt " -+"key,\n" - "right-clicking anywhere into the window and moving the mouse.

                          \n" - msgstr "" - "

                          \n" -@@ -916,21 +883,22 @@ - "Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n" - "Norway!

                          \n" - "

                          \n" --"To see where KDE developers can be found, take a look at worldwide.kde.org.

                          \n" -+"To see where KDE developers can be found, take a look at worldwide.kde.org.

                          \n" - msgstr "" - "

                          \n" --"您會發現 KDE 的開發者偏佈全世界，例如：在德國、\n" -+"您會發現 KDE 的開發者偏布全世界，例如：在德國、\n" - "瑞典、法國、加拿大、美國、澳州、納米比亞、阿根廷，\n" - "甚至是挪威！

                          \n" - "

                          \n" --"要知道哪裡可以找到 KDE 開發者，請查閱worldwide.kde.org" --"。

                          \n" -+"要知道哪裡可以找到 KDE 開發者，請查閱worldwide.kde.org。

                          \n" - - #: tips.cpp:515 - msgid "" - "

                          \n" --"KDE's CD player, KsCD, accesses the Internet CD database freedb to provide you\n" -+"KDE's CD player, KsCD, accesses the Internet CD database freedb to provide " -+"you\n" - "with title/track information.\n" - "

                          \n" - "

                          Full details of KsCD's functions are available in one single\n" - "command.

                          \n" - "
                            \n" --"
                          • Use Alt+F2 for just firing up programs (Alt+F2 \"kword\") " --"or\n" -+"
                          • Use Alt+F2 for just firing up programs (Alt+F2 \"kword" -+"\") or\n" - "
                          • use Konsole sessions (\"New\" in toolbar) if you need text output.\n" - "
                          \n" - msgstr "" -@@ -958,20 +926,21 @@ - "有些人開啟很多終端機視窗只是為了輸入一個指令。

                          \n" - "
                            \n" - "
                          • 使用 Alt+F2 來開啟程式（Alt+F2 \"kword\"）或\n" --"
                          • 如果需要看到輸出結果，使用 Konsole 連線階段（工具列中的「新增」）。
                          \n" -+"
                        • 如果需要看到輸出結果，使用 Konsole 連線階段（工具列中的「新增」）。\n" - - #: tips.cpp:536 - msgid "" - "

                          \n" --"You can change the color of the window titlebars by clicking on the title bar " --"of the\n" -+"You can change the color of the window titlebars by clicking on the title " -+"bar of the\n" - "color example in the Appearance & Themes module within the Control " - "Center.\n" - "

                          \n" - "

                          This works for all of the other available colors too.

                          \n" - msgstr "" - "

                          \n" --"您可以按下控制中心的外觀 & 佈景主題中色彩範例\n" -+"您可以按下控制中心的外觀 & 布景主題中色彩範例\n" - "的標題列來改變視窗標題列的色彩。\n" - "

                          \n" - "

                          這點也可以用在所有其他可用的色彩上。

                          \n" -@@ -979,7 +948,8 @@ - #: tips.cpp:545 - msgid "" - "

                          KDE Command Line Printing (I)

                          \n" --"

                          Want to print from command line, without missing KDE's printing power?

                          \n" -+"

                          Want to print from command line, without missing KDE's printing power?\n" - "

                          Type 'kprinter'. Up pops the\n" - "KDEPrint dialog. Select printer, print options and\n" - "print files (note that you may select different\n" -@@ -1002,11 +972,13 @@ - "

                          \n" - "You may specify print files and/or name a printer from the command line:\n" - "

                          \n"
--"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
--"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
-+"kprinter -d infotec \\\n"
-+"   /home/kurt/paragliding.jpg \\\n"
-+"   ../kdeprint-handbook.pdf \\\n"
-+"   /opt/kde3/flyer.ps\n"
- "
                          \n" --" This prints 3 different files (from different folders) to printer " --"\"infotec\".\n" -+" This prints 3 different files (from different folders) to printer \"infotec" -+"\".\n" - "

                          \n" - "
                          \n" - "\n" -@@ -1016,8 +988,10 @@ - "

                          \n" - "您可以在命令列指定列印檔案和/或為印表機命名：\n" - "

                          \n"
--"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
--"../kdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
-+"kprinter -d infotec \\\n"
-+"   /home/kurt/paragliding.jpg \\\n"
-+"   ../kdeprint-handbook.pdf \\\n"
-+"   /opt/kde3/flyer.ps\n"
- "
                          \n" - " 這樣會利用印表機「infotec」列印三個不同的檔案\n" - "（來自不同的目錄）。\n" -@@ -1034,7 +1008,7 @@ - "Control Center and might implement different features.

                          \n" - msgstr "" - "

                          \n" --"視窗管理程式的款式及舊式佈景的差別在於，前者甚至會從控制台中\n" -+"視窗管理程式的款式及舊式布景的差別在於，前者甚至會從控制臺中\n" - "反映出視窗標題列的顏色設定並可能有不同的功能。

                          \n" - - #: tips.cpp:583 -@@ -1055,18 +1029,16 @@ - msgid "" - "

                          If you want to know when the next release of KDE is planned,\n" - "look for the release schedule on http://developer.kde.org. If you only\n" -+" href=\"http://developer.kde.org/\">http://developer.kde.org. If you " -+"only\n" - "find old release schedules, there will probably be some weeks/months of\n" --"intensive development left before the next release.

                          " --"
                          \n" -+"intensive development left before the next release.


                          \n" - "
                          \n" - msgstr "" - "

                          如果想知道下一個版本的 KDE 會計劃在何時推出，在 \n" - "http://developer.kde.org 中\n" - "就可以找到推出時間表。如果你只找到舊版本的時間表，下個版本可能需時\n" --"數星期或數個月的發展。" --"

                          " --"
                          \n" -+"數星期或數個月的發展。


                          \n" - "

                          \n" - - #: tips.cpp:602 -@@ -1103,27 +1075,25 @@ - msgid "" - "

                          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" --"and select \"Add to Panel->Panel->Panel\".

                          " --"

                          \n" -+"and select \"Add to Panel->Panel->Panel\".

                          \n" - "(You can then put anything on the fresh panel, adjust its size and\n" - "so on.)

                          \n" - msgstr "" - "

                          如果您想增加面板來騰出空間給面板程式或按鈕，\n" - "可在面板上按滑鼠右鍵來顯示面板選單並選擇\n" --"「加入至面板→面板→面板」。

                          " --"

                          \n" -+"「加入至面板→面板→面板」。

                          \n" - "（您可以在新的面板上放上任何東西或\n" - "調整大小之類。）

                          \n" - - #: tips.cpp:630 - msgid "" - "

                          If you want to contribute your own \"tip of the day\", please send it to\n" --"kde-doc-english@kde.org" --", and we will be happy to\n" -+"kde-doc-english@kde.org, and " -+"we will be happy to\n" - " include\n" - "it in the next release.

                          \n" - msgstr "" --"

                          如果您想貢獻自己的「每日秘訣」，請寄到\n" -+"

                          如果您想貢獻自己的「每日祕訣」，請寄到\n" - "kde-doc-english@kde.org，\n" - "我們將很樂意\n" - "把它收錄\n" -@@ -1177,10 +1147,10 @@ - "

                          \n" - "

                          For further instructions, and details about the advanced features\n" - "available with Web Shortcuts, see the Konqueror Handbook.

                          " --"\n" --"

                          Contributed by Michael Lachmann and Thomas Diehl

                          " --"\n" -+"href=\"help:/konqueror/enhanced-browsing.html\">the Konqueror Handbook.\n" -+"

                          Contributed by Michael Lachmann and Thomas Diehl

                          \n" - msgstr "" - "

                          \n" - "在「設定→設定 Konqueror→網路捷徑」 裡可以\n" -@@ -1236,14 +1206,14 @@ - msgid "" - "

                          \n" - "If you want to make your desktop look more interesting, you can find\n" --"tons of themes, widget styles window decorations and more at kde-look.org.\n" -+"tons of themes, widget styles window decorations and more at kde-look.org.\n" - "

                          \n" - "

                          Contributed by Carsten Niehaus

                          \n" - msgstr "" - "

                          \n" - "如果想讓桌面看來更有趣，在 \n" --"www.kde-look.org 裡有很多佈景主題、\n" -+"www.kde-look.org 裡有很多布景主題、\n" - "介面風格和視窗裝飾可使用。\n" - "

                          \n" - "

                          由 Carsten Niehaus 提供

                          \n" -@@ -1305,8 +1275,7 @@ - "available on your distribution.) kmag works\n" - "just like xmag, with the difference that it magnifies on the fly.\n" - "

                          \n" --"

                          Contributed by Jesper Pedersen

                          " --"
                          \n" -+"

                          Contributed by Jesper Pedersen


                          \n" - msgstr "" - "

                          \n" - "如果您想量度螢幕上某一段距離，一個稱為 kruler 的程式\n" -@@ -1316,8 +1285,7 @@ - "（它不屬於 KDE 基本安裝套件，需要另外安裝。它有可能已在您的發行套件中\n" - "安裝好了。）kmag 就像 xmag 一樣運作，分別只在於前者\n" - "可隨時將螢幕放大。

                          \n" --"

                          由 Jesper Pedersen 提供

                          " --"
                          \n" -+"

                          由 Jesper Pedersen 提供


                          \n" - - #: tips.cpp:749 - msgid "" -@@ -1326,49 +1294,45 @@ - "configure the sound server from the Control Center by selecting\n" - "Sound & Multimedia->Sound Server.\n" - "

                          \n" --"

                          Contributed by Jeff Tranter

                          " --"
                          \n" -+"

                          Contributed by Jeff Tranter


                          \n" - msgstr "" - "

                          \n" - "KDE 中的音效是以 artsd 音效伺服器來維護的。您可以\n" - "在控制中心裡選擇「音效 & 多媒體→音效伺服器」\n" - "來設定音效伺服器。\n" - "

                          \n" --"

                          由 Jeff Tranter 提供

                          " --"
                          \n" -+"

                          由 Jeff Tranter 提供


                          \n" - - #: tips.cpp:759 - msgid "" - "

                          \n" --"You can associate sounds, pop up windows, and more with KDE events. This can be " --"configured\n" --"from the Control Center by selecting Sound & Multimedia->" --"System Notifications.\n" -+"You can associate sounds, pop up windows, and more with KDE events. This can " -+"be configured\n" -+"from the Control Center by selecting Sound & Multimedia->System " -+"Notifications.\n" - "

                          \n" --"

                          Contributed by Jeff Tranter

                          " --"
                          \n" -+"

                          Contributed by Jeff Tranter


                          \n" - msgstr "" - "

                          \n" - "您可以將音效關連到 KDE 事件。這可以在控制中心\n" - "裡選擇「音效 & 多媒體→系統通知」來設定。\n" - "

                          \n" --"

                          由 Jeff Tranter 提供

                          " --"
                          \n" -+"

                          由 Jeff Tranter 提供


                          \n" - - #: tips.cpp:768 - msgid "" - "

                          \n" --"Most non-KDE sound applications that do not know about the sound server can be\n" --"run using the artsdsp command. When the application is run, accesses to\n" -+"Most non-KDE sound applications that do not know about the sound server can " -+"be\n" -+"run using the artsdsp command. When the application is run, accesses " -+"to\n" - "the audio device will be redirected to the artsd sound server.\n" - "

                          \n" - "

                          \n" --"The command format is:" --"
                          \n" -+"The command format is:
                          \n" - "artsdsp application arguments ...\n" - "

                          \n" --"

                          Contributed by Jeff Tranter

                          " --"
                          \n" -+"

                          Contributed by Jeff Tranter


                          \n" - msgstr "" - "

                          \n" - "大多數不使用音效伺服器的非 KDE 聲音應用程式可以\n" -@@ -1376,12 +1340,10 @@ - "時，對音效裝置的存取都會重新導向到 artsd 音效伺服器。\n" - "

                          \n" - "

                          \n" --"命令的格式為：" --"
                          \n" -+"命令的格式為：
                          \n" - "artsdsp 應用程式 引數 ...\n" - "

                          \n" --"

                          由 Jeff Tranter 提供

                          " --"
                          \n" -+"

                          由 Jeff Tranter 提供


                          \n" - - #: tips.cpp:782 - msgid "" -@@ -1486,7 +1448,7 @@ - "

                          \n" - "KDE 應用程式為許多功能提功了簡短的「這是什麼？」\n" - "說明文字。只要按下視窗標題列上的問號標記，接著\n" --"按下您需要協助的項目。(在某些佈景主題中，此按鈕\n" -+"按下您需要協助的項目。(在某些布景主題中，此按鈕\n" - "是以小寫的「i」來代替問號標記)。\n" - "

                          \n" - -@@ -1646,8 +1608,8 @@ - msgid "" - "

                          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" --"

                            " --"
                          • Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-size,\n" -+"
                            • Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-" -+"size,\n" - "or in Konqueror file manager to change icon size.
                              • \n" - "
                            • Shift+Mouse-Wheel for fast scrolling in all KDE applications.
                              • \n" - "
                            • Mouse-Wheel over the taskbar in Kicker to quickly alternate between\n" -@@ -1657,8 +1619,7 @@ - msgstr "" - "

                              您可以使用滑鼠滾輪來快速的執行某些工作；\n" - "這裡是一些您可能不知道的：\n" --"

                                " --"
                              • 在 Konqueror 網頁瀏覽器中按 Ctrl+滑鼠滾輪可改變\n" -+"
                                • 在 Konqueror 網頁瀏覽器中按 Ctrl+滑鼠滾輪可改變\n" - "字型大小，或在 Konqueror 檔案管理程式中改變圖示大小。
                                  • \n" - "
                                • Shift+滑鼠滾輪可在所有 KDE 應用程式中快速捲動。
                                  • \n" - "
                                • 在 Kicker 工作列可以滑鼠滾輪切換不同的視窗。
                                  • \n" -@@ -1758,7 +1719,7 @@ - "

                                  不同的虛擬桌面可以各別自訂某些地方。\n" - "例如，您可以為特定的桌面指定特殊的背景：\n" - "可以看看 KDE 的控制中心，在「外觀 & \n" --"佈景主題->背景」或者在桌面按右鍵並選擇\n" -+"布景主題->背景」或者在桌面按右鍵並選擇\n" - "設定桌面。

                                  \n" - - #: tips.cpp:1014 -@@ -1791,11 +1752,9 @@ - " choice.\n" - "

                                  \n" - "

                                  \n" --"

                                  " --"
                                  " --"
                                  \n" --"This is the last tip in the tips database. Clicking \"Next\" will take you " --"back to\n" -+"


                                  \n" -+"This is the last tip in the tips database. Clicking \"Next\" will take " -+"you back to\n" - " the first tip.\n" - "

                                  \n" - msgstr "" -@@ -1807,9 +1766,7 @@ - "您的選擇。\n" - "

                                  \n" - "

                                  \n" --"

                                  " --"
                                  " --"
                                  \n" -+"


                                  \n" - "這是密訣資料庫中的最後一個密訣。按「下一步」會將您帶回\n" - "第一個密訣。\n" - "

                                  \n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_clients.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_clients.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_clients.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_clients.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kwin_clients\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-11-17 19:25+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -23,7 +23,9 @@ - msgid "" - "When selected, the window borders are drawn using the titlebar colors; " - "otherwise, they are drawn using normal border colors." --msgstr "選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪製。" -+msgstr "" -+"選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪" -+"製。" - - #: b2/config/config.cpp:49 - msgid "Draw &resize handle" -@@ -31,8 +33,8 @@ - - #: 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." -+"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 -@@ -61,8 +63,8 @@ - - #: 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." -+"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 -@@ -177,11 +179,11 @@ - - #: kwmtheme/cli_installer/main.cpp:12 - msgid "Installs a KWM theme" --msgstr "安裝一個 KWM 佈景主題" -+msgstr "安裝一個 KWM 布景主題" - - #: kwmtheme/cli_installer/main.cpp:16 - msgid "Path to a theme config file" --msgstr "佈景主題設定檔的路徑" -+msgstr "布景主題設定檔的路徑" - - #: laptop/laptopclient.cpp:353 - msgid "Laptop" -@@ -197,7 +199,7 @@ - #: rc.cpp:6 - #, no-c-format - msgid "Display the window &icon in the caption bubble" --msgstr "在標題圓中顯示視窗圖示 (&I)" -+msgstr "在標題圓中顯示視窗圖示(&I)" - - #. i18n: file ./keramik/config/keramikconfig.ui line 33 - #: rc.cpp:9 -@@ -218,11 +220,12 @@ - #, no-c-format - 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." -+"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 "" --"如果您想讓作用中的視窗擁有與非作用中視窗相同大小的標題圓，請選擇這個選項。 當您希望螢幕能容納更多視窗時(如筆記型電腦或者低解析度顯示)，這個選項非常有用." -+"如果您想讓作用中的視窗擁有與非作用中視窗相同大小的標題圓，請選擇這個選項。 當" -+"您希望螢幕能容納更多視窗時(如筆記型電腦或者低解析度顯示)，這個選項非常有用." - - #. i18n: file ./keramik/config/keramikconfig.ui line 52 - #: rc.cpp:18 -@@ -234,9 +237,11 @@ - #: rc.cpp:21 - #, 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 "如果您想讓擷取列置於視窗下，請選擇這個選項。 當這個選項未被選取時，將只有一個細邊在它的位置上。" -+"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 "" -+"如果您想讓擷取列置於視窗下，請選擇這個選項。 當這個選項未被選取時，將只有一個" -+"細邊在它的位置上。" - - #. i18n: file ./keramik/config/keramikconfig.ui line 63 - #: rc.cpp:24 rc.cpp:51 -@@ -248,8 +253,8 @@ - #: rc.cpp:27 rc.cpp:54 - #, no-c-format - msgid "" --"Check this option if you want the titlebar text to have a 3D look with a shadow " --"behind it." -+"Check this option if you want the titlebar text to have a 3D look with a " -+"shadow behind it." - msgstr "如果您想標題列的文字有著3D陰影效果，請選擇這個選項。" - - #. i18n: file ./plastik/config/configdialog.ui line 16 -@@ -274,9 +279,10 @@ - #: rc.cpp:48 - #, 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 "如果您希望視窗裝飾的顏色跟標題列一樣，請選擇這個選項，否則會跟背景顏色一樣。" -+"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 92 - #: rc.cpp:57 -@@ -304,13 +310,17 @@ - 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 一樣)" -+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 "選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪製。" -+msgstr "" -+"選擇後，視窗裝飾將使用標題列的顏色繪製，否則，將取而代之使用正常的邊界顏色繪" -+"製。" - - #: quartz/config/config.cpp:45 - msgid "Quartz &extra slim" -@@ -331,8 +341,8 @@ - #: 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." -+"corner. This makes window resizing easier, especially for trackballs and " -+"other mouse replacements on laptops." - msgstr "若選擇了此項目，則每一個視窗的右下角都會有一個調整視窗大小用的手把。" - - #: modernsystem/config/config.cpp:52 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_lib.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_lib.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin_lib.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin_lib.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kwin_lib\n" - "POT-Creation-Date: 2005-10-08 02:42+0200\n" - "PO-Revision-Date: 2006-01-20 15:51+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwin.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kwin\n" - "POT-Creation-Date: 2008-03-10 01:27+0100\n" - "PO-Revision-Date: 2005-11-17 19:24+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: >\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -416,17 +416,16 @@ - msgid "" - "kwin: it looks like there's already a window manager running. kwin not " - "started.\n" --msgstr "" --"KWin: 似乎已經有其他的視窗管理程式已經啟動了。 因此 kwin 無法啟動\n" -+msgstr "KWin: 似乎已經有其他的視窗管理程式已經啟動了。 因此 kwin 無法啟動\n" - - #: main.cpp:80 - msgid "kwin: failure during initialization; aborting" --msgstr "kwin: 程式在初使化時發生錯誤... 放棄執行" -+msgstr "kwin: 程式在初使化時發生錯誤… 放棄執行" - - #: main.cpp:101 - msgid "" --"kwin: unable to claim manager selection, another wm running? (try using " --"--replace)\n" -+"kwin: unable to claim manager selection, another wm running? (try using --" -+"replace)\n" - msgstr "" - "kwin：無法宣告管理程式選擇區，是否有其他 wm 在執行？(嘗試使用 --replace)\n" - -@@ -488,15 +487,15 @@ - - #: useractions.cpp:69 - msgid "Window &Shortcut..." --msgstr "視窗捷徑鍵(&S)..." -+msgstr "視窗捷徑鍵(&S)…" - - #: useractions.cpp:70 - msgid "&Special Window Settings..." --msgstr "特殊的視窗設定(&S)..." -+msgstr "特殊的視窗設定(&S)…" - - #: useractions.cpp:71 - msgid "&Special Application Settings..." --msgstr "特殊的應用程式設定(&S)..." -+msgstr "特殊的應用程式設定(&S)…" - - #: useractions.cpp:73 - msgid "Ad&vanced" -@@ -536,7 +535,7 @@ - - #: useractions.cpp:103 - msgid "Configur&e Window Behavior..." --msgstr "設定視窗行為...(&E)" -+msgstr "設定視窗行為…(&E)" - - #: useractions.cpp:198 - msgid "To &Desktop" -@@ -554,34 +553,35 @@ - #: workspace.cpp:2397 - 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 " --"mouse: use the window operations menu instead, activated using the %1 keyboard " --"shortcut." -+"Without the border, you will not be able to enable the border again using " -+"the mouse: use the window operations menu instead, activated using the %1 " -+"keyboard shortcut." - msgstr "" - "您已經選擇顯示無邊框的視窗。\n" --"沒有邊框，您將無法使用滑鼠讓邊框再次出現：要使用視窗操作選單來代替，使用 %1 鍵盤捷徑來作用它。" -+"沒有邊框，您將無法使用滑鼠讓邊框再次出現：要使用視窗操作選單來代替，使用 %1 " -+"鍵盤捷徑來作用它。" - - #: workspace.cpp:2409 - 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 " --"off you will not be able to disable it again using the mouse: use the window " --"operations menu instead, activated using the %1 keyboard shortcut." -+"If the application itself does not have an option to turn the fullscreen " -+"mode off you will not be able to disable it again using the mouse: use the " -+"window operations menu instead, activated using the %1 keyboard shortcut." - msgstr "" - "您已經選擇要視窗以全螢幕模式顯示。\n" --"如果該應用程式本身沒有關閉全螢幕模式的選項，您將無法使用滑鼠將其關閉：要使用視窗操作選單來代替，使用 %1 鍵盤捷徑來作用它。" -+"如果該應用程式本身沒有關閉全螢幕模式的選項，您將無法使用滑鼠將其關閉：要使用" -+"視窗操作選單來代替，使用 %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」。" -+"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" " -+"in a $PATH directory." -+msgstr "混合式管理程式無法啟動。\\n請確定您的 $PATH 目錄中有「kompmgr」。" - - #: workspace.cpp:2506 - msgid "" --"The Composite Manager crashed twice within a minute and is therefore disabled " --"for this session." -+"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 -@@ -590,53 +590,48 @@ - - #: workspace.cpp:2546 - msgid "" --"kompmgr failed to open the display" --"
                                  There is probably an invalid display entry in your ~/.xcompmgrrc.                                  " --msgstr "kompmgr 開啟該畫面失敗
                                  這可能是因為在您的 ~/.xcompmgrrc 中有無效的畫面項目。                                  " -+"kompmgr failed to open the display
                                  There is probably an " -+"invalid display entry in your ~/.xcompmgrrc.                                  " -+msgstr "" -+"kompmgr 開啟該畫面失敗
                                  這可能是因為在您的 ~/.xcompmgrrc 中有無" -+"效的畫面項目。                                  " - - #: workspace.cpp:2548 - msgid "" --"kompmgr cannot find the Xrender extension" --"
                                  You are using either an outdated or a crippled version of XOrg." --"
                                  Get XOrg ≥ 6.8 from www.freedesktop.org." --"
                                  " -+"kompmgr cannot find the Xrender extension
                                  You are using either " -+"an outdated or a crippled version of XOrg.
                                  Get XOrg ≥ 6.8 from www." -+"freedesktop.org.
                                  " - msgstr "" --"kompmgr 找不到 Xrender 延伸功能" --"
                                  您所使用的可能是過期或有缺陷的 XOrg 版本。" --"
                                  請至 www.freedesktop.org 取得 XOrg ≥ 6.8 。" --"
                                  " -+"kompmgr 找不到 Xrender 延伸功能
                                  您所使用的可能是過期或有缺陷的 " -+"XOrg 版本。
                                  請至 www.freedesktop.org 取得 XOrg ≥ 6.8 。
                                  " - - #: workspace.cpp:2550 - msgid "" --"Composite extension not found" --"
                                  You must use XOrg ≥ 6.8 for translucency and shadows to work." --"
                                  Additionally, you need to add a new section to your X config file:" --"
                                  Section \"Extensions\"" --"
                                  Option \"Composite\" \"Enable\"" --"
                                  EndSection                                  " --msgstr "" --"找不到 Composite extension" --"
                                  您 必須 使用 XOrg ≥ 6.8 才能使透明與陰影正常運作。" --"
                                  此外，您需要在 X config 檔案中加入此段：" --"
                                  Section \"Extensions\"" --"
                                  Option \"Composite\" \"Enable\"" --"
                                  EndSection                                  " -+"Composite extension not found
                                  You must use XOrg ≥ " -+"6.8 for translucency and shadows to work.
                                  Additionally, you need to add a " -+"new section to your X config file:
                                  Section \"Extensions\"
                                  Option " -+"\"Composite\" \"Enable\"
                                  EndSection                                  " -+msgstr "" -+"找不到 Composite extension
                                  您 必須 使用 XOrg ≥ 6.8 才" -+"能使透明與陰影正常運作。
                                  此外，您需要在 X config 檔案中加入此段：" -+"
                                  Section \"Extensions\"
                                  Option \"Composite\" \"Enable" -+"\"
                                  EndSection                                  " - - #: workspace.cpp:2555 - msgid "" --"Damage extension not found" --"
                                  You must use XOrg ≥ 6.8 for translucency and shadows to work.                                  " -+"Damage extension not found
                                  You must use XOrg ≥ 6.8 " -+"for translucency and shadows to work.                                  " - msgstr "" --"找不到Damage extension " --"
                                  您 必須 使用 XOrg ≥ 6.8 才能使透明與陰影正常運作。                                  " -+"找不到Damage extension
                                  您 必須 使用 XOrg ≥ 6.8 才能" -+"使透明與陰影正常運作。                                  " - - #: workspace.cpp:2557 - msgid "" --"XFixes extension not found" --"
                                  You must use XOrg ≥ 6.8 for translucency and shadows to work.                                  " -+"XFixes extension not found
                                  You must use XOrg ≥ 6.8 " -+"for translucency and shadows to work.                                  " - msgstr "" --"找不到 XFixes extension" --"
                                  您 必須 使用 XOrg ≥ 6.8 才能使透明與陰影正常運作。                                  " -+"找不到 XFixes extension
                                  您 必須 使用 XOrg ≥ 6.8 才能" -+"使透明與陰影正常運作。                                  " - - #: killer/killer.cpp:50 - msgid "KWin helper utility" -@@ -648,13 +643,13 @@ - - #: killer/killer.cpp:71 - msgid "" --"Window with title \"%2\" is not responding. This window belongs to " --"application %1 (PID=%3, hostname=%4)." --"

                                  Do you wish to terminate this application? (All unsaved data in this " --"application will be lost.)" --msgstr "" --"標題為「%2」的視窗沒有回應。該視窗是屬於應用程式 %1 (PID=%3, hostname=%4)。" --"

                                  您是否希望終止此應用程式？(此應用程式中所有未儲存的資料將會遺失。)" -+"Window with title \"%2\" is not responding. This window belongs " -+"to application %1 (PID=%3, hostname=%4).

                                  Do you wish to terminate " -+"this application? (All unsaved data in this application will be lost.)" -+msgstr "" -+"標題為「%2」的視窗沒有回應。該視窗是屬於應用程式 %1 (PID=%" -+"3, hostname=%4)。

                                  您是否希望終止此應用程式？(此應用程式中所有未儲存的資料將" -+"會遺失。)" - - #: killer/killer.cpp:76 - msgid "Terminate" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwriteconfig.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kwriteconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kwriteconfig.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kwriteconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kwriteconfig\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-20 15:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kxkb.po kde-i18n-zh_TW-3.5.10/messages/kdebase/kxkb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/kxkb.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/kxkb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kxkb\n" - "POT-Creation-Date: 2006-04-06 03:54+0200\n" - "PO-Revision-Date: 2006-01-12 13:59+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,11 +26,11 @@ - - #: kxkbtraywindow.cpp:60 - msgid "Error changing keyboard layout to '%1'" --msgstr "變更鍵盤佈局為「%1」失敗" -+msgstr "變更鍵盤布局為「%1」失敗" - - #: kxkbtraywindow.cpp:110 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: pixmap.cpp:243 - msgid "Belgian" -@@ -299,7 +298,7 @@ - - #: pixmap.cpp:316 - msgid "Maltese (US layout)" --msgstr "馬爾他鍵盤 (美國佈局)" -+msgstr "馬爾他鍵盤 (美國布局)" - - #: pixmap.cpp:317 - msgid "Northern Saami (Finland)" -@@ -443,7 +442,7 @@ - - #: kxkbbindings.cpp:10 - msgid "Switch to Next Keyboard Layout" --msgstr "切換到下一個鍵盤佈局" -+msgstr "切換到下一個鍵盤布局" - - #: _translatorinfo.cpp:1 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libdmctl.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libdmctl.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libdmctl.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libdmctl.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libdmctl\n" - "POT-Creation-Date: 2007-11-02 01:14+0100\n" - "PO-Revision-Date: 2006-01-20 15:36+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_kdeprint.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_kdeprint.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_kdeprint.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_kdeprint.po 2011-11-11 15:45:17.000000000 +0100 -@@ -2,13 +2,12 @@ - # Copyright (C) YEAR Free Software Foundation, Inc. - # FIRST AUTHOR , YEAR. - # --#, fuzzy - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: libkickermenu_kdeprint\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-11-07 13:55+1000\n" --"Last-Translator: Tony Ni \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -36,4 +35,4 @@ - - #: print_mnu.cpp:75 - msgid "Print File..." --msgstr "列印檔案..." -+msgstr "列印檔案…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_konsole.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_konsole.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_konsole.po 2006-03-17 11:47:46.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_konsole.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-02-23 03:46+0100\n" - "PO-Revision-Date: 2005-08-25 14:12+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_prefmenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_prefmenu.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_prefmenu.po 2006-05-22 20:38:36.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_prefmenu.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-03-18 04:02+0100\n" - "PO-Revision-Date: 2005-08-25 14:13+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_recentdocs.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_recentdocs.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_recentdocs.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_recentdocs.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: libkickermenu_recentdoc\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2002-08-24 23:18+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_remotemenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_remotemenu.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_remotemenu.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_remotemenu.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,14 +1,14 @@ - # Chinese/Traditional translation of libkickermenu_remotemenu. - # Woodman Tuen , 2005. --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: libkickermenu_remotemenu\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-25 14:14+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_systemmenu.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_systemmenu.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_systemmenu.po 2006-05-22 20:38:36.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_systemmenu.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,15 +1,15 @@ - # Chinese/Traditional translation of libkickermenu_systemmenu. - # Woodman Tuen , 2005. --# --# --# -+# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: libkickermenu_systemmenu\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-03-18 04:02+0100\n" - "PO-Revision-Date: 2005-08-25 14:08+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,4 +17,4 @@ - - #: systemmenu.cpp:60 - msgid "Empty..." --msgstr "清空..." -+msgstr "清空…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_tom.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_tom.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkickermenu_tom.po 2005-09-10 13:15:15.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkickermenu_tom.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,14 +1,14 @@ - # Chinese/Traditional translation of libkickermenu_tom. - # Woodman Tuen , 2005. --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: libkickermenu_tom\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2005-08-25 14:06+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -52,15 +52,15 @@ - - #: tom.cc:391 - msgid "Modify This Task..." --msgstr "修改本工作..." -+msgstr "修改本工作…" - - #: tom.cc:392 - msgid "Remove This Task..." --msgstr "移除本工作..." -+msgstr "移除本工作…" - - #: tom.cc:393 - msgid "Insert New Task..." --msgstr "插入新工作..." -+msgstr "插入新工作…" - - #: tom.cc:439 - msgid "Tasks" -@@ -76,7 +76,7 @@ - - #: tom.cc:489 tom.cc:515 - msgid "Run Command..." --msgstr "執行指令..." -+msgstr "執行指令…" - - #: tom.cc:493 - msgid "Recently Used Items" -@@ -105,12 +105,12 @@ - - #: tom.cc:613 - msgid "" --"Are you sure you want to remove the %1 task?" --"

                                  Tip: You can restore the task after it has been removed by selecting the " --""Modify These Tasks" entry" -+"Are you sure you want to remove the %1 task?

                                  Tip: " -+"You can restore the task after it has been removed by selecting the "" -+"Modify These Tasks" entry" - msgstr "" --"您真的要移除 %1 工作？" --"

                                  提示：您可以選取"修正這些工作"選項來回復已刪除的工作" -+"您真的要移除 %1 工作？

                                  提示：您可以選取"修正" -+"這些工作"選項來回復已刪除的工作" - - #: tom.cc:615 - msgid "Remove Task?" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkicker.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkicker.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkicker.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkicker.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: libkicker\n" - "POT-Creation-Date: 2008-07-31 01:15+0200\n" - "PO-Revision-Date: 2005-11-27 08:40+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -99,10 +99,12 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"When this option is enabled, when the panel is placed on the side or top edges " --"of the screen, the background image will be rotated to match the panel's " --"orientation" --msgstr "當此選項啟用時，該面板會置於畫面的側邊或頂端，其背景圖片也會旋轉以符合面板的方向" -+"When this option is enabled, when the panel is placed on the side or top " -+"edges of the screen, the background image will be rotated to match the " -+"panel's orientation" -+msgstr "" -+"當此選項啟用時，該面板會置於畫面的側邊或頂端，其背景圖片也會旋轉以符合面板的" -+"方向" - - #. i18n: file kickerSettings.kcfg line 53 - #: rc.cpp:36 -@@ -114,10 +116,12 @@ - #: rc.cpp:39 - #, no-c-format - msgid "" --"Here you can choose an image to be displayed on the panel. Press the 'browse' " --"button to choose a theme using the file dialog. This option is only effective " --"if 'Enable background image' is selected" --msgstr "您可以在這裡選擇要在面板上顯示的圖片。按下「瀏覽」以使用檔案對話盒選擇佈景主題。這個選項只有在選取了「啟用背景圖片」時才會生效。" -+"Here you can choose an image to be displayed on the panel. Press the " -+"'browse' button to choose a theme using the file dialog. This option is only " -+"effective if 'Enable background image' is selected" -+msgstr "" -+"您可以在這裡選擇要在面板上顯示的圖片。按下「瀏覽」以使用檔案對話盒選擇布景主" -+"題。這個選項只有在選取了「啟用背景圖片」時才會生效。" - - #. i18n: file kickerSettings.kcfg line 59 - #: rc.cpp:42 -@@ -154,9 +158,11 @@ - #: rc.cpp:57 - #, 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 "選擇這個選項讓面板程式控制桿只有在滑鼠通過時才出現。面板程式控制桿讓您移動、移除與設定面板程式。" -+"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 -@@ -168,9 +174,11 @@ - #: rc.cpp:63 - #, no-c-format - msgid "" --"Select this option to always hide the applet handles. Beware this could disable " --"moving, removing or configuring some applets." --msgstr "選擇這個選項永遠隱藏面板程式控制桿。注意這樣會停用對某些面板程式的移動、移除與設定。" -+"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 -@@ -183,18 +191,22 @@ - #, no-c-format - msgid "" - "A list of applets that have been loaded at runtime. In the case of a crash " --"these applets will not be loaded at the next Kicker start, in case they caused " --"the crash" --msgstr "在執行階段已載入的面板程式清單。如果遇到當機的情形時這些面板程式將不會在下次 Kicker 啟動時被載入，以免它們就是造成當機的原兇。" -+"these applets will not be loaded at the next Kicker start, in case they " -+"caused the crash" -+msgstr "" -+"在執行階段已載入的面板程式清單。如果遇到當機的情形時這些面板程式將不會在下次 " -+"Kicker 啟動時被載入，以免它們就是造成當機的原兇。" - - #. i18n: file kickerSettings.kcfg line 98 - #: rc.cpp:72 - #, no-c-format - msgid "" --"A list of extensions that have been loaded at runtime. In the case of a crash " --"these extensions will not be loaded at the next Kicker start, in case they " --"caused the crash" --msgstr "在執行階段已載入的延伸功能清單。如果遇到當機的情形時這些延伸功能將不會在下次 Kicker 啟動時被載入，以免它們就是造成當機的原兇。" -+"A list of extensions that have been loaded at runtime. In the case of a " -+"crash these extensions will not be loaded at the next Kicker start, in case " -+"they caused the crash" -+msgstr "" -+"在執行階段已載入的延伸功能清單。如果遇到當機的情形時這些延伸功能將不會在下次 " -+"Kicker 啟動時被載入，以免它們就是造成當機的原兇。" - - #. i18n: file kickerSettings.kcfg line 108 - #: rc.cpp:75 -@@ -458,7 +470,9 @@ - "Buttons that represent KServices (applications, primarily) watch for the " - "removal of the service and delete themselves when this happens. This setting " - "turns this off." --msgstr "代表 KServices (主要為應用程式)的按鈕監控該服務的移除並隨後刪除其按鈕。這個設定會關閉此功能。" -+msgstr "" -+"代表 KServices (主要為應用程式)的按鈕監控該服務的移除並隨後刪除其按鈕。這個設" -+"定會關閉此功能。" - - #. i18n: file kickerSettings.kcfg line 329 - #: rc.cpp:207 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkonq.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libkonq.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libkonq.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libkonq.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,7 +11,7 @@ - "Project-Id-Version: libkonq\n" - "POT-Creation-Date: 2007-09-26 01:13+0200\n" - "PO-Revision-Date: 2005-11-25 13:17+0800\n" --"Last-Translator: Frank Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -96,7 +96,7 @@ - - #: konq_dirpart.cc:222 - msgid "Configure Background..." --msgstr "設定背景..." -+msgstr "設定背景…" - - #: konq_dirpart.cc:225 - msgid "Allows choosing of background settings for this view" -@@ -216,7 +216,7 @@ - - #: konq_popupmenu.cc:501 - msgid "Create &Folder..." --msgstr "建立目錄(&F)..." -+msgstr "建立目錄(&F)…" - - #: konq_popupmenu.cc:508 - msgid "&Restore" -@@ -257,11 +257,11 @@ - - #: konq_popupmenu.cc:902 - msgid "&Other..." --msgstr "其他(&O)..." -+msgstr "其他(&O)…" - - #: konq_popupmenu.cc:906 konq_popupmenu.cc:913 - msgid "&Open With..." --msgstr "開啟用(&O)..." -+msgstr "開啟用(&O)…" - - #: konq_popupmenu.cc:933 - msgid "Ac&tions" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskbar.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskbar.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskbar.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskbar.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: libtaskbar\n" - "POT-Creation-Date: 2008-08-18 01:16+0200\n" - "PO-Revision-Date: 2007-02-27 09:12+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,11 +26,12 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"Turning this option off will cause the taskbar to display only " --"the windows on the current desktop. \\n\\nBy default, this option is selected " -+"Turning this option off will cause the taskbar to display only the " -+"windows on the current desktop. \\n\\nBy default, this option is selected " - "and all windows are shown." - msgstr "" --"關掉這個選項會讓工作列只顯示目前桌面上的視窗。\\n\\n預設為開啟，也就是會顯示所有的視窗。" -+"關掉這個選項會讓工作列只顯示目前桌面上的視窗。\\n\\n預設為開啟，也就是" -+"會顯示所有的視窗。" - - #. i18n: file taskbar.kcfg line 16 - #: rc.cpp:9 -@@ -43,11 +43,12 @@ - #: rc.cpp:12 - #, no-c-format - msgid "" --"Select this option if you want the taskbar to display only " --"minimized windows. \\n\\nBy default, this option is not selected and the " --"taskbar will show all windows." -+"Select this option if you want the taskbar to display only minimized " -+"windows. \\n\\nBy default, this option is not selected and the taskbar will " -+"show all windows." - msgstr "" --"選擇這個選項會讓工作列只顯示最小化的視窗。\\n\\n預設是關閉的，也就是會顯示所有的視窗。" -+"選擇這個選項會讓工作列只顯示最小化的視窗。\\n\\n預設是關閉的，也就是會" -+"顯示所有的視窗。" - - #. i18n: file taskbar.kcfg line 22 - #: rc.cpp:15 -@@ -78,16 +79,18 @@ - #, 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 Show all windows " --"option.\\n\\nYou can set the taskbar to Never " --"group windows, to Always group windows or to group windows " --"only When the Taskbar is Full.\\n\\nBy default the taskbar " -+"window group buttons are clicked on a menu appears showing all the windows " -+"in that group. This can be especially useful with the Show all windows option.\\n\\nYou can set the taskbar to Never group " -+"windows, to Always group windows or to group windows only " -+"When the Taskbar is Full.\\n\\nBy default the taskbar " - "groups windows when it is full." - msgstr "" --"工作列可以將類似的視窗歸類成一個群組，並提供一個按鍵。當按下群組按鍵時，會出現一個選單選擇您要用的視窗。這在您打開顯示所有視窗" --"時特別好用。\\n\\n您也可以將工作列設定成從不這樣做，或是總是" --"這樣做，或是當工作列滿了才這樣做。\\n\\n預設為工作列滿了之後才歸類成群組。" -+"工作列可以將類似的視窗歸類成一個群組，並提供一個按鍵。當按下群組按鍵時，會出" -+"現一個選單選擇您要用的視窗。這在您打開顯示所有視窗時特別好用。\\n\\n" -+"您也可以將工作列設定成從不這樣做，或是總是" -+"這樣做，或是當工作列滿了才這樣做。\\n\\n預設為工作列滿了之後" -+"才歸類成群組。" - - #. i18n: file taskbar.kcfg line 37 - #: rc.cpp:30 -@@ -101,8 +104,7 @@ - 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." --msgstr "" --"選擇這個選項，工作列會依桌面排序視窗。\\n\\n預設是開啟。" -+msgstr "選擇這個選項，工作列會依桌面排序視窗。\\n\\n預設是開啟。" - - #. i18n: file taskbar.kcfg line 42 - #: rc.cpp:36 -@@ -116,8 +118,7 @@ - msgid "" - "Selecting this option causes the taskbar to show windows ordered by " - "application.\\n\\nBy default this option is selected." --msgstr "" --"選擇這個選項，工作列會依應用程式排序視窗。\\n\\n預設是開啟。" -+msgstr "選擇這個選項，工作列會依應用程式排序視窗。\\n\\n預設是開啟。" - - #. i18n: file taskbar.kcfg line 47 - #: rc.cpp:42 -@@ -129,10 +130,11 @@ - #: 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." -+"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預設是開啟。" -+"如果您要在工作列前面顯示應用成式的圖示，就可以打開這個選項。\\n\\n預設是開" -+"啟。" - - #. i18n: file taskbar.kcfg line 64 - #: rc.cpp:48 -@@ -145,10 +147,11 @@ - #, no-c-format - msgid "" - "Turning this option off will cause the taskbar to display only " --"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.\\n\\nBy " -+"default, this option is selected and all windows are shown." - msgstr "" --"關掉這個選項，工作列就只會顯示同一個 Xinerama 螢幕內的視窗。\\n\\n預設是開啟，也就是會顯示所有的視窗。" -+"關掉這個選項，工作列就只會顯示同一個 Xinerama 螢幕內的視窗。\\n\\n預設" -+"是開啟，也就是會顯示所有的視窗。" - - #. i18n: file taskbar.kcfg line 74 - #: rc.cpp:54 -@@ -162,7 +165,8 @@ - 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 "選擇這個選項的話，工具列上會有一個按鈕，按下去後會出現所有視窗的列表選單。" -+msgstr "" -+"選擇這個選項的話，工具列上會有一個按鈕，按下去後會出現所有視窗的列表選單。" - - #. i18n: file taskbar.kcfg line 87 - #: rc.cpp:60 -@@ -228,9 +232,11 @@ - #: rc.cpp:90 - #, 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 次以上表示不停止。" -+"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 -@@ -242,8 +248,8 @@ - #: rc.cpp:96 - #, 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." -+"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." - msgstr "" - "打開這個選項的話，工作列上就不會用按鈕來顯示視窗與工作。\\n\\n預設為關閉。" - -@@ -257,10 +263,12 @@ - #: rc.cpp:102 - #, no-c-format - msgid "" --"Turning this option on will cause the taskbar to draw fancier text that has an " --"outline around it. While this is useful for transparent panels or particularly " --"dark panel backgrounds, it is slower." --msgstr "打開這個選項的話，工具列上的文字會以較花俏的方式顯現，外面會有一圈外環。這對透明的面板，或是較暗的面板來說特別有用，但是會變比較慢。" -+"Turning this option on will cause the taskbar to draw fancier text that has " -+"an outline around it. While this is useful for transparent panels or " -+"particularly dark panel backgrounds, it is slower." -+msgstr "" -+"打開這個選項的話，工具列上的文字會以較花俏的方式顯現，外面會有一圈外環。這對" -+"透明的面板，或是較暗的面板來說特別有用，但是會變比較慢。" - - #. i18n: file taskbar.kcfg line 140 - #: rc.cpp:105 -@@ -279,13 +287,12 @@ - #, no-c-format - msgid "" - "Enabling this option will draw a thumbnail of the window in its mouse-over " --"effect." --"

                                  If a window is minimized or resides on a different desktop while the taskbar " --"is starting, an icon is shown until the window is restored or the appropriate " --"desktop is activated, respectively.

                                  " -+"effect.

                                  If a window is minimized or resides on a different desktop while " -+"the taskbar is starting, an icon is shown until the window is restored or " -+"the appropriate desktop is activated, respectively.

                                  " - msgstr "" --"開啟這個選項，在滑鼠位置上會顯示極小的視窗。 " --"

                                  如果視窗已經最小化，或是在另一個桌面的話，就會使用圖示，直到切到該桌面或是叫出此視窗。

                                  " -+"開啟這個選項，在滑鼠位置上會顯示極小的視窗。

                                  如果視窗已經最小化，或是在另" -+"一個桌面的話，就會使用圖示，直到切到該桌面或是叫出此視窗。

                                  " - - #. i18n: file taskbar.kcfg line 149 - #: rc.cpp:114 -@@ -297,11 +304,12 @@ - #: rc.cpp:117 - #, no-c-format - msgid "" --"A thumbnail is created by resizing the window. The scaling factor is determined " --"by its largest dimension and this value. In doing so, the thumbnail's size will " --"not exceed this value in any dimension." -+"A thumbnail is created by resizing the window. The scaling factor is " -+"determined by its largest dimension and this value. In doing so, the " -+"thumbnail's size will not exceed this value in any dimension." - msgstr "" --"極小視窗其實是把視窗重新調整大小，調整的比例是由最大的維度(dimension)與此值來決定。設定此值，則極小視窗大小不會在任一維度超過這個值。" -+"極小視窗其實是把視窗重新調整大小，調整的比例是由最大的維度(dimension)與此值來" -+"決定。設定此值，則極小視窗大小不會在任一維度超過這個值。" - - #. i18n: file taskbar.kcfg line 154 - #: rc.cpp:120 -@@ -313,8 +321,8 @@ - #: rc.cpp:123 - #, no-c-format - msgid "" --"Turning this option on will allow choosing your own colors for taskbar buttons " --"text and background." -+"Turning this option on will allow choosing your own colors for taskbar " -+"buttons text and background." - msgstr "開啟這個選項的話，您可以選擇在工作列上按鈕的文字顏色，以及其背景顏色。" - - #. i18n: file taskbar.kcfg line 158 -@@ -341,8 +349,8 @@ - #: rc.cpp:135 - #, no-c-format - msgid "" --"This color is used for displaying text on taskbar button for tasks other than " --"active." -+"This color is used for displaying text on taskbar button for tasks other " -+"than active." - msgstr "這個顏色會用於目前未活動中工作按鈕上的文字。" - - #. i18n: file taskbar.kcfg line 168 -@@ -371,7 +379,7 @@ - - #: taskcontainer.cpp:1517 - msgid "Loading application ..." --msgstr "載入應用程式中..." -+msgstr "載入應用程式中…" - - #: taskcontainer.cpp:1581 - msgid "On all desktops" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskmanager.po kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskmanager.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/libtaskmanager.po 2007-10-08 12:00:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/libtaskmanager.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-08-31 01:13+0200\n" - "PO-Revision-Date: 2005-08-25 13:03+0800\n" --"Last-Translator: Paladin Liu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: zh-l10n \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -91,7 +91,7 @@ - msgstr "所有的桌面(&A)" - - #~ msgid "&Always on Top" --#~ msgstr "維持在頂端 (&A)" -+#~ msgstr "維持在頂端(&A)" - - #~ msgid "&Restore" --#~ msgstr "還原 (&R)" -+#~ msgstr "還原(&R)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/lockout.po kde-i18n-zh_TW-3.5.10/messages/kdebase/lockout.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/lockout.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/lockout.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,10 +6,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: lockout\n" - "POT-Creation-Date: 2008-08-18 01:16+0200\n" - "PO-Revision-Date: 2005-11-25 12:42+0800\n" --"Last-Translator: Frank Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,12 +33,12 @@ - - #: lockout.cpp:210 - msgid "&Configure Screen Saver..." --msgstr "設定螢幕保護程式(&C)..." -+msgstr "設定螢幕保護程式(&C)…" - - #: lockout.cpp:226 - msgid "&Log Out..." --msgstr "登出(&L)..." -+msgstr "登出(&L)…" - - #: lockout.cpp:231 - msgid "&Configure Session Manager..." --msgstr "設定 Session 管理員(&C)..." -+msgstr "設定 Session 管理員(&C)…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/mediaapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/mediaapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/mediaapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/mediaapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,14 +1,14 @@ - # Chinese/Traditional translation of mediaapplet. - # Woodman Tuen , 2005. --# --# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: mediaapplet\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-07-31 01:15+0200\n" - "PO-Revision-Date: 2005-08-25 12:59+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -48,7 +48,7 @@ - - #: mediaapplet.cpp:433 - msgid "&Configure..." --msgstr "設定(&C)..." -+msgstr "設定(&C)…" - - #: preferencesdialog.cpp:61 - msgid "Media Applet Preferences" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/naughtyapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/naughtyapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/naughtyapplet.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/naughtyapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-08-19 01:16+0200\n" - "PO-Revision-Date: 2005-08-25 12:50+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,11 +16,12 @@ - - #: NaughtyApplet.cpp:111 - msgid "" --"A program called '%1' is slowing down the others on your machine. It may have a " --"bug that is causing this, or it may just be busy.\n" -+"A program called '%1' is slowing down the others on your machine. It may " -+"have a bug that is causing this, or it may just be busy.\n" - "Would you like to try to stop the program?" - msgstr "" --"一個名為‘%1’的程式正在降低您的系統的速度。這可能是一個臭蟲所引致，或許可能是程式正在忙碌。\n" -+"一個名為‘%1’的程式正在降低您的系統的速度。這可能是一個臭蟲所引致，或許可能是" -+"程式正在忙碌。\n" - "您要嘗試中止程式嗎？" - - #: NaughtyApplet.cpp:116 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/nsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdebase/nsplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/nsplugin.po 2008-02-13 10:55:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/nsplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-12-22 01:14+0100\n" - "PO-Revision-Date: 2005-08-25 12:47+0800\n" --"Last-Translator: Yuan-Chen Cheng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -37,7 +37,7 @@ - - #: plugin_part.cpp:220 - msgid "&Save As..." --msgstr "另存為(&S)..." -+msgstr "另存為(&S)…" - - #: plugin_part.cpp:301 - #, c-format -@@ -81,9 +81,11 @@ - - #: viewer/viewer.cpp:280 - 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 "當連線到 DCOP 伺服器發生了錯誤。請確認 'dcopserver' 這個程式有啟動，然後再試一次。" -+"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 "" -+"當連線到 DCOP 伺服器發生了錯誤。請確認 'dcopserver' 這個程式有啟動，然後再試" -+"一次。" - - #: viewer/viewer.cpp:284 - msgid "Error Connecting to DCOP Server" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/privacy.po kde-i18n-zh_TW-3.5.10/messages/kdebase/privacy.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/privacy.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/privacy.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,7 +11,7 @@ - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-25 12:43+0800\n" --"Last-Translator: Keng-Tso Ou \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,7 +33,8 @@ - msgid "" - "The privacy module allows a user to erase traces which KDE leaves on the " - "system, such as command histories or browser caches." --msgstr "此隱私模組讓使用者消除 KDE 遺留在系統中的痕跡，例如指令的歷史紀錄或網頁快取。" -+msgstr "" -+"此隱私模組讓使用者消除 KDE 遺留在系統中的痕跡，例如指令的歷史紀錄或網頁快取。" - - #: privacy.cpp:49 - msgid "kcm_privacy" -@@ -107,8 +108,8 @@ - - #: privacy.cpp:112 - msgid "" --"Check all cleanup actions you would like to perform. These will be executed by " --"pressing the button below" -+"Check all cleanup actions you would like to perform. These will be executed " -+"by pressing the button below" - msgstr "選取所有要清除動作。按下下面的按鈕就可執行選取的動作。" - - #: privacy.cpp:113 -@@ -121,7 +122,8 @@ - - #: privacy.cpp:116 - msgid "" --"Clears the history of commands run through the Run Command tool on the desktop" -+"Clears the history of commands run through the Run Command tool on the " -+"desktop" - msgstr "清除桌面指令執行工具的指令執行紀錄" - - #: privacy.cpp:117 -@@ -164,11 +166,11 @@ - - #: privacy.cpp:254 - msgid "Starting cleanup..." --msgstr "開始清除..." -+msgstr "開始清除…" - - #: privacy.cpp:263 - msgid "Clearing %1..." --msgstr "正在清除 %1..." -+msgstr "正在清除 %1…" - - #: privacy.cpp:298 - msgid "Clearing of %1 failed" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/quicklauncher.po kde-i18n-zh_TW-3.5.10/messages/kdebase/quicklauncher.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/quicklauncher.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/quicklauncher.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: quicklauncher\n" - "POT-Creation-Date: 2008-07-31 01:15+0200\n" - "PO-Revision-Date: 2005-11-29 19:42+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,7 +39,7 @@ - - #: quicklauncher.cpp:110 - msgid "Configure Quicklauncher..." --msgstr "設定快速啟動程式..." -+msgstr "設定快速啟動程式…" - - #: quicklauncher.cpp:175 - msgid "Remove Application" -@@ -67,7 +67,7 @@ - #: rc.cpp:6 - #, no-c-format - msgid "Layout" --msgstr "佈局" -+msgstr "布局" - - #. i18n: file configdlgbase.ui line 46 - #: rc.cpp:9 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/trashapplet.po kde-i18n-zh_TW-3.5.10/messages/kdebase/trashapplet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/trashapplet.po 2006-07-22 10:04:12.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/trashapplet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,15 +1,15 @@ - # Chinese/Traditional translation of trashapplet. - # Woodman Tuen , 2005. --# --# --# -+# -+# -+# - msgid "" - msgstr "" - "Project-Id-Version: trashapplet\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-27 02:32+0200\n" - "PO-Revision-Date: 2005-08-25 12:26+0800\n" --"Last-Translator: Woodman Tuen \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese/Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/useraccount.po kde-i18n-zh_TW-3.5.10/messages/kdebase/useraccount.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdebase/useraccount.po 2008-08-19 20:43:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdebase/useraccount.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: useraccount\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2005-08-11 12:36+0800\n" --"Last-Translator: Stanley Wong \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -35,11 +35,11 @@ - - #: chfacedlg.cpp:79 - msgid "Custom &Image..." --msgstr "自訂影像(&I)..." -+msgstr "自訂影像(&I)…" - - #: chfacedlg.cpp:83 - msgid "&Acquire Image..." --msgstr "取得影像(&A)..." -+msgstr "取得影像(&A)…" - - #: chfacedlg.cpp:104 - msgid "(Custom)" -@@ -68,7 +68,7 @@ - - #: main.cpp:68 - msgid "Change &Password..." --msgstr "更改密碼(&P)..." -+msgstr "更改密碼(&P)…" - - #: main.cpp:81 - msgid "kcm_useraccount" -@@ -100,15 +100,17 @@ - - #: main.cpp:100 - msgid "" --"Here you can change your personal information, which will be used in mail " --"programs and word processors, for example. You can change your login password " --"by clicking Change Password." --msgstr "在這裏您可以更改您的個人資訊。它們會被郵件程式、文字處理器等程式使用到。您可以按更改密碼來更改您的登入密碼。" -+"Here you can change your personal information, which will be used in " -+"mail programs and word processors, for example. You can change your login " -+"password by clicking Change Password." -+msgstr "" -+"在這裏您可以更改您的個人資訊。它們會被郵件程式、文字處理器等程式使用到。" -+"您可以按更改密碼來更改您的登入密碼。" - - #: main.cpp:115 - msgid "" --"A program error occurred: the internal program 'kdepasswd' could not be found. " --"You will not be able to change your password." -+"A program error occurred: the internal program 'kdepasswd' could not be " -+"found. You will not be able to change your password." - msgstr "發生程式錯誤：找不到內部程式 'kdepasswd'。您將無法更改您的密碼。" - - #: main.cpp:213 -@@ -204,7 +206,7 @@ - #: rc.cpp:27 - #, no-c-format - msgid "Change Password..." --msgstr "更改密碼..." -+msgstr "更改密碼…" - - #. i18n: file main_widget.ui line 232 - #: rc.cpp:30 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/blinken.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/blinken.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/blinken.po 2006-07-22 10:04:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/blinken.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: blinken\n" - "POT-Creation-Date: 2006-02-24 03:55+0100\n" - "PO-Revision-Date: 2006-06-16 16:02+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -36,10 +35,10 @@ - - #: blinken.cpp:78 - msgid "" --"_: If the Steve font that is used by bliken by default to show status messages " --"does not support any of the characters of your language, please translate that " --"message to 1 and KDE standard font will be used to show the texts, if not " --"translate it to 0\n" -+"_: If the Steve font that is used by bliken by default to show status " -+"messages does not support any of the characters of your language, please " -+"translate that message to 1 and KDE standard font will be used to show the " -+"texts, if not translate it to 0\n" - "0" - msgstr "1" - -@@ -101,31 +100,31 @@ - - #: blinken.cpp:574 - msgid "Set the Difficulty Level..." --msgstr "設定難度等級..." -+msgstr "設定難度等級…" - - #: blinken.cpp:579 - msgid "Next sequence in 3..." --msgstr "下一個序列來了，倒數三..." -+msgstr "下一個序列來了，倒數三…" - - #: blinken.cpp:584 - msgid "Next sequence in 3, 2..." --msgstr "下一個序列來了，倒數三...二..." -+msgstr "下一個序列來了，倒數三…二..." - - #: blinken.cpp:585 - msgid "Next sequence in 2..." --msgstr "下一個序列來了，倒數二..." -+msgstr "下一個序列來了，倒數二…" - - #: blinken.cpp:590 - msgid "Next sequence in 3, 2, 1..." --msgstr "下一個序列來了，倒數三...二...一..." -+msgstr "下一個序列來了，倒數三…二...一..." - - #: blinken.cpp:591 - msgid "Next sequence in 2, 1..." --msgstr "下一個序列來了，倒數二...一..." -+msgstr "下一個序列來了，倒數二…一..." - - #: blinken.cpp:596 - msgid "Remember this sequence..." --msgstr "記住這個序列..." -+msgstr "記住這個序列…" - - #: blinken.cpp:601 - msgid "Repeat the sequence!" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kalzium.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kalzium.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kalzium.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kalzium.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kalzium\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-10-16 12:47+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -140,8 +139,8 @@ - - #: detailinfodlg.cpp:224 - msgid "" --"_: the first variable is a number. The result is for example '1.' or '5.', the " --"second is the value of the ionisation energy\n" -+"_: the first variable is a number. The result is for example '1.' or '5.', " -+"the second is the value of the ionisation energy\n" - "%1. Ionization energy: %2" - msgstr "%1. 游離能：%2" - -@@ -559,15 +558,15 @@ - - #: kalzium.cpp:148 - msgid "&Equation Solver..." --msgstr "化學方程式計算機(&E)..." -+msgstr "化學方程式計算機(&E)…" - - #: kalzium.cpp:152 - msgid "&Plot Data..." --msgstr "繪製資料(&P)..." -+msgstr "繪製資料(&P)…" - - #: kalzium.cpp:153 - msgid "&Glossary..." --msgstr "術語表(&G)..." -+msgstr "術語表(&G)…" - - #: kalzium.cpp:156 kalzium.cpp:181 kalzium.cpp:298 - msgid "Show &Legend" -@@ -702,15 +701,13 @@ - msgid "" - "_: For example: \"1 Carbon\" or \"3 Oxygen\"\n" - "%1 %2\n" --msgstr "" --"%1 %2\n" -+msgstr "%1 %2\n" - - #: molcalcwidget.cpp:90 - msgid "" - "_: For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)\n" - "%1 %2. Cumulative Mass: %3 u (%4%)\n" --msgstr "" --"%1 %2 累積質量 %3 u（%4%）\n" -+msgstr "%1 %2 累積質量 %3 u（%4%）\n" - - #: molcalcwidget.cpp:103 - msgid "Molecular mass: %1 u" -@@ -732,7 +729,8 @@ - " is being filled last. For example, all elements in the s-block\n" - " fill up the s-orbits." - msgstr "" --"週期表可以分為 s-、p-、d- 與 f- 四個區塊。四個字母分別指出哪個軌道最後才被填入。例如，所有在 s- 區塊的元素都是最後才會填入 s- 軌道。" -+"週期表可以分為 s-、p-、d- 與 f- 四個區塊。四個字母分別指出哪個軌道最後才被填" -+"入。例如，所有在 s- 區塊的元素都是最後才會填入 s- 軌道。" - - #: periodictableview.cpp:449 - msgid "" -@@ -1278,9 +1276,11 @@ - #: rc.cpp:219 - #, no-c-format - msgid "" --"If selected, the temperatures will be displayed in Kelvin. This is then saved " --"in configuration and restored next time you start Kalzium." --msgstr "選取此選項的話，溫度會以絕對溫度（Kelvin，K）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。" -+"If selected, the temperatures will be displayed in Kelvin. This is then " -+"saved in configuration and restored next time you start Kalzium." -+msgstr "" -+"選取此選項的話，溫度會以絕對溫度（Kelvin，K）為單位來顯示。此選項會儲存在設定" -+"中，並且在下次啟動 Kalzium 時回復。" - - #. i18n: file settings_units.ui line 55 - #: rc.cpp:222 -@@ -1298,9 +1298,11 @@ - #: rc.cpp:228 - #, no-c-format - msgid "" --"If selected, the temperatures will be displayed in Degrees Fahrenheit. This is " --"then saved in configuration and restored next time you start Kalzium." --msgstr "選取此選項的話，溫度會以華氏溫度（Fahrenheit，F）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。" -+"If selected, the temperatures will be displayed in Degrees Fahrenheit. This " -+"is then saved in configuration and restored next time you start Kalzium." -+msgstr "" -+"選取此選項的話，溫度會以華氏溫度（Fahrenheit，F）為單位來顯示。此選項會儲存在" -+"設定中，並且在下次啟動 Kalzium 時回復。" - - #. i18n: file settings_units.ui line 72 - #: rc.cpp:231 -@@ -1320,7 +1322,9 @@ - msgid "" - "If selected, the temperatures will be displayed in Degrees Rankine. This is " - "then saved in configuration and restored next time you start Kalzium." --msgstr "選取此選項的話，溫度會以雷氏溫度（Rankine，Ra）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。" -+msgstr "" -+"選取此選項的話，溫度會以雷氏溫度（Rankine，Ra）為單位來顯示。此選項會儲存在設" -+"定中，並且在下次啟動 Kalzium 時回復。" - - # - #. i18n: file settings_units.ui line 89 -@@ -1341,7 +1345,9 @@ - msgid "" - "If selected, the temperatures will be displayed in Degrees Réaumur. This is " - "then saved in configuration and restored next time you start Kalzium." --msgstr "選取此選項的話，溫度會以列氏溫度（Réaumur，Ré）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。" -+msgstr "" -+"選取此選項的話，溫度會以列氏溫度（Réaumur，Ré）為單位來顯示。此選項會儲存在設" -+"定中，並且在下次啟動 Kalzium 時回復。" - - #. i18n: file settings_units.ui line 106 - #: rc.cpp:249 -@@ -1361,7 +1367,9 @@ - msgid "" - "If selected, the temperatures will be displayed in Degrees Celsius. This is " - "then saved in configuration and restored next time you start Kalzium." --msgstr "選取此選項的話，溫度會以攝氏溫度（Celsius，C）為單位來顯示。此選項會儲存在設定中，並且在下次啟動 Kalzium 時回復。" -+msgstr "" -+"選取此選項的話，溫度會以攝氏溫度（Celsius，C）為單位來顯示。此選項會儲存在設" -+"定中，並且在下次啟動 Kalzium 時回復。" - - #. i18n: file settings_units.ui line 125 - #: rc.cpp:258 -@@ -1387,7 +1395,9 @@ - msgid "" - "Check this if you prefer the energy unit in kJ/mol (kilojoule per mol). The " - "other choice you have is eV (electronvolt)." --msgstr "如果您打算以 kJ/mol（千焦耳/每莫耳）做為能量單位，則勾選此選項。另外您也可以選擇 eV（電子伏特）。" -+msgstr "" -+"如果您打算以 kJ/mol（千焦耳/每莫耳）做為能量單位，則勾選此選項。另外您也可以" -+"選擇 eV（電子伏特）。" - - #. i18n: file settings_units.ui line 153 - #: rc.cpp:270 -@@ -1405,9 +1415,11 @@ - #: rc.cpp:276 - #, no-c-format - msgid "" --"Check this if you prefer the energy unit in eV (electronvolt). The other choice " --"you have is kJ/mol (kilojoule per mol)." --msgstr "如果您打算以 eV（電子伏特）做為能量單位，則勾選此選項。另外您也可以選擇 kJ/mol（千焦耳/每莫耳）。" -+"Check this if you prefer the energy unit in eV (electronvolt). The other " -+"choice you have is kJ/mol (kilojoule per mol)." -+msgstr "" -+"如果您打算以 eV（電子伏特）做為能量單位，則勾選此選項。另外您也可以選擇 kJ/" -+"mol（千焦耳/每莫耳）。" - - #. i18n: file somwidget.ui line 48 - #: rc.cpp:279 -@@ -1430,8 +1442,8 @@ - #: rc.cpp:287 - #, no-c-format - msgid "" --"This page gives an overview about the spectrum this element. With the mouse you " --"can zoom into the spectrum." -+"This page gives an overview about the spectrum this element. With the mouse " -+"you can zoom into the spectrum." - msgstr "此頁可以給您此元素的光譜概觀。您可以用滑鼠來縮放光譜。" - - #. i18n: file spectrumview.ui line 19 -@@ -1815,9 +1827,11 @@ - #. i18n: file data/data.xml line 214 - #: rc.cpp:585 - msgid "" --"Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot like " --"carbon" --msgstr "「硼」（Boron）為 Bor(ax) 與 (carb)on 的合體字。它在硼酸（Borax）內發現，而性質跟碳（Carbon）很相近" -+"Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot " -+"like carbon" -+msgstr "" -+"「硼」（Boron）為 Bor(ax) 與 (carb)on 的合體字。它在硼酸（Borax）內發現，而性" -+"質跟碳（Carbon）很相近" - - #. i18n: file data/data.xml line 260 - #: rc.cpp:587 -@@ -1919,7 +1933,9 @@ - msgid "" - "It was discovered near a town named Magnesia in a black earth. Thus. it was " - "named 'magnesia nigra'. short: Manganese" --msgstr "這是在一個叫做 Magnesia 附近的黑色土壤中發現的，因此被命名為 \"magnesia nigra\"，簡稱 Manganese。" -+msgstr "" -+"這是在一個叫做 Magnesia 附近的黑色土壤中發現的，因此被命名為 \"magnesia nigra" -+"\"，簡稱 Manganese。" - - #. i18n: file data/data.xml line 1325 - #: rc.cpp:627 -@@ -1992,7 +2008,8 @@ - "Named after the small town of Ytterby near Stockholm in Sweden. Terbium. " - "Ytterbium and Gadolinium are also named after this town." - msgstr "" --"依瑞典斯德哥爾摩附近的一個小城 Ytterby 命名。鋱（Terbium），鐿（Ytterbium）與釓（Gadolinium）也是依這個城市而命名的。" -+"依瑞典斯德哥爾摩附近的一個小城 Ytterby 命名。鋱（Terbium），鐿（Ytterbium）與" -+"釓（Gadolinium）也是依這個城市而命名的。" - - #. i18n: file data/data.xml line 2023 - #: rc.cpp:655 -@@ -2106,9 +2123,11 @@ - #. i18n: file data/data.xml line 3080 - #: rc.cpp:697 - msgid "" --"Named after the greek Prometheus. Prometheus stole the fire from the gods and " --"gave it to mankind." --msgstr "依希臘神話中的普羅米修斯（Prometheus）命名。普羅米修斯從神殿中偷取火送到人間。" -+"Named after the greek Prometheus. Prometheus stole the fire from the gods " -+"and gave it to mankind." -+msgstr "" -+"依希臘神話中的普羅米修斯（Prometheus）命名。普羅米修斯從神殿中偷取火送到人" -+"間。" - - #. i18n: file data/data.xml line 3115 - #: rc.cpp:699 -@@ -2143,9 +2162,11 @@ - #. i18n: file data/data.xml line 3335 - #: rc.cpp:711 - msgid "" --"Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also named " --"after this town." --msgstr "依瑞典城市 Ytterby 命名。鋱（Terbium）跟鐿（Ytterbium）也是依這個城市而命名的。" -+"Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also " -+"named after this town." -+msgstr "" -+"依瑞典城市 Ytterby 命名。鋱（Terbium）跟鐿（Ytterbium）也是依這個城市而命名" -+"的。" - - #. i18n: file data/data.xml line 3374 - #: rc.cpp:713 -@@ -2156,7 +2177,8 @@ - #: rc.cpp:715 - msgid "" - "Like Terbium and Gadolinium. this is named after the Swedish town of Ytterby" --msgstr "就像鋱（Terbium）與釓（Gadolinium），它也是依瑞典城市 Ytterby 而命名的。" -+msgstr "" -+"就像鋱（Terbium）與釓（Gadolinium），它也是依瑞典城市 Ytterby 而命名的。" - - #. i18n: file data/data.xml line 3449 - #: rc.cpp:717 -@@ -2176,9 +2198,11 @@ - #. i18n: file data/data.xml line 3561 - #: rc.cpp:723 - msgid "" --"'tung sten' means 'heavy stone' in Swedish. The old name (and thus the symbol " --"'W') was Wolfram. named after a mineral" --msgstr "tung sten 在瑞典語中表示「很重的石頭」。舊名稱是 Wolfram（因此符號為 W），依礦石命名" -+"'tung sten' means 'heavy stone' in Swedish. The old name (and thus the " -+"symbol 'W') was Wolfram. named after a mineral" -+msgstr "" -+"tung sten 在瑞典語中表示「很重的石頭」。舊名稱是 Wolfram（因此符號為 W），依" -+"礦石命名" - - #. i18n: file data/data.xml line 3602 - #: rc.cpp:725 -@@ -2264,8 +2288,8 @@ - #. i18n: file data/data.xml line 4210 - #: rc.cpp:757 - msgid "" --"Greek 'protos' for 'ancester'. Protactinium is before Actinium in the periodic " --"table." -+"Greek 'protos' for 'ancester'. Protactinium is before Actinium in the " -+"periodic table." - msgstr "希臘文中的 protos 表示「祖先」。鏷在週期表中是在錒的前面" - - #. i18n: file data/data.xml line 4247 -@@ -2363,7 +2387,8 @@ - #. i18n: file data/data.xml line 4829 - #: rc.cpp:795 - msgid "" --"Named after the German city Darmstadt where many elements have been discovered." -+"Named after the German city Darmstadt where many elements have been " -+"discovered." - msgstr "依德國城市 Darmstadt 命名，許多元素在這裡被發現" - - #. i18n: file data/data.xml line 4855 -@@ -3049,7 +3074,9 @@ - msgid "" - "Form of a substance; dependant on form stability and whether it takes up a " - "definite volume: solid, liquid or gaseous." --msgstr "物質的形態，與該形態的穩定度，以及它是否暫有明確的體積有關：固態、液態或氣態。" -+msgstr "" -+"物質的形態，與該形態的穩定度，以及它是否暫有明確的體積有關：固態、液態或氣" -+"態。" - - #. i18n: file data/knowledge.xml line 7 - #: rc.cpp:1139 -@@ -3106,20 +3133,23 @@ - #: rc.cpp:1163 - #, no-c-format - msgid "" --"Separation of a liquid solution (homogeneous mix) into its components through " --"evaporation and condensation. In a fractionary distillation the process is " --"repeated several times in a column." --msgstr "透過蒸發與冷凝的方式，將均勻混合的溶液中的各個組成成份分離出來的方法。在蒸餾的過程中，可能會重複很多次的蒸發跟冷凝的過程。" -+"Separation of a liquid solution (homogeneous mix) into its components " -+"through evaporation and condensation. In a fractionary distillation the " -+"process is repeated several times in a column." -+msgstr "" -+"透過蒸發與冷凝的方式，將均勻混合的溶液中的各個組成成份分離出來的方法。在蒸餾" -+"的過程中，可能會重複很多次的蒸發跟冷凝的過程。" - - #. i18n: file data/knowledge.xml line 28 - #: rc.cpp:1169 - #, no-c-format - msgid "" - "Matter that cannot be broken down into simpler matter. Chemical elements are " --"cornerstones of Materials. Elements consist of atoms that consist of a nucleus " --"of positive protons, neutral neutrons, and a shell of electrons." -+"cornerstones of Materials. Elements consist of atoms that consist of a " -+"nucleus of positive protons, neutral neutrons, and a shell of electrons." - msgstr "" --"物質不能再被分為更簡單的物質。化學元素是各種材料的基石。組成元素的原子是由帶正電的質子與中子組成的原子核，以及原子核外繞行的帶負電的電子所組成。" -+"物質不能再被分為更簡單的物質。化學元素是各種材料的基石。組成元素的原子是由帶" -+"正電的質子與中子組成的原子核，以及原子核外繞行的帶負電的電子所組成。" - - #. i18n: file data/knowledge.xml line 31 - #: rc.cpp:1172 -@@ -3163,18 +3193,20 @@ - msgid "" - "Separation of a solid matter from a liquid matter or gaseous matter with a " - "filter (porous separation wall)." --msgstr "使用過濾器（有多孔的分離壁障）將固態物質從液態或氣態物質中分離出來的方法" -+msgstr "" -+"使用過濾器（有多孔的分離壁障）將固態物質從液態或氣態物質中分離出來的方法" - - #. i18n: file data/knowledge.xml line 47 - #: rc.cpp:1196 - #, no-c-format - msgid "" --"Matter consisting of differentiated matter, combined in non-set ratios. " --"[i]Homogeneous mixes[/i] have a coherent look, [i]heterogeneous mixes[/i] " -+"Matter consisting of differentiated matter, combined in non-set ratios. [i]" -+"Homogeneous mixes[/i] have a coherent look, [i]heterogeneous mixes[/i] " - "consist of multiple phases." - msgstr "" --"包含多種可區分的物質，以任意的比例組合成的物質。同質混合物（Homogeneous mixes）為均勻混合，有一致外觀的混合物；" --"異質混合物（Heterogeneous mixes）為不均勻混合，具有多相的外觀的混合物。" -+"包含多種可區分的物質，以任意的比例組合成的物質。同質混合物（Homogeneous " -+"mixes）為均勻混合，有一致外觀的混合物；異質混合物（Heterogeneous " -+"mixes）為不均勻混合，具有多相的外觀的混合物。" - - #. i18n: file data/knowledge.xml line 50 - #: rc.cpp:1199 -@@ -3198,10 +3230,12 @@ - #: rc.cpp:1208 - #, no-c-format - msgid "" --"During a chemical reaction mass is neither lost nor gained. The sum mass of the " --"material going into the reaction equals the sum of the mass of the products of " --"the reaction." --msgstr "在化學反應中，質量不會減少也不會增加。所有參與反應的材料的總質量，會等於反應後產物的總質量。" -+"During a chemical reaction mass is neither lost nor gained. The sum mass of " -+"the material going into the reaction equals the sum of the mass of the " -+"products of the reaction." -+msgstr "" -+"在化學反應中，質量不會減少也不會增加。所有參與反應的材料的總質量，會等於反應" -+"後產物的總質量。" - - #. i18n: file data/knowledge.xml line 58 - #: rc.cpp:1211 -@@ -3213,9 +3247,11 @@ - #: rc.cpp:1214 - #, no-c-format - msgid "" --"An alloy always contains the same elements in the same mass ratio. Should two " --"or more elements bind together then the mass ratio is constant." --msgstr "一化合物中含有的元素是固定的，元素間的質量比例也是固定的。兩種以上的元素形成化合物時，其質量比為常數。" -+"An alloy always contains the same elements in the same mass ratio. Should " -+"two or more elements bind together then the mass ratio is constant." -+msgstr "" -+"一化合物中含有的元素是固定的，元素間的質量比例也是固定的。兩種以上的元素形成" -+"化合物時，其質量比為常數。" - - #. i18n: file data/knowledge.xml line 62 - #: rc.cpp:1217 -@@ -3272,8 +3308,11 @@ - #, no-c-format - msgid "" - "Through chemical composition and physical attributes, homogeneous portion of " --"matter that separated from its environment in its expansion through a surface." --msgstr "由於化學成份與物理屬性的不同，物質中同性質的成份從其環境中透過表面擴張分離出來。" -+"matter that separated from its environment in its expansion through a " -+"surface." -+msgstr "" -+"由於化學成份與物理屬性的不同，物質中同性質的成份從其環境中透過表面擴張分離出" -+"來。" - - #. i18n: file data/knowledge.xml line 82 - #: rc.cpp:1247 -@@ -3370,9 +3409,11 @@ - #: rc.cpp:1292 - #, no-c-format - msgid "" --"Rays consisting of alpha particles, consisting of two protons and two neutrons " --"that are emitted from the Atoms of certain radioactive elements." --msgstr "含有 alpha 粒子的射線。alpha 粒子由兩個質子與兩個中子組成，由放射性元素的原子中發射出來。" -+"Rays consisting of alpha particles, consisting of two protons and two " -+"neutrons that are emitted from the Atoms of certain radioactive elements." -+msgstr "" -+"含有 alpha 粒子的射線。alpha 粒子由兩個質子與兩個中子組成，由放射性元素的原子" -+"中發射出來。" - - #. i18n: file data/knowledge.xml line 114 - #: rc.cpp:1295 rc.cpp:1319 rc.cpp:1328 rc.cpp:1340 rc.cpp:1455 rc.cpp:1464 -@@ -3387,7 +3428,8 @@ - msgid "" - "Atoms are chemically inseparable and building blocks of matter. Atoms of one " - "kind are called an Element." --msgstr "原子在化學上是無法分離的，並組合成物質。同一種原子組成的物質就稱為元素。" -+msgstr "" -+"原子在化學上是無法分離的，並組合成物質。同一種原子組成的物質就稱為元素。" - - #. i18n: file data/knowledge.xml line 118 - #: rc.cpp:1304 rc.cpp:1448 rc.cpp:1467 rc.cpp:1482 rc.cpp:1494 -@@ -3417,18 +3459,20 @@ - #: rc.cpp:1316 - #, no-c-format - msgid "" --"The small, positively-charged center of an Atom, in which Protons and Neutrons " --"are found." -+"The small, positively-charged center of an Atom, in which Protons and " -+"Neutrons are found." - msgstr "位於原子中央的小的帶正電的核心，核心內有質子與中子。" - - #. i18n: file data/knowledge.xml line 132 - #: rc.cpp:1325 - #, no-c-format - msgid "" --"Mass of an atom, taken on a scale where the the mass of a carbon atom is 12u. " --"In elements that consist of different isotopes the mid-range mass of the " --"isotope mix is given." --msgstr "原子的質量。以碳元素為基準（定為 12u），依其比例決定其值。含有同位素的原子則是以同位素質量的加權平均數來決定。" -+"Mass of an atom, taken on a scale where the the mass of a carbon atom is " -+"12u. In elements that consist of different isotopes the mid-range mass of " -+"the isotope mix is given." -+msgstr "" -+"原子的質量。以碳元素為基準（定為 12u），依其比例決定其值。含有同位素的原子則" -+"是以同位素質量的加權平均數來決定。" - - #. i18n: file data/knowledge.xml line 139 - #: rc.cpp:1334 rc.cpp:1349 rc.cpp:1358 rc.cpp:1367 rc.cpp:1376 rc.cpp:1385 -@@ -3443,11 +3487,12 @@ - msgid "" - "Isotopes are forms of a chemical element whose nuclei have the same atomic " - "number, Z, but different atomic masses, A. The word isotope, meaning at the " --"same place, comes from the fact that all isotopes of an element are located at " --"the same place on the periodic table." -+"same place, comes from the fact that all isotopes of an element are located " -+"at the same place on the periodic table." - msgstr "" --"同位素（isotope）是某化學元素的原子核中有相同的原子數量 Z，但是不同的原子質量 A。isotope " --"這個字的意思是「同樣的地方」，表示所有同位素在元素週期表上都是落在同一個位置上。" -+"同位素（isotope）是某化學元素的原子核中有相同的原子數量 Z，但是不同的原子質" -+"量 A。isotope 這個字的意思是「同樣的地方」，表示所有同位素在元素週期表上都是" -+"落在同一個位置上。" - - #. i18n: file data/knowledge.xml line 146 - #: rc.cpp:1343 -@@ -3460,26 +3505,28 @@ - #, no-c-format - msgid "" - "The spin is an intrinsic angular momentum associated with microscopic " --"particles. It is a purely quantum mechanical phenomenon without any analogy in " --"classical mechanics. Whereas classical angular momentum arises from the " -+"particles. It is a purely quantum mechanical phenomenon without any analogy " -+"in classical mechanics. Whereas classical angular momentum arises from the " - "rotation of an extended object, spin is not associated with any rotating " - "internal masses, but is intrinsic to the particle itself." - msgstr "" --"自旋（spin）是與微觀粒子有關的內部角動量。這純粹是量子力學的現象，與傳統力學無關。傳統力學中的角動量是由繞著物體旋轉而產生，而自旋並非繞著內部的質量，而是粒" --"子本身內部所有的。" -+"自旋（spin）是與微觀粒子有關的內部角動量。這純粹是量子力學的現象，與傳統力學" -+"無關。傳統力學中的角動量是由繞著物體旋轉而產生，而自旋並非繞著內部的質量，而" -+"是粒子本身內部所有的。" - - #. i18n: file data/knowledge.xml line 154 - #: rc.cpp:1355 - #, no-c-format - msgid "" --"The magnetic moment of an object is a vector relating the aligning torque in a " --"magnetic field experienced by the object to the field vector itself. It's " --"measured in units of the nuclear magneton μ[sub]n[/sub]=(5.0507866 ± " --"0.0000017) 10[sup]-27[/sup] JT[sup]-1[/sup]" --msgstr "" --"物體的磁矩（magnetic moment）是一個向量，從經過物體的磁場的校準力矩（aligning " --"torque）指向磁場的向量。它是用核磁子（nuclear magneton）的單位來測量： μn " --"= (5.0507866± 0.0000017) 10-27 JT-1" -+"The magnetic moment of an object is a vector relating the aligning torque in " -+"a magnetic field experienced by the object to the field vector itself. It's " -+"measured in units of the nuclear magneton μ[sub]n[/sub]=(5.0507866 " -+"± 0.0000017) 10[sup]-27[/sup] JT[sup]-1[/sup]" -+msgstr "" -+"物體的磁矩（magnetic moment）是一個向量，從經過物體的磁場的校準力矩" -+"（aligning torque）指向磁場的向量。它是用核磁子（nuclear magneton）的單位來測" -+"量： μn = (5.0507866± 0.0000017) 10-27 " -+"JT-1" - - #. i18n: file data/knowledge.xml line 160 - #: rc.cpp:1361 -@@ -3492,22 +3539,17 @@ - #, no-c-format - msgid "" - "The decay mode describes a particular way a particle decays. For radioactive " --"decay (the decay of nuclides) the decay modes are:[br] -> " --"alpha decay (emission of a Helium-4 nucleus).[br] -> " --"β[sup]-[/sup] decay (emission of an electron)[br] -> " --"β[sup]+[/sup] decay (emission of a positron) [br] -> " --"electron capture (EC) [br] -> proton emission [br] -> " --"spontaneous fission [br] Typically one decay mode predominates for a particular " --"nuclide." --msgstr "" --"衰變模式（decay mode）描述粒子衰變的特殊方式。以放射性衰變（原子衰變）而言，其衰變模式為：" --"
                                  -> alpha 衰變（氦 He-4 核的放射）" --"
                                  -> β- 衰變（電子的放射）" --"
                                  -> β+ 衰變（正電子的放射）" --"
                                  -> 電子捕獲（EC） " --"
                                  -> 質子放射 " --"
                                  -> 自發性核裂變 " --"
                                  通常一個特定的原子核只有一種主要的衰變模式。" -+"decay (the decay of nuclides) the decay modes are:[br] -> alpha decay " -+"(emission of a Helium-4 nucleus).[br] -> β[sup]-[/sup] decay (emission " -+"of an electron)[br] -> β[sup]+[/sup] decay (emission of a positron) " -+"[br] -> electron capture (EC) [br] -> proton emission [br] -> spontaneous " -+"fission [br] Typically one decay mode predominates for a particular nuclide." -+msgstr "" -+"衰變模式（decay mode）描述粒子衰變的特殊方式。以放射性衰變（原子衰變）而言，" -+"其衰變模式為：
                                  -> alpha 衰變（氦 He-4 核的放射）
                                  -> β- 衰變（電子的放射）
                                  -> β+ 衰變（正電子的放射）
                                  -" -+"> 電子捕獲（EC）
                                  -> 質子放射
                                  -> 自發性核裂變
                                  通常一個特定的原子" -+"核只有一種主要的衰變模式。" - - #. i18n: file data/knowledge.xml line 167 - #: rc.cpp:1370 -@@ -3576,27 +3618,28 @@ - #, no-c-format - msgid "" - "A nuclear isomer is a metastable or isomeric state of an atom caused by the " --"excitation of a proton or neutron in its nucleus so that it requires a change " --"in spin before it can release its extra energy. They decay to lower energy " --"states of the nuclide through two isomeric transitions:[br] -> " --"γ- emission (emission of a high-energy photon)[br] -> " --"internal conversion (the energy is used to ionize the atom)[br] Contrast this " --"with the definition of a chemical isomer, the more common use of the word. Also " --"contrast with the meaning of isotope, in which the difference is the number of " --"neutrons in the nucleus. Metastable isomers of a particular atom are usually " --"designated with an \"m\" (or, in the case of atoms with more than one isomer, " --"2m, 3m, and so on). This designation is usually placed after the atomic symbol " --"and number of the atom (e.g., Co-58m), but is sometimes placed as a superscript " --"before (e.g., [sup]m[/sup]Co-58 or [sup]58m[/sup]Co)." --msgstr "" --"核異構物是原子由於其原子核中的質子或中子被激發後產生的一種同質異構或亞穩（metastable）的狀態。它需要改變自旋方式，以釋放出多餘的能量。它們會經過兩次同" --"質異構的轉換以衰變到較低的能量狀態：" --"
                                  -> γ 放射（較高能量的質子的放射）" --"
                                  -> 內部轉換（將能量用於電離原子）" --"
                                  與化學的同質異構物（isomer）比，這個字比較常用。與化學的同位素比較（isotope），差異是在原子核的中子數量不同。一個特定原子的亞穩態的核異構物" --"通常用 m 來表示（有的原子有兩個以上的核異構物，用 2m，3m " --"等來表示）。這個標記通常放在原子的化學符號與原子序號的後面（例如：Co-58m），但有時會放在前面以上標表示（例如：m" --"Co-58 或是 58mCo）。" -+"excitation of a proton or neutron in its nucleus so that it requires a " -+"change in spin before it can release its extra energy. They decay to lower " -+"energy states of the nuclide through two isomeric transitions:[br] -> " -+"γ- emission (emission of a high-energy photon)[br] -> internal " -+"conversion (the energy is used to ionize the atom)[br] Contrast this with " -+"the definition of a chemical isomer, the more common use of the word. Also " -+"contrast with the meaning of isotope, in which the difference is the number " -+"of neutrons in the nucleus. Metastable isomers of a particular atom are " -+"usually designated with an \"m\" (or, in the case of atoms with more than " -+"one isomer, 2m, 3m, and so on). This designation is usually placed after the " -+"atomic symbol and number of the atom (e.g., Co-58m), but is sometimes placed " -+"as a superscript before (e.g., [sup]m[/sup]Co-58 or [sup]58m[/sup]Co)." -+msgstr "" -+"核異構物是原子由於其原子核中的質子或中子被激發後產生的一種同質異構或亞穩" -+"（metastable）的狀態。它需要改變自旋方式，以釋放出多餘的能量。它們會經過兩次" -+"同質異構的轉換以衰變到較低的能量狀態：
                                  -> γ 放射（較高能量的質子的放" -+"射）
                                  -> 內部轉換（將能量用於電離原子）
                                  與化學的同質異構物（isomer）" -+"比，這個字比較常用。與化學的同位素比較（isotope），差異是在原子核的中子數量不" -+"同。一個特定原子的亞穩態的核異構物通常用 m 來表示（有的原子有兩個以上的核異構" -+"物，用 2m，3m 等來表示）。這個標記通常放在原子的化學符號與原子序號的後面（例" -+"如：Co-58m），但有時會放在前面以上標表示（例如：mCo-58 或是 " -+"58mCo）。" - - #. i18n: file data/knowledge.xml line 211 - #: rc.cpp:1442 -@@ -3617,12 +3660,12 @@ - #, no-c-format - msgid "" - "The electron is a subatomic particle with a mass of m[sub]e[/sub]=(9.1093897 " --"± 0.0000054)e-31 kg and a negative charge of [i]e[/i]=(1.60217733 ± " --"0.00000049)e-19 C\n" -+"± 0.0000054)e-31 kg and a negative charge of [i]e[/i]=(1.60217733 " -+"± 0.00000049)e-19 C\n" - "\t\t" - msgstr "" --"電子是一種亞原子粒子，質量為 me = (9.1093897 ± 0.0000054)e-31 公斤，負電荷為 e " --"= (1.60217733 ± 0.00000049)e-19 C。\n" -+"電子是一種亞原子粒子，質量為 me = (9.1093897 ± 0.0000054)e-" -+"31 公斤，負電荷為 e = (1.60217733 ± 0.00000049)e-19 C。\n" - "\t\t" - - #. i18n: file data/knowledge.xml line 224 -@@ -3630,12 +3673,13 @@ - #, no-c-format - msgid "" - "The proton is a subatomic particle with a mass of m[sub]e[/sub]=(1.6726231 " --"± 0.0000010) 10[sup]-27[/sup] kg and a positive charge of " --"[i]e[/i]=(1.60217733 ± 0.00000049) 10[sup]-19[/sup] C which occurs in the " -+"± 0.0000010) 10[sup]-27[/sup] kg and a positive charge of [i]e[/i]=" -+"(1.60217733 ± 0.00000049) 10[sup]-19[/sup] C which occurs in the " - "nucleus of an atom." - msgstr "" --"質子是一種亞原子粒子，質量為 me = (1.6726231 ± 0.0000010) 10-27 " --"公斤，正電荷為 e = (1.60217733 ± 0.00000049) 10-19 C，存在於原子核中。" -+"質子是一種亞原子粒子，質量為 me = (1.6726231 ± 0.0000010) " -+"10-27 公斤，正電荷為 e = (1.60217733 ± 0.00000049) " -+"10-19 C，存在於原子核中。" - - #. i18n: file data/knowledge.xml line 233 - #: rc.cpp:1476 -@@ -3644,8 +3688,8 @@ - "The neutron is a subatomic particle with a mass of m[sub]e[/sub]=(1.6749286 " - "± 0.0000010) 10[sup]-27[/sup] kg which occurs in the nucleus of an atom." - msgstr "" --"中子是一種亞原子粒子，質量為 me = (1.6749286 ± 0.0000010) 10-27 " --"公斤，存在於原子核中。" -+"中子是一種亞原子粒子，質量為 me = (1.6749286 ± 0.0000010) " -+"10-27 公斤，存在於原子核中。" - - #. i18n: file data/knowledge.xml line 241 - #: rc.cpp:1488 -@@ -3657,10 +3701,10 @@ - #: rc.cpp:1491 - #, no-c-format - msgid "" --"Cathode rays are streams of electrons observed in vacuum tubes, i.e. evacuated " --"glass tubes that are equipped with at least two electrodes, a cathode (negative " --"electrode) and an anode (positive electrode) in a configuration known as a " --"diode." -+"Cathode rays are streams of electrons observed in vacuum tubes, i.e. " -+"evacuated glass tubes that are equipped with at least two electrodes, a " -+"cathode (negative electrode) and an anode (positive electrode) in a " -+"configuration known as a diode." - msgstr "陰極射線（Cathode rays）是在真空管中發現的電子束，" - - #. i18n: file data/knowledge.xml line 248 -@@ -3673,14 +3717,15 @@ - #: rc.cpp:1500 - #, no-c-format - msgid "" --"The Ionic Radius is the radius of a charged atom, a so called ion. The ion can " --"have a positive or a negative charge. The charge of the ion which radius you " --"see is also displayed in Kalzium. A positive ion has less electrons in its " --"shell then the atom, a negative ion has more electrons. Therefore, a postive " --"ion has a smaller radius than its atom and vice versa." --msgstr "" --"離子半徑（Ionic Radius）就是帶電的原子，又叫做離子（ion）的半徑。離子可以帶正電也可以帶負電。Kalzium " --"也會顯示出您所見到的離子的電性。正離子在原子表面的電子數較少，負離子則較多。因此正離子的半徑會比原子半徑要小，反之亦然。" -+"The Ionic Radius is the radius of a charged atom, a so called ion. The ion " -+"can have a positive or a negative charge. The charge of the ion which radius " -+"you see is also displayed in Kalzium. A positive ion has less electrons in " -+"its shell then the atom, a negative ion has more electrons. Therefore, a " -+"postive ion has a smaller radius than its atom and vice versa." -+msgstr "" -+"離子半徑（Ionic Radius）就是帶電的原子，又叫做離子（ion）的半徑。離子可以帶正" -+"電也可以帶負電。Kalzium 也會顯示出您所見到的離子的電性。正離子在原子表面的電" -+"子數較少，負離子則較多。因此正離子的半徑會比原子半徑要小，反之亦然。" - - #. i18n: file data/knowledge.xml line 253 - #: rc.cpp:1509 rc.cpp:1512 rc.cpp:1536 rc.cpp:1554 -@@ -3692,20 +3737,23 @@ - #: rc.cpp:1515 - #, no-c-format - msgid "" --"The van der Waals radius of an atom is the radius of an imaginary hard sphere " --"which can be used to model the atom for many purposes. Van der Waals radii are " --"determined from measurements of atomic spacing between pairs of unbonded atoms " --"in crystals." -+"The van der Waals radius of an atom is the radius of an imaginary hard " -+"sphere which can be used to model the atom for many purposes. Van der Waals " -+"radii are determined from measurements of atomic spacing between pairs of " -+"unbonded atoms in crystals." - msgstr "" --"原子的凡德瓦半徑（van der Waals）是將原子模擬成一個硬的球體，可用於在許多方面模擬原子。凡德瓦半徑是測量晶體中一對對未成鍵的原子距離來決定的。" -+"原子的凡德瓦半徑（van der Waals）是將原子模擬成一個硬的球體，可用於在許多方面" -+"模擬原子。凡德瓦半徑是測量晶體中一對對未成鍵的原子距離來決定的。" - - #. i18n: file data/knowledge.xml line 267 - #: rc.cpp:1530 - #, no-c-format - msgid "" --"The atomic radius is the distance from the atomic nucleus to the outmost stable " --"electron orbital in a atom that is at equilibrium." --msgstr "原子半徑（atomic radius）是原子在平衡狀態下，原子核與最外層的穩定電子軌道的距離。" -+"The atomic radius is the distance from the atomic nucleus to the outmost " -+"stable electron orbital in a atom that is at equilibrium." -+msgstr "" -+"原子半徑（atomic radius）是原子在平衡狀態下，原子核與最外層的穩定電子軌道的距" -+"離。" - - #. i18n: file data/knowledge.xml line 276 - #: rc.cpp:1545 -@@ -3726,17 +3774,19 @@ - #, no-c-format - msgid "" - "Watchglasses are round glass panes with a diameter of around 5 - 10 cm which " --"are used in the various experimental techniques. The border is bent upwards to " --"allow the watchglass to hold small amounts of liquids in order to let them " --"evaporate. The evaporation can be accelerated by heating the watchglass with a " --"Bunsen burner. Watchglasses can also be used to cover petri dishes or beakers. " --"Moreover watchglasses are suited to weighing small amounts of matter or " --"alternatively drying them in the airing cupboard. The term watchglass is " --"derived from the former pocket watches' protection glass which was often domed." --msgstr "" --"表玻璃（watch glasses）是直徑約 5-10 " --"公分的圓形玻璃，可用於許多實驗中。它的邊緣上彎，能留住小量液體以便讓它們蒸發。也可以用本生燈對表玻璃加熱以加速蒸發。表玻璃也可以用於蓋住培養皿或是燒杯，此外也適" --"用於秤小量物質的重量，或是置於風乾機中風乾。表玻璃這個名詞是源於其微凸的造型就像是懷錶上的保護玻璃而來。" -+"are used in the various experimental techniques. The border is bent upwards " -+"to allow the watchglass to hold small amounts of liquids in order to let " -+"them evaporate. The evaporation can be accelerated by heating the watchglass " -+"with a Bunsen burner. Watchglasses can also be used to cover petri dishes or " -+"beakers. Moreover watchglasses are suited to weighing small amounts of " -+"matter or alternatively drying them in the airing cupboard. The term " -+"watchglass is derived from the former pocket watches' protection glass which " -+"was often domed." -+msgstr "" -+"表玻璃（watch glasses）是直徑約 5-10 公分的圓形玻璃，可用於許多實驗中。它的邊" -+"緣上彎，能留住小量液體以便讓它們蒸發。也可以用本生燈對表玻璃加熱以加速蒸發。" -+"表玻璃也可以用於蓋住培養皿或是燒杯，此外也適用於秤小量物質的重量，或是置於風" -+"乾機中風乾。表玻璃這個名詞是源於其微凸的造型就像是懷錶上的保護玻璃而來。" - - #. i18n: file data/tools.xml line 10 - #: rc.cpp:1563 -@@ -3748,21 +3798,25 @@ - #: rc.cpp:1566 - #, no-c-format - msgid "" --"A dehydrator is a laboratory apparatus which is often made of glass and serves " --"to dry chemical matters, that is, to remove water or liquid from a sample.\n" --"\t\t\tIn principle it is a glass bowl with cap which has a planar grinding so " --"that the bowl is air tight closeable. The dehydrator's lower part is ordinarily " --"filled with a drying agent e.g. calcium chloride, silica gel, phosphoric " --"anhydride or sulphuric acid. The sample to be dried is placed on a diaphanous " --"cartridge of plastic or ceramics above the drying agent.\n" -+"A dehydrator is a laboratory apparatus which is often made of glass and " -+"serves to dry chemical matters, that is, to remove water or liquid from a " -+"sample.\n" -+"\t\t\tIn principle it is a glass bowl with cap which has a planar grinding " -+"so that the bowl is air tight closeable. The dehydrator's lower part is " -+"ordinarily filled with a drying agent e.g. calcium chloride, silica gel, " -+"phosphoric anhydride or sulphuric acid. The sample to be dried is placed on " -+"a diaphanous cartridge of plastic or ceramics above the drying agent.\n" - "\t\t\tThe drying agent is hygroscopic, which means that it dehumidifies its " - "environment by absorbing water vapor. The dry atmosphere then takes up water " - "from the sample to be dried." - msgstr "" --"脫水器（dehydrator）是一種實驗室中的器具。它通常是用玻璃製造，用於乾燥化學物質，也就是將樣本中的水份或液體去除。\n" --"\t\t\t實際上它就是一個有蓋的玻璃碗，蓋子磨光以便密封。脫水器的下半部常會填入乾燥劑，如氯化鈣、矽凝膠、五氧化二磷或是硫酸等等。要乾燥的樣本會放在乾燥劑上方" --"，用塑膠或陶製的透明盒子隔開。\n" --"\t\t\t乾燥劑可以吸收水份，因此會用吸取環境中的水氣的方式使環境變乾燥。乾燥的空氣就會使樣本失去其中的水份。" -+"脫水器（dehydrator）是一種實驗室中的器具。它通常是用玻璃製造，用於乾燥化學物" -+"質，也就是將樣本中的水份或液體去除。\n" -+"\t\t\t實際上它就是一個有蓋的玻璃碗，蓋子磨光以便密封。脫水器的下半部常會填入" -+"乾燥劑，如氯化鈣、矽凝膠、五氧化二磷或是硫酸等等。要乾燥的樣本會放在乾燥劑上" -+"方，用塑膠或陶製的透明盒子隔開。\n" -+"\t\t\t乾燥劑可以吸收水份，因此會用吸取環境中的水氣的方式使環境變乾燥。乾燥的" -+"空氣就會使樣本失去其中的水份。" - - #. i18n: file data/tools.xml line 17 - #: rc.cpp:1571 -@@ -3774,11 +3828,12 @@ - #: rc.cpp:1574 - #, no-c-format - msgid "" --" The spatula is a laboratory tool to scrape off, grind and transport chemicals. " --"The material they are made of (e.g. iron, titanium, platinum) and their design " --"(e.g. flat spatula or spoon spatula) can be different." -+" The spatula is a laboratory tool to scrape off, grind and transport " -+"chemicals. The material they are made of (e.g. iron, titanium, platinum) and " -+"their design (e.g. flat spatula or spoon spatula) can be different." - msgstr "" --"刮刀（spatula）是一種實驗室用的工具，可以刮掉、壓碎與移動化學品。刮刀有許多種製造的材料（如鐵、鈦、鉑等）與設計（平面式的，或湯匙式的）。" -+"刮刀（spatula）是一種實驗室用的工具，可以刮掉、壓碎與移動化學品。刮刀有許多種" -+"製造的材料（如鐵、鈦、鉑等）與設計（平面式的，或湯匙式的）。" - - #. i18n: file data/tools.xml line 22 - #: rc.cpp:1577 -@@ -3790,16 +3845,17 @@ - #: rc.cpp:1580 - #, no-c-format - msgid "" --"The water jet pump has two entry pipes and one exit and consists in principle " --"of two pipes one inside the other. At the water entry a water jet shoots under " --"full pressure out of a nozzle into a slightly larger pipe. Thereby the water " --"jet carries away air or fluid from the second entry. " --"
                                  this is caused by the negative pressure in a drifting fluid. Thus it is an " -+"The water jet pump has two entry pipes and one exit and consists in " -+"principle of two pipes one inside the other. At the water entry a water jet " -+"shoots under full pressure out of a nozzle into a slightly larger pipe. " -+"Thereby the water jet carries away air or fluid from the second entry.
                                  " -+"this is caused by the negative pressure in a drifting fluid. Thus it is an " - "application of the hydrodynamic paradox. This says that objects close to " - "drifting fluids are aspirated instead of being pushed away." - msgstr "" --"水噴射幫浦（water jet " --"pump）有兩根進水管與一根出水管。在進水處有一個噴水口，會以全力將水噴射到另一個較大的管子內，利用漂移流體產生的負壓原理將空氣或其它流體導入另一個入口。" -+"水噴射幫浦（water jet pump）有兩根進水管與一根出水管。在進水處有一個噴水口，" -+"會以全力將水噴射到另一個較大的管子內，利用漂移流體產生的負壓原理將空氣或其它" -+"流體導入另一個入口。" - - #. i18n: file data/tools.xml line 27 - #: rc.cpp:1583 -@@ -3812,10 +3868,11 @@ - #, no-c-format - msgid "" - "With a refractometer the refractive index of optical media is determined. If " --"the refractive index of a chemical is known it can be used after a synthesis to " --"determine the sample's purity or to audit the synthesis' success." -+"the refractive index of a chemical is known it can be used after a synthesis " -+"to determine the sample's purity or to audit the synthesis' success." - msgstr "" --"折射計（Refractometer）用於決定光學媒體產生的折射率。如果某化學物質的折射率已知，則可用於測定化學合成樣品的純度，以及決定合成是否成功。" -+"折射計（Refractometer）用於決定光學媒體產生的折射率。如果某化學物質的折射率已" -+"知，則可用於測定化學合成樣品的純度，以及決定合成是否成功。" - - #. i18n: file data/tools.xml line 32 - #: rc.cpp:1589 -@@ -3830,7 +3887,9 @@ - "A mortar is used for manually grinding solids. It can also be used to " - "homogenize a mixture of powders by grinding. A club-shaped tool known as a " - "pestle is used with the mortar for grinding." --msgstr "研缽（mortar）與一根棍棒狀的研磨棒（pestle）用於研磨固體。它也可以用於將粉末調勻。" -+msgstr "" -+"研缽（mortar）與一根棍棒狀的研磨棒（pestle）用於研磨固體。它也可以用於將粉末" -+"調勻。" - - #. i18n: file data/tools.xml line 37 - #: rc.cpp:1595 -@@ -3845,12 +3904,12 @@ - "Heating coils are used to heat flasks and other containers. Multiple heating " - "coils can be connected with a thermometer so that the heat will not exceed a " - "specified temperature. It is possible to use a magnetic field inside the " --"heating coil to stir fluids with a magnetic stirrer. This will homogenize the " --"fluid in terms of temperature and composition." -+"heating coil to stir fluids with a magnetic stirrer. This will homogenize " -+"the fluid in terms of temperature and composition." - msgstr "" --"加熱線圈（heating " --"coils）用於加熱燒瓶與其它的容器。可以將多個加熱線圈與溫度計相連，以避免超過指定的溫度。另外也可以利用線圈中的磁場配合磁性的攪拌器來攪動流體，這樣可以將流體" --"混合均勻並達到一致溫度。" -+"加熱線圈（heating coils）用於加熱燒瓶與其它的容器。可以將多個加熱線圈與溫度計" -+"相連，以避免超過指定的溫度。另外也可以利用線圈中的磁場配合磁性的攪拌器來攪動" -+"流體，這樣可以將流體混合均勻並達到一致溫度。" - - #. i18n: file data/tools.xml line 42 - #: rc.cpp:1601 -@@ -3862,10 +3921,12 @@ - #: rc.cpp:1604 - #, no-c-format - msgid "" --"Large containers like round-bottomed flasks are placed on rings made of cork, a " --"special soft lightweight wood with good insulating qualities to protect fragile " --"instruments." --msgstr "大的容器如圓形的燒瓶會放在軟木製成的環上。軟木（Cork）是一種特別輕特別軟的木頭，有很好的阻絕性以保護易破的器具。" -+"Large containers like round-bottomed flasks are placed on rings made of " -+"cork, a special soft lightweight wood with good insulating qualities to " -+"protect fragile instruments." -+msgstr "" -+"大的容器如圓形的燒瓶會放在軟木製成的環上。軟木（Cork）是一種特別輕特別軟的木" -+"頭，有很好的阻絕性以保護易破的器具。" - - #. i18n: file data/tools.xml line 47 - #: rc.cpp:1607 -@@ -3877,9 +3938,11 @@ - #: rc.cpp:1610 - #, no-c-format - msgid "" --"A dropping funnel can be used to drop precise amounts of fluid. You can control " --"the dropping speed with a valve." --msgstr "滴漏（dropping funnel）可用於滴入特定量的流體。您可以用調節閥來控制滴入的速度。" -+"A dropping funnel can be used to drop precise amounts of fluid. You can " -+"control the dropping speed with a valve." -+msgstr "" -+"滴漏（dropping funnel）可用於滴入特定量的流體。您可以用調節閥來控制滴入的速" -+"度。" - - #. i18n: file data/tools.xml line 52 - #: rc.cpp:1613 -@@ -3894,7 +3957,9 @@ - "A separating funnel can be used to separate a mixture of fluids by differing " - "density. A valve at the bottom allows you to drain the more dense fluid for " - "transfer to another container." --msgstr "分離漏斗（separating funnel）可依不同的密度來分離混合的流體。底部的閥門可以讓您排出較密的流體，流到另一個容器中。" -+msgstr "" -+"分離漏斗（separating funnel）可依不同的密度來分離混合的流體。底部的閥門可以讓" -+"您排出較密的流體，流到另一個容器中。" - - #. i18n: file data/tools.xml line 57 - #: rc.cpp:1619 -@@ -3906,8 +3971,8 @@ - #: rc.cpp:1622 - #, no-c-format - msgid "" --"This rack comes in handy when you want to test many small amounts of chemicals " --"in a row, or if you want to dry test tubes." -+"This rack comes in handy when you want to test many small amounts of " -+"chemicals in a row, or if you want to dry test tubes." - msgstr "一個手可以拿取的架子，可放上許多試管。" - - #. i18n: file data/tools.xml line 62 -@@ -3920,14 +3985,16 @@ - #: rc.cpp:1628 - #, no-c-format - msgid "" --"A vortexer serves to homogenize reagents found in laboratories. The container " --"containing liquid to be homogenized is put on a platform. The platform shakes " --"by rotary agitation up to 3000RPM at which point a contact sensor is activated. " --"In this way extremely small volumes of fluid can be homogenized quickly as " --"well. It is the opposite of a centrifuge, used to separate fluids." --msgstr "" --"震盪器（Vortexer）用於將試劑均勻混合。將要混合的液體裝入容器中，並放在一個平台上。平台會以最高每分鐘 3000 " --"轉的速度旋轉震動。這樣少量的流體可以快速而充份的混合在一起。它與離心機（centrifuge）相反，離心機用於將液體中的成份分離。" -+"A vortexer serves to homogenize reagents found in laboratories. The " -+"container containing liquid to be homogenized is put on a platform. The " -+"platform shakes by rotary agitation up to 3000RPM at which point a contact " -+"sensor is activated. In this way extremely small volumes of fluid can be " -+"homogenized quickly as well. It is the opposite of a centrifuge, used to " -+"separate fluids." -+msgstr "" -+"震盪器（Vortexer）用於將試劑均勻混合。將要混合的液體裝入容器中，並放在一個平" -+"臺上。平臺會以最高每分鐘 3000 轉的速度旋轉震動。這樣少量的流體可以快速而充份" -+"的混合在一起。它與離心機（centrifuge）相反，離心機用於將液體中的成份分離。" - - #. i18n: file data/tools.xml line 67 - #: rc.cpp:1631 -@@ -3939,11 +4006,13 @@ - #: rc.cpp:1634 - #, no-c-format - msgid "" --"These bottles are used for many purposes. In most laboratories they are usually " --"filled with water, salt, acid or other commonly used fluids. They make it easy " --"to apply the fluid if you do not need to measure a precise amount." -+"These bottles are used for many purposes. In most laboratories they are " -+"usually filled with water, salt, acid or other commonly used fluids. They " -+"make it easy to apply the fluid if you do not need to measure a precise " -+"amount." - msgstr "" --"洗瓶（wash bottle）可用於許多地方。大部份的實驗室中它們用於裝水、鹽、酸類或其他成用的流體。當您不需要很精確的數量時，它們就很好用。" -+"洗瓶（wash bottle）可用於許多地方。大部份的實驗室中它們用於裝水、鹽、酸類或其" -+"他成用的流體。當您不需要很精確的數量時，它們就很好用。" - - #. i18n: file data/tools.xml line 72 - #: rc.cpp:1637 -@@ -3956,15 +4025,16 @@ - #, no-c-format - msgid "" - "A rotary evaporator consists of a round flask in a bath of hot water that is " --"designed to evaporate solvents. The flask is rotated and the solvent collects " --"under a vacuum onto a condenser and drips into a condensate collecting flask. " --"in this way solutions can be concentrated or purified. By attaching a vacuum " --"pump, the air pressure and therefore the boiling point of the fluid can be " --"decreased." --msgstr "" --"減壓濃縮裝置（Rotary " --"evaporator，官方譯法，民間又譯作旋轉蒸發瓶）用於蒸發溶媒（solvent）。將溶劑放入一個圓形燒瓶並浸在熱水中，燒瓶會被旋轉，溶劑中易揮發的溶媒在真空" --"條件下蒸發並經由冷凝而滴入收集燒瓶中，這樣溶液就被濃縮或純化了。連接到真空幫浦之後，氣壓下降，沸點也會跟著下降。" -+"designed to evaporate solvents. The flask is rotated and the solvent " -+"collects under a vacuum onto a condenser and drips into a condensate " -+"collecting flask. in this way solutions can be concentrated or purified. By " -+"attaching a vacuum pump, the air pressure and therefore the boiling point " -+"of the fluid can be decreased." -+msgstr "" -+"減壓濃縮裝置（Rotary evaporator，官方譯法，民間又譯作旋轉蒸發瓶）用於蒸發溶媒" -+"（solvent）。將溶劑放入一個圓形燒瓶並浸在熱水中，燒瓶會被旋轉，溶劑中易揮發的" -+"溶媒在真空條件下蒸發並經由冷凝而滴入收集燒瓶中，這樣溶液就被濃縮或純化了。連" -+"接到真空幫浦之後，氣壓下降，沸點也會跟著下降。" - - #. i18n: file data/tools.xml line 77 - #: rc.cpp:1643 -@@ -3976,11 +4046,13 @@ - #: rc.cpp:1646 - #, no-c-format - msgid "" --"A reflux condenser subjects fluid to a process where a gas produced by heating " --"is collected on the reflux condenser. The fluid is cooled until it condenses " --"and runs back into the original fluid. Usually it is put on a round-bottomed " --"flask or several neck flasks." --msgstr "迴流冷凝器（reflux condenser）會將加熱所產生的氣體冷凝並迴流到原始的液體中。通常它會放在一個圓形燒平或數個長頸燒瓶中。" -+"A reflux condenser subjects fluid to a process where a gas produced by " -+"heating is collected on the reflux condenser. The fluid is cooled until it " -+"condenses and runs back into the original fluid. Usually it is put on a " -+"round-bottomed flask or several neck flasks." -+msgstr "" -+"迴流冷凝器（reflux condenser）會將加熱所產生的氣體冷凝並迴流到原始的液體中。" -+"通常它會放在一個圓形燒平或數個長頸燒瓶中。" - - #. i18n: file data/tools.xml line 82 - #: rc.cpp:1649 -@@ -3992,10 +4064,12 @@ - #: rc.cpp:1652 - #, no-c-format - msgid "" --"A pipette bulb is used to fill pipettes. It produces a negative pressure which " --"makes the fluid go into the pipette. If one lets air back into the ball the " --"fluid will run out of the pipette." --msgstr "吸管球（pipette bulb）用於將液體吸入吸管中。它會產生負壓，讓流體進入吸管。它也可以將吸管中的液體壓出吸管外。" -+"A pipette bulb is used to fill pipettes. It produces a negative pressure " -+"which makes the fluid go into the pipette. If one lets air back into the " -+"ball the fluid will run out of the pipette." -+msgstr "" -+"吸管球（pipette bulb）用於將液體吸入吸管中。它會產生負壓，讓流體進入吸管。它" -+"也可以將吸管中的液體壓出吸管外。" - - #. i18n: file data/tools.xml line 87 - #: rc.cpp:1655 -@@ -4007,10 +4081,12 @@ - #: rc.cpp:1658 - #, no-c-format - msgid "" --"In a test tube small reactions or experiements are performed. There are many " --"different types of tubes. For example some have connectors, some are etched for " --"measurements, some are hardened for durability." --msgstr "小的化學反應跟小實驗可以在試管（test cube）中進行。試管有許多種，例如有些種類有連接器，有些有刻度，有些試管為了耐用而比較硬。" -+"In a test tube small reactions or experiements are performed. There are " -+"many different types of tubes. For example some have connectors, some are " -+"etched for measurements, some are hardened for durability." -+msgstr "" -+"小的化學反應跟小實驗可以在試管（test cube）中進行。試管有許多種，例如有些種類" -+"有連接器，有些有刻度，有些試管為了耐用而比較硬。" - - #. i18n: file data/tools.xml line 92 - #: rc.cpp:1661 -@@ -4022,13 +4098,14 @@ - #: rc.cpp:1664 - #, no-c-format - msgid "" --"Most laboratories insist that everyone wears protective goggles. Without them, " --"it is too risky to work with most chemicals. Usually, the lens is a special " --"type of plastic which protects you from both mechanical impacts and acid and " --"base chemicals." --msgstr "" --"大部份的實驗室都會堅持每個人都要戴護目鏡（protective " --"goggles），因為不戴的話太危險。通常它的鏡片是特殊塑膠製成，可以保護眼睛不會受到撞擊以及酸鹼等化學物質的傷害。" -+"Most laboratories insist that everyone wears protective goggles. Without " -+"them, it is too risky to work with most chemicals. Usually, the lens is a " -+"special type of plastic which protects you from both mechanical impacts and " -+"acid and base chemicals." -+msgstr "" -+"大部份的實驗室都會堅持每個人都要戴護目鏡（protective goggles），因為不戴的話" -+"太危險。通常它的鏡片是特殊塑膠製成，可以保護眼睛不會受到撞擊以及酸鹼等化學物" -+"質的傷害。" - - #. i18n: file data/tools.xml line 97 - #: rc.cpp:1667 -@@ -4040,10 +4117,12 @@ - #: rc.cpp:1670 - #, no-c-format - msgid "" --"A round-bottomed flask is used for a lot of reactions. Some can be connected to " --"other items, as the frosting on the neck shows. With cork rings they can be " --"placed on a table." --msgstr "圓底燒瓶用於許多化學反應。有些會在頸部連接其它的物件。使用軟木環就可以將圓底燒瓶置於桌上。" -+"A round-bottomed flask is used for a lot of reactions. Some can be connected " -+"to other items, as the frosting on the neck shows. With cork rings they can " -+"be placed on a table." -+msgstr "" -+"圓底燒瓶用於許多化學反應。有些會在頸部連接其它的物件。使用軟木環就可以將圓底" -+"燒瓶置於桌上。" - - #. i18n: file data/tools.xml line 102 - #: rc.cpp:1673 -@@ -4069,10 +4148,12 @@ - #: rc.cpp:1682 - #, no-c-format - msgid "" --"There are reactions which need to be kept free of water. To make this possible " --"one uses a drying tube, which contains a hygroscopic chemical to absorb water " --"in the atmosphere." --msgstr "有些化學反應需要保持無水狀態，此時就需要乾燥管（drying tube）。乾燥管內有化學乾燥劑，以吸收空氣中的水份。" -+"There are reactions which need to be kept free of water. To make this " -+"possible one uses a drying tube, which contains a hygroscopic chemical to " -+"absorb water in the atmosphere." -+msgstr "" -+"有些化學反應需要保持無水狀態，此時就需要乾燥管（drying tube）。乾燥管內有化學" -+"乾燥劑，以吸收空氣中的水份。" - - #. i18n: file data/tools.xml line 112 - #: rc.cpp:1685 -@@ -4084,10 +4165,13 @@ - #: rc.cpp:1688 - #, no-c-format - msgid "" --"With a test tube fastener you can easily hold test tubes. If you use a fastener " --"there is a safe distance between the hand and the test tube when the tube is " --"hot. In particular, it is used when you hold a test tube over an open flame." --msgstr "試管夾（test tube fastener）可以協助您固定試管，也可以避免您的手與熱的試管直接接觸以免燙傷，特別是試管需要在火燄上加熱時。" -+"With a test tube fastener you can easily hold test tubes. If you use a " -+"fastener there is a safe distance between the hand and the test tube when " -+"the tube is hot. In particular, it is used when you hold a test tube over an " -+"open flame." -+msgstr "" -+"試管夾（test tube fastener）可以協助您固定試管，也可以避免您的手與熱的試管直" -+"接接觸以免燙傷，特別是試管需要在火燄上加熱時。" - - #. i18n: file data/tools.xml line 117 - #: rc.cpp:1691 -@@ -4099,10 +4183,12 @@ - #: rc.cpp:1694 - #, no-c-format - msgid "" --"In a measuring cylinder you can fill amounts of liquids relatively precisely. " --"Furthermore, the cylinder allows particulate matter to sink. Following this, " --"you can separate particulates from the fluid by decanting." --msgstr "量筒（measuring cylinder）讓您精確量取液體。此外，也可以讓特定物質沉澱，以便從流體中分離出來。" -+"In a measuring cylinder you can fill amounts of liquids relatively " -+"precisely. Furthermore, the cylinder allows particulate matter to sink. " -+"Following this, you can separate particulates from the fluid by decanting." -+msgstr "" -+"量筒（measuring cylinder）讓您精確量取液體。此外，也可以讓特定物質沉澱，以便" -+"從流體中分離出來。" - - #. i18n: file data/tools.xml line 122 - #: rc.cpp:1697 -@@ -4115,9 +4201,11 @@ - #, no-c-format - msgid "" - "With a thermometer you can determine the temperature of a sample. In a " --"laboratory special thermometers are used, which can also be used within acids " --"or bases." --msgstr "溫度計（thermometer）用於決定樣本溫度。在實驗室中也有一些特殊的溫度計，用於測量酸鹼物質的溫度。" -+"laboratory special thermometers are used, which can also be used within " -+"acids or bases." -+msgstr "" -+"溫度計（thermometer）用於決定樣本溫度。在實驗室中也有一些特殊的溫度計，用於測" -+"量酸鹼物質的溫度。" - - #. i18n: file data/tools.xml line 127 - #: rc.cpp:1703 -@@ -4133,8 +4221,8 @@ - "heaters have a built-in magnet which can rotate. This causes the stir bar to " - "rotate and the mixture to be homogenized." - msgstr "" --"磁性攪拌棒（Magnetic stir " --"bars）是小的磁性棒，不會起化學作用。大部份的加入器中都內建一個會旋轉的磁鐵。因此磁性棒可以跟隨磁鐵旋轉，將液體攪伴均勻。" -+"磁性攪拌棒（Magnetic stir bars）是小的磁性棒，不會起化學作用。大部份的加入器" -+"中都內建一個會旋轉的磁鐵。因此磁性棒可以跟隨磁鐵旋轉，將液體攪伴均勻。" - - #. i18n: file data/tools.xml line 132 - #: rc.cpp:1709 -@@ -4147,9 +4235,11 @@ - #, no-c-format - msgid "" - "With a magnetic stir bar retriever you can remove magnetic stir bars from a " --"container. The retriever is a bar with a magnet at the end which attracts the " --"stir bars." --msgstr "磁性攪拌棒回收器（magnetic stir bar retriever）用於從容器中取出磁性攪拌棒，它具有磁性可以將磁性攪拌棒吸出來。" -+"container. The retriever is a bar with a magnet at the end which attracts " -+"the stir bars." -+msgstr "" -+"磁性攪拌棒回收器（magnetic stir bar retriever）用於從容器中取出磁性攪拌棒，它" -+"具有磁性可以將磁性攪拌棒吸出來。" - - #. i18n: file data/tools.xml line 137 - #: rc.cpp:1715 -@@ -4161,14 +4251,15 @@ - #: rc.cpp:1718 - #, no-c-format - msgid "" --"Pipettes are used to introduce small quantities of liquids in laboratories. A " --"pipette has a volume scale and as a rule pileusballs are used as droppers for " --"liquids. Both sorts of pipettes are calibrated for fluids with a temperature of " --"20°C and for time of outflow (signified by \"Ex.\"). If needed times of outflow " --"are indicated on the pipettes." --msgstr "" --"吸管（pipette）用於在實驗中引入小量液體。它有容量刻度，有的只有一兩個特定的刻度。這兩種都在攝氏 20 " --"度時進行體積校正，以及校正滿出來時的流出時間，並標示在吸管上。" -+"Pipettes are used to introduce small quantities of liquids in laboratories. " -+"A pipette has a volume scale and as a rule pileusballs are used as droppers " -+"for liquids. Both sorts of pipettes are calibrated for fluids with a " -+"temperature of 20°C and for time of outflow (signified by \"Ex.\"). If " -+"needed times of outflow are indicated on the pipettes." -+msgstr "" -+"吸管（pipette）用於在實驗中引入小量液體。它有容量刻度，有的只有一兩個特定的刻" -+"度。這兩種都在攝氏 20 度時進行體積校正，以及校正滿出來時的流出時間，並標示在" -+"吸管上。" - - #. i18n: file data/tools.xml line 142 - #: rc.cpp:1721 -@@ -4180,33 +4271,31 @@ - #: rc.cpp:1724 - #, no-c-format - msgid "" --"This flask named after the chemist Emil Erlenmeyer (1825-1909) comes - unlike " --"the beaker - with an inverted conical base and a cylindrical neck. There are " --"different types of Erlenmeyer flasks for laboratory applications, the narrow " --"and wide neck form. Depending on the application the flask may have precision " --"grinding to allow good connection to other containers.\n" --"\t\t\t" --"
                                  \n" -+"This flask named after the chemist Emil Erlenmeyer (1825-1909) comes - " -+"unlike the beaker - with an inverted conical base and a cylindrical neck. " -+"There are different types of Erlenmeyer flasks for laboratory applications, " -+"the narrow and wide neck form. Depending on the application the flask may " -+"have precision grinding to allow good connection to other containers.\n" -+"\t\t\t
                                  \n" - "\t\t\tThe narrow neck reduces the risk of fluid escaping, especially when " - "boiling or during reactions which agitate the contents.\n" --"\t\t\t" --"
                                  \n" --"\t\t\tAn Erlenmeyer flask is useful for mixing fluids or accelerating reactions " --"by stirring or shaking, for example. The Erlenmeyer flask is particularly " --"suited for a magnetic stirrer, since it can be placed directly on the stirring " --"platform. A round-bottomed flask, by contrast, must be placed on a cork ring on " --"the stirring platform.\n" --msgstr "" --"錐形燒瓶（Emil Erlenmeyer）的英文名稱是為了紀念化學家 Emil " --"Erlenmeyer（1825-1909）。與一般燒瓶不同，它的底座是圓錐型，瓶頸則為圓柱狀。依據不同的實驗用途有幾種不同的錐形燒瓶，如窄頸與寬頸等。有的燒瓶會" --"磨光以便容易與其它容器連接在一起。\n" --"\t\t\t" --"
                                  \n" -+"\t\t\t
                                  \n" -+"\t\t\tAn Erlenmeyer flask is useful for mixing fluids or accelerating " -+"reactions by stirring or shaking, for example. The Erlenmeyer flask is " -+"particularly suited for a magnetic stirrer, since it can be placed directly " -+"on the stirring platform. A round-bottomed flask, by contrast, must be " -+"placed on a cork ring on the stirring platform.\n" -+msgstr "" -+"錐形燒瓶（Emil Erlenmeyer）的英文名稱是為了紀念化學家 Emil Erlenmeyer（1825-" -+"1909）。與一般燒瓶不同，它的底座是圓錐型，瓶頸則為圓柱狀。依據不同的實驗用途" -+"有幾種不同的錐形燒瓶，如窄頸與寬頸等。有的燒瓶會磨光以便容易與其它容器連接在" -+"一起。\n" -+"\t\t\t
                                  \n" - "\t\t\t窄頸燒瓶可以避免流體溢出，特別是在沸騰或是在攪拌其內容物時。\n" --"\t\t\t" --"
                                  \n" --"\t\t\t錐形燒瓶常用於混合流體，或是攪拌、搖動以加速反應進行時。它特別適合與磁性攪拌棒一起使用，因為它可以直接放在攪拌平台上。圓形燒瓶相對而言就比較不方便，" --"因為它必須擺在軟木環上。\n" -+"\t\t\t
                                  \n" -+"\t\t\t錐形燒瓶常用於混合流體，或是攪拌、搖動以加速反應進行時。它特別適合與磁" -+"性攪拌棒一起使用，因為它可以直接放在攪拌平臺上。圓形燒瓶相對而言就比較不方" -+"便，因為它必須擺在軟木環上。\n" - - #. i18n: file data/tools.xml line 153 - #: rc.cpp:1732 -@@ -4219,12 +4308,13 @@ - #, no-c-format - msgid "" - "For some chemical reactions it is important that the solvent is gas free. To " --"achieve this the reaction vessel is put for some time into a ultrasonic bath. " --"Through the high sound frequency the vapor locks peel away and ascend. This " --"procedure is called outgassing." --msgstr "" --"有些化學反應必須確保溶劑中沒有氣體。此時會將進行反應用的導管放在超音波清洗器（ultrasonic " --"bath）中。透過超高頻的聲音，將裡面的氣體震出來。這個過程叫做除氣（outgassing）。" -+"achieve this the reaction vessel is put for some time into a ultrasonic " -+"bath. Through the high sound frequency the vapor locks peel away and ascend. " -+"This procedure is called outgassing." -+msgstr "" -+"有些化學反應必須確保溶劑中沒有氣體。此時會將進行反應用的導管放在超音波清洗器" -+"（ultrasonic bath）中。透過超高頻的聲音，將裡面的氣體震出來。這個過程叫做除氣" -+"（outgassing）。" - - #. i18n: file data/tools.xml line 158 - #: rc.cpp:1738 -@@ -4236,13 +4326,14 @@ - #: rc.cpp:1741 - #, no-c-format - msgid "" --"In a laboratory you often have to weigh out very precise amounts of reagents. " --"High precise scales can measure masses down to 1/10000 gram.Therefor they stand " --"on granite blocks to avoid vibrancies and are protected against blasts by a " --"dome." --msgstr "" --"在實驗室中經常需要量測出非常精確的試劑重量。高精確度的天平可用於測量質量，最小單位甚至可以到萬分之一克。因此經常使用花崗岩做底部以防止震動，並在外部使用半圓罩子" --"以避免風的干擾。" -+"In a laboratory you often have to weigh out very precise amounts of " -+"reagents. High precise scales can measure masses down to 1/10000 gram." -+"Therefor they stand on granite blocks to avoid vibrancies and are protected " -+"against blasts by a dome." -+msgstr "" -+"在實驗室中經常需要量測出非常精確的試劑重量。高精確度的天平可用於測量質量，最" -+"小單位甚至可以到萬分之一克。因此經常使用花崗岩做底部以防止震動，並在外部使用" -+"半圓罩子以避免風的干擾。" - - #. i18n: file data/tools.xml line 163 - #: rc.cpp:1744 -@@ -4254,17 +4345,18 @@ - #: rc.cpp:1747 - #, no-c-format - msgid "" --"To separate a mixture you can use distillation amongst others. The distillation " --"bridge is thereby the way between the two pots. In the one pot there is the " --"mixture to be separated. Through heating, a gas forms which is lead through the " --"bridge. At the end of the bridge the gas phase is condensed again and drips in " --"a round flask. As a rule, the bridge is cooled by return flow. In addition, " --"there is often a thermometer for controlling the temperature on the " --"distillation bridge." --msgstr "" --"要分離混合物，我們可以用蒸餾的方式。蒸餾橋（Distillation " --"bridge）擺在兩個杯子中間。其中一個杯子是要分離的混合物，經過加熱後，氣體被導到橋中。氣體到橋的另一端後被冷凝，並滴入圓形燒瓶中。蒸餾橋的冷卻一般是靠回流。" --"此外，蒸餾橋上通常也會有溫度計以控制溫度。" -+"To separate a mixture you can use distillation amongst others. The " -+"distillation bridge is thereby the way between the two pots. In the one pot " -+"there is the mixture to be separated. Through heating, a gas forms which is " -+"lead through the bridge. At the end of the bridge the gas phase is condensed " -+"again and drips in a round flask. As a rule, the bridge is cooled by return " -+"flow. In addition, there is often a thermometer for controlling the " -+"temperature on the distillation bridge." -+msgstr "" -+"要分離混合物，我們可以用蒸餾的方式。蒸餾橋（Distillation bridge）擺在兩個杯子" -+"中間。其中一個杯子是要分離的混合物，經過加熱後，氣體被導到橋中。氣體到橋的另" -+"一端後被冷凝，並滴入圓形燒瓶中。蒸餾橋的冷卻一般是靠回流。此外，蒸餾橋上通常" -+"也會有溫度計以控制溫度。" - - #. i18n: file data/tools.xml line 169 - #: rc.cpp:1750 -@@ -4278,10 +4370,11 @@ - msgid "" - "A syringe consists of two parts: A glass tube and a punch. Both are normally " - "made of glass. A gas floats into the glass tube. As the syringe is a closed " --"system the punch has to give way. This can be used measuring the volume of an " --"reaction." -+"system the punch has to give way. This can be used measuring the volume of " -+"an reaction." - msgstr "" --"注射器（syringe）包括兩部份：一個玻璃管與一個注射用的桿子。通常兩者都是玻璃做的。當氣體流入玻璃管內時，因為注射器是密封的，因此會將桿子推出。這樣可用於測" -+"注射器（syringe）包括兩部份：一個玻璃管與一個注射用的桿子。通常兩者都是玻璃做" -+"的。當氣體流入玻璃管內時，因為注射器是密封的，因此會將桿子推出。這樣可用於測" - "量反應時的體積。" - - #. i18n: file data/tools.xml line 174 -@@ -4295,12 +4388,14 @@ - #, no-c-format - msgid "" - "At the four ends of this separation beaker you put four small caps. While " --"distilling, you can turn the beaker by 60 degree after a certain temperate has " --"been reached. This way, at the end of the distillation all four caps have a " --"specific liquid in it, depending on the boiling points of the liquid distilled." --msgstr "" --"分離燒杯（separation beaker）有四個口，每個口都有小蓋子。在蒸餾的過程中，您可以在燒杯達到一定溫度時就將燒杯轉 60 " --"度。這樣在蒸餾完成時，依沸點的不同，四個蓋子都會有特定的液體在裡面。" -+"distilling, you can turn the beaker by 60 degree after a certain temperate " -+"has been reached. This way, at the end of the distillation all four caps " -+"have a specific liquid in it, depending on the boiling points of the liquid " -+"distilled." -+msgstr "" -+"分離燒杯（separation beaker）有四個口，每個口都有小蓋子。在蒸餾的過程中，您可" -+"以在燒杯達到一定溫度時就將燒杯轉 60 度。這樣在蒸餾完成時，依沸點的不同，四個" -+"蓋子都會有特定的液體在裡面。" - - #. i18n: file data/tools.xml line 179 - #: rc.cpp:1762 -@@ -4312,12 +4407,13 @@ - #: rc.cpp:1765 - #, no-c-format - msgid "" --"There are several types of burners. The picture shows a Teclu-Burner. Each type " --"has specific uses. They vary in the peak temperature and overall heating " --"capability." --msgstr "" --"燃燒器（burner）有好幾種。圖片中顯示的是雙層轉筒燃燒器（Teclu-burner，又譯作「特克魯燃燒器」）。每一種都有不同的用途。它們的最大溫度以及整體加" --"熱能力都不同。" -+"There are several types of burners. The picture shows a Teclu-Burner. Each " -+"type has specific uses. They vary in the peak temperature and overall " -+"heating capability." -+msgstr "" -+"燃燒器（burner）有好幾種。圖片中顯示的是雙層轉筒燃燒器（Teclu-burner，又譯作" -+"「特克魯燃燒器」）。每一種都有不同的用途。它們的最大溫度以及整體加熱能力都不" -+"同。" - - #. i18n: file data/tools.xml line 184 - #: rc.cpp:1768 -@@ -4331,7 +4427,9 @@ - msgid "" - "Most laboratories use extractor hoods. They filter the gasses from chemical " - "reactions and pump the cleaned air outside of the building." --msgstr "大部份的實驗室都有通風櫃（extractor hood）。它們會將化學反應產生的氣體過濾，並將乾淨的氣體排出。" -+msgstr "" -+"大部份的實驗室都有通風櫃（extractor hood）。它們會將化學反應產生的氣體過濾，" -+"並將乾淨的氣體排出。" - - #. i18n: file data/tools.xml line 189 - #: rc.cpp:1774 -@@ -4349,9 +4447,9 @@ - "reached the contact thermometer will make the heating coild stop heating. " - "Therefore in an experiment it is possible to have a constant temperature." - msgstr "" --"接觸式溫度計（contact " --"thermometer）與一般溫度計不同的地方在於它有個偵測目前溫度的感應器。將它與加熱線圈相連，就可以在感應器感知溫度已達到設定目標時停止加熱。因此實驗時可以" --"保持恆溫。" -+"接觸式溫度計（contact thermometer）與一般溫度計不同的地方在於它有個偵測目前溫" -+"度的感應器。將它與加熱線圈相連，就可以在感應器感知溫度已達到設定目標時停止加" -+"熱。因此實驗時可以保持恆溫。" - - #. i18n: file data/tools.xml line 194 - #: rc.cpp:1780 -@@ -4381,8 +4479,9 @@ - "value. If you need a more precise value you can for example use a pH-Meter " - "which is using the conductivity of a solution." - msgstr "" --"測量溶液的酸鹼值（pH）有好幾種方法。石蕊試紙是其中一種。根據它變色的程度可以一定程度的知道 pH 值。如果您需要更精確的數值，您可以用 pH " --"量尺，它是利用溶液的傳導能力。" -+"測量溶液的酸鹼值（pH）有好幾種方法。石蕊試紙是其中一種。根據它變色的程度可以" -+"一定程度的知道 pH 值。如果您需要更精確的數值，您可以用 pH 量尺，它是利用溶液" -+"的傳導能力。" - - #. i18n: file data/tools.xml line 204 - #: rc.cpp:1792 -@@ -4406,14 +4505,15 @@ - #: rc.cpp:1801 - #, no-c-format - msgid "" --"A buret is used to titrate liquids. The buret is filled with a specified volume " --"of a liquid. Below it a container like an Erlenmeyer flask is placed. By " --"opening the valve the liquid in the container will be titrated. High-quality " --"buret have a venting-mechanism with which they can be very easily refilled with " --"the exact volume for which the buret is calibrated." --msgstr "" --"滴定管（Buret）用於滴定溶液。滴定管中裝了特定容量的液體。在它下方是一個容器，如錐形瓶。開啟閥門後，容器內的液體就開始被滴定。高品質的滴定管會有一種孔狀的設" --"備，這樣可以重新填入精確容量的液體。" -+"A buret is used to titrate liquids. The buret is filled with a specified " -+"volume of a liquid. Below it a container like an Erlenmeyer flask is placed. " -+"By opening the valve the liquid in the container will be titrated. High-" -+"quality buret have a venting-mechanism with which they can be very easily " -+"refilled with the exact volume for which the buret is calibrated." -+msgstr "" -+"滴定管（Buret）用於滴定溶液。滴定管中裝了特定容量的液體。在它下方是一個容器，" -+"如錐形瓶。開啟閥門後，容器內的液體就開始被滴定。高品質的滴定管會有一種孔狀的" -+"設備，這樣可以重新填入精確容量的液體。" - - #. i18n: file data/tools.xml line 214 - #: rc.cpp:1804 -@@ -4441,10 +4541,11 @@ - #, no-c-format - msgid "" - "The DSC measures the heat flow volume of a compound. This value is very " --"specific for every kind of matter. Thus, the DSC is used to identify chemicals " --"or to describe them." -+"specific for every kind of matter. Thus, the DSC is used to identify " -+"chemicals or to describe them." - msgstr "" --"熱微差掃描分析儀（DSC）測量化合物的熱通量（heat flow volume）。每種物質都有特定的熱通量值，因此 DSC 用於辨識或描述化學物質。" -+"熱微差掃描分析儀（DSC）測量化合物的熱通量（heat flow volume）。每種物質都有特" -+"定的熱通量值，因此 DSC 用於辨識或描述化學物質。" - - #. i18n: file data/tools.xml line 224 - #: rc.cpp:1816 -@@ -4456,13 +4557,13 @@ - #: rc.cpp:1819 - #, no-c-format - msgid "" --"A dewar vessel (or dewar flask) is designed for a good thermal insulation. Its " --"hull is a double-layer construction with vacuum between the two layers. Because " --"of this they are appropriote for keeping liquids cold or warm. A thermos flawsk " --"is an example of a dewar vessel." -+"A dewar vessel (or dewar flask) is designed for a good thermal insulation. " -+"Its hull is a double-layer construction with vacuum between the two layers. " -+"Because of this they are appropriote for keeping liquids cold or warm. A " -+"thermos flawsk is an example of a dewar vessel." - msgstr "" --"杜瓦瓶（dewar vessel 或 dewar " --"flask）用於隔絕熱能。外層有兩層，中間抽成真空。因此它們適於保持液體的溫度。我們常用的保溫瓶就是杜瓦瓶的一種。" -+"杜瓦瓶（dewar vessel 或 dewar flask）用於隔絕熱能。外層有兩層，中間抽成真空。" -+"因此它們適於保持液體的溫度。我們常用的保溫瓶就是杜瓦瓶的一種。" - - #: somwidget_impl.cpp:139 - msgid "Elements with melting point around this temperature:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kanagram.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kanagram.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kanagram.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kanagram.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kanagram\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-06-30 14:54+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -176,19 +175,18 @@ - msgstr "需要標籤<%1>但是讀到標籤<%2>" - - #: keduvockvtmlreader.cpp:1670 keduvockvtmlreader.cpp:1690 --msgid "" --"File:\t%1\n" --msgstr "" --"檔案：\t%1\n" -+msgid "File:\t%1\n" -+msgstr "檔案：\t%1\n" - - #: keduvockvtmlreader.cpp:1673 - msgid "" --"Your document contains an unknown tag <%1>. Maybe your version of KVocTrain is " --"too old, or the document is damaged.\n" -+"Your document contains an unknown tag <%1>. Maybe your version of KVocTrain " -+"is too old, or the document is damaged.\n" - "Loading is aborted because KVocTrain cannot read documents with unknown " - "elements.\n" - msgstr "" --"您的文件中包含未知的標籤<%1>。也許您的 KVocTrain 版本太舊了，或是文件已損毀。\n" -+"您的文件中包含未知的標籤<%1>。也許您的 KVocTrain 版本太舊了，或是文件已損" -+"毀。\n" - "載入將中斷，因為 KVocTrain 無法讀取含有未知標籤的文件。\n" - - #: keduvockvtmlreader.cpp:1681 -@@ -229,8 +227,8 @@ - - #: mainsettings.cpp:150 - msgid "" --"The font could not be installed. Please check that you are properly connected " --"to the Internet." -+"The font could not be installed. Please check that you are properly " -+"connected to the Internet." - msgstr "無法安裝此字型。請檢查您是否已連上網路。" - - #. i18n: file ./vocabeditwidget.ui line 16 -@@ -249,10 +247,12 @@ - #: rc.cpp:15 - #, no-c-format - msgid "" --"The description of the vocabulary. If you're creating a new vocabulary, add a " --"description so that users of your vocabulary will know what kinds of words it " --"contains." --msgstr "字彙的描述。如果您要建立新字彙，請寫好描述以便讓使用者知道這個字彙包含了哪些種類的字。" -+"The description of the vocabulary. If you're creating a new vocabulary, add " -+"a description so that users of your vocabulary will know what kinds of words " -+"it contains." -+msgstr "" -+"字彙的描述。如果您要建立新字彙，請寫好描述以便讓使用者知道這個字彙包含了哪些" -+"種類的字。" - - #. i18n: file ./vocabeditwidget.ui line 96 - #: rc.cpp:18 -@@ -324,8 +324,8 @@ - #: rc.cpp:54 - #, no-c-format - msgid "" --"This setting allows you to set the length of time that Kanagram's hint bubble " --"is shown." -+"This setting allows you to set the length of time that Kanagram's hint " -+"bubble is shown." - msgstr "這個設定是 Kanagram 提示顯示的時間。" - - #. i18n: file ./mainsettingswidget.ui line 30 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kbruch.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kbruch.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kbruch.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kbruch.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kbruch\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-06-16 16:31+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -42,10 +41,12 @@ - - #: exercisecompare.cpp:137 - msgid "" --"In this exercise you have to compare 2 given fractions by choosing the correct " --"comparison sign. You can change the comparison sign by just clicking on the " --"button showing the sign." --msgstr "這個練習中您要比較兩個分數的大小，選擇正確的比較符號。您可以點選比較符號的按鍵來改變符號。" -+"In this exercise you have to compare 2 given fractions by choosing the " -+"correct comparison sign. You can change the comparison sign by just clicking " -+"on the button showing the sign." -+msgstr "" -+"這個練習中您要比較兩個分數的大小，選擇正確的比較符號。您可以點選比較符號的按" -+"鍵來改變符號。" - - #: exercisecompare.cpp:211 exerciseconvert.cpp:338 exercisefactorize.cpp:399 - #: taskview.cpp:263 -@@ -89,9 +90,10 @@ - #: exerciseconvert.cpp:159 exerciseconvert.cpp:423 exercisefactorize.cpp:156 - #: exercisefactorize.cpp:470 taskview.cpp:154 taskview.cpp:347 - msgid "" --"Click on this button to check your result. The button will not work if you have " --"not entered a result yet." --msgstr "按下此鍵來檢查您的計算結果是否正確。如果您還沒輸入，則這個按鍵不會有作用。" -+"Click on this button to check your result. The button will not work if you " -+"have not entered a result yet." -+msgstr "" -+"按下此鍵來檢查您的計算結果是否正確。如果您還沒輸入，則這個按鍵不會有作用。" - - #: taskview.cpp:169 - msgid "In this exercise you have to solve a given task with fractions." -@@ -100,14 +102,16 @@ - #: taskview.cpp:170 - msgid "" - "In this exercise you have to solve the generated task. You have to enter " --"numerator and denominator. You can adjust the difficulty of the task with the " --"boxes in the toolbar. Do not forget to reduce the result!" --msgstr "這個練習是讓您解分數的計算題。您必須輸入結果的分子與分母。您可以在工具列中調整題目的難度。記得結果要約分！" -+"numerator and denominator. You can adjust the difficulty of the task with " -+"the boxes in the toolbar. Do not forget to reduce the result!" -+msgstr "" -+"這個練習是讓您解分數的計算題。您必須輸入結果的分子與分母。您可以在工具列中調" -+"整題目的難度。記得結果要約分！" - - #: exerciseconvert.cpp:406 taskview.cpp:332 - msgid "" --"You entered a 0 as the denominator. This means division by zero, which is not " --"allowed. This task will be counted as not correctly solved." -+"You entered a 0 as the denominator. This means division by zero, which is " -+"not allowed. This task will be counted as not correctly solved." - msgstr "您輸入 0 當分母。這表示除數為零，是絕對錯誤的。這一題會被認定為錯誤。" - - #: exerciseconvert.cpp:412 taskview.cpp:338 -@@ -314,7 +318,8 @@ - #: rc.cpp:111 - #, no-c-format - msgid "" --"Enables/disables showing the result also in the special mixed-number notation." -+"Enables/disables showing the result also in the special mixed-number " -+"notation." - msgstr "決定是否要在顯示結果時也以帶分數方式顯示。" - - #: mainqtwidget.cpp:70 -@@ -323,8 +328,8 @@ - - #: mainqtwidget.cpp:71 - msgid "" --"Click on the different icons to choose another exercise. The exercises help you " --"to practice different aspects of calculating with fractions." -+"Click on the different icons to choose another exercise. The exercises help " -+"you to practice different aspects of calculating with fractions." - msgstr "點選不同的圖示可以選擇各種不同的分數計算練習題型。" - - #: mainqtwidget.cpp:79 -@@ -374,8 +379,8 @@ - - #: mainqtwidget.cpp:200 - msgid "" --"Choose the number which will be the maximum for the main denominator: 10, 20, " --"30, 40 or 50." -+"Choose the number which will be the maximum for the main denominator: 10, " -+"20, 30, 40 or 50." - msgstr "選擇要以哪一個做為最大分母：10，20，30，40 或 50。" - - #: mainqtwidget.cpp:212 -@@ -404,9 +409,9 @@ - - #: mainqtwidget.cpp:238 - msgid "" --"Choose the type of operations you want for calculating fractions: " --"Addition/Substraction, Multiplication/Division or All Operations Mixed. If you " --"choose All Operations Mixed, the program will randomly choose addition, " -+"Choose the type of operations you want for calculating fractions: Addition/" -+"Substraction, Multiplication/Division or All Operations Mixed. If you choose " -+"All Operations Mixed, the program will randomly choose addition, " - "substraction, multiplication and/or division." - msgstr "選擇您要練習分數計算的運算型態：加減、乘除或加減乘除混合題型。" - -@@ -498,8 +503,9 @@ - "field. Do not forget to enter all prime factors, even when a prime factor " - "repeats several times!" - msgstr "" --"這個練習讓您做質因數分解。您必須輸入此數字的所有質因數。您可以點選質因數的按鍵來加入質因數，已選擇的質因數會列在上方的欄位中。要記得輸入「所有」的質因數，包括重" --"複出現的！" -+"這個練習讓您做質因數分解。您必須輸入此數字的所有質因數。您可以點選質因數的按" -+"鍵來加入質因數，已選擇的質因數會列在上方的欄位中。要記得輸入「所有」的質因" -+"數，包括重複出現的！" - - #: statisticsview.cpp:65 - msgid "Tasks so far:" -@@ -539,11 +545,13 @@ - - #: statisticsview.cpp:131 - msgid "" --"This part of the window shows the statistics. Each exercise you do is counted. " --"You can reset the statistics by clicking on the button below. Also, if you do " --"not want to see the statistics, use the vertical bar on the left to reduce the " --"size of this window part." --msgstr "視窗的這部份顯示統計數據。您做的每一題計算都會計數。您可以將統計重置歸零，也可以用左方的垂直列來把統計視窗關掉。" -+"This part of the window shows the statistics. Each exercise you do is " -+"counted. You can reset the statistics by clicking on the button below. Also, " -+"if you do not want to see the statistics, use the vertical bar on the left " -+"to reduce the size of this window part." -+msgstr "" -+"視窗的這部份顯示統計數據。您做的每一題計算都會計數。您可以將統計重置歸零，也" -+"可以用左方的垂直列來把統計視窗關掉。" - - #: exerciseconvert.cpp:170 - msgid "In this exercise you have to convert a number into a fraction." -@@ -551,6 +559,6 @@ - - #: exerciseconvert.cpp:171 - msgid "" --"In this exercise you have to convert a given number into a fraction by entering " --"numerator and denominator. Do not forget to reduce the result!" -+"In this exercise you have to convert a given number into a fraction by " -+"entering numerator and denominator. Do not forget to reduce the result!" - msgstr "這個練習讓您將一個循環小數轉成分數。要記得把結果約分！" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/keduca.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/keduca.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/keduca.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/keduca.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: keduca\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-06-19 12:25+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -179,7 +178,7 @@ - - #: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116 - msgid "Open &Gallery..." --msgstr "開啟相簿(&G)..." -+msgstr "開啟相簿(&G)…" - - #: keducabuilder/keducabuilder.cpp:121 - msgid "Document Info" -@@ -187,11 +186,11 @@ - - #: keducabuilder/keducabuilder.cpp:124 - msgid "&Add..." --msgstr "新增(&A)..." -+msgstr "新增(&A)…" - - #: keducabuilder/keducabuilder.cpp:125 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: keducabuilder/keducabuilder.cpp:127 - msgid "&Up" -@@ -275,8 +274,8 @@ - - #: keducabuilder/keducabuilder.cpp:462 - msgid "" --"If you want to share this document, it is better to copy the images to the same " --"folder as the document.\n" -+"If you want to share this document, it is better to copy the images to the " -+"same folder as the document.\n" - "Do you want to copy images?" - msgstr "如果要分享此文件，最好將圖片複製到跟文件同一個目錄下。您要複製圖片嗎？" - -@@ -307,7 +306,7 @@ - - #: keducabuilder/keducabuilder.cpp:536 - msgid "Complete Document Info..." --msgstr "完成文件資訊..." -+msgstr "完成文件資訊…" - - #: keducabuilder/keducabuilder.cpp:546 - msgid "" -@@ -431,15 +430,15 @@ - - #: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96 - msgid "&Next >>" --msgstr "下一個 >> (&N)" -+msgstr "下一個 >>(&N)" - - #: keduca/keducaview.cpp:89 - msgid "&Save Results..." --msgstr "儲存結果(&S)..." -+msgstr "儲存結果(&S)…" - - #: keduca/keducaview.cpp:151 - msgid "Save Results As" --msgstr "儲存結果為..." -+msgstr "儲存結果為…" - - #: keduca/keducaview.cpp:192 - msgid "Save failed." -@@ -551,11 +550,9 @@ - #, no-c-format - msgid "" - "\n" --" " --"

                                  Question

                                  \n" -+"

                                  Question

                                  \n" - "
                                  \n" --" " --"

                                  Only the question and type is required.

                                  \n" -+"

                                  Only the question and type is required.

                                  \n" - "                                  " - msgstr "" - "\n" -@@ -617,11 +614,9 @@ - #, no-c-format - msgid "" - "\n" --" " --"

                                  Answers

                                  \n" -+"

                                  Answers

                                  \n" - "
                                  \n" --" " --"

                                  Only the answer and value is required.

                                  \n" -+"

                                  Only the answer and value is required.

                                  \n" - "                                  " - msgstr "" - "\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_drgeo.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_drgeo.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_drgeo.po 2006-07-22 10:04:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_drgeo.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_drgeo\n" - "POT-Creation-Date: 2005-05-08 12:46+0200\n" - "PO-Revision-Date: 2006-06-20 16:21+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_kig.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_kig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kfile_kig.po 2006-07-22 10:04:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kfile_kig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_kig\n" - "POT-Creation-Date: 2005-05-25 08:18+0200\n" - "PO-Revision-Date: 2006-06-19 10:24+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kgeography.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kgeography.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kgeography.po 2007-05-14 12:22:57.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kgeography.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: kgeography\n" - "POT-Creation-Date: 2007-03-02 02:46+0100\n" - "PO-Revision-Date: 2007-03-13 14:28+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -64,14 +63,14 @@ - msgid "" - "_: There are two ways of dealing with the translation of \"%1 is the capital " - "of...\". The first option simply replaces %1 with the translated name of the " --"relevant city. If the grammar of your language allows this, choose this option " --"by setting the translation of this message to 1, and leave untranslated the " --"translations of \"%1 is the capital of...\" that have the placename embedded " --"(or translate them as - if you wish to show the file as fully translated. The " --"second option is to translate all messages in full - this is likely to be " --"required in the case of highly-inflected languages like Russian. To choose this " --"option, set the translation of this message to 0, and translate all the " --"messages.\n" -+"relevant city. If the grammar of your language allows this, choose this " -+"option by setting the translation of this message to 1, and leave " -+"untranslated the translations of \"%1 is the capital of...\" that have the " -+"placename embedded (or translate them as - if you wish to show the file as " -+"fully translated. The second option is to translate all messages in full - " -+"this is likely to be required in the case of highly-inflected languages like " -+"Russian. To choose this option, set the translation of this message to 0, " -+"and translate all the messages.\n" - "0" - msgstr "0" - -@@ -88,13 +87,13 @@ - "_: There are two ways of dealing with the translation of \"The capital of %1 " - "is...\". The first option simply replaces %1 with the translated name of the " - "relevant region. If the grammar of your language allows this, choose this " --"option by setting the translation of this message to 1, and leave untranslated " --"the translations of \"The capital of %1 is...\" that have the placename " --"embedded (or translate them as - if you wish to show the file as fully " --"translated. The second option is to translate all messages in full - this is " --"likely to be required in the case of highly-inflected languages like Russian. " --"To choose this option, set the translation of this message to 0, and translate " --"all the messages.\n" -+"option by setting the translation of this message to 1, and leave " -+"untranslated the translations of \"The capital of %1 is...\" that have the " -+"placename embedded (or translate them as - if you wish to show the file as " -+"fully translated. The second option is to translate all messages in full - " -+"this is likely to be required in the case of highly-inflected languages like " -+"Russian. To choose this option, set the translation of this message to 0, " -+"and translate all the messages.\n" - "0" - msgstr "0" - -@@ -111,13 +110,13 @@ - "_: There are two ways of dealing with the translation of \"The flag of %1 " - "is...\". The first option simply replaces %1 with the translated name of the " - "relevant region. If the grammar of your language allows this, choose this " --"option by setting the translation of this message to 1, and leave untranslated " --"the translations of \"The flag of %1 is...\" that have the placename embedded " --"(or translate them as - if you wish to show the file as fully translated. The " --"second option is to translate all messages in full - this is likely to be " --"required in the case of highly-inflected languages like Russian. To choose this " --"option, set the translation of this message to 0, and translate all the " --"messages.\n" -+"option by setting the translation of this message to 1, and leave " -+"untranslated the translations of \"The flag of %1 is...\" that have the " -+"placename embedded (or translate them as - if you wish to show the file as " -+"fully translated. The second option is to translate all messages in full - " -+"this is likely to be required in the case of highly-inflected languages like " -+"Russian. To choose this option, set the translation of this message to 0, " -+"and translate all the messages.\n" - "0" - msgstr "0" - -@@ -143,22 +142,23 @@ - - #: kgeography.cpp:50 - msgid "" --"In this section left click on any part of the map to learn about the divisions" -+"In this section left click on any part of the map to learn about the " -+"divisions" - msgstr "這一章節內，點擊地圖的任何地方，可以學習關於該地區的資訊" - - #: kgeography.cpp:51 - msgid "&Click Division in Map..." --msgstr "點選地圖上的地區(&C)..." -+msgstr "點選地圖上的地區(&C)…" - - #: kgeography.cpp:52 - msgid "" --"In this challenge you are given a division name on the left under the menu and " --"you must find it on the map and click on it" -+"In this challenge you are given a division name on the left under the menu " -+"and you must find it on the map and click on it" - msgstr "在這個挑戰中，您必須根據國家名稱在地圖上點擊正確的位置。" - - #: kgeography.cpp:53 - msgid "Guess Division From Its &Capital..." --msgstr "從首都猜國家(&C)..." -+msgstr "從首都猜國家(&C)…" - - #: kgeography.cpp:54 - msgid "In this quiz you have to guess the division name given its capital" -@@ -166,7 +166,7 @@ - - #: kgeography.cpp:55 - msgid "Guess Capital of &Division..." --msgstr "猜國家的首都(&D)..." -+msgstr "猜國家的首都(&D)…" - - #: kgeography.cpp:56 - msgid "In this quiz you have to guess the capital of a given division name" -@@ -174,7 +174,7 @@ - - #: kgeography.cpp:57 - msgid "&Guess Division From Its Flag..." --msgstr "從國旗猜國家(&G)..." -+msgstr "從國旗猜國家(&G)…" - - #: kgeography.cpp:58 - msgid "In this quiz you have to guess the division name given its flag" -@@ -182,7 +182,7 @@ - - #: kgeography.cpp:59 - msgid "G&uess Flag of Division..." --msgstr "猜國家的國旗(&U)..." -+msgstr "猜國家的國旗(&U)…" - - #: kgeography.cpp:60 - msgid "In this quiz you have to guess the flag of a division given its name" -@@ -190,7 +190,7 @@ - - #: kgeography.cpp:76 - msgid "&Open Map..." --msgstr "開啟地圖(&O)..." -+msgstr "開啟地圖(&O)…" - - #: kgeography.cpp:82 - msgid "&Original Size" -@@ -224,16 +224,16 @@ - - #: kgeography.cpp:290 - msgid "" --"_: There are two ways of dealing with the translation of \"Current map: %1\". " --"The first option simply replaces %1 with the translated name of the relevant " --"region. If the grammar of your language allows this, choose this option by " --"setting the translation of this message to 1, and leave untranslated the " --"translations of \"Current map: %1\" that have the placename embedded (or " --"translate them as - if you wish to show the file as fully translated. The " --"second option is to translate all messages in full - this is likely to be " --"required in the case of highly-inflected languages like Russian. To choose this " --"option, set the translation of this message to 0, and translate all the " --"messages.\n" -+"_: There are two ways of dealing with the translation of \"Current map: %1" -+"\". The first option simply replaces %1 with the translated name of the " -+"relevant region. If the grammar of your language allows this, choose this " -+"option by setting the translation of this message to 1, and leave " -+"untranslated the translations of \"Current map: %1\" that have the placename " -+"embedded (or translate them as - if you wish to show the file as fully " -+"translated. The second option is to translate all messages in full - this is " -+"likely to be required in the case of highly-inflected languages like " -+"Russian. To choose this option, set the translation of this message to 0, " -+"and translate all the messages.\n" - "0" - msgstr "0" - -@@ -245,7 +245,9 @@ - msgid "" - "Maps, flags, translations, etc. are as accurate as their respective authors " - "could achieve, but KGeography should not be taken as an authoritative source." --msgstr "地圖、旗幟、翻譯等等已經由各地的作者盡量精確地提供了，但是 KGeography 不應被當做是相關資訊的權威來源。" -+msgstr "" -+"地圖、旗幟、翻譯等等已經由各地的作者盡量精確地提供了，但是 KGeography 不應被" -+"當做是相關資訊的權威來源。" - - #: main.cpp:19 - msgid "KGeography" -@@ -287,20 +289,22 @@ - msgid "" - "You have found a bug in a map. Please contact the author and tell the %1 map " - "has nothing associated to color %2,%3,%4." --msgstr "您在地圖上找到了錯誤。請與作者聯絡，並告訴他地圖 %1 並未與顏色 %2,%3,%4 相關。" -+msgstr "" -+"您在地圖上找到了錯誤。請與作者聯絡，並告訴他地圖 %1 並未與顏色 %2,%3,%4 相" -+"關。" - - #: mapasker.cpp:173 - msgid "" --"_: There are two ways of dealing with the translation of \"Please click on: " --"%1\". The first option simply replaces %1 with the translated name of the " --"relevant region/city. If the grammar of your language allows this, choose this " --"option by setting the translation of this message to 1, and leave untranslated " --"the translations of \"Please click on: %1\" that have the placename embedded " --"(or translate them as - if you wish to show the file as fully translated. The " --"second option is to translate all messages in full - this is likely to be " --"required in the case of highly-inflected languages like Russian. To choose this " --"option, set the translation of this message to 0, and translate all the " --"messages.\n" -+"_: There are two ways of dealing with the translation of \"Please click on: %" -+"1\". The first option simply replaces %1 with the translated name of the " -+"relevant region/city. If the grammar of your language allows this, choose " -+"this option by setting the translation of this message to 1, and leave " -+"untranslated the translations of \"Please click on: %1\" that have the " -+"placename embedded (or translate them as - if you wish to show the file as " -+"fully translated. The second option is to translate all messages in full - " -+"this is likely to be required in the case of highly-inflected languages like " -+"Russian. To choose this option, set the translation of this message to 0, " -+"and translate all the messages.\n" - "0" - msgstr "0" - -@@ -358,8 +362,8 @@ - - #: mapparser.cpp:157 - msgid "" --"There is already either a division called %1 or a division with the same colors " --"as %2" -+"There is already either a division called %1 or a division with the same " -+"colors as %2" - msgstr "已經有個地區叫做 %1，不然就是有個地區的顏色與 %2 一樣" - - #: mapparser.cpp:159 -@@ -401,8 +405,7 @@ - #: mapsdatatranslation.cpp:2 - msgid "" - "_: africa.kgm\n" --"Current map:" --"
                                  Africa                                  " -+"Current map:
                                  Africa                                  " - msgstr "目前地圖：
                                  非洲                                  " - - #: mapsdatatranslation.cpp:3 -@@ -433,7 +436,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Algeria is..." --msgstr "阿爾及利亞（Algeria）的首都是..." -+msgstr "阿爾及利亞（Algeria）的首都是…" - - #: mapsdatatranslation.cpp:8 - msgid "" -@@ -446,7 +449,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Algeria is..." --msgstr "阿爾及利亞（Algeria）的國旗是..." -+msgstr "阿爾及利亞（Algeria）的國旗是…" - - #: mapsdatatranslation.cpp:10 - msgid "" -@@ -470,7 +473,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Angola is..." --msgstr "安哥拉（Angola）的首都是..." -+msgstr "安哥拉（Angola）的首都是…" - - #: mapsdatatranslation.cpp:14 - msgid "" -@@ -483,7 +486,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Angola is..." --msgstr "安哥拉（Angola）的國旗是..." -+msgstr "安哥拉（Angola）的國旗是…" - - #: mapsdatatranslation.cpp:16 - msgid "" -@@ -507,7 +510,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Benin is..." --msgstr "貝南（Benin）的首都是..." -+msgstr "貝南（Benin）的首都是…" - - #: mapsdatatranslation.cpp:20 - msgid "" -@@ -520,7 +523,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Benin is..." --msgstr "貝南（Benin）的國旗是..." -+msgstr "貝南（Benin）的國旗是…" - - #: mapsdatatranslation.cpp:22 - msgid "" -@@ -544,7 +547,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Botswana is..." --msgstr "波札那（Botswana）的首都是..." -+msgstr "波札那（Botswana）的首都是…" - - #: mapsdatatranslation.cpp:26 - msgid "" -@@ -557,7 +560,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Botswana is..." --msgstr "波札那（Botswana）的國旗是..." -+msgstr "波札那（Botswana）的國旗是…" - - #: mapsdatatranslation.cpp:28 - msgid "" -@@ -581,7 +584,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Burkina Faso is..." --msgstr "布吉納法索（Burkina Faso）的首都是..." -+msgstr "布吉納法索（Burkina Faso）的首都是…" - - #: mapsdatatranslation.cpp:32 - msgid "" -@@ -594,7 +597,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Burkina Faso is..." --msgstr "布吉納法索（Burkina Faso）的國旗是..." -+msgstr "布吉納法索（Burkina Faso）的國旗是…" - - #: mapsdatatranslation.cpp:34 - msgid "" -@@ -618,7 +621,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Burundi is..." --msgstr "蒲隆地（Burundi）的首都是..." -+msgstr "蒲隆地（Burundi）的首都是…" - - #: mapsdatatranslation.cpp:38 - msgid "" -@@ -631,7 +634,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Burundi is..." --msgstr "蒲隆地（Burundi）的國旗是..." -+msgstr "蒲隆地（Burundi）的國旗是…" - - #: mapsdatatranslation.cpp:40 - msgid "" -@@ -655,7 +658,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Cameroon is..." --msgstr "喀麥隆（Cameroon）的首都是..." -+msgstr "喀麥隆（Cameroon）的首都是…" - - #: mapsdatatranslation.cpp:44 - msgid "" -@@ -668,7 +671,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Cameroon is..." --msgstr "喀麥隆（Cameroon）的國旗是..." -+msgstr "喀麥隆（Cameroon）的國旗是…" - - #: mapsdatatranslation.cpp:46 - msgid "" -@@ -692,7 +695,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Central African Republic is..." --msgstr "中非共和國（Central African Republic）的首都是..." -+msgstr "中非共和國（Central African Republic）的首都是…" - - #: mapsdatatranslation.cpp:50 - msgid "" -@@ -705,7 +708,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Central African Republic is..." --msgstr "中非共和國（Central African Republic）的國旗是..." -+msgstr "中非共和國（Central African Republic）的國旗是…" - - #: mapsdatatranslation.cpp:52 - msgid "" -@@ -729,7 +732,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Chad is..." --msgstr "查德（Chad）的首都是..." -+msgstr "查德（Chad）的首都是…" - - #: mapsdatatranslation.cpp:56 - msgid "" -@@ -742,7 +745,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Chad is..." --msgstr "查德（Chad）的國旗是..." -+msgstr "查德（Chad）的國旗是…" - - #: mapsdatatranslation.cpp:58 - msgid "" -@@ -766,7 +769,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Côte d'Ivoire is..." --msgstr "象牙海岸（Côte d'Ivoire）的首都是..." -+msgstr "象牙海岸（Côte d'Ivoire）的首都是…" - - #: mapsdatatranslation.cpp:62 - msgid "" -@@ -779,7 +782,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Côte d'Ivoire is..." --msgstr "象牙海岸（Côte d'Ivoire）的國旗是..." -+msgstr "象牙海岸（Côte d'Ivoire）的國旗是…" - - #: mapsdatatranslation.cpp:64 - msgid "" -@@ -809,7 +812,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Democratic Republic of the Congo is..." --msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是..." -+msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是…" - - #: mapsdatatranslation.cpp:69 - msgid "" -@@ -822,7 +825,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Democratic Republic of the Congo is..." --msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是..." -+msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是…" - - #: mapsdatatranslation.cpp:71 - msgid "" -@@ -846,7 +849,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Djibouti is..." --msgstr "吉布地（Djibouti）的首都是..." -+msgstr "吉布地（Djibouti）的首都是…" - - #: mapsdatatranslation.cpp:75 - msgid "" -@@ -859,7 +862,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Djibouti is..." --msgstr "吉布地（Djibouti）的國旗是..." -+msgstr "吉布地（Djibouti）的國旗是…" - - #: mapsdatatranslation.cpp:78 - msgid "" -@@ -877,7 +880,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Egypt is..." --msgstr "埃及（Egypt）的首都是..." -+msgstr "埃及（Egypt）的首都是…" - - #: mapsdatatranslation.cpp:81 - msgid "" -@@ -890,7 +893,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Egypt is..." --msgstr "埃及（Egypt）的國旗是..." -+msgstr "埃及（Egypt）的國旗是…" - - #: mapsdatatranslation.cpp:83 - msgid "" -@@ -914,7 +917,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Equatorial Guinea is..." --msgstr "赤道幾內亞（Equatorial Guinea）的首都是..." -+msgstr "赤道幾內亞（Equatorial Guinea）的首都是…" - - #: mapsdatatranslation.cpp:87 - msgid "" -@@ -927,7 +930,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Equatorial Guinea is..." --msgstr "赤道幾內亞（Equatorial Guinea）的國旗是..." -+msgstr "赤道幾內亞（Equatorial Guinea）的國旗是…" - - #: mapsdatatranslation.cpp:89 - msgid "" -@@ -951,7 +954,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Eritrea is..." --msgstr "厄利垂亞（Eritrea）的首都是..." -+msgstr "厄利垂亞（Eritrea）的首都是…" - - #: mapsdatatranslation.cpp:93 - msgid "" -@@ -964,7 +967,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Eritrea is..." --msgstr "厄利垂亞（Eritrea）的國旗是..." -+msgstr "厄利垂亞（Eritrea）的國旗是…" - - #: mapsdatatranslation.cpp:95 - msgid "" -@@ -988,7 +991,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Ethiopia is..." --msgstr "衣索比亞（Ethiopia）的首都是..." -+msgstr "衣索比亞（Ethiopia）的首都是…" - - #: mapsdatatranslation.cpp:99 - msgid "" -@@ -1001,7 +1004,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Ethiopia is..." --msgstr "衣索比亞（Ethiopia）的國旗是..." -+msgstr "衣索比亞（Ethiopia）的國旗是…" - - #: mapsdatatranslation.cpp:101 - msgid "" -@@ -1025,7 +1028,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Gabon is..." --msgstr "加彭（Gabon）的首都是..." -+msgstr "加彭（Gabon）的首都是…" - - #: mapsdatatranslation.cpp:105 - msgid "" -@@ -1038,7 +1041,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Gabon is..." --msgstr "加彭（Gabon）的國旗是..." -+msgstr "加彭（Gabon）的國旗是…" - - #: mapsdatatranslation.cpp:107 - msgid "" -@@ -1062,7 +1065,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Ghana is..." --msgstr "迦納（Ghana）的首都是..." -+msgstr "迦納（Ghana）的首都是…" - - #: mapsdatatranslation.cpp:111 - msgid "" -@@ -1075,7 +1078,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Ghana is..." --msgstr "迦納（Ghana）的國旗是..." -+msgstr "迦納（Ghana）的國旗是…" - - #: mapsdatatranslation.cpp:113 - msgid "" -@@ -1105,7 +1108,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Guinea is..." --msgstr "幾內亞（Guinea）的首都是..." -+msgstr "幾內亞（Guinea）的首都是…" - - #: mapsdatatranslation.cpp:118 - msgid "" -@@ -1118,7 +1121,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Guinea is..." --msgstr "幾內亞（Guinea）的國旗是..." -+msgstr "幾內亞（Guinea）的國旗是…" - - #: mapsdatatranslation.cpp:120 - msgid "" -@@ -1142,7 +1145,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Guinea-Bissau is..." --msgstr "幾內亞比索（Guinea-Bissau）的首都是..." -+msgstr "幾內亞比索（Guinea-Bissau）的首都是…" - - #: mapsdatatranslation.cpp:124 - msgid "" -@@ -1155,7 +1158,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Guinea-Bissau is..." --msgstr "幾內亞比索（Guinea-Bissau）的國旗是..." -+msgstr "幾內亞比索（Guinea-Bissau）的國旗是…" - - #: mapsdatatranslation.cpp:126 - msgid "" -@@ -1209,7 +1212,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Kenya is..." --msgstr "肯亞（Kenya）的首都是..." -+msgstr "肯亞（Kenya）的首都是…" - - #: mapsdatatranslation.cpp:135 - msgid "" -@@ -1222,7 +1225,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Kenya is..." --msgstr "肯亞（Kenya）的國旗是..." -+msgstr "肯亞（Kenya）的國旗是…" - - #: mapsdatatranslation.cpp:137 - msgid "" -@@ -1258,7 +1261,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Lesotho is..." --msgstr "賴索托（Lesotho）的首都是..." -+msgstr "賴索托（Lesotho）的首都是…" - - #: mapsdatatranslation.cpp:143 - msgid "" -@@ -1271,7 +1274,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Lesotho is..." --msgstr "賴索托（Lesotho）的國旗是..." -+msgstr "賴索托（Lesotho）的國旗是…" - - #: mapsdatatranslation.cpp:145 - msgid "" -@@ -1295,7 +1298,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Liberia is..." --msgstr "賴比瑞亞（Liberia）的首都是..." -+msgstr "賴比瑞亞（Liberia）的首都是…" - - #: mapsdatatranslation.cpp:149 - msgid "" -@@ -1308,7 +1311,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Liberia is..." --msgstr "賴比瑞亞（Liberia）的國旗是..." -+msgstr "賴比瑞亞（Liberia）的國旗是…" - - #: mapsdatatranslation.cpp:151 - msgid "" -@@ -1332,7 +1335,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Libya is..." --msgstr "利比亞（Libya）的首都是..." -+msgstr "利比亞（Libya）的首都是…" - - #: mapsdatatranslation.cpp:155 - msgid "" -@@ -1345,7 +1348,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Libya is..." --msgstr "利比亞（Libya）的國旗是..." -+msgstr "利比亞（Libya）的國旗是…" - - #: mapsdatatranslation.cpp:157 - msgid "" -@@ -1369,7 +1372,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Madagascar is..." --msgstr "馬達加斯加（Madagascar）的首都是..." -+msgstr "馬達加斯加（Madagascar）的首都是…" - - #: mapsdatatranslation.cpp:161 - msgid "" -@@ -1382,7 +1385,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Madagascar is..." --msgstr "馬達加斯加（Madagascar）的國旗是..." -+msgstr "馬達加斯加（Madagascar）的國旗是…" - - #: mapsdatatranslation.cpp:163 - msgid "" -@@ -1406,7 +1409,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Malawi is..." --msgstr "馬拉威（Malawi）的首都是..." -+msgstr "馬拉威（Malawi）的首都是…" - - #: mapsdatatranslation.cpp:167 - msgid "" -@@ -1419,7 +1422,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Malawi is..." --msgstr "馬拉威（Malawi）的國旗是..." -+msgstr "馬拉威（Malawi）的國旗是…" - - #: mapsdatatranslation.cpp:169 - msgid "" -@@ -1443,7 +1446,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Mali is..." --msgstr "馬利（Mali）的首都是..." -+msgstr "馬利（Mali）的首都是…" - - #: mapsdatatranslation.cpp:173 - msgid "" -@@ -1456,7 +1459,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Mali is..." --msgstr "馬利（Mali）的國旗是..." -+msgstr "馬利（Mali）的國旗是…" - - #: mapsdatatranslation.cpp:175 - msgid "" -@@ -1480,7 +1483,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Mauritania is..." --msgstr "茅利塔尼亞（Mauritania）的首都是..." -+msgstr "茅利塔尼亞（Mauritania）的首都是…" - - #: mapsdatatranslation.cpp:179 - msgid "" -@@ -1493,7 +1496,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Mauritania is..." --msgstr "茅利塔尼亞（Mauritania）的國旗是..." -+msgstr "茅利塔尼亞（Mauritania）的國旗是…" - - #: mapsdatatranslation.cpp:181 - msgid "" -@@ -1517,7 +1520,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Morocco is..." --msgstr "摩洛哥（Morocco）的首都是..." -+msgstr "摩洛哥（Morocco）的首都是…" - - #: mapsdatatranslation.cpp:185 - msgid "" -@@ -1530,7 +1533,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Morocco is..." --msgstr "摩洛哥（Morocco）的國旗是..." -+msgstr "摩洛哥（Morocco）的國旗是…" - - #: mapsdatatranslation.cpp:187 - msgid "" -@@ -1554,7 +1557,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Mozambique is..." --msgstr "莫三比克（Mozambique）的首都是..." -+msgstr "莫三比克（Mozambique）的首都是…" - - #: mapsdatatranslation.cpp:191 - msgid "" -@@ -1567,7 +1570,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Mozambique is..." --msgstr "莫三比克（Mozambique）的國旗是..." -+msgstr "莫三比克（Mozambique）的國旗是…" - - #: mapsdatatranslation.cpp:193 - msgid "" -@@ -1591,7 +1594,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Namibia is..." --msgstr "納米比亞（Namibia）的首都是..." -+msgstr "納米比亞（Namibia）的首都是…" - - #: mapsdatatranslation.cpp:197 - msgid "" -@@ -1604,7 +1607,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Namibia is..." --msgstr "納米比亞（Namibia）的國旗是..." -+msgstr "納米比亞（Namibia）的國旗是…" - - #: mapsdatatranslation.cpp:199 - msgid "" -@@ -1628,7 +1631,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Niger is..." --msgstr "尼日（Niger）的首都是..." -+msgstr "尼日（Niger）的首都是…" - - #: mapsdatatranslation.cpp:203 - msgid "" -@@ -1641,7 +1644,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Niger is..." --msgstr "尼日（Niger）的國旗是..." -+msgstr "尼日（Niger）的國旗是…" - - #: mapsdatatranslation.cpp:205 - msgid "" -@@ -1665,7 +1668,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Nigeria is..." --msgstr "奈及利亞（Nigeria）的首都是..." -+msgstr "奈及利亞（Nigeria）的首都是…" - - #: mapsdatatranslation.cpp:209 - msgid "" -@@ -1678,7 +1681,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Nigeria is..." --msgstr "奈及利亞（Nigeria）的國旗是..." -+msgstr "奈及利亞（Nigeria）的國旗是…" - - #: mapsdatatranslation.cpp:211 - msgid "" -@@ -1714,7 +1717,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Republic of the Congo is..." --msgstr "剛果（Republic of the Congo）的首都是..." -+msgstr "剛果（Republic of the Congo）的首都是…" - - #: mapsdatatranslation.cpp:217 - msgid "" -@@ -1727,7 +1730,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Republic of the Congo is..." --msgstr "剛果（Republic of the Congo）的國旗是..." -+msgstr "剛果（Republic of the Congo）的國旗是…" - - #: mapsdatatranslation.cpp:219 - msgid "" -@@ -1751,7 +1754,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Rwanda is..." --msgstr "盧安達（Rwanda）的首都是..." -+msgstr "盧安達（Rwanda）的首都是…" - - #: mapsdatatranslation.cpp:223 - msgid "" -@@ -1764,7 +1767,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Rwanda is..." --msgstr "盧安達（Rwanda）的國旗是..." -+msgstr "盧安達（Rwanda）的國旗是…" - - #: mapsdatatranslation.cpp:225 - msgid "" -@@ -1794,7 +1797,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Senegal is..." --msgstr "塞內加爾（Senegal）的首都是..." -+msgstr "塞內加爾（Senegal）的首都是…" - - #: mapsdatatranslation.cpp:230 - msgid "" -@@ -1807,7 +1810,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Senegal is..." --msgstr "塞內加爾（Senegal）的國旗是..." -+msgstr "塞內加爾（Senegal）的國旗是…" - - #: mapsdatatranslation.cpp:232 - msgid "" -@@ -1831,7 +1834,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Sierra Leone is..." --msgstr "獅子山共和國（Sierra Leone）的首都是..." -+msgstr "獅子山共和國（Sierra Leone）的首都是…" - - #: mapsdatatranslation.cpp:236 - msgid "" -@@ -1844,7 +1847,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Sierra Leone is..." --msgstr "獅子山共和國（Sierra Leone）的國旗是..." -+msgstr "獅子山共和國（Sierra Leone）的國旗是…" - - #: mapsdatatranslation.cpp:238 - msgid "" -@@ -1868,7 +1871,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Somalia is..." --msgstr "索馬利亞（Somalia）的首都是..." -+msgstr "索馬利亞（Somalia）的首都是…" - - #: mapsdatatranslation.cpp:242 - msgid "" -@@ -1881,7 +1884,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Somalia is..." --msgstr "索馬利亞（Somalia）的國旗是..." -+msgstr "索馬利亞（Somalia）的國旗是…" - - #: mapsdatatranslation.cpp:244 - msgid "" -@@ -1905,7 +1908,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of South Africa is..." --msgstr "南非（South Africa）的首都是..." -+msgstr "南非（South Africa）的首都是…" - - #: mapsdatatranslation.cpp:248 - msgid "" -@@ -1918,7 +1921,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of South Africa is..." --msgstr "南非（South Africa）的國旗是..." -+msgstr "南非（South Africa）的國旗是…" - - #: mapsdatatranslation.cpp:250 - msgid "" -@@ -1948,7 +1951,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Sudan is..." --msgstr "蘇丹（Sudan）的首都是..." -+msgstr "蘇丹（Sudan）的首都是…" - - #: mapsdatatranslation.cpp:255 - msgid "" -@@ -1961,7 +1964,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Sudan is..." --msgstr "蘇丹（Sudan）的國旗是..." -+msgstr "蘇丹（Sudan）的國旗是…" - - #: mapsdatatranslation.cpp:257 - msgid "" -@@ -1985,7 +1988,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Swaziland is..." --msgstr "史瓦濟蘭（Swaziland）的首都是..." -+msgstr "史瓦濟蘭（Swaziland）的首都是…" - - #: mapsdatatranslation.cpp:261 - msgid "" -@@ -1998,7 +2001,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Swaziland is..." --msgstr "史瓦濟蘭（Swaziland）的國旗是..." -+msgstr "史瓦濟蘭（Swaziland）的國旗是…" - - #: mapsdatatranslation.cpp:263 - msgid "" -@@ -2028,7 +2031,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Tanzania is..." --msgstr "坦尚尼亞（Tanzania）的首都是..." -+msgstr "坦尚尼亞（Tanzania）的首都是…" - - #: mapsdatatranslation.cpp:268 - msgid "" -@@ -2041,7 +2044,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Tanzania is..." --msgstr "坦尚尼亞（Tanzania）的國旗是..." -+msgstr "坦尚尼亞（Tanzania）的國旗是…" - - #: mapsdatatranslation.cpp:270 - msgid "" -@@ -2065,7 +2068,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of The Gambia is..." --msgstr "甘比亞（The Gambia）的首都是..." -+msgstr "甘比亞（The Gambia）的首都是…" - - #: mapsdatatranslation.cpp:274 - msgid "" -@@ -2078,7 +2081,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of The Gambia is..." --msgstr "甘比亞（The Gambia）的國旗是..." -+msgstr "甘比亞（The Gambia）的國旗是…" - - #: mapsdatatranslation.cpp:276 - msgid "" -@@ -2102,7 +2105,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Togo is..." --msgstr "多哥（Togo）的首都是..." -+msgstr "多哥（Togo）的首都是…" - - #: mapsdatatranslation.cpp:280 - msgid "" -@@ -2115,7 +2118,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Togo is..." --msgstr "多哥（Togo）的國旗是..." -+msgstr "多哥（Togo）的國旗是…" - - #: mapsdatatranslation.cpp:282 - msgid "" -@@ -2139,7 +2142,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Tunisia is..." --msgstr "突尼西亞（Tunisia）的首都是..." -+msgstr "突尼西亞（Tunisia）的首都是…" - - #: mapsdatatranslation.cpp:286 - msgid "" -@@ -2152,7 +2155,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Tunisia is..." --msgstr "突尼西亞（Tunisia）的國旗是..." -+msgstr "突尼西亞（Tunisia）的國旗是…" - - #: mapsdatatranslation.cpp:288 - msgid "" -@@ -2188,7 +2191,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Uganda is..." --msgstr "烏干達（Uganda）的首都是..." -+msgstr "烏干達（Uganda）的首都是…" - - #: mapsdatatranslation.cpp:294 - msgid "" -@@ -2201,7 +2204,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Uganda is..." --msgstr "烏干達（Uganda）的國旗是..." -+msgstr "烏干達（Uganda）的國旗是…" - - #: mapsdatatranslation.cpp:296 - msgid "" -@@ -2237,7 +2240,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Western Sahara is..." --msgstr "西撒哈拉（Western Sahara）的首都是..." -+msgstr "西撒哈拉（Western Sahara）的首都是…" - - #: mapsdatatranslation.cpp:302 - msgid "" -@@ -2250,7 +2253,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Western Sahara is..." --msgstr "西撒哈拉（Western Sahara）的國旗是..." -+msgstr "西撒哈拉（Western Sahara）的國旗是…" - - #: mapsdatatranslation.cpp:304 - msgid "" -@@ -2280,7 +2283,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Zambia is..." --msgstr "尚比亞（Zambia）的首都是..." -+msgstr "尚比亞（Zambia）的首都是…" - - #: mapsdatatranslation.cpp:309 - msgid "" -@@ -2293,7 +2296,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Zambia is..." --msgstr "尚比亞（Zambia）的國旗是..." -+msgstr "尚比亞（Zambia）的國旗是…" - - #: mapsdatatranslation.cpp:311 - msgid "" -@@ -2317,7 +2320,7 @@ - msgid "" - "_: africa.kgm\n" - "The capital of Zimbabwe is..." --msgstr "辛巴威（Zimbabwe）的首都是..." -+msgstr "辛巴威（Zimbabwe）的首都是…" - - #: mapsdatatranslation.cpp:315 - msgid "" -@@ -2330,7 +2333,7 @@ - msgid "" - "_: africa.kgm\n" - "The flag of Zimbabwe is..." --msgstr "辛巴威（Zimbabwe）的國旗是..." -+msgstr "辛巴威（Zimbabwe）的國旗是…" - - #: mapsdatatranslation.cpp:317 - msgid "" -@@ -2353,8 +2356,7 @@ - #: mapsdatatranslation.cpp:320 - msgid "" - "_: asia.kgm\n" --"Current map:" --"
                                  Asia                                  " -+"Current map:
                                  Asia                                  " - msgstr "目前地圖：
                                  亞洲                                  " - - #: mapsdatatranslation.cpp:321 -@@ -2373,7 +2375,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Russia is..." --msgstr "俄羅斯（Russia）的首都是..." -+msgstr "俄羅斯（Russia）的首都是…" - - #: mapsdatatranslation.cpp:324 - msgid "" -@@ -2386,7 +2388,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Russia is..." --msgstr "俄羅斯（Russia）的國旗是..." -+msgstr "俄羅斯（Russia）的國旗是…" - - #: mapsdatatranslation.cpp:326 - msgid "" -@@ -2410,7 +2412,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Turkey is..." --msgstr "土耳其（Turkey）的首都是..." -+msgstr "土耳其（Turkey）的首都是…" - - #: mapsdatatranslation.cpp:330 - msgid "" -@@ -2423,7 +2425,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Turkey is..." --msgstr "土耳其（Turkey）的國旗是..." -+msgstr "土耳其（Turkey）的國旗是…" - - #: mapsdatatranslation.cpp:332 - msgid "" -@@ -2471,7 +2473,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Iran is..." --msgstr "伊朗（Iran）的首都是..." -+msgstr "伊朗（Iran）的首都是…" - - #: mapsdatatranslation.cpp:340 - msgid "" -@@ -2484,7 +2486,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Iran is..." --msgstr "伊朗（Iran）的國旗是..." -+msgstr "伊朗（Iran）的國旗是…" - - #: mapsdatatranslation.cpp:342 - msgid "" -@@ -2508,7 +2510,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Iraq is..." --msgstr "伊拉克（Iraq）的首都是..." -+msgstr "伊拉克（Iraq）的首都是…" - - #: mapsdatatranslation.cpp:346 - msgid "" -@@ -2521,7 +2523,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Iraq is..." --msgstr "伊拉克（Iraq）的國旗是..." -+msgstr "伊拉克（Iraq）的國旗是…" - - #: mapsdatatranslation.cpp:348 - msgid "" -@@ -2545,7 +2547,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Israel is..." --msgstr "以色列（Israel）的首都是..." -+msgstr "以色列（Israel）的首都是…" - - #: mapsdatatranslation.cpp:352 - msgid "" -@@ -2558,7 +2560,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Israel is..." --msgstr "以色列（Israel）的國旗是..." -+msgstr "以色列（Israel）的國旗是…" - - #: mapsdatatranslation.cpp:354 - msgid "" -@@ -2582,7 +2584,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Jordan is..." --msgstr "約旦（Jordan）的首都是..." -+msgstr "約旦（Jordan）的首都是…" - - #: mapsdatatranslation.cpp:358 - msgid "" -@@ -2595,7 +2597,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Jordan is..." --msgstr "約旦（Jordan）的國旗是..." -+msgstr "約旦（Jordan）的國旗是…" - - #: mapsdatatranslation.cpp:360 - msgid "" -@@ -2625,7 +2627,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Kuwait is..." --msgstr "科威特（Kuwait）的首都是..." -+msgstr "科威特（Kuwait）的首都是…" - - #: mapsdatatranslation.cpp:365 - msgid "" -@@ -2638,7 +2640,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Kuwait is..." --msgstr "科威特（Kuwait）的國旗是..." -+msgstr "科威特（Kuwait）的國旗是…" - - #: mapsdatatranslation.cpp:367 - msgid "" -@@ -2662,7 +2664,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Lebanon is..." --msgstr "黎巴嫩（Lebanon）的首都是..." -+msgstr "黎巴嫩（Lebanon）的首都是…" - - #: mapsdatatranslation.cpp:371 - msgid "" -@@ -2675,7 +2677,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Lebanon is..." --msgstr "黎巴嫩（Lebanon）的國旗是..." -+msgstr "黎巴嫩（Lebanon）的國旗是…" - - #: mapsdatatranslation.cpp:373 - msgid "" -@@ -2699,7 +2701,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Qatar is..." --msgstr "卡達（Qatar）的首都是..." -+msgstr "卡達（Qatar）的首都是…" - - #: mapsdatatranslation.cpp:377 - msgid "" -@@ -2712,7 +2714,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Qatar is..." --msgstr "卡達（Qatar）的國旗是..." -+msgstr "卡達（Qatar）的國旗是…" - - #: mapsdatatranslation.cpp:379 - msgid "" -@@ -2736,7 +2738,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Saudi Arabia is..." --msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是..." -+msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是…" - - #: mapsdatatranslation.cpp:383 - msgid "" -@@ -2749,7 +2751,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Saudi Arabia is..." --msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是..." -+msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是…" - - #: mapsdatatranslation.cpp:385 - msgid "" -@@ -2785,7 +2787,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Syria is..." --msgstr "敘利亞（Syria）的首都是..." -+msgstr "敘利亞（Syria）的首都是…" - - #: mapsdatatranslation.cpp:391 - msgid "" -@@ -2798,7 +2800,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Syria is..." --msgstr "敘利亞（Syria）的國旗是..." -+msgstr "敘利亞（Syria）的國旗是…" - - #: mapsdatatranslation.cpp:393 - msgid "" -@@ -2828,7 +2830,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of United Arab Emirates is..." --msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是..." -+msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是…" - - #: mapsdatatranslation.cpp:398 - msgid "" -@@ -2841,7 +2843,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of United Arab Emirates is..." --msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是..." -+msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是…" - - #: mapsdatatranslation.cpp:400 - msgid "" -@@ -2865,7 +2867,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Oman is..." --msgstr "阿曼（Oman）的首都是..." -+msgstr "阿曼（Oman）的首都是…" - - #: mapsdatatranslation.cpp:404 - msgid "" -@@ -2878,7 +2880,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Oman is..." --msgstr "阿曼（Oman）的國旗是..." -+msgstr "阿曼（Oman）的國旗是…" - - #: mapsdatatranslation.cpp:406 - msgid "" -@@ -2908,7 +2910,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Yemen is..." --msgstr "葉門（Yemen）的首都是..." -+msgstr "葉門（Yemen）的首都是…" - - #: mapsdatatranslation.cpp:411 - msgid "" -@@ -2921,7 +2923,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Yemen is..." --msgstr "葉門（Yemen）的國旗是..." -+msgstr "葉門（Yemen）的國旗是…" - - #: mapsdatatranslation.cpp:413 - msgid "" -@@ -2951,7 +2953,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of China is..." --msgstr "中華人民共和國（China）的首都是..." -+msgstr "中華人民共和國（China）的首都是…" - - #: mapsdatatranslation.cpp:418 - msgid "" -@@ -2964,7 +2966,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of China is..." --msgstr "中華人民共和國（China）的國旗是..." -+msgstr "中華人民共和國（China）的國旗是…" - - #: mapsdatatranslation.cpp:420 - msgid "" -@@ -2988,7 +2990,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of India is..." --msgstr "印度（India）的首都是..." -+msgstr "印度（India）的首都是…" - - #: mapsdatatranslation.cpp:424 - msgid "" -@@ -3001,7 +3003,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of India is..." --msgstr "印度（India）的國旗是..." -+msgstr "印度（India）的國旗是…" - - #: mapsdatatranslation.cpp:426 - msgid "" -@@ -3025,7 +3027,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Sri Lanka is..." --msgstr "斯里蘭卡（Sri Lanka）的首都是..." -+msgstr "斯里蘭卡（Sri Lanka）的首都是…" - - #: mapsdatatranslation.cpp:430 - msgid "" -@@ -3038,7 +3040,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Sri Lanka is..." --msgstr "斯里蘭卡（Sri Lanka）的國旗是..." -+msgstr "斯里蘭卡（Sri Lanka）的國旗是…" - - #: mapsdatatranslation.cpp:432 - msgid "" -@@ -3062,7 +3064,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Mongolia is..." --msgstr "蒙古（Mongolia）的首都是..." -+msgstr "蒙古（Mongolia）的首都是…" - - #: mapsdatatranslation.cpp:436 - msgid "" -@@ -3075,7 +3077,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Mongolia is..." --msgstr "蒙古（Mongolia）的國旗是..." -+msgstr "蒙古（Mongolia）的國旗是…" - - #: mapsdatatranslation.cpp:438 - msgid "" -@@ -3099,7 +3101,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Kazakhstan is..." --msgstr "哈薩克（Kazakhstan）的首都是..." -+msgstr "哈薩克（Kazakhstan）的首都是…" - - #: mapsdatatranslation.cpp:442 - msgid "" -@@ -3112,7 +3114,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Kazakhstan is..." --msgstr "哈薩克（Kazakhstan）的國旗是..." -+msgstr "哈薩克（Kazakhstan）的國旗是…" - - #: mapsdatatranslation.cpp:444 - msgid "" -@@ -3136,7 +3138,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Japan is..." --msgstr "日本（Japan）的首都是..." -+msgstr "日本（Japan）的首都是…" - - #: mapsdatatranslation.cpp:448 - msgid "" -@@ -3149,7 +3151,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Japan is..." --msgstr "日本（Japan）的國旗是..." -+msgstr "日本（Japan）的國旗是…" - - #: mapsdatatranslation.cpp:450 - msgid "" -@@ -3173,7 +3175,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Myanmar is..." --msgstr "緬甸（Myanmar）的首都是..." -+msgstr "緬甸（Myanmar）的首都是…" - - #: mapsdatatranslation.cpp:454 - msgid "" -@@ -3186,7 +3188,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Myanmar is..." --msgstr "緬甸（Myanmar）的國旗是..." -+msgstr "緬甸（Myanmar）的國旗是…" - - #: mapsdatatranslation.cpp:456 - msgid "" -@@ -3210,7 +3212,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Nepal is..." --msgstr "尼泊爾（Nepal）的首都是..." -+msgstr "尼泊爾（Nepal）的首都是…" - - #: mapsdatatranslation.cpp:460 - msgid "" -@@ -3223,7 +3225,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Nepal is..." --msgstr "尼泊爾（Nepal）的國旗是..." -+msgstr "尼泊爾（Nepal）的國旗是…" - - #: mapsdatatranslation.cpp:462 - msgid "" -@@ -3247,7 +3249,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Bhutan is..." --msgstr "不丹（Bhutan）的首都是..." -+msgstr "不丹（Bhutan）的首都是…" - - #: mapsdatatranslation.cpp:466 - msgid "" -@@ -3260,7 +3262,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Bhutan is..." --msgstr "不丹（Bhutan）的國旗是..." -+msgstr "不丹（Bhutan）的國旗是…" - - #: mapsdatatranslation.cpp:468 - msgid "" -@@ -3290,7 +3292,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Malaysia is..." --msgstr "馬來西亞（Malaysia）的首都是..." -+msgstr "馬來西亞（Malaysia）的首都是…" - - #: mapsdatatranslation.cpp:473 - msgid "" -@@ -3303,7 +3305,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Malaysia is..." --msgstr "馬來西亞（Malaysia）的國旗是..." -+msgstr "馬來西亞（Malaysia）的國旗是…" - - #: mapsdatatranslation.cpp:475 - msgid "" -@@ -3327,7 +3329,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Bangladesh is..." --msgstr "孟加拉（Bangladesh）的首都是..." -+msgstr "孟加拉（Bangladesh）的首都是…" - - #: mapsdatatranslation.cpp:479 - msgid "" -@@ -3340,7 +3342,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Bangladesh is..." --msgstr "孟加拉（Bangladesh）的國旗是..." -+msgstr "孟加拉（Bangladesh）的國旗是…" - - #: mapsdatatranslation.cpp:481 - msgid "" -@@ -3364,7 +3366,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Afghanistan is..." --msgstr "阿富汗（Afghanistan）的首都是..." -+msgstr "阿富汗（Afghanistan）的首都是…" - - #: mapsdatatranslation.cpp:485 - msgid "" -@@ -3377,7 +3379,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Afghanistan is..." --msgstr "阿富汗（Afghanistan）的國旗是..." -+msgstr "阿富汗（Afghanistan）的國旗是…" - - #: mapsdatatranslation.cpp:487 - msgid "" -@@ -3401,7 +3403,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Azerbaijan is..." --msgstr "亞塞拜然（Azerbaijan）的首都是..." -+msgstr "亞塞拜然（Azerbaijan）的首都是…" - - #: mapsdatatranslation.cpp:491 - msgid "" -@@ -3414,7 +3416,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Azerbaijan is..." --msgstr "亞塞拜然（Azerbaijan）的國旗是..." -+msgstr "亞塞拜然（Azerbaijan）的國旗是…" - - #: mapsdatatranslation.cpp:493 - msgid "" -@@ -3438,7 +3440,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Armenia is..." --msgstr "亞美尼亞（Armenia）的首都是..." -+msgstr "亞美尼亞（Armenia）的首都是…" - - #: mapsdatatranslation.cpp:497 - msgid "" -@@ -3451,7 +3453,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Armenia is..." --msgstr "亞美尼亞（Armenia）的國旗是..." -+msgstr "亞美尼亞（Armenia）的國旗是…" - - #: mapsdatatranslation.cpp:499 - msgid "" -@@ -3475,7 +3477,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Bahrain is..." --msgstr "巴林（Bahrain）的首都是..." -+msgstr "巴林（Bahrain）的首都是…" - - #: mapsdatatranslation.cpp:503 - msgid "" -@@ -3488,7 +3490,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Bahrain is..." --msgstr "巴林（Bahrain）的國旗是..." -+msgstr "巴林（Bahrain）的國旗是…" - - #: mapsdatatranslation.cpp:505 - msgid "" -@@ -3512,7 +3514,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Georgia is..." --msgstr "喬治亞（Georgia）的首都是..." -+msgstr "喬治亞（Georgia）的首都是…" - - #: mapsdatatranslation.cpp:509 - msgid "" -@@ -3525,7 +3527,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Georgia is..." --msgstr "喬治亞（Georgia）的國旗是..." -+msgstr "喬治亞（Georgia）的國旗是…" - - #: mapsdatatranslation.cpp:511 - msgid "" -@@ -3549,7 +3551,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Turkmenistan is..." --msgstr "土庫曼（Turkmenistan）的首都是..." -+msgstr "土庫曼（Turkmenistan）的首都是…" - - #: mapsdatatranslation.cpp:515 - msgid "" -@@ -3562,7 +3564,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Turkmenistan is..." --msgstr "土庫曼（Turkmenistan）的國旗是..." -+msgstr "土庫曼（Turkmenistan）的國旗是…" - - #: mapsdatatranslation.cpp:517 - msgid "" -@@ -3586,7 +3588,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Uzbekistan is..." --msgstr "烏茲別克（Uzbekistan）的首都是..." -+msgstr "烏茲別克（Uzbekistan）的首都是…" - - #: mapsdatatranslation.cpp:521 - msgid "" -@@ -3599,7 +3601,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Uzbekistan is..." --msgstr "烏茲別克（Uzbekistan）的國旗是..." -+msgstr "烏茲別克（Uzbekistan）的國旗是…" - - #: mapsdatatranslation.cpp:523 - msgid "" -@@ -3623,7 +3625,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Kyrgyzstan is..." --msgstr "吉爾吉斯（Kyrgyzstan）的首都是..." -+msgstr "吉爾吉斯（Kyrgyzstan）的首都是…" - - #: mapsdatatranslation.cpp:527 - msgid "" -@@ -3636,7 +3638,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Kyrgyzstan is..." --msgstr "吉爾吉斯（Kyrgyzstan）的國旗是..." -+msgstr "吉爾吉斯（Kyrgyzstan）的國旗是…" - - #: mapsdatatranslation.cpp:529 - msgid "" -@@ -3660,7 +3662,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Tajikistan is..." --msgstr "塔吉克（Tajikistan）的首都是..." -+msgstr "塔吉克（Tajikistan）的首都是…" - - #: mapsdatatranslation.cpp:533 - msgid "" -@@ -3673,7 +3675,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Tajikistan is..." --msgstr "塔吉克（Tajikistan）的國旗是..." -+msgstr "塔吉克（Tajikistan）的國旗是…" - - #: mapsdatatranslation.cpp:535 - msgid "" -@@ -3697,7 +3699,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Pakistan is..." --msgstr "巴基斯坦（Pakistan）的首都是..." -+msgstr "巴基斯坦（Pakistan）的首都是…" - - #: mapsdatatranslation.cpp:539 - msgid "" -@@ -3710,7 +3712,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Pakistan is..." --msgstr "巴基斯坦（Pakistan）的國旗是..." -+msgstr "巴基斯坦（Pakistan）的國旗是…" - - #: mapsdatatranslation.cpp:541 - msgid "" -@@ -3734,7 +3736,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Laos is..." --msgstr "寮國（Laos）的首都是..." -+msgstr "寮國（Laos）的首都是…" - - #: mapsdatatranslation.cpp:545 - msgid "" -@@ -3747,7 +3749,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Laos is..." --msgstr "寮國（Laos）的國旗是..." -+msgstr "寮國（Laos）的國旗是…" - - #: mapsdatatranslation.cpp:547 - msgid "" -@@ -3771,7 +3773,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Cambodia is..." --msgstr "柬埔寨（Cambodia）的首都是..." -+msgstr "柬埔寨（Cambodia）的首都是…" - - #: mapsdatatranslation.cpp:551 - msgid "" -@@ -3784,7 +3786,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Cambodia is..." --msgstr "柬埔寨（Cambodia）的國旗是..." -+msgstr "柬埔寨（Cambodia）的國旗是…" - - #: mapsdatatranslation.cpp:553 - msgid "" -@@ -3808,7 +3810,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Brunei is..." --msgstr "汶萊（Brunei）的首都是..." -+msgstr "汶萊（Brunei）的首都是…" - - #: mapsdatatranslation.cpp:557 - msgid "" -@@ -3821,7 +3823,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Brunei is..." --msgstr "汶萊（Brunei）的國旗是..." -+msgstr "汶萊（Brunei）的國旗是…" - - #: mapsdatatranslation.cpp:559 - msgid "" -@@ -3845,7 +3847,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Philippines is..." --msgstr "菲律賓（Philippines）的首都是..." -+msgstr "菲律賓（Philippines）的首都是…" - - #: mapsdatatranslation.cpp:563 - msgid "" -@@ -3858,7 +3860,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Philippines is..." --msgstr "菲律賓（Philippines）的國旗是..." -+msgstr "菲律賓（Philippines）的國旗是…" - - #: mapsdatatranslation.cpp:565 - msgid "" -@@ -3882,7 +3884,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Thailand is..." --msgstr "泰國（Thailand）的首都是..." -+msgstr "泰國（Thailand）的首都是…" - - #: mapsdatatranslation.cpp:569 - msgid "" -@@ -3895,7 +3897,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Thailand is..." --msgstr "泰國（Thailand）的國旗是..." -+msgstr "泰國（Thailand）的國旗是…" - - #: mapsdatatranslation.cpp:571 - msgid "" -@@ -3919,7 +3921,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Vietnam is..." --msgstr "越南（Vietnam）的首都是..." -+msgstr "越南（Vietnam）的首都是…" - - #: mapsdatatranslation.cpp:575 - msgid "" -@@ -3932,7 +3934,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Vietnam is..." --msgstr "越南（Vietnam）的國旗是..." -+msgstr "越南（Vietnam）的國旗是…" - - #: mapsdatatranslation.cpp:577 - msgid "" -@@ -3950,38 +3952,38 @@ - msgid "" - "_: asia.kgm\n" - "Taiwan" --msgstr "中華民國（台灣，Taiwan）" -+msgstr "中華民國（臺灣，Taiwan）" - - #: mapsdatatranslation.cpp:580 - msgid "" - "_: asia.kgm\n" - "The capital of Taiwan is..." --msgstr "中華民國（台灣，Taiwan）的首都是..." -+msgstr "中華民國（臺灣，Taiwan）的首都是…" - - #: mapsdatatranslation.cpp:581 - msgid "" - "_: asia.kgm\n" - "Please click on:\n" - "Taiwan" --msgstr "請點選：中華民國（台灣，Taiwan）" -+msgstr "請點選：中華民國（臺灣，Taiwan）" - - #: mapsdatatranslation.cpp:582 - msgid "" - "_: asia.kgm\n" - "The flag of Taiwan is..." --msgstr "中華民國（台灣，Taiwan）的國旗是..." -+msgstr "中華民國（臺灣，Taiwan）的國旗是…" - - #: mapsdatatranslation.cpp:583 - msgid "" - "_: asia.kgm\n" - "Taipei" --msgstr "台北（Taipei）" -+msgstr "臺北（Taipei）" - - #: mapsdatatranslation.cpp:584 - msgid "" - "_: asia.kgm\n" - "Taipei is the capital of..." --msgstr "台北（Taipei）是哪個國家的首都？" -+msgstr "臺北（Taipei）是哪個國家的首都？" - - #: mapsdatatranslation.cpp:585 mapsdatatranslation.cpp:589 - msgid "" -@@ -3993,7 +3995,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of Singapore is..." --msgstr "新加坡（Singapore）的首都是..." -+msgstr "新加坡（Singapore）的首都是…" - - #: mapsdatatranslation.cpp:587 - msgid "" -@@ -4006,7 +4008,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of Singapore is..." --msgstr "新加坡（Singapore）的國旗是..." -+msgstr "新加坡（Singapore）的國旗是…" - - #: mapsdatatranslation.cpp:590 - msgid "" -@@ -4024,7 +4026,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of North Korea is..." --msgstr "北韓（North Korea）的首都是..." -+msgstr "北韓（North Korea）的首都是…" - - #: mapsdatatranslation.cpp:593 - msgid "" -@@ -4037,7 +4039,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of North Korea is..." --msgstr "北韓（North Korea）的國旗是..." -+msgstr "北韓（North Korea）的國旗是…" - - #: mapsdatatranslation.cpp:595 - msgid "" -@@ -4061,7 +4063,7 @@ - msgid "" - "_: asia.kgm\n" - "The capital of South Korea is..." --msgstr "南韓（South Korea）的首都是..." -+msgstr "南韓（South Korea）的首都是…" - - #: mapsdatatranslation.cpp:599 - msgid "" -@@ -4074,7 +4076,7 @@ - msgid "" - "_: asia.kgm\n" - "The flag of South Korea is..." --msgstr "南韓（South Korea）的國旗是..." -+msgstr "南韓（South Korea）的國旗是…" - - #: mapsdatatranslation.cpp:601 - msgid "" -@@ -4097,8 +4099,7 @@ - #: mapsdatatranslation.cpp:604 - msgid "" - "_: austria.kgm\n" --"Current map:" --"
                                  Austria                                  " -+"Current map:
                                  Austria                                  " - msgstr "目前地圖：
                                  奧地利                                  " - - #: mapsdatatranslation.cpp:605 -@@ -4123,7 +4124,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Vienna is..." --msgstr "維也納（Vienna）的首都是..." -+msgstr "維也納（Vienna）的首都是…" - - #: mapsdatatranslation.cpp:609 - msgid "" -@@ -4148,7 +4149,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Burgenland is..." --msgstr "布爾根蘭（Burgenland）的首都是..." -+msgstr "布爾根蘭（Burgenland）的首都是…" - - #: mapsdatatranslation.cpp:614 - msgid "" -@@ -4179,7 +4180,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Styria is..." --msgstr "思提瑞亞（Styria）的首都是..." -+msgstr "思提瑞亞（Styria）的首都是…" - - #: mapsdatatranslation.cpp:619 - msgid "" -@@ -4210,7 +4211,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Carinthia is..." --msgstr "卡林西亞（Carinthia）的首都是..." -+msgstr "卡林西亞（Carinthia）的首都是…" - - #: mapsdatatranslation.cpp:624 - msgid "" -@@ -4241,7 +4242,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Tyrol is..." --msgstr "提洛（Tyrol）的首都是..." -+msgstr "提洛（Tyrol）的首都是…" - - #: mapsdatatranslation.cpp:629 - msgid "" -@@ -4272,7 +4273,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Vorarlberg is..." --msgstr "福拉爾貝格（Vorarlberg）的首都是..." -+msgstr "福拉爾貝格（Vorarlberg）的首都是…" - - #: mapsdatatranslation.cpp:634 - msgid "" -@@ -4303,7 +4304,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Salzburg is..." --msgstr "薩爾茨堡（Salzburg）的首都是..." -+msgstr "薩爾茨堡（Salzburg）的首都是…" - - #: mapsdatatranslation.cpp:639 - msgid "" -@@ -4328,7 +4329,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Upper Austria is..." --msgstr "上奧地利（Upper Austria）的首都是..." -+msgstr "上奧地利（Upper Austria）的首都是…" - - #: mapsdatatranslation.cpp:644 - msgid "" -@@ -4359,7 +4360,7 @@ - msgid "" - "_: austria.kgm\n" - "The capital of Lower Austria is..." --msgstr "下奧地利（Lower Austria）的首都是..." -+msgstr "下奧地利（Lower Austria）的首都是…" - - #: mapsdatatranslation.cpp:649 - msgid "" -@@ -4389,8 +4390,7 @@ - #: mapsdatatranslation.cpp:653 - msgid "" - "_: brazil.kgm\n" --"Current map:" --"
                                  Brazil                                  " -+"Current map:
                                  Brazil                                  " - msgstr "目前地圖：
                                  巴西                                  " - - #: mapsdatatranslation.cpp:654 -@@ -4403,7 +4403,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Sergipe is..." --msgstr "塞爾希培（Sergipe）的首都是..." -+msgstr "塞爾希培（Sergipe）的首都是…" - - #: mapsdatatranslation.cpp:656 - msgid "" -@@ -4416,7 +4416,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Sergipe is..." --msgstr "塞爾希培（Sergipe）的旗幟是..." -+msgstr "塞爾希培（Sergipe）的旗幟是…" - - #: mapsdatatranslation.cpp:658 - msgid "" -@@ -4440,7 +4440,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Para is..." --msgstr "帕拉（Para）的首都是..." -+msgstr "帕拉（Para）的首都是…" - - #: mapsdatatranslation.cpp:662 - msgid "" -@@ -4453,7 +4453,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Para is..." --msgstr "帕拉（Para）的旗幟是..." -+msgstr "帕拉（Para）的旗幟是…" - - #: mapsdatatranslation.cpp:664 - msgid "" -@@ -4477,7 +4477,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Minas Gerais is..." --msgstr "米納斯吉拉斯（Minas Gerais）的首都是..." -+msgstr "米納斯吉拉斯（Minas Gerais）的首都是…" - - #: mapsdatatranslation.cpp:668 - msgid "" -@@ -4490,7 +4490,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Minas Gerais is..." --msgstr "米納斯吉拉斯（Minas Gerais）的旗幟是..." -+msgstr "米納斯吉拉斯（Minas Gerais）的旗幟是…" - - #: mapsdatatranslation.cpp:670 - msgid "" -@@ -4514,7 +4514,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Roraima is..." --msgstr "羅賴馬（Roraima）的首都是..." -+msgstr "羅賴馬（Roraima）的首都是…" - - #: mapsdatatranslation.cpp:674 - msgid "" -@@ -4527,7 +4527,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Roraima is..." --msgstr "羅賴馬（Roraima）的旗幟是..." -+msgstr "羅賴馬（Roraima）的旗幟是…" - - #: mapsdatatranslation.cpp:676 - msgid "" -@@ -4551,7 +4551,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Federal District is..." --msgstr "巴西利亞邦聯行政區（Federal District）的首都是..." -+msgstr "巴西利亞邦聯行政區（Federal District）的首都是…" - - #: mapsdatatranslation.cpp:680 - msgid "" -@@ -4564,7 +4564,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Federal District is..." --msgstr "巴西利亞邦聯行政區（Federal District）的旗幟是..." -+msgstr "巴西利亞邦聯行政區（Federal District）的旗幟是…" - - #: mapsdatatranslation.cpp:682 - msgid "" -@@ -4588,7 +4588,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Mato Grosso do Sul is..." --msgstr "南馬托格羅索（Mato Grosso do Sul）的首都是..." -+msgstr "南馬托格羅索（Mato Grosso do Sul）的首都是…" - - #: mapsdatatranslation.cpp:686 - msgid "" -@@ -4601,7 +4601,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Mato Grosso do Sul is..." --msgstr "南馬托格羅索（Mato Grosso do Sul）的旗幟是..." -+msgstr "南馬托格羅索（Mato Grosso do Sul）的旗幟是…" - - #: mapsdatatranslation.cpp:688 - msgid "" -@@ -4625,7 +4625,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Mato Grosso is..." --msgstr "馬托格羅索（Mato Grosso）的首都是..." -+msgstr "馬托格羅索（Mato Grosso）的首都是…" - - #: mapsdatatranslation.cpp:692 - msgid "" -@@ -4638,7 +4638,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Mato Grosso is..." --msgstr "馬托格羅索（Mato Grosso）的旗幟是..." -+msgstr "馬托格羅索（Mato Grosso）的旗幟是…" - - #: mapsdatatranslation.cpp:694 - msgid "" -@@ -4662,7 +4662,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Parana is..." --msgstr "巴拉那（Parana）的首都是..." -+msgstr "巴拉那（Parana）的首都是…" - - #: mapsdatatranslation.cpp:698 - msgid "" -@@ -4675,7 +4675,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Parana is..." --msgstr "巴拉那（Parana）的旗幟是..." -+msgstr "巴拉那（Parana）的旗幟是…" - - #: mapsdatatranslation.cpp:700 - msgid "" -@@ -4699,7 +4699,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Santa Catarina is..." --msgstr "聖卡塔林納（Santa Catarina）的首都是..." -+msgstr "聖卡塔林納（Santa Catarina）的首都是…" - - #: mapsdatatranslation.cpp:704 - msgid "" -@@ -4712,7 +4712,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Santa Catarina is..." --msgstr "聖卡塔林納（Santa Catarina）的旗幟是..." -+msgstr "聖卡塔林納（Santa Catarina）的旗幟是…" - - #: mapsdatatranslation.cpp:706 - msgid "" -@@ -4736,7 +4736,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Ceara is..." --msgstr "塞阿拉（Ceara）的首都是..." -+msgstr "塞阿拉（Ceara）的首都是…" - - #: mapsdatatranslation.cpp:710 - msgid "" -@@ -4749,7 +4749,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Ceara is..." --msgstr "塞阿拉（Ceara）的旗幟是..." -+msgstr "塞阿拉（Ceara）的旗幟是…" - - #: mapsdatatranslation.cpp:712 - msgid "" -@@ -4773,7 +4773,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Goias is..." --msgstr "戈亞斯（Goias）的首都是..." -+msgstr "戈亞斯（Goias）的首都是…" - - #: mapsdatatranslation.cpp:716 - msgid "" -@@ -4786,7 +4786,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Goias is..." --msgstr "戈亞斯（Goias）的旗幟是..." -+msgstr "戈亞斯（Goias）的旗幟是…" - - #: mapsdatatranslation.cpp:718 - msgid "" -@@ -4810,7 +4810,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Paraiba is..." --msgstr "帕拉伊巴（Paraiba）的首都是..." -+msgstr "帕拉伊巴（Paraiba）的首都是…" - - #: mapsdatatranslation.cpp:722 - msgid "" -@@ -4823,7 +4823,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Paraiba is..." --msgstr "帕拉伊巴（Paraiba）的旗幟是..." -+msgstr "帕拉伊巴（Paraiba）的旗幟是…" - - #: mapsdatatranslation.cpp:724 - msgid "" -@@ -4847,7 +4847,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Amapa is..." --msgstr "阿馬帕（Amapa）的首都是..." -+msgstr "阿馬帕（Amapa）的首都是…" - - #: mapsdatatranslation.cpp:728 - msgid "" -@@ -4860,7 +4860,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Amapa is..." --msgstr "阿馬帕（Amapa）的旗幟是..." -+msgstr "阿馬帕（Amapa）的旗幟是…" - - #: mapsdatatranslation.cpp:730 - msgid "" -@@ -4884,7 +4884,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Alagoas is..." --msgstr "阿拉戈阿斯（Alagoas）的首都是..." -+msgstr "阿拉戈阿斯（Alagoas）的首都是…" - - #: mapsdatatranslation.cpp:734 - msgid "" -@@ -4897,7 +4897,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Alagoas is..." --msgstr "阿拉戈阿斯（Alagoas）的旗幟是..." -+msgstr "阿拉戈阿斯（Alagoas）的旗幟是…" - - #: mapsdatatranslation.cpp:736 - msgid "" -@@ -4921,7 +4921,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Amazonas is..." --msgstr "亞馬遜（Amazonas）的首都是..." -+msgstr "亞馬遜（Amazonas）的首都是…" - - #: mapsdatatranslation.cpp:740 - msgid "" -@@ -4934,7 +4934,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Amazonas is..." --msgstr "亞馬遜（Amazonas）的旗幟是..." -+msgstr "亞馬遜（Amazonas）的旗幟是…" - - #: mapsdatatranslation.cpp:742 - msgid "" -@@ -4958,7 +4958,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Rio Grande do Norte is..." --msgstr "北里約格朗德（Rio Grande do Norte）的首都是..." -+msgstr "北里約格朗德（Rio Grande do Norte）的首都是…" - - #: mapsdatatranslation.cpp:746 - msgid "" -@@ -4971,7 +4971,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Rio Grande do Norte is..." --msgstr "北里約格朗德（Rio Grande do Norte）的旗幟是..." -+msgstr "北里約格朗德（Rio Grande do Norte）的旗幟是…" - - #: mapsdatatranslation.cpp:748 - msgid "" -@@ -4995,7 +4995,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Tocantins is..." --msgstr "托坎廷斯（Tocantins）的首都是..." -+msgstr "托坎廷斯（Tocantins）的首都是…" - - #: mapsdatatranslation.cpp:752 - msgid "" -@@ -5008,7 +5008,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Tocantins is..." --msgstr "托坎廷斯（Tocantins）的旗幟是..." -+msgstr "托坎廷斯（Tocantins）的旗幟是…" - - #: mapsdatatranslation.cpp:754 - msgid "" -@@ -5032,7 +5032,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Rio Grande do Sul is..." --msgstr "南里約格朗德（Rio Grande do Sul）的首都是..." -+msgstr "南里約格朗德（Rio Grande do Sul）的首都是…" - - #: mapsdatatranslation.cpp:758 - msgid "" -@@ -5045,7 +5045,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Rio Grande do Sul is..." --msgstr "南里約格朗德（Rio Grande do Sul）的旗幟是..." -+msgstr "南里約格朗德（Rio Grande do Sul）的旗幟是…" - - #: mapsdatatranslation.cpp:760 - msgid "" -@@ -5069,7 +5069,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Rondonia is..." --msgstr "朗多尼亞（Rondonia）的首都是..." -+msgstr "朗多尼亞（Rondonia）的首都是…" - - #: mapsdatatranslation.cpp:764 - msgid "" -@@ -5082,7 +5082,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Rondonia is..." --msgstr "朗多尼亞（Rondonia）的旗幟是..." -+msgstr "朗多尼亞（Rondonia）的旗幟是…" - - #: mapsdatatranslation.cpp:766 - msgid "" -@@ -5106,7 +5106,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Pernambuco is..." --msgstr "伯南布哥（Pernambuco）的首都是..." -+msgstr "伯南布哥（Pernambuco）的首都是…" - - #: mapsdatatranslation.cpp:770 - msgid "" -@@ -5119,7 +5119,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Pernambuco is..." --msgstr "伯南布哥（Pernambuco）的旗幟是..." -+msgstr "伯南布哥（Pernambuco）的旗幟是…" - - #: mapsdatatranslation.cpp:772 - msgid "" -@@ -5143,7 +5143,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Acre is..." --msgstr "阿克理（Acre）的首都是..." -+msgstr "阿克理（Acre）的首都是…" - - #: mapsdatatranslation.cpp:776 - msgid "" -@@ -5156,7 +5156,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Acre is..." --msgstr "阿克理（Acre）的旗幟是..." -+msgstr "阿克理（Acre）的旗幟是…" - - #: mapsdatatranslation.cpp:778 - msgid "" -@@ -5180,7 +5180,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Rio de Janeiro State is..." --msgstr "里約熱內盧（Rio de Janeiro State）的首都是..." -+msgstr "里約熱內盧（Rio de Janeiro State）的首都是…" - - #: mapsdatatranslation.cpp:782 - msgid "" -@@ -5193,7 +5193,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Rio de Janeiro State is..." --msgstr "里約熱內盧（Rio de Janeiro State）的旗幟是..." -+msgstr "里約熱內盧（Rio de Janeiro State）的旗幟是…" - - #: mapsdatatranslation.cpp:784 - msgid "" -@@ -5217,7 +5217,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Bahia is..." --msgstr "巴伊亞（Bahia）的首都是..." -+msgstr "巴伊亞（Bahia）的首都是…" - - #: mapsdatatranslation.cpp:788 - msgid "" -@@ -5230,7 +5230,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Bahia is..." --msgstr "巴伊亞（Bahia）的旗幟是..." -+msgstr "巴伊亞（Bahia）的旗幟是…" - - #: mapsdatatranslation.cpp:790 - msgid "" -@@ -5254,7 +5254,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Maranhao is..." --msgstr "馬朗浩（Maranhao）的首都是..." -+msgstr "馬朗浩（Maranhao）的首都是…" - - #: mapsdatatranslation.cpp:794 - msgid "" -@@ -5267,7 +5267,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Maranhao is..." --msgstr "馬朗浩（Maranhao）的旗幟是..." -+msgstr "馬朗浩（Maranhao）的旗幟是…" - - #: mapsdatatranslation.cpp:796 - msgid "" -@@ -5291,7 +5291,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Sao Paulo State is..." --msgstr "聖保羅（Sao Paulo State）的首都是..." -+msgstr "聖保羅（Sao Paulo State）的首都是…" - - #: mapsdatatranslation.cpp:800 - msgid "" -@@ -5304,7 +5304,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Sao Paulo State is..." --msgstr "聖保羅（Sao Paulo State）的旗幟是..." -+msgstr "聖保羅（Sao Paulo State）的旗幟是…" - - #: mapsdatatranslation.cpp:802 - msgid "" -@@ -5328,7 +5328,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Piaui is..." --msgstr "皮奧伊（Piaui）的首都是..." -+msgstr "皮奧伊（Piaui）的首都是…" - - #: mapsdatatranslation.cpp:806 - msgid "" -@@ -5341,7 +5341,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Piaui is..." --msgstr "皮奧伊（Piaui）的旗幟是..." -+msgstr "皮奧伊（Piaui）的旗幟是…" - - #: mapsdatatranslation.cpp:808 - msgid "" -@@ -5365,7 +5365,7 @@ - msgid "" - "_: brazil.kgm\n" - "The capital of Espirito Santo is..." --msgstr "聖埃斯皮里托（Espirito Santo）的首都是..." -+msgstr "聖埃斯皮里托（Espirito Santo）的首都是…" - - #: mapsdatatranslation.cpp:812 - msgid "" -@@ -5378,7 +5378,7 @@ - msgid "" - "_: brazil.kgm\n" - "The flag of Espirito Santo is..." --msgstr "聖埃斯皮里托（Espirito Santo）的旗幟是..." -+msgstr "聖埃斯皮里托（Espirito Santo）的旗幟是…" - - #: mapsdatatranslation.cpp:814 - msgid "" -@@ -5413,8 +5413,7 @@ - #: mapsdatatranslation.cpp:819 - msgid "" - "_: canada.kgm\n" --"Current map:" --"
                                  Canada                                  " -+"Current map:
                                  Canada                                  " - msgstr "目前地圖：
                                  加拿大                                  " - - #: mapsdatatranslation.cpp:820 -@@ -5439,7 +5438,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Prince Edward Island is..." --msgstr "愛德華王子島（Prince Edward Island）的首都是..." -+msgstr "愛德華王子島（Prince Edward Island）的首都是…" - - #: mapsdatatranslation.cpp:824 - msgid "" -@@ -5452,7 +5451,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Prince Edward Island is..." --msgstr "愛德華王子島（Prince Edward Island）的旗幟是..." -+msgstr "愛德華王子島（Prince Edward Island）的旗幟是…" - - #: mapsdatatranslation.cpp:826 - msgid "" -@@ -5476,7 +5475,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of British Columbia is..." --msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的首都是..." -+msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的首都是…" - - #: mapsdatatranslation.cpp:830 - msgid "" -@@ -5489,7 +5488,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of British Columbia is..." --msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的旗幟是..." -+msgstr "卑詩省（又叫英屬哥倫比亞）（British Columbia）的旗幟是…" - - #: mapsdatatranslation.cpp:832 - msgid "" -@@ -5513,7 +5512,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Ontario is..." --msgstr "安大略（Ontario）的首都是..." -+msgstr "安大略（Ontario）的首都是…" - - #: mapsdatatranslation.cpp:836 - msgid "" -@@ -5526,7 +5525,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Ontario is..." --msgstr "安大略（Ontario）的旗幟是..." -+msgstr "安大略（Ontario）的旗幟是…" - - #: mapsdatatranslation.cpp:838 - msgid "" -@@ -5550,7 +5549,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Newfoundland is..." --msgstr "紐芬蘭（Newfoundland）的首都是..." -+msgstr "紐芬蘭（Newfoundland）的首都是…" - - #: mapsdatatranslation.cpp:842 - msgid "" -@@ -5563,7 +5562,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Newfoundland is..." --msgstr "紐芬蘭（Newfoundland）的旗幟是..." -+msgstr "紐芬蘭（Newfoundland）的旗幟是…" - - #: mapsdatatranslation.cpp:844 - msgid "" -@@ -5587,7 +5586,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Nunavut is..." --msgstr "努那福特（Nunavut）的首都是..." -+msgstr "努那福特（Nunavut）的首都是…" - - #: mapsdatatranslation.cpp:848 - msgid "" -@@ -5600,7 +5599,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Nunavut is..." --msgstr "努那福特（Nunavut）的旗幟是..." -+msgstr "努那福特（Nunavut）的旗幟是…" - - #: mapsdatatranslation.cpp:850 - msgid "" -@@ -5624,7 +5623,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Alberta is..." --msgstr "艾伯塔（Alberta）的首都是..." -+msgstr "艾伯塔（Alberta）的首都是…" - - #: mapsdatatranslation.cpp:854 - msgid "" -@@ -5637,7 +5636,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Alberta is..." --msgstr "艾伯塔（Alberta）的旗幟是..." -+msgstr "艾伯塔（Alberta）的旗幟是…" - - #: mapsdatatranslation.cpp:856 - msgid "" -@@ -5661,7 +5660,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of North West Territories is..." --msgstr "西北地區（North West Territories）的首都是..." -+msgstr "西北地區（North West Territories）的首都是…" - - #: mapsdatatranslation.cpp:860 - msgid "" -@@ -5674,7 +5673,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of North West Territories is..." --msgstr "西北地區（North West Territories）的旗幟是..." -+msgstr "西北地區（North West Territories）的旗幟是…" - - #: mapsdatatranslation.cpp:862 - msgid "" -@@ -5698,7 +5697,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Quebec is..." --msgstr "魁北克（Quebec）的首都是..." -+msgstr "魁北克（Quebec）的首都是…" - - #: mapsdatatranslation.cpp:866 - msgid "" -@@ -5711,7 +5710,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Quebec is..." --msgstr "魁北克（Quebec）的旗幟是..." -+msgstr "魁北克（Quebec）的旗幟是…" - - #: mapsdatatranslation.cpp:868 - msgid "" -@@ -5735,7 +5734,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of New Brunswick is..." --msgstr "紐布蘭（New Brunswick）的首都是..." -+msgstr "紐布蘭（New Brunswick）的首都是…" - - #: mapsdatatranslation.cpp:872 - msgid "" -@@ -5748,7 +5747,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of New Brunswick is..." --msgstr "紐布蘭（New Brunswick）的旗幟是..." -+msgstr "紐布蘭（New Brunswick）的旗幟是…" - - #: mapsdatatranslation.cpp:874 - msgid "" -@@ -5772,7 +5771,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Manitoba is..." --msgstr "曼尼托巴（Manitoba）的首都是..." -+msgstr "曼尼托巴（Manitoba）的首都是…" - - #: mapsdatatranslation.cpp:878 - msgid "" -@@ -5785,7 +5784,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Manitoba is..." --msgstr "曼尼托巴（Manitoba）的旗幟是..." -+msgstr "曼尼托巴（Manitoba）的旗幟是…" - - #: mapsdatatranslation.cpp:880 - msgid "" -@@ -5809,7 +5808,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Nova Scotia is..." --msgstr "諾瓦斯科（Nova Scotia）的首都是..." -+msgstr "諾瓦斯科（Nova Scotia）的首都是…" - - #: mapsdatatranslation.cpp:884 - msgid "" -@@ -5822,7 +5821,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Nova Scotia is..." --msgstr "諾瓦斯科（Nova Scotia）的旗幟是..." -+msgstr "諾瓦斯科（Nova Scotia）的旗幟是…" - - #: mapsdatatranslation.cpp:886 - msgid "" -@@ -5846,7 +5845,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Yukon Territory is..." --msgstr "育空地區（Yukon Territory）的首都是..." -+msgstr "育空地區（Yukon Territory）的首都是…" - - #: mapsdatatranslation.cpp:890 - msgid "" -@@ -5859,7 +5858,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Yukon Territory is..." --msgstr "育空地區（Yukon Territory）的旗幟是..." -+msgstr "育空地區（Yukon Territory）的旗幟是…" - - #: mapsdatatranslation.cpp:892 - msgid "" -@@ -5883,7 +5882,7 @@ - msgid "" - "_: canada.kgm\n" - "The capital of Saskatchewan is..." --msgstr "薩克其萬（Saskatchewan）的首都是..." -+msgstr "薩克其萬（Saskatchewan）的首都是…" - - #: mapsdatatranslation.cpp:896 - msgid "" -@@ -5896,7 +5895,7 @@ - msgid "" - "_: canada.kgm\n" - "The flag of Saskatchewan is..." --msgstr "薩克其萬（Saskatchewan）的旗幟是..." -+msgstr "薩克其萬（Saskatchewan）的旗幟是…" - - #: mapsdatatranslation.cpp:898 - msgid "" -@@ -5919,8 +5918,7 @@ - #: mapsdatatranslation.cpp:901 - msgid "" - "_: china.kgm\n" --"Current map:" --"
                                  China                                  " -+"Current map:
                                  China                                  " - msgstr "目前地圖：
                                  中國                                  " - - #: mapsdatatranslation.cpp:902 -@@ -6035,7 +6033,7 @@ - msgid "" - "_: china.kgm\n" - "Taiwan" --msgstr "台灣（Taiwan）" -+msgstr "中華民國（臺灣，Taiwan）" - - #: mapsdatatranslation.cpp:921 - msgid "" -@@ -6065,7 +6063,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Anhui is..." --msgstr "安徽省的首都是..." -+msgstr "安徽省的首都是…" - - #: mapsdatatranslation.cpp:926 - msgid "" -@@ -6122,7 +6120,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Fujian is..." --msgstr "福建省的首都是..." -+msgstr "福建省的首都是…" - - #: mapsdatatranslation.cpp:935 - msgid "" -@@ -6153,7 +6151,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Gansu is..." --msgstr "甘肅省的首都是..." -+msgstr "甘肅省的首都是…" - - #: mapsdatatranslation.cpp:940 - msgid "" -@@ -6184,7 +6182,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Guangdong is..." --msgstr "廣東省的首都是..." -+msgstr "廣東省的首都是…" - - #: mapsdatatranslation.cpp:945 - msgid "" -@@ -6215,7 +6213,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Guangxi Zhuang is..." --msgstr "廣西省的首都是..." -+msgstr "廣西省的首都是…" - - #: mapsdatatranslation.cpp:950 - msgid "" -@@ -6246,7 +6244,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Guizhou is..." --msgstr "貴州省的首都是..." -+msgstr "貴州省的首都是…" - - #: mapsdatatranslation.cpp:955 - msgid "" -@@ -6277,7 +6275,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Hainan is..." --msgstr "海南省的首都是..." -+msgstr "海南省的首都是…" - - #: mapsdatatranslation.cpp:960 - msgid "" -@@ -6308,7 +6306,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Hebei is..." --msgstr "河北的首都是..." -+msgstr "河北的首都是…" - - #: mapsdatatranslation.cpp:965 - msgid "" -@@ -6339,7 +6337,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Heilongjiang is..." --msgstr "黑龍江省的首都是..." -+msgstr "黑龍江省的首都是…" - - #: mapsdatatranslation.cpp:970 - msgid "" -@@ -6370,7 +6368,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Henan is..." --msgstr "河南省的首都是..." -+msgstr "河南省的首都是…" - - #: mapsdatatranslation.cpp:975 - msgid "" -@@ -6401,7 +6399,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Hubei is..." --msgstr "湖北省的首都是..." -+msgstr "湖北省的首都是…" - - #: mapsdatatranslation.cpp:980 - msgid "" -@@ -6432,7 +6430,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Hunan is..." --msgstr "湖南省的首都是..." -+msgstr "湖南省的首都是…" - - #: mapsdatatranslation.cpp:985 - msgid "" -@@ -6463,7 +6461,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Jiangsu is..." --msgstr "江蘇省的首都是..." -+msgstr "江蘇省的首都是…" - - #: mapsdatatranslation.cpp:990 - msgid "" -@@ -6494,7 +6492,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Jiangxi is..." --msgstr "江西省的首都是..." -+msgstr "江西省的首都是…" - - #: mapsdatatranslation.cpp:995 - msgid "" -@@ -6525,7 +6523,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Jilin is..." --msgstr "吉林省的首都是..." -+msgstr "吉林省的首都是…" - - #: mapsdatatranslation.cpp:1000 - msgid "" -@@ -6556,7 +6554,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Liaoning is..." --msgstr "遼寧省的首都是..." -+msgstr "遼寧省的首都是…" - - #: mapsdatatranslation.cpp:1005 - msgid "" -@@ -6587,7 +6585,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Nei Mongol is..." --msgstr "內蒙古自治區的首都是..." -+msgstr "內蒙古自治區的首都是…" - - #: mapsdatatranslation.cpp:1010 - msgid "" -@@ -6618,7 +6616,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Ningxia Hui is..." --msgstr "寧夏回族自治區的首都是..." -+msgstr "寧夏回族自治區的首都是…" - - #: mapsdatatranslation.cpp:1015 - msgid "" -@@ -6649,7 +6647,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Qinghai is..." --msgstr "青海省的首都是..." -+msgstr "青海省的首都是…" - - #: mapsdatatranslation.cpp:1020 - msgid "" -@@ -6680,7 +6678,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Shanxi is..." --msgstr "山西省的首都是..." -+msgstr "山西省的首都是…" - - #: mapsdatatranslation.cpp:1025 - msgid "" -@@ -6711,7 +6709,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Shandong is..." --msgstr "山東省的首都是..." -+msgstr "山東省的首都是…" - - #: mapsdatatranslation.cpp:1030 - msgid "" -@@ -6755,7 +6753,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Shaanxi is..." --msgstr "陝西省的首都是..." -+msgstr "陝西省的首都是…" - - #: mapsdatatranslation.cpp:1037 - msgid "" -@@ -6786,7 +6784,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Sichuan is..." --msgstr "四川省的首都是..." -+msgstr "四川省的首都是…" - - #: mapsdatatranslation.cpp:1042 - msgid "" -@@ -6830,7 +6828,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Xinjiang Uygur is..." --msgstr "新疆維吾爾自治區的首都是..." -+msgstr "新疆維吾爾自治區的首都是…" - - #: mapsdatatranslation.cpp:1049 - msgid "" -@@ -6861,7 +6859,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Xizang is..." --msgstr "西藏自治區的首都是..." -+msgstr "西藏自治區的首都是…" - - #: mapsdatatranslation.cpp:1054 - msgid "" -@@ -6892,7 +6890,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Yunnan is..." --msgstr "雲南省的首都是..." -+msgstr "雲南省的首都是…" - - #: mapsdatatranslation.cpp:1059 - msgid "" -@@ -6923,7 +6921,7 @@ - msgid "" - "_: china.kgm\n" - "The capital of Zhejiang is..." --msgstr "浙江省的首都是..." -+msgstr "浙江省的首都是…" - - #: mapsdatatranslation.cpp:1064 - msgid "" -@@ -6979,8 +6977,7 @@ - #: mapsdatatranslation.cpp:1072 - msgid "" - "_: europe.kgm\n" --"Current map:" --"
                                  Europe                                  " -+"Current map:
                                  Europe                                  " - msgstr "目前地圖：
                                  歐洲                                  " - - #: mapsdatatranslation.cpp:1073 -@@ -7011,7 +7008,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Albania is..." --msgstr "阿爾巴尼亞（Albania）的首都是..." -+msgstr "阿爾巴尼亞（Albania）的首都是…" - - #: mapsdatatranslation.cpp:1078 - msgid "" -@@ -7024,7 +7021,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Albania is..." --msgstr "阿爾巴尼亞（Albania）的國旗是..." -+msgstr "阿爾巴尼亞（Albania）的國旗是…" - - #: mapsdatatranslation.cpp:1080 - msgid "" -@@ -7054,7 +7051,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Austria is..." --msgstr "奧地利（Austria）的首都是..." -+msgstr "奧地利（Austria）的首都是…" - - #: mapsdatatranslation.cpp:1085 - msgid "" -@@ -7067,7 +7064,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Austria is..." --msgstr "奧地利（Austria）的國旗是..." -+msgstr "奧地利（Austria）的國旗是…" - - #: mapsdatatranslation.cpp:1087 - msgid "" -@@ -7091,7 +7088,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Belarus is..." --msgstr "白俄羅斯（Belarus）的首都是..." -+msgstr "白俄羅斯（Belarus）的首都是…" - - #: mapsdatatranslation.cpp:1091 - msgid "" -@@ -7104,7 +7101,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Belarus is..." --msgstr "白俄羅斯（Belarus）的國旗是..." -+msgstr "白俄羅斯（Belarus）的國旗是…" - - #: mapsdatatranslation.cpp:1093 - msgid "" -@@ -7128,7 +7125,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Belgium is..." --msgstr "比利時（Belgium）的首都是..." -+msgstr "比利時（Belgium）的首都是…" - - #: mapsdatatranslation.cpp:1097 - msgid "" -@@ -7141,7 +7138,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Belgium is..." --msgstr "比利時（Belgium）的國旗是..." -+msgstr "比利時（Belgium）的國旗是…" - - #: mapsdatatranslation.cpp:1099 - msgid "" -@@ -7165,7 +7162,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Bosnia and Herzegovina is..." --msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是..." -+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是…" - - #: mapsdatatranslation.cpp:1103 - msgid "" -@@ -7178,7 +7175,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Bosnia and Herzegovina is..." --msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是..." -+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是…" - - #: mapsdatatranslation.cpp:1105 - msgid "" -@@ -7202,7 +7199,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Bulgaria is..." --msgstr "保加利亞（Bulgaria）的首都是..." -+msgstr "保加利亞（Bulgaria）的首都是…" - - #: mapsdatatranslation.cpp:1109 - msgid "" -@@ -7215,7 +7212,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Bulgaria is..." --msgstr "保加利亞（Bulgaria）的國旗是..." -+msgstr "保加利亞（Bulgaria）的國旗是…" - - #: mapsdatatranslation.cpp:1111 - msgid "" -@@ -7239,7 +7236,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Croatia is..." --msgstr "克羅埃西亞（Croatia）的首都是..." -+msgstr "克羅埃西亞（Croatia）的首都是…" - - #: mapsdatatranslation.cpp:1115 - msgid "" -@@ -7252,7 +7249,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Croatia is..." --msgstr "克羅埃西亞（Croatia）的國旗是..." -+msgstr "克羅埃西亞（Croatia）的國旗是…" - - #: mapsdatatranslation.cpp:1117 - msgid "" -@@ -7276,7 +7273,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Czech Republic is..." --msgstr "捷克（Czech Republic）的首都是..." -+msgstr "捷克（Czech Republic）的首都是…" - - #: mapsdatatranslation.cpp:1121 - msgid "" -@@ -7289,7 +7286,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Czech Republic is..." --msgstr "捷克（Czech Republic）的國旗是..." -+msgstr "捷克（Czech Republic）的國旗是…" - - #: mapsdatatranslation.cpp:1123 - msgid "" -@@ -7313,7 +7310,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Denmark is..." --msgstr "丹麥（Denmark）的首都是..." -+msgstr "丹麥（Denmark）的首都是…" - - #: mapsdatatranslation.cpp:1127 - msgid "" -@@ -7326,7 +7323,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Denmark is..." --msgstr "丹麥（Denmark）的國旗是..." -+msgstr "丹麥（Denmark）的國旗是…" - - #: mapsdatatranslation.cpp:1129 - msgid "" -@@ -7350,7 +7347,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Estonia is..." --msgstr "愛沙尼亞（Estonia）的首都是..." -+msgstr "愛沙尼亞（Estonia）的首都是…" - - #: mapsdatatranslation.cpp:1133 - msgid "" -@@ -7363,7 +7360,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Estonia is..." --msgstr "愛沙尼亞（Estonia）的國旗是..." -+msgstr "愛沙尼亞（Estonia）的國旗是…" - - #: mapsdatatranslation.cpp:1135 - msgid "" -@@ -7387,7 +7384,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Finland is..." --msgstr "芬蘭（Finland）的首都是..." -+msgstr "芬蘭（Finland）的首都是…" - - #: mapsdatatranslation.cpp:1139 - msgid "" -@@ -7400,7 +7397,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Finland is..." --msgstr "芬蘭（Finland）的國旗是..." -+msgstr "芬蘭（Finland）的國旗是…" - - #: mapsdatatranslation.cpp:1141 - msgid "" -@@ -7424,7 +7421,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Macedonia is..." --msgstr "馬其頓（Macedonia）的首都是..." -+msgstr "馬其頓（Macedonia）的首都是…" - - #: mapsdatatranslation.cpp:1145 - msgid "" -@@ -7437,7 +7434,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Macedonia is..." --msgstr "馬其頓（Macedonia）的國旗是..." -+msgstr "馬其頓（Macedonia）的國旗是…" - - #: mapsdatatranslation.cpp:1147 - msgid "" -@@ -7461,7 +7458,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of France is..." --msgstr "法蘭西（France）的首都是..." -+msgstr "法蘭西（France）的首都是…" - - #: mapsdatatranslation.cpp:1151 - msgid "" -@@ -7474,7 +7471,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of France is..." --msgstr "法蘭西（France）的國旗是..." -+msgstr "法蘭西（France）的國旗是…" - - #: mapsdatatranslation.cpp:1153 - msgid "" -@@ -7498,7 +7495,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Germany is..." --msgstr "德意志（Germany）的首都是..." -+msgstr "德意志（Germany）的首都是…" - - #: mapsdatatranslation.cpp:1157 - msgid "" -@@ -7511,7 +7508,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Germany is..." --msgstr "德意志（Germany）的國旗是..." -+msgstr "德意志（Germany）的國旗是…" - - #: mapsdatatranslation.cpp:1159 - msgid "" -@@ -7535,7 +7532,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Greece is..." --msgstr "希臘（Greece）的首都是..." -+msgstr "希臘（Greece）的首都是…" - - #: mapsdatatranslation.cpp:1163 - msgid "" -@@ -7548,7 +7545,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Greece is..." --msgstr "希臘（Greece）的國旗是..." -+msgstr "希臘（Greece）的國旗是…" - - #: mapsdatatranslation.cpp:1165 - msgid "" -@@ -7572,7 +7569,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Hungary is..." --msgstr "匈牙利（Hungary）的首都是..." -+msgstr "匈牙利（Hungary）的首都是…" - - #: mapsdatatranslation.cpp:1169 - msgid "" -@@ -7585,7 +7582,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Hungary is..." --msgstr "匈牙利（Hungary）的國旗是..." -+msgstr "匈牙利（Hungary）的國旗是…" - - #: mapsdatatranslation.cpp:1171 - msgid "" -@@ -7609,7 +7606,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Iceland is..." --msgstr "冰島（Iceland）的首都是..." -+msgstr "冰島（Iceland）的首都是…" - - #: mapsdatatranslation.cpp:1175 - msgid "" -@@ -7622,7 +7619,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Iceland is..." --msgstr "冰島（Iceland）的國旗是..." -+msgstr "冰島（Iceland）的國旗是…" - - #: mapsdatatranslation.cpp:1177 - msgid "" -@@ -7646,7 +7643,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Ireland is..." --msgstr "愛爾蘭（Ireland）的首都是..." -+msgstr "愛爾蘭（Ireland）的首都是…" - - #: mapsdatatranslation.cpp:1181 - msgid "" -@@ -7659,7 +7656,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Ireland is..." --msgstr "愛爾蘭（Ireland）的國旗是..." -+msgstr "愛爾蘭（Ireland）的國旗是…" - - #: mapsdatatranslation.cpp:1183 - msgid "" -@@ -7683,7 +7680,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Italy is..." --msgstr "義大利（Italy）的首都是..." -+msgstr "義大利（Italy）的首都是…" - - #: mapsdatatranslation.cpp:1187 - msgid "" -@@ -7696,7 +7693,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Italy is..." --msgstr "義大利（Italy）的國旗是..." -+msgstr "義大利（Italy）的國旗是…" - - #: mapsdatatranslation.cpp:1189 - msgid "" -@@ -7720,7 +7717,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Latvia is..." --msgstr "拉脫維亞（Latvia）的首都是..." -+msgstr "拉脫維亞（Latvia）的首都是…" - - #: mapsdatatranslation.cpp:1193 - msgid "" -@@ -7733,7 +7730,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Latvia is..." --msgstr "拉脫維亞（Latvia）的國旗是..." -+msgstr "拉脫維亞（Latvia）的國旗是…" - - #: mapsdatatranslation.cpp:1195 - msgid "" -@@ -7757,7 +7754,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Lithuania is..." --msgstr "立陶宛（Lithuania）的首都是..." -+msgstr "立陶宛（Lithuania）的首都是…" - - #: mapsdatatranslation.cpp:1199 - msgid "" -@@ -7770,7 +7767,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Lithuania is..." --msgstr "立陶宛（Lithuania）的國旗是..." -+msgstr "立陶宛（Lithuania）的國旗是…" - - #: mapsdatatranslation.cpp:1201 - msgid "" -@@ -7794,7 +7791,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Luxembourg is..." --msgstr "盧森堡（Luxembourg）的首都是..." -+msgstr "盧森堡（Luxembourg）的首都是…" - - #: mapsdatatranslation.cpp:1205 - msgid "" -@@ -7807,7 +7804,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Luxembourg is..." --msgstr "盧森堡（Luxembourg）的國旗是..." -+msgstr "盧森堡（Luxembourg）的國旗是…" - - #: mapsdatatranslation.cpp:1208 - msgid "" -@@ -7825,7 +7822,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Moldova is..." --msgstr "摩爾多瓦（Moldova）的首都是..." -+msgstr "摩爾多瓦（Moldova）的首都是…" - - #: mapsdatatranslation.cpp:1211 - msgid "" -@@ -7838,7 +7835,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Moldova is..." --msgstr "摩爾多瓦（Moldova）的國旗是..." -+msgstr "摩爾多瓦（Moldova）的國旗是…" - - #: mapsdatatranslation.cpp:1213 - msgid "" -@@ -7868,7 +7865,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Netherlands is..." --msgstr "荷蘭（Netherlands）的首都是..." -+msgstr "荷蘭（Netherlands）的首都是…" - - #: mapsdatatranslation.cpp:1218 - msgid "" -@@ -7881,7 +7878,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Netherlands is..." --msgstr "荷蘭（Netherlands）的國旗是..." -+msgstr "荷蘭（Netherlands）的國旗是…" - - #: mapsdatatranslation.cpp:1220 - msgid "" -@@ -7905,7 +7902,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Norway is..." --msgstr "挪威（Norway）的首都是..." -+msgstr "挪威（Norway）的首都是…" - - #: mapsdatatranslation.cpp:1224 - msgid "" -@@ -7918,7 +7915,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Norway is..." --msgstr "挪威（Norway）的國旗是..." -+msgstr "挪威（Norway）的國旗是…" - - #: mapsdatatranslation.cpp:1226 - msgid "" -@@ -7942,7 +7939,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Poland is..." --msgstr "波蘭（Poland）的首都是..." -+msgstr "波蘭（Poland）的首都是…" - - #: mapsdatatranslation.cpp:1230 - msgid "" -@@ -7955,7 +7952,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Poland is..." --msgstr "波蘭（Poland）的國旗是..." -+msgstr "波蘭（Poland）的國旗是…" - - #: mapsdatatranslation.cpp:1232 - msgid "" -@@ -7979,7 +7976,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Portugal is..." --msgstr "葡萄牙（Portugal）的首都是..." -+msgstr "葡萄牙（Portugal）的首都是…" - - #: mapsdatatranslation.cpp:1236 - msgid "" -@@ -7992,7 +7989,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Portugal is..." --msgstr "葡萄牙（Portugal）的國旗是..." -+msgstr "葡萄牙（Portugal）的國旗是…" - - #: mapsdatatranslation.cpp:1238 - msgid "" -@@ -8016,7 +8013,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Romania is..." --msgstr "羅馬尼亞（Romania）的首都是..." -+msgstr "羅馬尼亞（Romania）的首都是…" - - #: mapsdatatranslation.cpp:1242 - msgid "" -@@ -8029,7 +8026,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Romania is..." --msgstr "羅馬尼亞（Romania）的國旗是..." -+msgstr "羅馬尼亞（Romania）的國旗是…" - - #: mapsdatatranslation.cpp:1244 - msgid "" -@@ -8053,7 +8050,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Russia is..." --msgstr "俄羅斯（Russia）的首都是..." -+msgstr "俄羅斯（Russia）的首都是…" - - #: mapsdatatranslation.cpp:1248 - msgid "" -@@ -8066,7 +8063,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Russia is..." --msgstr "俄羅斯（Russia）的國旗是..." -+msgstr "俄羅斯（Russia）的國旗是…" - - #: mapsdatatranslation.cpp:1250 - msgid "" -@@ -8090,7 +8087,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of San Marino is..." --msgstr "聖馬利諾（San Marino）的首都是..." -+msgstr "聖馬利諾（San Marino）的首都是…" - - #: mapsdatatranslation.cpp:1254 - msgid "" -@@ -8103,7 +8100,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of San Marino is..." --msgstr "聖馬利諾（San Marino）的國旗是..." -+msgstr "聖馬利諾（San Marino）的國旗是…" - - #: mapsdatatranslation.cpp:1257 - msgid "" -@@ -8121,7 +8118,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Serbia is..." --msgstr "塞爾維亞（Serbia）的首都是..." -+msgstr "塞爾維亞（Serbia）的首都是…" - - #: mapsdatatranslation.cpp:1260 - msgid "" -@@ -8134,7 +8131,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Serbia is..." --msgstr "塞爾維亞（Serbia）的國旗是..." -+msgstr "塞爾維亞（Serbia）的國旗是…" - - #: mapsdatatranslation.cpp:1262 - msgid "" -@@ -8158,7 +8155,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Montenegro is..." --msgstr "蒙特內哥羅（Montenegro）的首都是..." -+msgstr "蒙特內哥羅（Montenegro）的首都是…" - - #: mapsdatatranslation.cpp:1266 - msgid "" -@@ -8171,7 +8168,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Montenegro is..." --msgstr "蒙特內哥羅（Montenegro）的國旗是..." -+msgstr "蒙特內哥羅（Montenegro）的國旗是…" - - #: mapsdatatranslation.cpp:1268 - msgid "" -@@ -8195,7 +8192,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Slovakia is..." --msgstr "斯洛伐克（Slovakia）的首都是..." -+msgstr "斯洛伐克（Slovakia）的首都是…" - - #: mapsdatatranslation.cpp:1272 - msgid "" -@@ -8208,7 +8205,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Slovakia is..." --msgstr "斯洛伐克（Slovakia）的國旗是..." -+msgstr "斯洛伐克（Slovakia）的國旗是…" - - #: mapsdatatranslation.cpp:1274 - msgid "" -@@ -8232,7 +8229,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Slovenia is..." --msgstr "斯洛伐尼亞（Slovenia）的首都是..." -+msgstr "斯洛伐尼亞（Slovenia）的首都是…" - - #: mapsdatatranslation.cpp:1278 - msgid "" -@@ -8245,7 +8242,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Slovenia is..." --msgstr "斯洛伐尼亞（Slovenia）的國旗是..." -+msgstr "斯洛伐尼亞（Slovenia）的國旗是…" - - #: mapsdatatranslation.cpp:1280 - msgid "" -@@ -8269,7 +8266,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Spain is..." --msgstr "西班牙（Spain）的首都是..." -+msgstr "西班牙（Spain）的首都是…" - - #: mapsdatatranslation.cpp:1284 - msgid "" -@@ -8282,7 +8279,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Spain is..." --msgstr "西班牙（Spain）的國旗是..." -+msgstr "西班牙（Spain）的國旗是…" - - #: mapsdatatranslation.cpp:1286 - msgid "" -@@ -8306,7 +8303,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Sweden is..." --msgstr "瑞典（Sweden）的首都是..." -+msgstr "瑞典（Sweden）的首都是…" - - #: mapsdatatranslation.cpp:1290 - msgid "" -@@ -8319,7 +8316,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Sweden is..." --msgstr "瑞典（Sweden）的國旗是..." -+msgstr "瑞典（Sweden）的國旗是…" - - #: mapsdatatranslation.cpp:1292 - msgid "" -@@ -8331,7 +8328,7 @@ - msgid "" - "_: europe.kgm\n" - "Stockholm is the capital of..." --msgstr "斯德哥爾摩（Stockholm）的首都是..." -+msgstr "斯德哥爾摩（Stockholm）的首都是…" - - #: mapsdatatranslation.cpp:1294 - msgid "" -@@ -8343,7 +8340,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Switzerland is..." --msgstr "瑞士（Switzerland）的首都是..." -+msgstr "瑞士（Switzerland）的首都是…" - - #: mapsdatatranslation.cpp:1296 - msgid "" -@@ -8356,7 +8353,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Switzerland is..." --msgstr "瑞士（Switzerland）的國旗是..." -+msgstr "瑞士（Switzerland）的國旗是…" - - #: mapsdatatranslation.cpp:1298 - msgid "" -@@ -8392,7 +8389,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Turkey is..." --msgstr "土耳其（Turkey）的首都是..." -+msgstr "土耳其（Turkey）的首都是…" - - #: mapsdatatranslation.cpp:1304 - msgid "" -@@ -8405,7 +8402,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Turkey is..." --msgstr "土耳其（Turkey）的國旗是..." -+msgstr "土耳其（Turkey）的國旗是…" - - #: mapsdatatranslation.cpp:1306 - msgid "" -@@ -8429,7 +8426,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of Ukraine is..." --msgstr "烏克蘭（Ukraine）的首都是..." -+msgstr "烏克蘭（Ukraine）的首都是…" - - #: mapsdatatranslation.cpp:1310 - msgid "" -@@ -8442,7 +8439,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of Ukraine is..." --msgstr "烏克蘭（Ukraine）的國旗是..." -+msgstr "烏克蘭（Ukraine）的國旗是…" - - #: mapsdatatranslation.cpp:1312 - msgid "" -@@ -8466,7 +8463,7 @@ - msgid "" - "_: europe.kgm\n" - "The capital of United Kingdom is..." --msgstr "大英國協（United Kingdom）的首都是..." -+msgstr "大英國協（United Kingdom）的首都是…" - - #: mapsdatatranslation.cpp:1316 - msgid "" -@@ -8479,7 +8476,7 @@ - msgid "" - "_: europe.kgm\n" - "The flag of United Kingdom is..." --msgstr "大英國協（United Kingdom）的國旗是..." -+msgstr "大英國協（United Kingdom）的國旗是…" - - #: mapsdatatranslation.cpp:1318 - msgid "" -@@ -8502,8 +8499,7 @@ - #: mapsdatatranslation.cpp:1321 - msgid "" - "_: france.kgm\n" --"Current map:" --"
                                  France                                  " -+"Current map:
                                  France                                  " - msgstr "目前地圖：
                                  法國                                  " - - #: mapsdatatranslation.cpp:1322 -@@ -8528,7 +8524,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Ain is..." --msgstr "安省（Ain）的首都是..." -+msgstr "安省（Ain）的首都是…" - - #: mapsdatatranslation.cpp:1326 - msgid "" -@@ -8559,7 +8555,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Aisne is..." --msgstr "埃納省（Aisne）的首都是..." -+msgstr "埃納省（Aisne）的首都是…" - - #: mapsdatatranslation.cpp:1331 - msgid "" -@@ -8590,7 +8586,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Allier is..." --msgstr "阿列省（Allier）的首都是..." -+msgstr "阿列省（Allier）的首都是…" - - #: mapsdatatranslation.cpp:1336 - msgid "" -@@ -8621,7 +8617,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Alpes de Haute-Provence is..." --msgstr "上普羅旺斯阿爾卑斯省（Alpes de Haute-Provence）的首都是..." -+msgstr "上普羅旺斯阿爾卑斯省（Alpes de Haute-Provence）的首都是…" - - #: mapsdatatranslation.cpp:1341 - msgid "" -@@ -8652,7 +8648,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Hautes-Alpes is..." --msgstr "上阿爾卑斯省（Hautes-Alpes）的首都是..." -+msgstr "上阿爾卑斯省（Hautes-Alpes）的首都是…" - - #: mapsdatatranslation.cpp:1346 - msgid "" -@@ -8683,7 +8679,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Alpes Maritimes is..." --msgstr "濱海阿爾卑斯省（Alpes Maritimes）的首都是..." -+msgstr "濱海阿爾卑斯省（Alpes Maritimes）的首都是…" - - #: mapsdatatranslation.cpp:1351 - msgid "" -@@ -8714,7 +8710,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Ardèche is..." --msgstr "阿爾代什省（Ardèche）的首都是..." -+msgstr "阿爾代什省（Ardèche）的首都是…" - - #: mapsdatatranslation.cpp:1356 - msgid "" -@@ -8745,7 +8741,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Ardennes is..." --msgstr "阿登省（Ardennes）的首都是..." -+msgstr "阿登省（Ardennes）的首都是…" - - #: mapsdatatranslation.cpp:1361 - msgid "" -@@ -8776,7 +8772,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Ariège is..." --msgstr "阿列日省（Ariège）的首都是..." -+msgstr "阿列日省（Ariège）的首都是…" - - #: mapsdatatranslation.cpp:1366 - msgid "" -@@ -8807,7 +8803,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Aube is..." --msgstr "奧布省（Aube）的首都是..." -+msgstr "奧布省（Aube）的首都是…" - - #: mapsdatatranslation.cpp:1371 - msgid "" -@@ -8838,7 +8834,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Aude is..." --msgstr "奧德省（Aude）的首都是..." -+msgstr "奧德省（Aude）的首都是…" - - #: mapsdatatranslation.cpp:1376 - msgid "" -@@ -8869,7 +8865,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Aveyron is..." --msgstr "阿韋龍省（Aveyron）的首都是..." -+msgstr "阿韋龍省（Aveyron）的首都是…" - - #: mapsdatatranslation.cpp:1381 - msgid "" -@@ -8900,7 +8896,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Bouches-du-Rhône is..." --msgstr "羅訥河口省（Bouches-du-Rhône）的首都是..." -+msgstr "羅訥河口省（Bouches-du-Rhône）的首都是…" - - #: mapsdatatranslation.cpp:1386 - msgid "" -@@ -8931,7 +8927,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Calvados is..." --msgstr "卡爾瓦多斯省（Calvados）的首都是..." -+msgstr "卡爾瓦多斯省（Calvados）的首都是…" - - #: mapsdatatranslation.cpp:1391 - msgid "" -@@ -8962,7 +8958,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Cantal is..." --msgstr "康塔爾省（Cantal）的首都是..." -+msgstr "康塔爾省（Cantal）的首都是…" - - #: mapsdatatranslation.cpp:1396 - msgid "" -@@ -8993,7 +8989,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Charente is..." --msgstr "夏朗德省（Charente）的首都是..." -+msgstr "夏朗德省（Charente）的首都是…" - - #: mapsdatatranslation.cpp:1401 - msgid "" -@@ -9024,7 +9020,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Charente-Maritime is..." --msgstr "濱海夏朗德省（Charente-Maritime）的首都是..." -+msgstr "濱海夏朗德省（Charente-Maritime）的首都是…" - - #: mapsdatatranslation.cpp:1406 - msgid "" -@@ -9055,7 +9051,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Cher is..." --msgstr "謝爾省（Cher）的首都是..." -+msgstr "謝爾省（Cher）的首都是…" - - #: mapsdatatranslation.cpp:1411 - msgid "" -@@ -9086,7 +9082,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Corrèze is..." --msgstr "科雷茲省（Corrèze）的首都是..." -+msgstr "科雷茲省（Corrèze）的首都是…" - - #: mapsdatatranslation.cpp:1416 - msgid "" -@@ -9105,7 +9101,7 @@ - msgid "" - "_: france.kgm\n" - "Tulle is the capital of..." --msgstr "帝勒（Tulle）的首都是..." -+msgstr "帝勒（Tulle）的首都是…" - - #: mapsdatatranslation.cpp:1419 - msgid "" -@@ -9117,7 +9113,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Corse du Sud is..." --msgstr "南科西嘉（Corse du Sud）的首都是..." -+msgstr "南科西嘉（Corse du Sud）的首都是…" - - #: mapsdatatranslation.cpp:1421 - msgid "" -@@ -9148,7 +9144,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Corse is..." --msgstr "上科西嘉（Haute-Corse）的首都是..." -+msgstr "上科西嘉（Haute-Corse）的首都是…" - - #: mapsdatatranslation.cpp:1426 - msgid "" -@@ -9167,7 +9163,7 @@ - msgid "" - "_: france.kgm\n" - "Bastia is the capital of..." --msgstr "巴斯蒂亞（Bastia）的首都是..." -+msgstr "巴斯蒂亞（Bastia）的首都是…" - - #: mapsdatatranslation.cpp:1429 - msgid "" -@@ -9179,7 +9175,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Côte d'Or is..." --msgstr "科爾多省（Côte d'Or）的首都是..." -+msgstr "科爾多省（Côte d'Or）的首都是…" - - #: mapsdatatranslation.cpp:1431 - msgid "" -@@ -9210,7 +9206,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Côtes d'Armor is..." --msgstr "阿摩爾濱海省（Côtes d'Armor）的首都是..." -+msgstr "阿摩爾濱海省（Côtes d'Armor）的首都是…" - - #: mapsdatatranslation.cpp:1436 - msgid "" -@@ -9241,7 +9237,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Creuse is..." --msgstr "克勒茲省（Creuse）的首都是..." -+msgstr "克勒茲省（Creuse）的首都是…" - - #: mapsdatatranslation.cpp:1441 - msgid "" -@@ -9272,7 +9268,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Dordogne is..." --msgstr "多爾多涅省（Dordogne）的首都是..." -+msgstr "多爾多涅省（Dordogne）的首都是…" - - #: mapsdatatranslation.cpp:1446 - msgid "" -@@ -9303,7 +9299,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Doubs is..." --msgstr "杜伯省（Doubs）的首都是..." -+msgstr "杜伯省（Doubs）的首都是…" - - #: mapsdatatranslation.cpp:1451 - msgid "" -@@ -9334,7 +9330,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Drôme is..." --msgstr "德龍省（Drôme）的首都是..." -+msgstr "德龍省（Drôme）的首都是…" - - #: mapsdatatranslation.cpp:1456 - msgid "" -@@ -9365,7 +9361,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Eure is..." --msgstr "厄爾省（Eure）的首都是..." -+msgstr "厄爾省（Eure）的首都是…" - - #: mapsdatatranslation.cpp:1461 - msgid "" -@@ -9396,7 +9392,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Eure et Loir is..." --msgstr "厄爾盧瓦爾省（Eure et Loir）的首都是..." -+msgstr "厄爾盧瓦爾省（Eure et Loir）的首都是…" - - #: mapsdatatranslation.cpp:1466 - msgid "" -@@ -9427,7 +9423,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Finistère is..." --msgstr "菲尼斯泰爾省（Finistère）的首都是..." -+msgstr "菲尼斯泰爾省（Finistère）的首都是…" - - #: mapsdatatranslation.cpp:1471 - msgid "" -@@ -9458,7 +9454,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Gard is..." --msgstr "加爾省（Gard）的首都是..." -+msgstr "加爾省（Gard）的首都是…" - - #: mapsdatatranslation.cpp:1476 - msgid "" -@@ -9489,7 +9485,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Garonne is..." --msgstr "上加龍省（Haute-Garonne）的首都是..." -+msgstr "上加龍省（Haute-Garonne）的首都是…" - - #: mapsdatatranslation.cpp:1481 - msgid "" -@@ -9520,7 +9516,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Gers is..." --msgstr "熱爾省（Gers）的首都是..." -+msgstr "熱爾省（Gers）的首都是…" - - #: mapsdatatranslation.cpp:1486 - msgid "" -@@ -9551,7 +9547,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Gironde is..." --msgstr "吉倫特省（Gironde）的首都是..." -+msgstr "吉倫特省（Gironde）的首都是…" - - #: mapsdatatranslation.cpp:1491 - msgid "" -@@ -9582,7 +9578,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Hérault is..." --msgstr "埃羅省（Hérault）的首都是..." -+msgstr "埃羅省（Hérault）的首都是…" - - #: mapsdatatranslation.cpp:1496 - msgid "" -@@ -9613,7 +9609,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Ille et Vilaine is..." --msgstr "伊勒維萊納省（Ille et Vilaine）的首都是..." -+msgstr "伊勒維萊納省（Ille et Vilaine）的首都是…" - - #: mapsdatatranslation.cpp:1501 - msgid "" -@@ -9644,7 +9640,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Indre is..." --msgstr "安德爾省（Indre）的首都是..." -+msgstr "安德爾省（Indre）的首都是…" - - #: mapsdatatranslation.cpp:1506 - msgid "" -@@ -9675,7 +9671,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Indre et Loire is..." --msgstr "安德爾魯瓦爾省（Indre et Loire）的首都是..." -+msgstr "安德爾魯瓦爾省（Indre et Loire）的首都是…" - - #: mapsdatatranslation.cpp:1511 - msgid "" -@@ -9706,7 +9702,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Isère is..." --msgstr "伊澤爾省（Isère）的首都是..." -+msgstr "伊澤爾省（Isère）的首都是…" - - #: mapsdatatranslation.cpp:1516 - msgid "" -@@ -9737,7 +9733,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Jura is..." --msgstr "汝拉省（Jura）的首都是..." -+msgstr "汝拉省（Jura）的首都是…" - - #: mapsdatatranslation.cpp:1521 - msgid "" -@@ -9768,7 +9764,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Landes is..." --msgstr "朗德省（Landes）的首都是..." -+msgstr "朗德省（Landes）的首都是…" - - #: mapsdatatranslation.cpp:1526 - msgid "" -@@ -9799,7 +9795,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Loir et Cher is..." --msgstr "盧瓦爾謝爾省（Loir et Cher）的首都是..." -+msgstr "盧瓦爾謝爾省（Loir et Cher）的首都是…" - - #: mapsdatatranslation.cpp:1531 - msgid "" -@@ -9830,7 +9826,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Loire is..." --msgstr "盧瓦爾省（Loire）的首都是..." -+msgstr "盧瓦爾省（Loire）的首都是…" - - #: mapsdatatranslation.cpp:1536 - msgid "" -@@ -9861,7 +9857,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Loire is..." --msgstr "上盧瓦爾省（Haute-Loire）的首都是..." -+msgstr "上盧瓦爾省（Haute-Loire）的首都是…" - - #: mapsdatatranslation.cpp:1541 - msgid "" -@@ -9892,7 +9888,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Loire-Atlantique is..." --msgstr "大西洋盧瓦爾省（Loire-Atlantique）的首都是..." -+msgstr "大西洋盧瓦爾省（Loire-Atlantique）的首都是…" - - #: mapsdatatranslation.cpp:1546 - msgid "" -@@ -9923,7 +9919,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Loiret is..." --msgstr "盧瓦雷省（Loiret）的首都是..." -+msgstr "盧瓦雷省（Loiret）的首都是…" - - #: mapsdatatranslation.cpp:1551 - msgid "" -@@ -9954,7 +9950,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Lot is..." --msgstr "洛特省（Lot）的首都是..." -+msgstr "洛特省（Lot）的首都是…" - - #: mapsdatatranslation.cpp:1556 - msgid "" -@@ -9985,7 +9981,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Lot et Garonne is..." --msgstr "洛特加龍省（Lot et Garonne）的首都是..." -+msgstr "洛特加龍省（Lot et Garonne）的首都是…" - - #: mapsdatatranslation.cpp:1561 - msgid "" -@@ -10016,7 +10012,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Lozère is..." --msgstr "洛澤爾省（Lozère）的首都是..." -+msgstr "洛澤爾省（Lozère）的首都是…" - - #: mapsdatatranslation.cpp:1566 - msgid "" -@@ -10047,7 +10043,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Maine et Loire is..." --msgstr "曼恩盧瓦爾省（Maine et Loire）的首都是..." -+msgstr "曼恩盧瓦爾省（Maine et Loire）的首都是…" - - #: mapsdatatranslation.cpp:1571 - msgid "" -@@ -10078,7 +10074,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Manche is..." --msgstr "芒什省（Manche）的首都是..." -+msgstr "芒什省（Manche）的首都是…" - - #: mapsdatatranslation.cpp:1576 - msgid "" -@@ -10109,7 +10105,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Marne is..." --msgstr "馬恩省（Marne）的首都是..." -+msgstr "馬恩省（Marne）的首都是…" - - #: mapsdatatranslation.cpp:1581 - msgid "" -@@ -10140,7 +10136,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Marne is..." --msgstr "上馬恩省（Haute-Marne）的首都是..." -+msgstr "上馬恩省（Haute-Marne）的首都是…" - - #: mapsdatatranslation.cpp:1586 - msgid "" -@@ -10171,7 +10167,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Mayenne is..." --msgstr "馬耶訥省（Mayenne）的首都是..." -+msgstr "馬耶訥省（Mayenne）的首都是…" - - #: mapsdatatranslation.cpp:1591 - msgid "" -@@ -10202,7 +10198,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Meurthe et Moselle is..." --msgstr "默爾特摩澤爾省（Meurthe et Moselle）的首都是..." -+msgstr "默爾特摩澤爾省（Meurthe et Moselle）的首都是…" - - #: mapsdatatranslation.cpp:1596 - msgid "" -@@ -10233,7 +10229,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Meuse is..." --msgstr "默茲省（Meuse）的首都是..." -+msgstr "默茲省（Meuse）的首都是…" - - #: mapsdatatranslation.cpp:1601 - msgid "" -@@ -10264,7 +10260,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Morbihan is..." --msgstr "莫爾比昂省（Morbihan）的首都是..." -+msgstr "莫爾比昂省（Morbihan）的首都是…" - - #: mapsdatatranslation.cpp:1606 - msgid "" -@@ -10295,7 +10291,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Moselle is..." --msgstr "摩澤爾省（Moselle）的首都是..." -+msgstr "摩澤爾省（Moselle）的首都是…" - - #: mapsdatatranslation.cpp:1611 - msgid "" -@@ -10326,7 +10322,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Nièvre is..." --msgstr "涅夫勒省（Nièvre）的首都是..." -+msgstr "涅夫勒省（Nièvre）的首都是…" - - #: mapsdatatranslation.cpp:1616 - msgid "" -@@ -10357,7 +10353,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Nord is..." --msgstr "諾爾省（Nord）的首都是..." -+msgstr "諾爾省（Nord）的首都是…" - - #: mapsdatatranslation.cpp:1621 - msgid "" -@@ -10388,7 +10384,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Oise is..." --msgstr "瓦茲省（Oise）的首都是..." -+msgstr "瓦茲省（Oise）的首都是…" - - #: mapsdatatranslation.cpp:1626 - msgid "" -@@ -10419,7 +10415,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Orne is..." --msgstr "奧恩（Orne）的首都是..." -+msgstr "奧恩（Orne）的首都是…" - - #: mapsdatatranslation.cpp:1631 - msgid "" -@@ -10450,7 +10446,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Pas-de-Calais is..." --msgstr "加萊海峽省（Pas-de-Calais）的首都是..." -+msgstr "加萊海峽省（Pas-de-Calais）的首都是…" - - #: mapsdatatranslation.cpp:1636 - msgid "" -@@ -10481,7 +10477,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Puy-de-Dôme is..." --msgstr "多姆山省（Puy-de-Dôme）的首都是..." -+msgstr "多姆山省（Puy-de-Dôme）的首都是…" - - #: mapsdatatranslation.cpp:1641 - msgid "" -@@ -10512,7 +10508,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Pyrénées-Atlantiques is..." --msgstr "比利尼斯大西洋省（Pyrénées-Atlantiques）的首都是..." -+msgstr "比利尼斯大西洋省（Pyrénées-Atlantiques）的首都是…" - - #: mapsdatatranslation.cpp:1646 - msgid "" -@@ -10543,14 +10539,14 @@ - msgid "" - "_: france.kgm\n" - "The capital of Hautes-Pyrénées is..." --msgstr "上比利尼斯省（Hautes-Pyrénées）的首都是..." -+msgstr "上比利尼斯省（Hautes-Pyrénées）的首都是…" - - #: mapsdatatranslation.cpp:1651 - msgid "" - "_: france.kgm\n" - "Please click on:\n" - "Hautes-Pyrénées" --msgstr "請點選：上比利尼斯省（Hautes-Pyrénées）的首都是..." -+msgstr "請點選：上比利尼斯省（Hautes-Pyrénées）的首都是…" - - #: mapsdatatranslation.cpp:1652 - msgid "" -@@ -10574,7 +10570,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Pyrénées-Orientales is..." --msgstr "東比利尼斯省（Pyrénées-Orientales）的首都是..." -+msgstr "東比利尼斯省（Pyrénées-Orientales）的首都是…" - - #: mapsdatatranslation.cpp:1656 - msgid "" -@@ -10605,7 +10601,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Bas-Rhin is..." --msgstr "下萊茵省（Bas-Rhin）的首都是..." -+msgstr "下萊茵省（Bas-Rhin）的首都是…" - - #: mapsdatatranslation.cpp:1661 - msgid "" -@@ -10636,7 +10632,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haut-Rhin is..." --msgstr "上萊茵省（Haut-Rhin）的首都是..." -+msgstr "上萊茵省（Haut-Rhin）的首都是…" - - #: mapsdatatranslation.cpp:1666 - msgid "" -@@ -10667,7 +10663,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Rhône is..." --msgstr "羅訥省（Rhône）的首都是..." -+msgstr "羅訥省（Rhône）的首都是…" - - #: mapsdatatranslation.cpp:1671 - msgid "" -@@ -10698,7 +10694,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Saône is..." --msgstr "上索恩省（Haute-Saône）的首都是..." -+msgstr "上索恩省（Haute-Saône）的首都是…" - - #: mapsdatatranslation.cpp:1676 - msgid "" -@@ -10729,7 +10725,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Saône et Loire is..." --msgstr "索恩盧瓦爾省（Saône et Loire）的首都是..." -+msgstr "索恩盧瓦爾省（Saône et Loire）的首都是…" - - #: mapsdatatranslation.cpp:1681 - msgid "" -@@ -10760,7 +10756,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Sarthe is..." --msgstr "薩爾特省（Sarthe）的首都是..." -+msgstr "薩爾特省（Sarthe）的首都是…" - - #: mapsdatatranslation.cpp:1686 - msgid "" -@@ -10791,7 +10787,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Savoie is..." --msgstr "薩瓦省（Savoie）的首都是..." -+msgstr "薩瓦省（Savoie）的首都是…" - - #: mapsdatatranslation.cpp:1691 - msgid "" -@@ -10822,7 +10818,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Savoie is..." --msgstr "上薩瓦省（Haute-Savoie）的首都是..." -+msgstr "上薩瓦省（Haute-Savoie）的首都是…" - - #: mapsdatatranslation.cpp:1696 - msgid "" -@@ -10853,7 +10849,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Paris is..." --msgstr "巴黎省（Paris）的首都是..." -+msgstr "巴黎省（Paris）的首都是…" - - #: mapsdatatranslation.cpp:1701 - msgid "" -@@ -10878,7 +10874,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Seine-Maritime is..." --msgstr "濱海塞納省（Seine-Maritime）的首都是..." -+msgstr "濱海塞納省（Seine-Maritime）的首都是…" - - #: mapsdatatranslation.cpp:1706 - msgid "" -@@ -10909,7 +10905,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Seine et Marne is..." --msgstr "塞納馬恩省（Seine et Marne）的首都是..." -+msgstr "塞納馬恩省（Seine et Marne）的首都是…" - - #: mapsdatatranslation.cpp:1711 - msgid "" -@@ -10940,7 +10936,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Yvelines is..." --msgstr "伊夫林省（Yvelines）的首都是..." -+msgstr "伊夫林省（Yvelines）的首都是…" - - #: mapsdatatranslation.cpp:1716 - msgid "" -@@ -10971,7 +10967,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Deux-Sèvres is..." --msgstr "德塞夫勒省（Deux-Sèvres）的首都是..." -+msgstr "德塞夫勒省（Deux-Sèvres）的首都是…" - - #: mapsdatatranslation.cpp:1721 - msgid "" -@@ -11002,7 +10998,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Somme is..." --msgstr "索姆省（Somme）的首都是..." -+msgstr "索姆省（Somme）的首都是…" - - #: mapsdatatranslation.cpp:1726 - msgid "" -@@ -11033,7 +11029,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Tarn is..." --msgstr "塔恩（Tarn）的首都是..." -+msgstr "塔恩（Tarn）的首都是…" - - #: mapsdatatranslation.cpp:1731 - msgid "" -@@ -11064,7 +11060,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Tarn et Garonne is..." --msgstr "塔恩加龍省（Tarn et Garonne）的首都是..." -+msgstr "塔恩加龍省（Tarn et Garonne）的首都是…" - - #: mapsdatatranslation.cpp:1736 - msgid "" -@@ -11095,7 +11091,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Var is..." --msgstr "瓦爾省（Var）的首都是..." -+msgstr "瓦爾省（Var）的首都是…" - - #: mapsdatatranslation.cpp:1741 - msgid "" -@@ -11126,7 +11122,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Vaucluse is..." --msgstr "沃克呂茲省（Vaucluse）的首都是..." -+msgstr "沃克呂茲省（Vaucluse）的首都是…" - - #: mapsdatatranslation.cpp:1746 - msgid "" -@@ -11157,7 +11153,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Vendée is..." --msgstr "旺代省（Vendée）的首都是..." -+msgstr "旺代省（Vendée）的首都是…" - - #: mapsdatatranslation.cpp:1751 - msgid "" -@@ -11188,7 +11184,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Vienne is..." --msgstr "維埃納省（Vienne）的首都是..." -+msgstr "維埃納省（Vienne）的首都是…" - - #: mapsdatatranslation.cpp:1756 - msgid "" -@@ -11219,7 +11215,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Haute-Vienne is..." --msgstr "上維埃納省（Haute-Vienne）的首都是..." -+msgstr "上維埃納省（Haute-Vienne）的首都是…" - - #: mapsdatatranslation.cpp:1761 - msgid "" -@@ -11250,7 +11246,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Vosges is..." --msgstr "孚日省（Vosges）的首都是..." -+msgstr "孚日省（Vosges）的首都是…" - - #: mapsdatatranslation.cpp:1766 - msgid "" -@@ -11281,7 +11277,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Yonne is..." --msgstr "約納省（Yonne）的首都是..." -+msgstr "約納省（Yonne）的首都是…" - - #: mapsdatatranslation.cpp:1771 - msgid "" -@@ -11312,7 +11308,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Territoire de Belfort is..." --msgstr "貝爾福地區（Territoire de Belfort）的首都是..." -+msgstr "貝爾福地區（Territoire de Belfort）的首都是…" - - #: mapsdatatranslation.cpp:1776 - msgid "" -@@ -11343,7 +11339,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Essonne is..." --msgstr "埃松省（Essonne）的首都是..." -+msgstr "埃松省（Essonne）的首都是…" - - #: mapsdatatranslation.cpp:1781 - msgid "" -@@ -11374,7 +11370,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Hauts-de-Seine is..." --msgstr "上塞納省（Hauts-de-Seine）的首都是..." -+msgstr "上塞納省（Hauts-de-Seine）的首都是…" - - #: mapsdatatranslation.cpp:1786 - msgid "" -@@ -11405,7 +11401,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Seine-Saint-Denis is..." --msgstr "塞納聖但尼省（Seine-Saint-Denis）的首都是..." -+msgstr "塞納聖但尼省（Seine-Saint-Denis）的首都是…" - - #: mapsdatatranslation.cpp:1791 - msgid "" -@@ -11436,7 +11432,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Val-de-Marne is..." --msgstr "瓦勒德馬恩省（Val-de-Marne）的首都是..." -+msgstr "瓦勒德馬恩省（Val-de-Marne）的首都是…" - - #: mapsdatatranslation.cpp:1796 - msgid "" -@@ -11467,7 +11463,7 @@ - msgid "" - "_: france.kgm\n" - "The capital of Val d'Oise is..." --msgstr "瓦勒德瓦茲省（Val d'Oise）的首都是..." -+msgstr "瓦勒德瓦茲省（Val d'Oise）的首都是…" - - #: mapsdatatranslation.cpp:1801 - msgid "" -@@ -11497,8 +11493,7 @@ - #: mapsdatatranslation.cpp:1805 - msgid "" - "_: germany.kgm\n" --"Current map:" --"
                                  Germany                                  " -+"Current map:
                                  Germany                                  " - msgstr "目前地圖：
                                  德國                                  " - - #: mapsdatatranslation.cpp:1806 -@@ -11523,7 +11518,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Baden-Württemberg is..." --msgstr "巴登符騰堡（Baden-Württemberg）的首都是..." -+msgstr "巴登符騰堡（Baden-Württemberg）的首都是…" - - #: mapsdatatranslation.cpp:1810 - msgid "" -@@ -11536,7 +11531,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Baden-Württemberg is..." --msgstr "巴登符騰堡（Baden-Württemberg）的旗幟是..." -+msgstr "巴登符騰堡（Baden-Württemberg）的旗幟是…" - - #: mapsdatatranslation.cpp:1812 - msgid "" -@@ -11560,7 +11555,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Bavaria is..." --msgstr "巴伐利亞（Bavaria）的首都是..." -+msgstr "巴伐利亞（Bavaria）的首都是…" - - #: mapsdatatranslation.cpp:1816 - msgid "" -@@ -11573,7 +11568,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Bavaria is..." --msgstr "巴伐利亞（Bavaria）的旗幟是..." -+msgstr "巴伐利亞（Bavaria）的旗幟是…" - - #: mapsdatatranslation.cpp:1818 - msgid "" -@@ -11597,7 +11592,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Berlin is..." --msgstr "柏林（Berlin）的首都是..." -+msgstr "柏林（Berlin）的首都是…" - - #: mapsdatatranslation.cpp:1822 - msgid "" -@@ -11610,7 +11605,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Berlin is..." --msgstr "柏林（Berlin）的旗幟是..." -+msgstr "柏林（Berlin）的旗幟是…" - - #: mapsdatatranslation.cpp:1825 - msgid "" -@@ -11628,7 +11623,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Brandenburg is..." --msgstr "布蘭登堡（Brandenburg）的首都是..." -+msgstr "布蘭登堡（Brandenburg）的首都是…" - - #: mapsdatatranslation.cpp:1828 - msgid "" -@@ -11641,7 +11636,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Brandenburg is..." --msgstr "布蘭登堡（Brandenburg）的旗幟是..." -+msgstr "布蘭登堡（Brandenburg）的旗幟是…" - - #: mapsdatatranslation.cpp:1830 - msgid "" -@@ -11665,7 +11660,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Bremen is..." --msgstr "不來梅（Bremen）的首都是..." -+msgstr "不來梅（Bremen）的首都是…" - - #: mapsdatatranslation.cpp:1834 - msgid "" -@@ -11678,7 +11673,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Bremen is..." --msgstr "不來梅（Bremen）的旗幟是..." -+msgstr "不來梅（Bremen）的旗幟是…" - - #: mapsdatatranslation.cpp:1837 - msgid "" -@@ -11696,7 +11691,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Hamburg is..." --msgstr "漢堡（Hamburg）的首都是..." -+msgstr "漢堡（Hamburg）的首都是…" - - #: mapsdatatranslation.cpp:1840 - msgid "" -@@ -11709,7 +11704,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Hamburg is..." --msgstr "漢堡（Hamburg）的旗幟是..." -+msgstr "漢堡（Hamburg）的旗幟是…" - - #: mapsdatatranslation.cpp:1843 - msgid "" -@@ -11727,7 +11722,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Hesse is..." --msgstr "黑森（Hesse）的首都是..." -+msgstr "黑森（Hesse）的首都是…" - - #: mapsdatatranslation.cpp:1846 - msgid "" -@@ -11740,7 +11735,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Hesse is..." --msgstr "黑森（Hesse）的旗幟是..." -+msgstr "黑森（Hesse）的旗幟是…" - - #: mapsdatatranslation.cpp:1848 - msgid "" -@@ -11764,7 +11759,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Mecklenburg-Western Pomerania is..." --msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的首都是..." -+msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的首都是…" - - #: mapsdatatranslation.cpp:1852 - msgid "" -@@ -11777,7 +11772,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Mecklenburg-Western Pomerania is..." --msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的旗幟是..." -+msgstr "梅克倫堡-前波莫瑞（Mecklenburg-Western Pomerania）的旗幟是…" - - #: mapsdatatranslation.cpp:1854 - msgid "" -@@ -11801,7 +11796,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Lower Saxony is..." --msgstr "下薩克森（Lower Saxony）的首都是..." -+msgstr "下薩克森（Lower Saxony）的首都是…" - - #: mapsdatatranslation.cpp:1858 - msgid "" -@@ -11814,7 +11809,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Lower Saxony is..." --msgstr "下薩克森（Lower Saxony）的旗幟是..." -+msgstr "下薩克森（Lower Saxony）的旗幟是…" - - #: mapsdatatranslation.cpp:1860 - msgid "" -@@ -11838,7 +11833,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of North Rhine-Westphalia is..." --msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的首都是..." -+msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的首都是…" - - #: mapsdatatranslation.cpp:1864 - msgid "" -@@ -11851,7 +11846,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of North Rhine-Westphalia is..." --msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的旗幟是..." -+msgstr "北萊茵-威斯特法倫（North Rhine-Westphalia）的旗幟是…" - - #: mapsdatatranslation.cpp:1866 - msgid "" -@@ -11875,7 +11870,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Rhineland-Palatinate is..." --msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的首都是..." -+msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的首都是…" - - #: mapsdatatranslation.cpp:1870 - msgid "" -@@ -11888,7 +11883,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Rhineland-Palatinate is..." --msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的旗幟是..." -+msgstr "萊茵蘭-法耳茨（Rhineland-Palatinate）的旗幟是…" - - #: mapsdatatranslation.cpp:1872 - msgid "" -@@ -11912,7 +11907,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Saarland is..." --msgstr "薩爾（Saarland）的首都是..." -+msgstr "薩爾（Saarland）的首都是…" - - #: mapsdatatranslation.cpp:1876 - msgid "" -@@ -11925,7 +11920,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Saarland is..." --msgstr "薩爾（Saarland）的旗幟是..." -+msgstr "薩爾（Saarland）的旗幟是…" - - #: mapsdatatranslation.cpp:1878 - msgid "" -@@ -11949,7 +11944,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Saxony is..." --msgstr "薩克森（Saxony）的首都是..." -+msgstr "薩克森（Saxony）的首都是…" - - #: mapsdatatranslation.cpp:1882 - msgid "" -@@ -11962,7 +11957,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Saxony is..." --msgstr "薩克森（Saxony）的旗幟是..." -+msgstr "薩克森（Saxony）的旗幟是…" - - #: mapsdatatranslation.cpp:1884 - msgid "" -@@ -11986,7 +11981,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Saxony-Anhalt is..." --msgstr "薩克森安哈特（Saxony-Anhalt）的首都是..." -+msgstr "薩克森安哈特（Saxony-Anhalt）的首都是…" - - #: mapsdatatranslation.cpp:1888 - msgid "" -@@ -11999,7 +11994,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Saxony-Anhalt is..." --msgstr "薩克森安哈特（Saxony-Anhalt）的旗幟是..." -+msgstr "薩克森安哈特（Saxony-Anhalt）的旗幟是…" - - #: mapsdatatranslation.cpp:1890 - msgid "" -@@ -12023,7 +12018,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Schleswig-Holstein is..." --msgstr "石勒益荷斯泰（Schleswig-Holstein）的首都是..." -+msgstr "石勒益荷斯泰（Schleswig-Holstein）的首都是…" - - #: mapsdatatranslation.cpp:1894 - msgid "" -@@ -12036,7 +12031,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Schleswig-Holstein is..." --msgstr "石勒益荷斯泰（Schleswig-Holstein）的旗幟是..." -+msgstr "石勒益荷斯泰（Schleswig-Holstein）的旗幟是…" - - #: mapsdatatranslation.cpp:1896 - msgid "" -@@ -12060,7 +12055,7 @@ - msgid "" - "_: germany.kgm\n" - "The capital of Thuringia is..." --msgstr "圖林根（Thuringia）的首都是..." -+msgstr "圖林根（Thuringia）的首都是…" - - #: mapsdatatranslation.cpp:1900 - msgid "" -@@ -12073,7 +12068,7 @@ - msgid "" - "_: germany.kgm\n" - "The flag of Thuringia is..." --msgstr "圖林根（Thuringia）的旗幟是..." -+msgstr "圖林根（Thuringia）的旗幟是…" - - #: mapsdatatranslation.cpp:1902 - msgid "" -@@ -12096,8 +12091,7 @@ - #: mapsdatatranslation.cpp:1905 - msgid "" - "_: italy.kgm\n" --"Current map:" --"
                                  Italy                                  " -+"Current map:
                                  Italy                                  " - msgstr "目前地圖：
                                  義大利                                  " - - #: mapsdatatranslation.cpp:1906 -@@ -12122,7 +12116,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Sicily is..." --msgstr "西西里（Sicily）的首都是..." -+msgstr "西西里（Sicily）的首都是…" - - #: mapsdatatranslation.cpp:1910 - msgid "" -@@ -12135,7 +12129,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Sicily is..." --msgstr "西西里（Sicily）的旗幟是..." -+msgstr "西西里（Sicily）的旗幟是…" - - #: mapsdatatranslation.cpp:1912 - msgid "" -@@ -12159,7 +12153,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Friuli Venezia Giulia is..." --msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的首都是..." -+msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的首都是…" - - #: mapsdatatranslation.cpp:1916 - msgid "" -@@ -12172,7 +12166,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Friuli Venezia Giulia is..." --msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的旗幟是..." -+msgstr "弗留利-威尼斯朱利亞（Friuli Venezia Giulia）的旗幟是…" - - #: mapsdatatranslation.cpp:1918 - msgid "" -@@ -12196,7 +12190,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Abruzzo is..." --msgstr "阿布魯佐（Abruzzo）的首都是..." -+msgstr "阿布魯佐（Abruzzo）的首都是…" - - #: mapsdatatranslation.cpp:1922 - msgid "" -@@ -12209,7 +12203,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Abruzzo is..." --msgstr "阿布魯佐（Abruzzo）的旗幟是..." -+msgstr "阿布魯佐（Abruzzo）的旗幟是…" - - #: mapsdatatranslation.cpp:1924 - msgid "" -@@ -12233,7 +12227,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Latium is..." --msgstr "拉丁姆（Latium）的首都是..." -+msgstr "拉丁姆（Latium）的首都是…" - - #: mapsdatatranslation.cpp:1928 - msgid "" -@@ -12246,7 +12240,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Latium is..." --msgstr "拉丁姆（Latium）的旗幟是..." -+msgstr "拉丁姆（Latium）的旗幟是…" - - #: mapsdatatranslation.cpp:1930 - msgid "" -@@ -12270,7 +12264,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Calabria is..." --msgstr "卡拉布里亞（Calabria）的首都是..." -+msgstr "卡拉布里亞（Calabria）的首都是…" - - #: mapsdatatranslation.cpp:1934 - msgid "" -@@ -12283,7 +12277,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Calabria is..." --msgstr "卡拉布里亞（Calabria）的旗幟是..." -+msgstr "卡拉布里亞（Calabria）的旗幟是…" - - #: mapsdatatranslation.cpp:1936 - msgid "" -@@ -12307,7 +12301,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Piedmont is..." --msgstr "皮埃蒙特（Piedmont）的首都是..." -+msgstr "皮埃蒙特（Piedmont）的首都是…" - - #: mapsdatatranslation.cpp:1940 - msgid "" -@@ -12320,7 +12314,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Piedmont is..." --msgstr "皮埃蒙特（Piedmont）的旗幟是..." -+msgstr "皮埃蒙特（Piedmont）的旗幟是…" - - #: mapsdatatranslation.cpp:1942 - msgid "" -@@ -12344,7 +12338,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Apulia is..." --msgstr "普利亞（Apulia）的首都是..." -+msgstr "普利亞（Apulia）的首都是…" - - #: mapsdatatranslation.cpp:1946 - msgid "" -@@ -12357,7 +12351,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Apulia is..." --msgstr "普利亞（Apulia）的旗幟是..." -+msgstr "普利亞（Apulia）的旗幟是…" - - #: mapsdatatranslation.cpp:1948 - msgid "" -@@ -12381,7 +12375,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Lombardy is..." --msgstr "倫巴第（Lombardy）的首都是..." -+msgstr "倫巴第（Lombardy）的首都是…" - - #: mapsdatatranslation.cpp:1952 - msgid "" -@@ -12394,7 +12388,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Lombardy is..." --msgstr "倫巴第（Lombardy）的旗幟是..." -+msgstr "倫巴第（Lombardy）的旗幟是…" - - #: mapsdatatranslation.cpp:1954 - msgid "" -@@ -12418,7 +12412,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Umbria is..." --msgstr "烏布里亞（Umbria）的首都是..." -+msgstr "烏布里亞（Umbria）的首都是…" - - #: mapsdatatranslation.cpp:1958 - msgid "" -@@ -12431,7 +12425,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Umbria is..." --msgstr "烏布里亞（Umbria）的旗幟是..." -+msgstr "烏布里亞（Umbria）的旗幟是…" - - #: mapsdatatranslation.cpp:1960 - msgid "" -@@ -12455,7 +12449,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Trentino Alto Adige is..." --msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的首都是..." -+msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的首都是…" - - #: mapsdatatranslation.cpp:1964 - msgid "" -@@ -12468,7 +12462,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Trentino Alto Adige is..." --msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的旗幟是..." -+msgstr "特倫蒂諾上阿迪傑（Trentino Alto Adige）的旗幟是…" - - #: mapsdatatranslation.cpp:1966 - msgid "" -@@ -12492,7 +12486,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Molise is..." --msgstr "莫利塞（Molise）的首都是..." -+msgstr "莫利塞（Molise）的首都是…" - - #: mapsdatatranslation.cpp:1970 - msgid "" -@@ -12505,7 +12499,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Molise is..." --msgstr "莫利塞（Molise）的旗幟是..." -+msgstr "莫利塞（Molise）的旗幟是…" - - #: mapsdatatranslation.cpp:1972 - msgid "" -@@ -12529,7 +12523,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Tuscany is..." --msgstr "托斯卡納（Tuscany）的首都是..." -+msgstr "托斯卡納（Tuscany）的首都是…" - - #: mapsdatatranslation.cpp:1976 - msgid "" -@@ -12542,7 +12536,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Tuscany is..." --msgstr "托斯卡納（Tuscany）的旗幟是..." -+msgstr "托斯卡納（Tuscany）的旗幟是…" - - #: mapsdatatranslation.cpp:1978 - msgid "" -@@ -12566,7 +12560,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Emilia Romagna is..." --msgstr "艾米利羅馬涅（Emilia Romagna）的首都是..." -+msgstr "艾米利羅馬涅（Emilia Romagna）的首都是…" - - #: mapsdatatranslation.cpp:1982 - msgid "" -@@ -12579,7 +12573,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Emilia Romagna is..." --msgstr "艾米利羅馬涅（Emilia Romagna）的旗幟是..." -+msgstr "艾米利羅馬涅（Emilia Romagna）的旗幟是…" - - #: mapsdatatranslation.cpp:1984 - msgid "" -@@ -12603,7 +12597,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Val d'Aosta is..." --msgstr "瓦萊達奧斯塔（Val d'Aosta）的首都是..." -+msgstr "瓦萊達奧斯塔（Val d'Aosta）的首都是…" - - #: mapsdatatranslation.cpp:1988 - msgid "" -@@ -12616,7 +12610,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Val d'Aosta is..." --msgstr "瓦萊達奧斯塔（Val d'Aosta）的旗幟是..." -+msgstr "瓦萊達奧斯塔（Val d'Aosta）的旗幟是…" - - #: mapsdatatranslation.cpp:1990 - msgid "" -@@ -12640,7 +12634,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Campania is..." --msgstr "坎帕尼亞（Campania）的首都是..." -+msgstr "坎帕尼亞（Campania）的首都是…" - - #: mapsdatatranslation.cpp:1994 - msgid "" -@@ -12653,7 +12647,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Campania is..." --msgstr "坎帕尼亞（Campania）的旗幟是..." -+msgstr "坎帕尼亞（Campania）的旗幟是…" - - #: mapsdatatranslation.cpp:1996 - msgid "" -@@ -12677,7 +12671,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Basilicata is..." --msgstr "巴斯利卡塔（Basilicata）的首都是..." -+msgstr "巴斯利卡塔（Basilicata）的首都是…" - - #: mapsdatatranslation.cpp:2000 - msgid "" -@@ -12690,7 +12684,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Basilicata is..." --msgstr "巴斯利卡塔（Basilicata）的旗幟是..." -+msgstr "巴斯利卡塔（Basilicata）的旗幟是…" - - #: mapsdatatranslation.cpp:2002 - msgid "" -@@ -12714,7 +12708,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Liguria is..." --msgstr "利古里亞（Liguria）的首都是..." -+msgstr "利古里亞（Liguria）的首都是…" - - #: mapsdatatranslation.cpp:2006 - msgid "" -@@ -12727,7 +12721,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Liguria is..." --msgstr "利古里亞（Liguria）的旗幟是..." -+msgstr "利古里亞（Liguria）的旗幟是…" - - #: mapsdatatranslation.cpp:2008 - msgid "" -@@ -12751,7 +12745,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Sardinia is..." --msgstr "薩丁（Sardinia）的首都是..." -+msgstr "薩丁（Sardinia）的首都是…" - - #: mapsdatatranslation.cpp:2012 - msgid "" -@@ -12764,7 +12758,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Sardinia is..." --msgstr "薩丁（Sardinia）的旗幟是..." -+msgstr "薩丁（Sardinia）的旗幟是…" - - #: mapsdatatranslation.cpp:2014 - msgid "" -@@ -12788,7 +12782,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Marches is..." --msgstr "馬爾凱（Marches）的首都是..." -+msgstr "馬爾凱（Marches）的首都是…" - - #: mapsdatatranslation.cpp:2018 - msgid "" -@@ -12801,7 +12795,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Marches is..." --msgstr "馬爾凱（Marches）的旗幟是..." -+msgstr "馬爾凱（Marches）的旗幟是…" - - #: mapsdatatranslation.cpp:2020 - msgid "" -@@ -12825,7 +12819,7 @@ - msgid "" - "_: italy.kgm\n" - "The capital of Veneto is..." --msgstr "威尼托（Veneto）的首都是..." -+msgstr "威尼托（Veneto）的首都是…" - - #: mapsdatatranslation.cpp:2024 - msgid "" -@@ -12838,7 +12832,7 @@ - msgid "" - "_: italy.kgm\n" - "The flag of Veneto is..." --msgstr "威尼托（Veneto）的旗幟是..." -+msgstr "威尼托（Veneto）的旗幟是…" - - #: mapsdatatranslation.cpp:2026 - msgid "" -@@ -12861,8 +12855,7 @@ - #: mapsdatatranslation.cpp:2029 - msgid "" - "_: italyprovince.kgm\n" --"Current map:" --"
                                  Italy by Provinces                                  " -+"Current map:
                                  Italy by Provinces                                  " - msgstr "目前地圖：
                                  義大利省份地圖                                  " - - #: mapsdatatranslation.cpp:2030 -@@ -12887,7 +12880,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Alessandria is..." --msgstr "亞力山德（Alessandria）的首都是..." -+msgstr "亞力山德（Alessandria）的首都是…" - - #: mapsdatatranslation.cpp:2034 - msgid "" -@@ -12912,7 +12905,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Asti is..." --msgstr "阿斯蒂（Asti）的首都是..." -+msgstr "阿斯蒂（Asti）的首都是…" - - #: mapsdatatranslation.cpp:2039 - msgid "" -@@ -12937,7 +12930,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Biella is..." --msgstr "比耶拉（Biella）的首都是..." -+msgstr "比耶拉（Biella）的首都是…" - - #: mapsdatatranslation.cpp:2044 - msgid "" -@@ -12962,7 +12955,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Cuneo is..." --msgstr "卡歐（Cuneo）的首都是..." -+msgstr "卡歐（Cuneo）的首都是…" - - #: mapsdatatranslation.cpp:2049 - msgid "" -@@ -12987,7 +12980,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Novara is..." --msgstr "熱那亞（Novara）的首都是..." -+msgstr "熱那亞（Novara）的首都是…" - - #: mapsdatatranslation.cpp:2054 - msgid "" -@@ -13012,7 +13005,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Turin is..." --msgstr "都靈（Turin）的首都是..." -+msgstr "都靈（Turin）的首都是…" - - #: mapsdatatranslation.cpp:2059 - msgid "" -@@ -13037,7 +13030,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Verbano-Cusio-Ossola is..." --msgstr "韋巴諾庫西奧奧索拉（Verbano-Cusio-Ossola）的首都是..." -+msgstr "韋巴諾庫西奧奧索拉（Verbano-Cusio-Ossola）的首都是…" - - #: mapsdatatranslation.cpp:2064 - msgid "" -@@ -13068,7 +13061,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Vercelli is..." --msgstr "沃什裡（Vercelli）的首都是..." -+msgstr "沃什裡（Vercelli）的首都是…" - - #: mapsdatatranslation.cpp:2069 - msgid "" -@@ -13093,7 +13086,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Bergamo is..." --msgstr "貝加莫（Bergamo）的首都是..." -+msgstr "貝加莫（Bergamo）的首都是…" - - #: mapsdatatranslation.cpp:2074 - msgid "" -@@ -13118,7 +13111,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Brescia is..." --msgstr "布列西亞（Brescia）的首都是..." -+msgstr "布列西亞（Brescia）的首都是…" - - #: mapsdatatranslation.cpp:2079 - msgid "" -@@ -13143,7 +13136,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Como is..." --msgstr "科摩（Como）的首都是..." -+msgstr "科摩（Como）的首都是…" - - #: mapsdatatranslation.cpp:2084 - msgid "" -@@ -13168,7 +13161,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Cremona is..." --msgstr "克雷蒙納（Cremona）的首都是..." -+msgstr "克雷蒙納（Cremona）的首都是…" - - #: mapsdatatranslation.cpp:2089 - msgid "" -@@ -13193,7 +13186,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Lecco is..." --msgstr "萊科（Lecco）的首都是..." -+msgstr "萊科（Lecco）的首都是…" - - #: mapsdatatranslation.cpp:2094 - msgid "" -@@ -13218,7 +13211,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Lodi is..." --msgstr "洛迪（Lodi）的首都是..." -+msgstr "洛迪（Lodi）的首都是…" - - #: mapsdatatranslation.cpp:2099 - msgid "" -@@ -13243,7 +13236,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Mantova is..." --msgstr "曼都瓦（Mantova）的首都是..." -+msgstr "曼都瓦（Mantova）的首都是…" - - #: mapsdatatranslation.cpp:2104 - msgid "" -@@ -13268,7 +13261,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Milan is..." --msgstr "米蘭（Milan）的首都是..." -+msgstr "米蘭（Milan）的首都是…" - - #: mapsdatatranslation.cpp:2109 - msgid "" -@@ -13293,7 +13286,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pavia is..." --msgstr "帕維亞（Pavia）的首都是..." -+msgstr "帕維亞（Pavia）的首都是…" - - #: mapsdatatranslation.cpp:2114 - msgid "" -@@ -13318,7 +13311,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Sondrio is..." --msgstr "桑德里奧（Sondrio）的首都是..." -+msgstr "桑德里奧（Sondrio）的首都是…" - - #: mapsdatatranslation.cpp:2119 - msgid "" -@@ -13343,7 +13336,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Varese is..." --msgstr "瓦雷澤（Varese）的首都是..." -+msgstr "瓦雷澤（Varese）的首都是…" - - #: mapsdatatranslation.cpp:2124 - msgid "" -@@ -13368,7 +13361,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Aosta is..." --msgstr "奧斯塔（Aosta）的首都是..." -+msgstr "奧斯塔（Aosta）的首都是…" - - #: mapsdatatranslation.cpp:2129 - msgid "" -@@ -13393,7 +13386,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Bolzano is..." --msgstr "波扎諾（Bolzano）的首都是..." -+msgstr "波扎諾（Bolzano）的首都是…" - - #: mapsdatatranslation.cpp:2134 - msgid "" -@@ -13418,7 +13411,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Trento is..." --msgstr "特倫多（Trento）的首都是..." -+msgstr "特倫多（Trento）的首都是…" - - #: mapsdatatranslation.cpp:2139 - msgid "" -@@ -13443,7 +13436,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Belluno is..." --msgstr "貝盧諾（Belluno）的首都是..." -+msgstr "貝盧諾（Belluno）的首都是…" - - #: mapsdatatranslation.cpp:2144 - msgid "" -@@ -13468,7 +13461,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Padova is..." --msgstr "帕多瓦（Padova）的首都是..." -+msgstr "帕多瓦（Padova）的首都是…" - - #: mapsdatatranslation.cpp:2149 - msgid "" -@@ -13493,7 +13486,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Rovigo is..." --msgstr "羅維戈（Rovigo）的首都是..." -+msgstr "羅維戈（Rovigo）的首都是…" - - #: mapsdatatranslation.cpp:2154 - msgid "" -@@ -13518,7 +13511,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Treviso is..." --msgstr "特雷維索（Treviso）的首都是..." -+msgstr "特雷維索（Treviso）的首都是…" - - #: mapsdatatranslation.cpp:2159 - msgid "" -@@ -13543,7 +13536,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Venice is..." --msgstr "威尼斯（Venice）的首都是..." -+msgstr "威尼斯（Venice）的首都是…" - - #: mapsdatatranslation.cpp:2164 - msgid "" -@@ -13568,7 +13561,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Verona is..." --msgstr "維羅納（Verona）的首都是..." -+msgstr "維羅納（Verona）的首都是…" - - #: mapsdatatranslation.cpp:2169 - msgid "" -@@ -13593,7 +13586,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Vicenza is..." --msgstr "維琴察（Vicenza）的首都是..." -+msgstr "維琴察（Vicenza）的首都是…" - - #: mapsdatatranslation.cpp:2174 - msgid "" -@@ -13618,7 +13611,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Gorizia is..." --msgstr "戈里察（Gorizia）的首都是..." -+msgstr "戈里察（Gorizia）的首都是…" - - #: mapsdatatranslation.cpp:2179 - msgid "" -@@ -13643,7 +13636,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pordenone is..." --msgstr "波登諾內（Pordenone）的首都是..." -+msgstr "波登諾內（Pordenone）的首都是…" - - #: mapsdatatranslation.cpp:2184 - msgid "" -@@ -13668,7 +13661,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Trieste is..." --msgstr "的里雅斯特（Trieste）的首都是..." -+msgstr "的里雅斯特（Trieste）的首都是…" - - #: mapsdatatranslation.cpp:2189 - msgid "" -@@ -13693,7 +13686,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Udine is..." --msgstr "烏迪內（Udine）的首都是..." -+msgstr "烏迪內（Udine）的首都是…" - - #: mapsdatatranslation.cpp:2194 - msgid "" -@@ -13718,7 +13711,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Genoa is..." --msgstr "熱那亞（Genoa）的首都是..." -+msgstr "熱那亞（Genoa）的首都是…" - - #: mapsdatatranslation.cpp:2199 - msgid "" -@@ -13743,7 +13736,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Imperia is..." --msgstr "因佩里亞（Imperia）的首都是..." -+msgstr "因佩里亞（Imperia）的首都是…" - - #: mapsdatatranslation.cpp:2204 - msgid "" -@@ -13768,7 +13761,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of La Spezia is..." --msgstr "斯佩奇亞（La Spezia）的首都是..." -+msgstr "斯佩奇亞（La Spezia）的首都是…" - - #: mapsdatatranslation.cpp:2209 - msgid "" -@@ -13793,7 +13786,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Savona is..." --msgstr "薩窩那（Savona）的首都是..." -+msgstr "薩窩那（Savona）的首都是…" - - #: mapsdatatranslation.cpp:2214 - msgid "" -@@ -13818,7 +13811,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Bologna is..." --msgstr "波洛尼亞（Bologna）的首都是..." -+msgstr "波洛尼亞（Bologna）的首都是…" - - #: mapsdatatranslation.cpp:2219 - msgid "" -@@ -13843,7 +13836,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Ferrara is..." --msgstr "斐拉拉（Ferrara）的首都是..." -+msgstr "斐拉拉（Ferrara）的首都是…" - - #: mapsdatatranslation.cpp:2224 - msgid "" -@@ -13868,7 +13861,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Forlì-Cesena is..." --msgstr "佛利塞擇納（Forlì-Cesena）的首都是..." -+msgstr "佛利塞擇納（Forlì-Cesena）的首都是…" - - #: mapsdatatranslation.cpp:2229 - msgid "" -@@ -13899,7 +13892,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Modena is..." --msgstr "摩德納（Modena）的首都是..." -+msgstr "摩德納（Modena）的首都是…" - - #: mapsdatatranslation.cpp:2234 - msgid "" -@@ -13924,7 +13917,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Parma is..." --msgstr "帕爾馬（Parma）的首都是..." -+msgstr "帕爾馬（Parma）的首都是…" - - #: mapsdatatranslation.cpp:2239 - msgid "" -@@ -13949,7 +13942,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Piacenza is..." --msgstr "皮亞琴察（Piacenza）的首都是..." -+msgstr "皮亞琴察（Piacenza）的首都是…" - - #: mapsdatatranslation.cpp:2244 - msgid "" -@@ -13974,7 +13967,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Ravenna is..." --msgstr "拉文那（Ravenna）的首都是..." -+msgstr "拉文那（Ravenna）的首都是…" - - #: mapsdatatranslation.cpp:2249 - msgid "" -@@ -13999,7 +13992,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Reggio nell'Emilia is..." --msgstr "勒佐艾米利亞（Reggio nell'Emilia）的首都是..." -+msgstr "勒佐艾米利亞（Reggio nell'Emilia）的首都是…" - - #: mapsdatatranslation.cpp:2254 - msgid "" -@@ -14024,7 +14017,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Rimini is..." --msgstr "里米尼（Rimini）的首都是..." -+msgstr "里米尼（Rimini）的首都是…" - - #: mapsdatatranslation.cpp:2259 - msgid "" -@@ -14049,7 +14042,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Arezzo is..." --msgstr "阿雷佐（Arezzo）的首都是..." -+msgstr "阿雷佐（Arezzo）的首都是…" - - #: mapsdatatranslation.cpp:2264 - msgid "" -@@ -14074,7 +14067,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Florence is..." --msgstr "佛羅倫斯（Florence）的首都是..." -+msgstr "佛羅倫斯（Florence）的首都是…" - - #: mapsdatatranslation.cpp:2269 - msgid "" -@@ -14099,7 +14092,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Grosseto is..." --msgstr "格羅塞托（Grosseto）的首都是..." -+msgstr "格羅塞托（Grosseto）的首都是…" - - #: mapsdatatranslation.cpp:2274 - msgid "" -@@ -14124,7 +14117,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Livorno is..." --msgstr "里窩那（Livorno）的首都是..." -+msgstr "里窩那（Livorno）的首都是…" - - #: mapsdatatranslation.cpp:2279 - msgid "" -@@ -14149,7 +14142,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Lucca is..." --msgstr "盧卡（Lucca）的首都是..." -+msgstr "盧卡（Lucca）的首都是…" - - #: mapsdatatranslation.cpp:2284 - msgid "" -@@ -14174,7 +14167,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Massa-Carrara is..." --msgstr "馬薩卡拉拉（Massa-Carrara）的首都是..." -+msgstr "馬薩卡拉拉（Massa-Carrara）的首都是…" - - #: mapsdatatranslation.cpp:2289 - msgid "" -@@ -14205,7 +14198,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pisa is..." --msgstr "比薩（Pisa）的首都是..." -+msgstr "比薩（Pisa）的首都是…" - - #: mapsdatatranslation.cpp:2294 - msgid "" -@@ -14230,7 +14223,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pistoia is..." --msgstr "皮斯托亞（Pistoia）的首都是..." -+msgstr "皮斯托亞（Pistoia）的首都是…" - - #: mapsdatatranslation.cpp:2299 - msgid "" -@@ -14255,7 +14248,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Prato is..." --msgstr "普拉托（Prato）的首都是..." -+msgstr "普拉托（Prato）的首都是…" - - #: mapsdatatranslation.cpp:2304 - msgid "" -@@ -14280,7 +14273,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Siena is..." --msgstr "錫耶納（Siena）的首都是..." -+msgstr "錫耶納（Siena）的首都是…" - - #: mapsdatatranslation.cpp:2309 - msgid "" -@@ -14305,7 +14298,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Perugia is..." --msgstr "佩魯賈（Perugia）的首都是..." -+msgstr "佩魯賈（Perugia）的首都是…" - - #: mapsdatatranslation.cpp:2314 - msgid "" -@@ -14330,7 +14323,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Terni is..." --msgstr "特爾尼（Terni）的首都是..." -+msgstr "特爾尼（Terni）的首都是…" - - #: mapsdatatranslation.cpp:2319 - msgid "" -@@ -14355,7 +14348,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Ancona is..." --msgstr "安科納（Ancona）的首都是..." -+msgstr "安科納（Ancona）的首都是…" - - #: mapsdatatranslation.cpp:2324 - msgid "" -@@ -14380,7 +14373,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Ascoli Piceno is..." --msgstr "阿斯科利皮切諾（Ascoli Piceno）的首都是..." -+msgstr "阿斯科利皮切諾（Ascoli Piceno）的首都是…" - - #: mapsdatatranslation.cpp:2329 - msgid "" -@@ -14405,7 +14398,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Macerata is..." --msgstr "馬塞拉塔（Macerata）的首都是..." -+msgstr "馬塞拉塔（Macerata）的首都是…" - - #: mapsdatatranslation.cpp:2334 - msgid "" -@@ -14430,7 +14423,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pesaro and Urbino is..." --msgstr "佩薩洛和烏爾比諾（Pesaro and Urbino）的首都是..." -+msgstr "佩薩洛和烏爾比諾（Pesaro and Urbino）的首都是…" - - #: mapsdatatranslation.cpp:2339 - msgid "" -@@ -14461,7 +14454,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Frosinone is..." --msgstr "佛羅西諾內（Frosinone）的首都是..." -+msgstr "佛羅西諾內（Frosinone）的首都是…" - - #: mapsdatatranslation.cpp:2344 - msgid "" -@@ -14486,7 +14479,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Latina is..." --msgstr "拉丁納（Latina）的首都是..." -+msgstr "拉丁納（Latina）的首都是…" - - #: mapsdatatranslation.cpp:2349 - msgid "" -@@ -14511,7 +14504,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Rieti is..." --msgstr "列蒂（Rieti）的首都是..." -+msgstr "列蒂（Rieti）的首都是…" - - #: mapsdatatranslation.cpp:2354 - msgid "" -@@ -14536,7 +14529,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Rome is..." --msgstr "羅馬（Rome）的首都是..." -+msgstr "羅馬（Rome）的首都是…" - - #: mapsdatatranslation.cpp:2359 - msgid "" -@@ -14561,7 +14554,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Viterbo is..." --msgstr "維特爾博（Viterbo）的首都是..." -+msgstr "維特爾博（Viterbo）的首都是…" - - #: mapsdatatranslation.cpp:2364 - msgid "" -@@ -14586,7 +14579,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Chieti is..." --msgstr "奇耶蒂（Chieti）的首都是..." -+msgstr "奇耶蒂（Chieti）的首都是…" - - #: mapsdatatranslation.cpp:2369 - msgid "" -@@ -14611,7 +14604,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of L'Aquila is..." --msgstr "阿奎拉（L'Aquila）的首都是..." -+msgstr "阿奎拉（L'Aquila）的首都是…" - - #: mapsdatatranslation.cpp:2374 - msgid "" -@@ -14636,7 +14629,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Pescara is..." --msgstr "佩斯卡拉（Pescara）的首都是..." -+msgstr "佩斯卡拉（Pescara）的首都是…" - - #: mapsdatatranslation.cpp:2379 - msgid "" -@@ -14661,7 +14654,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Teramo is..." --msgstr "泰拉莫（Teramo）的首都是..." -+msgstr "泰拉莫（Teramo）的首都是…" - - #: mapsdatatranslation.cpp:2384 - msgid "" -@@ -14686,7 +14679,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Campobasso is..." --msgstr "坎波巴索（Campobasso）的首都是..." -+msgstr "坎波巴索（Campobasso）的首都是…" - - #: mapsdatatranslation.cpp:2389 - msgid "" -@@ -14711,7 +14704,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Isernia is..." --msgstr "伊塞尼亞（Isernia）的首都是..." -+msgstr "伊塞尼亞（Isernia）的首都是…" - - #: mapsdatatranslation.cpp:2394 - msgid "" -@@ -14736,7 +14729,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Avellino is..." --msgstr "阿韋利諾（Avellino）的首都是..." -+msgstr "阿韋利諾（Avellino）的首都是…" - - #: mapsdatatranslation.cpp:2399 - msgid "" -@@ -14761,7 +14754,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Benevento is..." --msgstr "班尼凡托（Benevento）的首都是..." -+msgstr "班尼凡托（Benevento）的首都是…" - - #: mapsdatatranslation.cpp:2404 - msgid "" -@@ -14786,7 +14779,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Caserta is..." --msgstr "卡塞塔（Caserta）的首都是..." -+msgstr "卡塞塔（Caserta）的首都是…" - - #: mapsdatatranslation.cpp:2409 - msgid "" -@@ -14811,7 +14804,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Naples is..." --msgstr "那不勒斯（Naples）的首都是..." -+msgstr "那不勒斯（Naples）的首都是…" - - #: mapsdatatranslation.cpp:2414 - msgid "" -@@ -14836,7 +14829,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Salerno is..." --msgstr "薩勒諾（Salerno）的首都是..." -+msgstr "薩勒諾（Salerno）的首都是…" - - #: mapsdatatranslation.cpp:2419 - msgid "" -@@ -14861,7 +14854,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Bari is..." --msgstr "巴里（Bari）的首都是..." -+msgstr "巴里（Bari）的首都是…" - - #: mapsdatatranslation.cpp:2424 - msgid "" -@@ -14886,7 +14879,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Brindisi is..." --msgstr "布林迪西（Brindisi）的首都是..." -+msgstr "布林迪西（Brindisi）的首都是…" - - #: mapsdatatranslation.cpp:2429 - msgid "" -@@ -14911,7 +14904,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Foggia is..." --msgstr "福賈（Foggia）的首都是..." -+msgstr "福賈（Foggia）的首都是…" - - #: mapsdatatranslation.cpp:2434 - msgid "" -@@ -14936,7 +14929,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Lecce is..." --msgstr "萊切（Lecce）的首都是..." -+msgstr "萊切（Lecce）的首都是…" - - #: mapsdatatranslation.cpp:2439 - msgid "" -@@ -14961,7 +14954,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Taranto is..." --msgstr "塔蘭托（Taranto）的首都是..." -+msgstr "塔蘭托（Taranto）的首都是…" - - #: mapsdatatranslation.cpp:2444 - msgid "" -@@ -14986,7 +14979,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Matera is..." --msgstr "梅特拉（Matera）的首都是..." -+msgstr "梅特拉（Matera）的首都是…" - - #: mapsdatatranslation.cpp:2449 - msgid "" -@@ -15011,7 +15004,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Potenza is..." --msgstr "波坦察（Potenza）的首都是..." -+msgstr "波坦察（Potenza）的首都是…" - - #: mapsdatatranslation.cpp:2454 - msgid "" -@@ -15036,7 +15029,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Catanzaro is..." --msgstr "卡坦扎羅（Catanzaro）的首都是..." -+msgstr "卡坦扎羅（Catanzaro）的首都是…" - - #: mapsdatatranslation.cpp:2459 - msgid "" -@@ -15061,7 +15054,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Cosenza is..." --msgstr "科森札（Cosenza）的首都是..." -+msgstr "科森札（Cosenza）的首都是…" - - #: mapsdatatranslation.cpp:2464 - msgid "" -@@ -15086,7 +15079,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Crotone is..." --msgstr "克羅托內（Crotone）的首都是..." -+msgstr "克羅托內（Crotone）的首都是…" - - #: mapsdatatranslation.cpp:2469 - msgid "" -@@ -15111,7 +15104,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Reggio di Calabria is..." --msgstr "勒佐卡拉布里亞（Reggio di Calabria）的首都是..." -+msgstr "勒佐卡拉布里亞（Reggio di Calabria）的首都是…" - - #: mapsdatatranslation.cpp:2474 - msgid "" -@@ -15136,7 +15129,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Vibo Valentia is..." --msgstr "維伯瓦倫蒂亞（Vibo Valentia）的首都是..." -+msgstr "維伯瓦倫蒂亞（Vibo Valentia）的首都是…" - - #: mapsdatatranslation.cpp:2479 - msgid "" -@@ -15161,7 +15154,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Agrigento is..." --msgstr "阿格里琴托（Agrigento）的首都是..." -+msgstr "阿格里琴托（Agrigento）的首都是…" - - #: mapsdatatranslation.cpp:2484 - msgid "" -@@ -15186,7 +15179,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Caltanissetta is..." --msgstr "卡爾塔尼塞塔（Caltanissetta）的首都是..." -+msgstr "卡爾塔尼塞塔（Caltanissetta）的首都是…" - - #: mapsdatatranslation.cpp:2489 - msgid "" -@@ -15211,7 +15204,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Catania is..." --msgstr "卡塔尼亞（Catania）的首都是..." -+msgstr "卡塔尼亞（Catania）的首都是…" - - #: mapsdatatranslation.cpp:2494 - msgid "" -@@ -15236,7 +15229,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Enna is..." --msgstr "恩納（Enna）的首都是..." -+msgstr "恩納（Enna）的首都是…" - - #: mapsdatatranslation.cpp:2499 - msgid "" -@@ -15261,7 +15254,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Messina is..." --msgstr "墨西拿（Messina）的首都是..." -+msgstr "墨西拿（Messina）的首都是…" - - #: mapsdatatranslation.cpp:2504 - msgid "" -@@ -15286,7 +15279,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Palermo is..." --msgstr "巴勒莫（Palermo）的首都是..." -+msgstr "巴勒莫（Palermo）的首都是…" - - #: mapsdatatranslation.cpp:2509 - msgid "" -@@ -15311,7 +15304,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Ragusa is..." --msgstr "拉古薩（Ragusa）的首都是..." -+msgstr "拉古薩（Ragusa）的首都是…" - - #: mapsdatatranslation.cpp:2514 - msgid "" -@@ -15336,7 +15329,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Syracuse is..." --msgstr "敘拉古（Syracuse）的首都是..." -+msgstr "敘拉古（Syracuse）的首都是…" - - #: mapsdatatranslation.cpp:2519 - msgid "" -@@ -15361,7 +15354,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Trapani is..." --msgstr "特拉帕尼（Trapani）的首都是..." -+msgstr "特拉帕尼（Trapani）的首都是…" - - #: mapsdatatranslation.cpp:2524 - msgid "" -@@ -15386,7 +15379,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Cagliari is..." --msgstr "卡利亞里（Cagliari）的首都是..." -+msgstr "卡利亞里（Cagliari）的首都是…" - - #: mapsdatatranslation.cpp:2529 - msgid "" -@@ -15411,7 +15404,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Nuoro is..." --msgstr "努奧羅（Nuoro）的首都是..." -+msgstr "努奧羅（Nuoro）的首都是…" - - #: mapsdatatranslation.cpp:2534 - msgid "" -@@ -15436,7 +15429,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Oristano is..." --msgstr "奧里斯塔諾（Oristano）的首都是..." -+msgstr "奧里斯塔諾（Oristano）的首都是…" - - #: mapsdatatranslation.cpp:2539 - msgid "" -@@ -15461,7 +15454,7 @@ - msgid "" - "_: italyprovince.kgm\n" - "The capital of Sassari is..." --msgstr "薩薩里（Sassari）的首都是..." -+msgstr "薩薩里（Sassari）的首都是…" - - #: mapsdatatranslation.cpp:2544 - msgid "" -@@ -15485,8 +15478,7 @@ - #: mapsdatatranslation.cpp:2548 - msgid "" - "_: ncamerica.kgm\n" --"Current map:" --"
                                  North and Central America                                  " -+"Current map:
                                  North and Central America                                  " - msgstr "目前地圖：
                                  北美與中美洲                                  " - - #: mapsdatatranslation.cpp:2549 -@@ -15517,7 +15509,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Canada is..." --msgstr "加拿大（Canada）的首都是..." -+msgstr "加拿大（Canada）的首都是…" - - #: mapsdatatranslation.cpp:2554 - msgid "" -@@ -15530,7 +15522,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Canada is..." --msgstr "加拿大（Canada）的國旗是..." -+msgstr "加拿大（Canada）的國旗是…" - - #: mapsdatatranslation.cpp:2556 - msgid "" -@@ -15554,7 +15546,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of El Salvador is..." --msgstr "薩爾瓦多（El Salvador）的首都是..." -+msgstr "薩爾瓦多（El Salvador）的首都是…" - - #: mapsdatatranslation.cpp:2560 - msgid "" -@@ -15567,7 +15559,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of El Salvador is..." --msgstr "薩爾瓦多（El Salvador）的國旗是..." -+msgstr "薩爾瓦多（El Salvador）的國旗是…" - - #: mapsdatatranslation.cpp:2562 - msgid "" -@@ -15591,7 +15583,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of The United States of America is..." --msgstr "美利堅合眾國（The United States of America）的首都是..." -+msgstr "美利堅合眾國（The United States of America）的首都是…" - - #: mapsdatatranslation.cpp:2566 - msgid "" -@@ -15604,7 +15596,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of The United States of America is..." --msgstr "美利堅合眾國（The United States of America）的國旗是..." -+msgstr "美利堅合眾國（The United States of America）的國旗是…" - - #: mapsdatatranslation.cpp:2568 - msgid "" -@@ -15628,7 +15620,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of The Bahamas is..." --msgstr "巴哈馬（The Bahamas）的首都是..." -+msgstr "巴哈馬（The Bahamas）的首都是…" - - #: mapsdatatranslation.cpp:2572 - msgid "" -@@ -15641,7 +15633,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of The Bahamas is..." --msgstr "巴哈馬（The Bahamas）的國旗是..." -+msgstr "巴哈馬（The Bahamas）的國旗是…" - - #: mapsdatatranslation.cpp:2574 - msgid "" -@@ -15665,7 +15657,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of The Dominican Republic is..." --msgstr "多明尼加（The Dominican Republic）的首都是..." -+msgstr "多明尼加（The Dominican Republic）的首都是…" - - #: mapsdatatranslation.cpp:2578 - msgid "" -@@ -15678,7 +15670,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of The Dominican Republic is..." --msgstr "多明尼加（The Dominican Republic）的國旗是..." -+msgstr "多明尼加（The Dominican Republic）的國旗是…" - - #: mapsdatatranslation.cpp:2580 - msgid "" -@@ -15702,7 +15694,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Haiti is..." --msgstr "海地（Haiti）的首都是..." -+msgstr "海地（Haiti）的首都是…" - - #: mapsdatatranslation.cpp:2584 - msgid "" -@@ -15715,7 +15707,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Haiti is..." --msgstr "海地（Haiti）的國旗是..." -+msgstr "海地（Haiti）的國旗是…" - - #: mapsdatatranslation.cpp:2586 - msgid "" -@@ -15739,7 +15731,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Cuba is..." --msgstr "古巴（Cuba）的首都是..." -+msgstr "古巴（Cuba）的首都是…" - - #: mapsdatatranslation.cpp:2590 - msgid "" -@@ -15752,7 +15744,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Cuba is..." --msgstr "古巴（Cuba）的國旗是..." -+msgstr "古巴（Cuba）的國旗是…" - - #: mapsdatatranslation.cpp:2592 - msgid "" -@@ -15776,7 +15768,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Jamaica is..." --msgstr "牙買加（Jamaica）的首都是..." -+msgstr "牙買加（Jamaica）的首都是…" - - #: mapsdatatranslation.cpp:2596 - msgid "" -@@ -15789,7 +15781,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Jamaica is..." --msgstr "牙買加（Jamaica）的國旗是..." -+msgstr "牙買加（Jamaica）的國旗是…" - - #: mapsdatatranslation.cpp:2598 - msgid "" -@@ -15813,7 +15805,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Dominica is..." --msgstr "多米尼克（Dominica）的首都是..." -+msgstr "多米尼克（Dominica）的首都是…" - - #: mapsdatatranslation.cpp:2602 - msgid "" -@@ -15826,7 +15818,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Dominica is..." --msgstr "多米尼克（Dominica）的國旗是..." -+msgstr "多米尼克（Dominica）的國旗是…" - - #: mapsdatatranslation.cpp:2604 - msgid "" -@@ -15850,7 +15842,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Antigua and Barbuda is..." --msgstr "安地卡（Antigua and Barbuda）的首都是..." -+msgstr "安地卡（Antigua and Barbuda）的首都是…" - - #: mapsdatatranslation.cpp:2608 - msgid "" -@@ -15863,7 +15855,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Antigua and Barbuda is..." --msgstr "安地卡（Antigua and Barbuda）的國旗是..." -+msgstr "安地卡（Antigua and Barbuda）的國旗是…" - - #: mapsdatatranslation.cpp:2610 - msgid "" -@@ -15887,7 +15879,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Barbados is..." --msgstr "巴貝多（Barbados）的首都是..." -+msgstr "巴貝多（Barbados）的首都是…" - - #: mapsdatatranslation.cpp:2614 - msgid "" -@@ -15900,7 +15892,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Barbados is..." --msgstr "巴貝多（Barbados）的國旗是..." -+msgstr "巴貝多（Barbados）的國旗是…" - - #: mapsdatatranslation.cpp:2616 - msgid "" -@@ -15924,7 +15916,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Trinidad and Tobago is..." --msgstr "千里達（Trinidad and Tobago）的首都是..." -+msgstr "千里達（Trinidad and Tobago）的首都是…" - - #: mapsdatatranslation.cpp:2620 - msgid "" -@@ -15937,7 +15929,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Trinidad and Tobago is..." --msgstr "千里達（Trinidad and Tobago）的國旗是..." -+msgstr "千里達（Trinidad and Tobago）的國旗是…" - - #: mapsdatatranslation.cpp:2622 - msgid "" -@@ -15961,7 +15953,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Mexico is..." --msgstr "墨西哥（Mexico）的首都是..." -+msgstr "墨西哥（Mexico）的首都是…" - - #: mapsdatatranslation.cpp:2626 - msgid "" -@@ -15974,7 +15966,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Mexico is..." --msgstr "墨西哥（Mexico）的國旗是..." -+msgstr "墨西哥（Mexico）的國旗是…" - - #: mapsdatatranslation.cpp:2628 - msgid "" -@@ -15998,7 +15990,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Guatemala is..." --msgstr "瓜地馬拉（Guatemala）的首都是..." -+msgstr "瓜地馬拉（Guatemala）的首都是…" - - #: mapsdatatranslation.cpp:2632 - msgid "" -@@ -16011,7 +16003,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Guatemala is..." --msgstr "瓜地馬拉（Guatemala）的國旗是..." -+msgstr "瓜地馬拉（Guatemala）的國旗是…" - - #: mapsdatatranslation.cpp:2634 - msgid "" -@@ -16035,7 +16027,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Belize is..." --msgstr "貝里斯（Belize）的首都是..." -+msgstr "貝里斯（Belize）的首都是…" - - #: mapsdatatranslation.cpp:2638 - msgid "" -@@ -16048,7 +16040,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Belize is..." --msgstr "貝里斯（Belize）的國旗是..." -+msgstr "貝里斯（Belize）的國旗是…" - - #: mapsdatatranslation.cpp:2640 - msgid "" -@@ -16072,7 +16064,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Honduras is..." --msgstr "宏都拉斯（Honduras）的首都是..." -+msgstr "宏都拉斯（Honduras）的首都是…" - - #: mapsdatatranslation.cpp:2644 - msgid "" -@@ -16085,7 +16077,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Honduras is..." --msgstr "宏都拉斯（Honduras）的國旗是..." -+msgstr "宏都拉斯（Honduras）的國旗是…" - - #: mapsdatatranslation.cpp:2646 - msgid "" -@@ -16109,7 +16101,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Nicaragua is..." --msgstr "尼加拉瓜（Nicaragua）的首都是..." -+msgstr "尼加拉瓜（Nicaragua）的首都是…" - - #: mapsdatatranslation.cpp:2650 - msgid "" -@@ -16122,7 +16114,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Nicaragua is..." --msgstr "尼加拉瓜（Nicaragua）的國旗是..." -+msgstr "尼加拉瓜（Nicaragua）的國旗是…" - - #: mapsdatatranslation.cpp:2652 - msgid "" -@@ -16146,7 +16138,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Costa Rica is..." --msgstr "哥斯大黎加（Costa Rica）的首都是..." -+msgstr "哥斯大黎加（Costa Rica）的首都是…" - - #: mapsdatatranslation.cpp:2656 - msgid "" -@@ -16159,7 +16151,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Costa Rica is..." --msgstr "哥斯大黎加（Costa Rica）的國旗是..." -+msgstr "哥斯大黎加（Costa Rica）的國旗是…" - - #: mapsdatatranslation.cpp:2658 - msgid "" -@@ -16183,7 +16175,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The capital of Panama is..." --msgstr "巴拿馬（Panama）的首都是..." -+msgstr "巴拿馬（Panama）的首都是…" - - #: mapsdatatranslation.cpp:2662 - msgid "" -@@ -16196,7 +16188,7 @@ - msgid "" - "_: ncamerica.kgm\n" - "The flag of Panama is..." --msgstr "巴拿馬（Panama）的國旗是..." -+msgstr "巴拿馬（Panama）的國旗是…" - - #: mapsdatatranslation.cpp:2664 - msgid "" -@@ -16243,8 +16235,7 @@ - #: mapsdatatranslation.cpp:2671 - msgid "" - "_: netherlands.kgm\n" --"Current map:" --"
                                  The Netherlands                                  " -+"Current map:
                                  The Netherlands                                  " - msgstr "目前地圖：
                                  荷蘭                                  " - - #: mapsdatatranslation.cpp:2672 -@@ -16275,7 +16266,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Friesland is..." --msgstr "弗裡斯蘭（Friesland）的首都是..." -+msgstr "弗裡斯蘭（Friesland）的首都是…" - - #: mapsdatatranslation.cpp:2677 - msgid "" -@@ -16306,7 +16297,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Groningen is..." --msgstr "格羅寧根（Groningen）的首都是..." -+msgstr "格羅寧根（Groningen）的首都是…" - - #: mapsdatatranslation.cpp:2682 - msgid "" -@@ -16331,7 +16322,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Drenthe is..." --msgstr "德倫特（Drenthe）的首都是..." -+msgstr "德倫特（Drenthe）的首都是…" - - #: mapsdatatranslation.cpp:2687 - msgid "" -@@ -16362,7 +16353,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Overijssel is..." --msgstr "上艾瑟爾（Overijssel）的首都是..." -+msgstr "上艾瑟爾（Overijssel）的首都是…" - - #: mapsdatatranslation.cpp:2692 - msgid "" -@@ -16393,7 +16384,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Gelderland is..." --msgstr "海爾德蘭（Gelderland）的首都是..." -+msgstr "海爾德蘭（Gelderland）的首都是…" - - #: mapsdatatranslation.cpp:2697 - msgid "" -@@ -16424,7 +16415,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of North Brabant is..." --msgstr "北布拉班特（North Brabant）的首都是..." -+msgstr "北布拉班特（North Brabant）的首都是…" - - #: mapsdatatranslation.cpp:2702 - msgid "" -@@ -16455,7 +16446,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Limburg is..." --msgstr "林堡（Limburg）的首都是..." -+msgstr "林堡（Limburg）的首都是…" - - #: mapsdatatranslation.cpp:2707 - msgid "" -@@ -16486,7 +16477,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Flevoland is..." --msgstr "弗萊福蘭（Flevoland）的首都是..." -+msgstr "弗萊福蘭（Flevoland）的首都是…" - - #: mapsdatatranslation.cpp:2712 - msgid "" -@@ -16517,7 +16508,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Utrecht is..." --msgstr "烏德勒支（Utrecht）的首都是..." -+msgstr "烏德勒支（Utrecht）的首都是…" - - #: mapsdatatranslation.cpp:2717 - msgid "" -@@ -16542,7 +16533,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of Zeeland is..." --msgstr "澤蘭（Zeeland）的首都是..." -+msgstr "澤蘭（Zeeland）的首都是…" - - #: mapsdatatranslation.cpp:2722 - msgid "" -@@ -16573,7 +16564,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of North Holland is..." --msgstr "北荷蘭（North Holland）的首都是..." -+msgstr "北荷蘭（North Holland）的首都是…" - - #: mapsdatatranslation.cpp:2727 - msgid "" -@@ -16604,7 +16595,7 @@ - msgid "" - "_: netherlands.kgm\n" - "The capital of South Holland is..." --msgstr "南荷蘭（South Holland）的首都是..." -+msgstr "南荷蘭（South Holland）的首都是…" - - #: mapsdatatranslation.cpp:2732 - msgid "" -@@ -16634,8 +16625,7 @@ - #: mapsdatatranslation.cpp:2736 - msgid "" - "_: norway.kgm\n" --"Current map:" --"
                                  Norway                                  " -+"Current map:
                                  Norway                                  " - msgstr "目前地圖：
                                  挪威                                  " - - #: mapsdatatranslation.cpp:2737 -@@ -16660,7 +16650,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Finnmark is..." --msgstr "芬馬克（Finnmark）的首都是..." -+msgstr "芬馬克（Finnmark）的首都是…" - - #: mapsdatatranslation.cpp:2741 - msgid "" -@@ -16691,7 +16681,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Troms is..." --msgstr "特羅姆斯（Troms）的首都是..." -+msgstr "特羅姆斯（Troms）的首都是…" - - #: mapsdatatranslation.cpp:2746 - msgid "" -@@ -16722,7 +16712,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Nordland is..." --msgstr "諾爾蘭（Nordland）的首都是..." -+msgstr "諾爾蘭（Nordland）的首都是…" - - #: mapsdatatranslation.cpp:2751 - msgid "" -@@ -16753,7 +16743,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Nord-Trøndelag is..." --msgstr "北特倫德拉格（Nord-Trøndelag）的首都是..." -+msgstr "北特倫德拉格（Nord-Trøndelag）的首都是…" - - #: mapsdatatranslation.cpp:2756 - msgid "" -@@ -16784,7 +16774,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Sør-Trøndelag is..." --msgstr "南特倫德拉格（Sør-Trøndelag）的首都是..." -+msgstr "南特倫德拉格（Sør-Trøndelag）的首都是…" - - #: mapsdatatranslation.cpp:2761 - msgid "" -@@ -16815,7 +16805,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Møre Og Romsdal is..." --msgstr "默勒魯姆斯達爾（Møre Og Romsdal）的首都是..." -+msgstr "默勒魯姆斯達爾（Møre Og Romsdal）的首都是…" - - #: mapsdatatranslation.cpp:2766 - msgid "" -@@ -16846,7 +16836,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Oppland is..." --msgstr "奧普蘭（Oppland）的首都是..." -+msgstr "奧普蘭（Oppland）的首都是…" - - #: mapsdatatranslation.cpp:2771 - msgid "" -@@ -16877,7 +16867,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Hedmark is..." --msgstr "海德馬克（Hedmark）的首都是..." -+msgstr "海德馬克（Hedmark）的首都是…" - - #: mapsdatatranslation.cpp:2776 - msgid "" -@@ -16908,7 +16898,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Sogn Og Fjordane is..." --msgstr "松恩.菲尤拉訥（Sogn Og Fjordane）的首都是..." -+msgstr "松恩.菲尤拉訥（Sogn Og Fjordane）的首都是…" - - #: mapsdatatranslation.cpp:2781 - msgid "" -@@ -16939,7 +16929,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Hordaland is..." --msgstr "霍達蘭（Hordaland）的首都是..." -+msgstr "霍達蘭（Hordaland）的首都是…" - - #: mapsdatatranslation.cpp:2786 - msgid "" -@@ -16970,7 +16960,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Rogaland is..." --msgstr "羅加蘭（Rogaland）的首都是..." -+msgstr "羅加蘭（Rogaland）的首都是…" - - #: mapsdatatranslation.cpp:2791 - msgid "" -@@ -17001,7 +16991,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Vest-Agder is..." --msgstr "西阿格德爾（Vest-Agder）的首都是..." -+msgstr "西阿格德爾（Vest-Agder）的首都是…" - - #: mapsdatatranslation.cpp:2796 - msgid "" -@@ -17032,7 +17022,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Aust-Agder is..." --msgstr "東阿格德爾（Aust-Agder）的首都是..." -+msgstr "東阿格德爾（Aust-Agder）的首都是…" - - #: mapsdatatranslation.cpp:2801 - msgid "" -@@ -17063,7 +17053,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Telemark is..." --msgstr "泰勒馬克（Telemark）的首都是..." -+msgstr "泰勒馬克（Telemark）的首都是…" - - #: mapsdatatranslation.cpp:2806 - msgid "" -@@ -17094,7 +17084,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Buskerud is..." --msgstr "布斯克呂（Buskerud）的首都是..." -+msgstr "布斯克呂（Buskerud）的首都是…" - - #: mapsdatatranslation.cpp:2811 - msgid "" -@@ -17125,7 +17115,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Vestfold is..." --msgstr "西福爾（Vestfold）的首都是..." -+msgstr "西福爾（Vestfold）的首都是…" - - #: mapsdatatranslation.cpp:2816 - msgid "" -@@ -17157,7 +17147,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Oslo is..." --msgstr "奧斯陸（Oslo）的首都是..." -+msgstr "奧斯陸（Oslo）的首都是…" - - #: mapsdatatranslation.cpp:2821 - msgid "" -@@ -17182,7 +17172,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Akershus is..." --msgstr "阿克什胡斯（Akershus）的首都是..." -+msgstr "阿克什胡斯（Akershus）的首都是…" - - #: mapsdatatranslation.cpp:2826 - msgid "" -@@ -17201,7 +17191,7 @@ - msgid "" - "_: norway.kgm\n" - "The capital of Østfold is..." --msgstr "東福爾（Østfold）的首都是..." -+msgstr "東福爾（Østfold）的首都是…" - - #: mapsdatatranslation.cpp:2831 - msgid "" -@@ -17231,8 +17221,7 @@ - #: mapsdatatranslation.cpp:2835 - msgid "" - "_: poland.kgm\n" --"Current map:" --"
                                  Poland                                  " -+"Current map:
                                  Poland                                  " - msgstr "目前地圖：
                                  波蘭                                  " - - #: mapsdatatranslation.cpp:2836 -@@ -17257,7 +17246,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Masovia is..." --msgstr "馬佐維亞（Masovia）的首都是..." -+msgstr "馬佐維亞（Masovia）的首都是…" - - #: mapsdatatranslation.cpp:2840 - msgid "" -@@ -17288,7 +17277,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Warmia and Masuria is..." --msgstr "瓦爾米亞-馬祖爾（Warmia and Masuria）的首都是..." -+msgstr "瓦爾米亞-馬祖爾（Warmia and Masuria）的首都是…" - - #: mapsdatatranslation.cpp:2845 - msgid "" -@@ -17319,7 +17308,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Podlachia is..." --msgstr "波德拉斯（Podlachia）的首都是..." -+msgstr "波德拉斯（Podlachia）的首都是…" - - #: mapsdatatranslation.cpp:2850 - msgid "" -@@ -17350,7 +17339,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Lublin is..." --msgstr "盧布林（Lublin）的首都是..." -+msgstr "盧布林（Lublin）的首都是…" - - #: mapsdatatranslation.cpp:2855 - msgid "" -@@ -17375,7 +17364,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Subcarpathia is..." --msgstr "喀爾巴阡山（Subcarpathia）的首都是..." -+msgstr "喀爾巴阡山（Subcarpathia）的首都是…" - - #: mapsdatatranslation.cpp:2860 - msgid "" -@@ -17406,7 +17395,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Świętokrzyskie is..." --msgstr "聖十字（Świętokrzyskie）的首都是..." -+msgstr "聖十字（Świętokrzyskie）的首都是…" - - #: mapsdatatranslation.cpp:2865 - msgid "" -@@ -17437,7 +17426,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Lesser Poland is..." --msgstr "小波蘭（Lesser Poland）的首都是..." -+msgstr "小波蘭（Lesser Poland）的首都是…" - - #: mapsdatatranslation.cpp:2870 - msgid "" -@@ -17468,7 +17457,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Łódź is..." --msgstr "羅茲（Łódź）的首都是..." -+msgstr "羅茲（Łódź）的首都是…" - - #: mapsdatatranslation.cpp:2875 - msgid "" -@@ -17493,7 +17482,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Silesia is..." --msgstr "西里西亞（Silesia）的首都是..." -+msgstr "西里西亞（Silesia）的首都是…" - - #: mapsdatatranslation.cpp:2880 - msgid "" -@@ -17524,7 +17513,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Opole is..." --msgstr "奧波萊（Opole）的首都是..." -+msgstr "奧波萊（Opole）的首都是…" - - #: mapsdatatranslation.cpp:2885 - msgid "" -@@ -17549,7 +17538,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Pomerania is..." --msgstr "濱海（Pomerania）的首都是..." -+msgstr "濱海（Pomerania）的首都是…" - - #: mapsdatatranslation.cpp:2890 - msgid "" -@@ -17580,7 +17569,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of West Pomerania is..." --msgstr "西濱海（West Pomerania）的首都是..." -+msgstr "西濱海（West Pomerania）的首都是…" - - #: mapsdatatranslation.cpp:2895 - msgid "" -@@ -17611,7 +17600,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Greater Poland is..." --msgstr "大波蘭（Greater Poland）的首都是..." -+msgstr "大波蘭（Greater Poland）的首都是…" - - #: mapsdatatranslation.cpp:2900 - msgid "" -@@ -17642,7 +17631,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Lower Silesia is..." --msgstr "下西里西亞（Lower Silesia）的首都是..." -+msgstr "下西里西亞（Lower Silesia）的首都是…" - - #: mapsdatatranslation.cpp:2905 - msgid "" -@@ -17673,7 +17662,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Lubusz is..." --msgstr "魯布斯卡（Lubusz）的首都是..." -+msgstr "魯布斯卡（Lubusz）的首都是…" - - #: mapsdatatranslation.cpp:2910 - msgid "" -@@ -17704,7 +17693,7 @@ - msgid "" - "_: poland.kgm\n" - "The capital of Kuyavia-Pomerania is..." --msgstr "庫亞瓦濱海（Kuyavia-Pomerania）的首都是..." -+msgstr "庫亞瓦濱海（Kuyavia-Pomerania）的首都是…" - - #: mapsdatatranslation.cpp:2915 - msgid "" -@@ -17734,8 +17723,7 @@ - #: mapsdatatranslation.cpp:2919 - msgid "" - "_: southamerica.kgm\n" --"Current map:" --"
                                  South America                                  " -+"Current map:
                                  South America                                  " - msgstr "目前地圖：
                                  南美洲                                  " - - #: mapsdatatranslation.cpp:2920 -@@ -17772,7 +17760,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Colombia is..." --msgstr "哥倫比亞（Colombia）的首都是..." -+msgstr "哥倫比亞（Colombia）的首都是…" - - #: mapsdatatranslation.cpp:2926 - msgid "" -@@ -17785,7 +17773,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Colombia is..." --msgstr "哥倫比亞（Colombia）的國旗是..." -+msgstr "哥倫比亞（Colombia）的國旗是…" - - #: mapsdatatranslation.cpp:2928 - msgid "" -@@ -17809,7 +17797,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Venezuela is..." --msgstr "委內瑞拉（Venezuela）的首都是..." -+msgstr "委內瑞拉（Venezuela）的首都是…" - - #: mapsdatatranslation.cpp:2932 - msgid "" -@@ -17822,7 +17810,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Venezuela is..." --msgstr "委內瑞拉（Venezuela）的國旗是..." -+msgstr "委內瑞拉（Venezuela）的國旗是…" - - #: mapsdatatranslation.cpp:2934 - msgid "" -@@ -17846,7 +17834,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Guyana is..." --msgstr "蓋亞那（Guyana）的首都是..." -+msgstr "蓋亞那（Guyana）的首都是…" - - #: mapsdatatranslation.cpp:2938 - msgid "" -@@ -17859,7 +17847,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Guyana is..." --msgstr "蓋亞那（Guyana）的國旗是..." -+msgstr "蓋亞那（Guyana）的國旗是…" - - #: mapsdatatranslation.cpp:2940 - msgid "" -@@ -17883,7 +17871,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Suriname is..." --msgstr "蘇利南（Suriname）的首都是..." -+msgstr "蘇利南（Suriname）的首都是…" - - #: mapsdatatranslation.cpp:2944 - msgid "" -@@ -17896,7 +17884,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Suriname is..." --msgstr "蘇利南（Suriname）的國旗是..." -+msgstr "蘇利南（Suriname）的國旗是…" - - #: mapsdatatranslation.cpp:2946 - msgid "" -@@ -17920,7 +17908,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of French Guiana is..." --msgstr "法屬蓋亞那（French Guiana）的首都是..." -+msgstr "法屬蓋亞那（French Guiana）的首都是…" - - #: mapsdatatranslation.cpp:2950 - msgid "" -@@ -17933,7 +17921,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of French Guiana is..." --msgstr "法屬蓋亞那（French Guiana）的國旗是..." -+msgstr "法屬蓋亞那（French Guiana）的國旗是…" - - #: mapsdatatranslation.cpp:2952 - msgid "" -@@ -17957,7 +17945,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Ecuador is..." --msgstr "厄瓜多（Ecuador）的首都是..." -+msgstr "厄瓜多（Ecuador）的首都是…" - - #: mapsdatatranslation.cpp:2956 - msgid "" -@@ -17970,7 +17958,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Ecuador is..." --msgstr "厄瓜多（Ecuador）的國旗是..." -+msgstr "厄瓜多（Ecuador）的國旗是…" - - #: mapsdatatranslation.cpp:2958 - msgid "" -@@ -17988,26 +17976,26 @@ - msgid "" - "_: southamerica.kgm\n" - "Peru" --msgstr "秘魯（Peru）" -+msgstr "祕魯（Peru）" - - #: mapsdatatranslation.cpp:2961 - msgid "" - "_: southamerica.kgm\n" - "The capital of Peru is..." --msgstr "秘魯（Peru）的首都是..." -+msgstr "祕魯（Peru）的首都是…" - - #: mapsdatatranslation.cpp:2962 - msgid "" - "_: southamerica.kgm\n" - "Please click on:\n" - "Peru" --msgstr "請點選：秘魯（Peru）" -+msgstr "請點選：祕魯（Peru）" - - #: mapsdatatranslation.cpp:2963 - msgid "" - "_: southamerica.kgm\n" - "The flag of Peru is..." --msgstr "秘魯（Peru）的國旗是..." -+msgstr "祕魯（Peru）的國旗是…" - - #: mapsdatatranslation.cpp:2964 - msgid "" -@@ -18031,7 +18019,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Brazil is..." --msgstr "巴西（Brazil）的首都是..." -+msgstr "巴西（Brazil）的首都是…" - - #: mapsdatatranslation.cpp:2968 - msgid "" -@@ -18044,7 +18032,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Brazil is..." --msgstr "巴西（Brazil）的國旗是..." -+msgstr "巴西（Brazil）的國旗是…" - - #: mapsdatatranslation.cpp:2970 - msgid "" -@@ -18068,7 +18056,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Bolivia is..." --msgstr "玻利維亞（Bolivia）的首都是..." -+msgstr "玻利維亞（Bolivia）的首都是…" - - #: mapsdatatranslation.cpp:2974 - msgid "" -@@ -18081,7 +18069,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Bolivia is..." --msgstr "玻利維亞（Bolivia）的國旗是..." -+msgstr "玻利維亞（Bolivia）的國旗是…" - - #: mapsdatatranslation.cpp:2976 - msgid "" -@@ -18105,7 +18093,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Chile is..." --msgstr "智利（Chile）的首都是..." -+msgstr "智利（Chile）的首都是…" - - #: mapsdatatranslation.cpp:2980 - msgid "" -@@ -18118,7 +18106,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Chile is..." --msgstr "智利（Chile）的國旗是..." -+msgstr "智利（Chile）的國旗是…" - - #: mapsdatatranslation.cpp:2982 - msgid "" -@@ -18142,7 +18130,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Paraguay is..." --msgstr "巴拉圭（Paraguay）的首都是..." -+msgstr "巴拉圭（Paraguay）的首都是…" - - #: mapsdatatranslation.cpp:2986 - msgid "" -@@ -18155,7 +18143,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Paraguay is..." --msgstr "巴拉圭（Paraguay）的國旗是..." -+msgstr "巴拉圭（Paraguay）的國旗是…" - - #: mapsdatatranslation.cpp:2988 - msgid "" -@@ -18179,7 +18167,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Argentina is..." --msgstr "阿根廷（Argentina）的首都是..." -+msgstr "阿根廷（Argentina）的首都是…" - - #: mapsdatatranslation.cpp:2992 - msgid "" -@@ -18192,7 +18180,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Argentina is..." --msgstr "阿根廷（Argentina）的國旗是..." -+msgstr "阿根廷（Argentina）的國旗是…" - - #: mapsdatatranslation.cpp:2994 - msgid "" -@@ -18216,7 +18204,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The capital of Uruguay is..." --msgstr "烏拉圭（Uruguay）的首都是..." -+msgstr "烏拉圭（Uruguay）的首都是…" - - #: mapsdatatranslation.cpp:2998 - msgid "" -@@ -18229,7 +18217,7 @@ - msgid "" - "_: southamerica.kgm\n" - "The flag of Uruguay is..." --msgstr "烏拉圭（Uruguay）的國旗是..." -+msgstr "烏拉圭（Uruguay）的國旗是…" - - #: mapsdatatranslation.cpp:3000 - msgid "" -@@ -18252,8 +18240,7 @@ - #: mapsdatatranslation.cpp:3003 - msgid "" - "_: spain.kgm\n" --"Current map:" --"
                                  Spain                                  " -+"Current map:
                                  Spain                                  " - msgstr "目前地圖：
                                  西班牙                                  " - - #: mapsdatatranslation.cpp:3004 -@@ -18278,7 +18265,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Andalucia is..." --msgstr "安達盧西亞（Andalucia）的首都是..." -+msgstr "安達盧西亞（Andalucia）的首都是…" - - #: mapsdatatranslation.cpp:3008 - msgid "" -@@ -18309,7 +18296,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Aragon is..." --msgstr "亞拉岡（Aragon）的首都是..." -+msgstr "亞拉岡（Aragon）的首都是…" - - #: mapsdatatranslation.cpp:3013 - msgid "" -@@ -18340,7 +18327,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Asturias is..." --msgstr "阿斯圖里亞斯（Asturias）的首都是..." -+msgstr "阿斯圖里亞斯（Asturias）的首都是…" - - #: mapsdatatranslation.cpp:3018 - msgid "" -@@ -18371,7 +18358,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Balearic Islands is..." --msgstr "巴利阿里群島（Balearic Islands）的首都是..." -+msgstr "巴利阿里群島（Balearic Islands）的首都是…" - - #: mapsdatatranslation.cpp:3023 - msgid "" -@@ -18402,7 +18389,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Basque Country is..." --msgstr "巴斯克（Basque Country）的首都是..." -+msgstr "巴斯克（Basque Country）的首都是…" - - #: mapsdatatranslation.cpp:3028 - msgid "" -@@ -18433,7 +18420,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Canary Islands is..." --msgstr "加那利群島（Canary Islands）的首都是..." -+msgstr "加那利群島（Canary Islands）的首都是…" - - #: mapsdatatranslation.cpp:3033 - msgid "" -@@ -18446,14 +18433,17 @@ - msgid "" - "_: spain.kgm\n" - "Las Palmas de Gran Canaria and Santa Cruz de Tenerife" --msgstr "拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de Tenerife）" -+msgstr "" -+"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de " -+"Tenerife）" - - #: mapsdatatranslation.cpp:3035 - msgid "" - "_: spain.kgm\n" - "Las Palmas de Gran Canaria and Santa Cruz de Tenerife is the capital of..." - msgstr "" --"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de Tenerife）是哪個自治區的首都？" -+"拉斯帕爾馬斯與聖克魯斯（Las Palmas de Gran Canaria and Santa Cruz de " -+"Tenerife）是哪個自治區的首都？" - - #: mapsdatatranslation.cpp:3036 - msgid "" -@@ -18465,7 +18455,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Cantabria is..." --msgstr "坎塔布里亞（Cantabria）的首都是..." -+msgstr "坎塔布里亞（Cantabria）的首都是…" - - #: mapsdatatranslation.cpp:3038 - msgid "" -@@ -18496,7 +18486,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Castile-La Mancha is..." --msgstr "卡斯提拉曼恰（Castile-La Mancha）的首都是..." -+msgstr "卡斯提拉曼恰（Castile-La Mancha）的首都是…" - - #: mapsdatatranslation.cpp:3043 - msgid "" -@@ -18527,7 +18517,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Castile and Leon is..." --msgstr "卡斯提和萊昂（Castile and Leon）的首都是..." -+msgstr "卡斯提和萊昂（Castile and Leon）的首都是…" - - #: mapsdatatranslation.cpp:3048 - msgid "" -@@ -18558,7 +18548,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Catalonia is..." --msgstr "卡塔羅尼亞（Catalonia）的首都是..." -+msgstr "卡塔羅尼亞（Catalonia）的首都是…" - - #: mapsdatatranslation.cpp:3053 - msgid "" -@@ -18589,7 +18579,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Extremadura is..." --msgstr "埃斯特雷馬杜拉（Extremadura）的首都是..." -+msgstr "埃斯特雷馬杜拉（Extremadura）的首都是…" - - #: mapsdatatranslation.cpp:3058 - msgid "" -@@ -18620,7 +18610,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Galicia is..." --msgstr "加利西亞（Galicia）的首都是..." -+msgstr "加利西亞（Galicia）的首都是…" - - #: mapsdatatranslation.cpp:3063 - msgid "" -@@ -18651,7 +18641,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of La Rioja is..." --msgstr "里奧哈（La Rioja）的首都是..." -+msgstr "里奧哈（La Rioja）的首都是…" - - #: mapsdatatranslation.cpp:3068 - msgid "" -@@ -18682,7 +18672,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Madrid is..." --msgstr "馬德里（Madrid）的首都是..." -+msgstr "馬德里（Madrid）的首都是…" - - #: mapsdatatranslation.cpp:3073 - msgid "" -@@ -18707,7 +18697,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Murcia is..." --msgstr "穆爾西亞（Murcia）的首都是..." -+msgstr "穆爾西亞（Murcia）的首都是…" - - #: mapsdatatranslation.cpp:3078 - msgid "" -@@ -18732,7 +18722,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Navarre is..." --msgstr "那瓦爾（Navarre）的首都是..." -+msgstr "那瓦爾（Navarre）的首都是…" - - #: mapsdatatranslation.cpp:3083 - msgid "" -@@ -18763,7 +18753,7 @@ - msgid "" - "_: spain.kgm\n" - "The capital of Valencian Community is..." --msgstr "巴倫西亞（Valencian Community）的首都是..." -+msgstr "巴倫西亞（Valencian Community）的首都是…" - - #: mapsdatatranslation.cpp:3088 - msgid "" -@@ -18793,8 +18783,7 @@ - #: mapsdatatranslation.cpp:3092 - msgid "" - "_: usa.kgm\n" --"Current map:" --"
                                  USA                                  " -+"Current map:
                                  USA                                  " - msgstr "目前地圖：
                                  美國                                  " - - #: mapsdatatranslation.cpp:3093 -@@ -18891,7 +18880,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Alabama is..." --msgstr "阿拉巴馬（Alabama）的首都是..." -+msgstr "阿拉巴馬（Alabama）的首都是…" - - #: mapsdatatranslation.cpp:3109 - msgid "" -@@ -18922,7 +18911,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Alaska is..." --msgstr "阿拉斯加（Alaska）的首都是..." -+msgstr "阿拉斯加（Alaska）的首都是…" - - #: mapsdatatranslation.cpp:3114 - msgid "" -@@ -18953,7 +18942,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Arizona is..." --msgstr "亞利桑那（Arizona）的首都是..." -+msgstr "亞利桑那（Arizona）的首都是…" - - #: mapsdatatranslation.cpp:3119 - msgid "" -@@ -18984,7 +18973,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Arkansas is..." --msgstr "阿肯色（Arkansas）的首都是..." -+msgstr "阿肯色（Arkansas）的首都是…" - - #: mapsdatatranslation.cpp:3124 - msgid "" -@@ -19015,7 +19004,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of California is..." --msgstr "加利福尼亞（California）的首都是..." -+msgstr "加利福尼亞（California）的首都是…" - - #: mapsdatatranslation.cpp:3129 - msgid "" -@@ -19046,7 +19035,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Colorado is..." --msgstr "科羅拉多（Colorado）的首都是..." -+msgstr "科羅拉多（Colorado）的首都是…" - - #: mapsdatatranslation.cpp:3134 - msgid "" -@@ -19077,7 +19066,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Connecticut is..." --msgstr "康乃狄克（Connecticut）的首都是..." -+msgstr "康乃狄克（Connecticut）的首都是…" - - #: mapsdatatranslation.cpp:3139 - msgid "" -@@ -19108,7 +19097,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Delaware is..." --msgstr "德拉瓦（Delaware）的首都是..." -+msgstr "德拉瓦（Delaware）的首都是…" - - #: mapsdatatranslation.cpp:3144 - msgid "" -@@ -19139,7 +19128,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Florida is..." --msgstr "佛羅里達（Florida）的首都是..." -+msgstr "佛羅里達（Florida）的首都是…" - - #: mapsdatatranslation.cpp:3149 - msgid "" -@@ -19170,7 +19159,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Georgia is..." --msgstr "喬治亞（Georgia）的首都是..." -+msgstr "喬治亞（Georgia）的首都是…" - - #: mapsdatatranslation.cpp:3154 - msgid "" -@@ -19201,7 +19190,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Hawaii is..." --msgstr "夏威夷（Hawaii）的首都是..." -+msgstr "夏威夷（Hawaii）的首都是…" - - #: mapsdatatranslation.cpp:3159 - msgid "" -@@ -19232,7 +19221,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Idaho is..." --msgstr "愛德荷（Idaho）的首都是..." -+msgstr "愛德荷（Idaho）的首都是…" - - #: mapsdatatranslation.cpp:3164 - msgid "" -@@ -19263,7 +19252,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Illinois is..." --msgstr "伊利諾（Illinois）的首都是..." -+msgstr "伊利諾（Illinois）的首都是…" - - #: mapsdatatranslation.cpp:3169 - msgid "" -@@ -19294,7 +19283,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Indiana is..." --msgstr "印地安那（Indiana）的首都是..." -+msgstr "印地安那（Indiana）的首都是…" - - #: mapsdatatranslation.cpp:3174 - msgid "" -@@ -19325,7 +19314,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Iowa is..." --msgstr "愛荷華（Iowa）的首都是..." -+msgstr "愛荷華（Iowa）的首都是…" - - #: mapsdatatranslation.cpp:3179 - msgid "" -@@ -19356,7 +19345,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Kansas is..." --msgstr "堪薩斯（Kansas）的首都是..." -+msgstr "堪薩斯（Kansas）的首都是…" - - #: mapsdatatranslation.cpp:3184 - msgid "" -@@ -19387,7 +19376,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Kentucky is..." --msgstr "肯塔基（Kentucky）的首都是..." -+msgstr "肯塔基（Kentucky）的首都是…" - - #: mapsdatatranslation.cpp:3189 - msgid "" -@@ -19418,7 +19407,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Louisiana is..." --msgstr "路易西安那（Louisiana）的首都是..." -+msgstr "路易西安那（Louisiana）的首都是…" - - #: mapsdatatranslation.cpp:3194 - msgid "" -@@ -19449,7 +19438,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Maine is..." --msgstr "緬因（Maine）的首都是..." -+msgstr "緬因（Maine）的首都是…" - - #: mapsdatatranslation.cpp:3199 - msgid "" -@@ -19480,7 +19469,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Maryland is..." --msgstr "馬里蘭（Maryland）的首都是..." -+msgstr "馬里蘭（Maryland）的首都是…" - - #: mapsdatatranslation.cpp:3204 - msgid "" -@@ -19511,7 +19500,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Massachusetts is..." --msgstr "麻塞諸塞（Massachusetts）的首都是..." -+msgstr "麻塞諸塞（Massachusetts）的首都是…" - - #: mapsdatatranslation.cpp:3209 - msgid "" -@@ -19542,7 +19531,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Michigan is..." --msgstr "密西根（Michigan）的首都是..." -+msgstr "密西根（Michigan）的首都是…" - - #: mapsdatatranslation.cpp:3214 - msgid "" -@@ -19573,7 +19562,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Minnesota is..." --msgstr "明尼蘇達（Minnesota）的首都是..." -+msgstr "明尼蘇達（Minnesota）的首都是…" - - #: mapsdatatranslation.cpp:3219 - msgid "" -@@ -19604,7 +19593,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Mississippi is..." --msgstr "密西西比（Mississippi）的首都是..." -+msgstr "密西西比（Mississippi）的首都是…" - - #: mapsdatatranslation.cpp:3224 - msgid "" -@@ -19635,7 +19624,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Missouri is..." --msgstr "密蘇里（Missouri）的首都是..." -+msgstr "密蘇里（Missouri）的首都是…" - - #: mapsdatatranslation.cpp:3229 - msgid "" -@@ -19666,7 +19655,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Montana is..." --msgstr "蒙大拿（Montana）的首都是..." -+msgstr "蒙大拿（Montana）的首都是…" - - #: mapsdatatranslation.cpp:3234 - msgid "" -@@ -19697,7 +19686,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Nebraska is..." --msgstr "內布拉斯加（Nebraska）的首都是..." -+msgstr "內布拉斯加（Nebraska）的首都是…" - - #: mapsdatatranslation.cpp:3239 - msgid "" -@@ -19728,7 +19717,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Nevada is..." --msgstr "內華達（Nevada）的首都是..." -+msgstr "內華達（Nevada）的首都是…" - - #: mapsdatatranslation.cpp:3244 - msgid "" -@@ -19759,7 +19748,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of New Hampshire is..." --msgstr "新罕布夏（New Hampshire）的首都是..." -+msgstr "新罕布夏（New Hampshire）的首都是…" - - #: mapsdatatranslation.cpp:3249 - msgid "" -@@ -19790,7 +19779,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of New Jersey is..." --msgstr "紐澤西（New Jersey）的首都是..." -+msgstr "紐澤西（New Jersey）的首都是…" - - #: mapsdatatranslation.cpp:3254 - msgid "" -@@ -19821,7 +19810,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of New Mexico is..." --msgstr "新墨西哥（New Mexico）的首都是..." -+msgstr "新墨西哥（New Mexico）的首都是…" - - #: mapsdatatranslation.cpp:3259 - msgid "" -@@ -19852,7 +19841,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of New York is..." --msgstr "紐約（New York）的首都是..." -+msgstr "紐約（New York）的首都是…" - - #: mapsdatatranslation.cpp:3264 - msgid "" -@@ -19883,7 +19872,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of North Carolina is..." --msgstr "北卡羅萊納（North Carolina）的首都是..." -+msgstr "北卡羅萊納（North Carolina）的首都是…" - - #: mapsdatatranslation.cpp:3269 - msgid "" -@@ -19914,7 +19903,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of North Dakota is..." --msgstr "北達科他（North Dakota）的首都是..." -+msgstr "北達科他（North Dakota）的首都是…" - - #: mapsdatatranslation.cpp:3274 - msgid "" -@@ -19945,7 +19934,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Ohio is..." --msgstr "俄亥俄（Ohio）的首都是..." -+msgstr "俄亥俄（Ohio）的首都是…" - - #: mapsdatatranslation.cpp:3279 - msgid "" -@@ -19976,7 +19965,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Oklahoma is..." --msgstr "奧克拉荷馬（Oklahoma）的首都是..." -+msgstr "奧克拉荷馬（Oklahoma）的首都是…" - - #: mapsdatatranslation.cpp:3284 - msgid "" -@@ -20007,7 +19996,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Oregon is..." --msgstr "奧勒岡（Oregon）的首都是..." -+msgstr "奧勒岡（Oregon）的首都是…" - - #: mapsdatatranslation.cpp:3289 - msgid "" -@@ -20038,7 +20027,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Pennsylvania is..." --msgstr "賓夕法尼亞（Pennsylvania）的首都是..." -+msgstr "賓夕法尼亞（Pennsylvania）的首都是…" - - #: mapsdatatranslation.cpp:3294 - msgid "" -@@ -20069,7 +20058,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Rhode Island is..." --msgstr "羅德島（Rhode Island）的首都是..." -+msgstr "羅德島（Rhode Island）的首都是…" - - #: mapsdatatranslation.cpp:3299 - msgid "" -@@ -20100,7 +20089,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of South Carolina is..." --msgstr "南卡羅萊納（South Carolina）的首都是..." -+msgstr "南卡羅萊納（South Carolina）的首都是…" - - #: mapsdatatranslation.cpp:3304 - msgid "" -@@ -20131,7 +20120,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of South Dakota is..." --msgstr "南達科塔（South Dakota）的首都是..." -+msgstr "南達科塔（South Dakota）的首都是…" - - #: mapsdatatranslation.cpp:3309 - msgid "" -@@ -20162,7 +20151,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Tennessee is..." --msgstr "田納西（Tennessee）的首都是..." -+msgstr "田納西（Tennessee）的首都是…" - - #: mapsdatatranslation.cpp:3314 - msgid "" -@@ -20193,7 +20182,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Texas is..." --msgstr "德克薩斯（Texas）的首都是..." -+msgstr "德克薩斯（Texas）的首都是…" - - #: mapsdatatranslation.cpp:3319 - msgid "" -@@ -20224,7 +20213,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Utah is..." --msgstr "猶他（Utah）的首都是..." -+msgstr "猶他（Utah）的首都是…" - - #: mapsdatatranslation.cpp:3324 - msgid "" -@@ -20255,7 +20244,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Vermont is..." --msgstr "佛蒙特（Vermont）的首都是..." -+msgstr "佛蒙特（Vermont）的首都是…" - - #: mapsdatatranslation.cpp:3329 - msgid "" -@@ -20286,7 +20275,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Virginia is..." --msgstr "維吉尼亞（Virginia）的首都是..." -+msgstr "維吉尼亞（Virginia）的首都是…" - - #: mapsdatatranslation.cpp:3334 - msgid "" -@@ -20317,7 +20306,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Washington is..." --msgstr "華盛頓（Washington）的首都是..." -+msgstr "華盛頓（Washington）的首都是…" - - #: mapsdatatranslation.cpp:3339 - msgid "" -@@ -20348,7 +20337,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of West Virginia is..." --msgstr "西維吉尼亞（West Virginia）的首都是..." -+msgstr "西維吉尼亞（West Virginia）的首都是…" - - #: mapsdatatranslation.cpp:3344 - msgid "" -@@ -20379,7 +20368,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Wisconsin is..." --msgstr "威斯康辛（Wisconsin）的首都是..." -+msgstr "威斯康辛（Wisconsin）的首都是…" - - #: mapsdatatranslation.cpp:3349 - msgid "" -@@ -20410,7 +20399,7 @@ - msgid "" - "_: usa.kgm\n" - "The capital of Wyoming is..." --msgstr "俄懷明（Wyoming）的首都是..." -+msgstr "俄懷明（Wyoming）的首都是…" - - #: mapsdatatranslation.cpp:3354 - msgid "" -@@ -20440,8 +20429,7 @@ - #: mapsdatatranslation.cpp:3358 - msgid "" - "_: world.kgm\n" --"Current map:" --"
                                  World                                  " -+"Current map:
                                  World                                  " - msgstr "目前地圖：
                                  世界                                  " - - #: mapsdatatranslation.cpp:3359 -@@ -20460,7 +20448,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Algeria is..." --msgstr "阿爾及利亞（Algeria）的首都是..." -+msgstr "阿爾及利亞（Algeria）的首都是…" - - #: mapsdatatranslation.cpp:3362 - msgid "" -@@ -20473,7 +20461,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Algeria is..." --msgstr "阿爾及利亞（Algeria）的國旗是..." -+msgstr "阿爾及利亞（Algeria）的國旗是…" - - #: mapsdatatranslation.cpp:3364 - msgid "" -@@ -20497,7 +20485,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Angola is..." --msgstr "安哥拉（Angola）的首都是..." -+msgstr "安哥拉（Angola）的首都是…" - - #: mapsdatatranslation.cpp:3368 - msgid "" -@@ -20510,7 +20498,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Angola is..." --msgstr "安哥拉（Angola）的國旗是..." -+msgstr "安哥拉（Angola）的國旗是…" - - #: mapsdatatranslation.cpp:3370 - msgid "" -@@ -20534,7 +20522,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Benin is..." --msgstr "貝南（Benin）的首都是..." -+msgstr "貝南（Benin）的首都是…" - - #: mapsdatatranslation.cpp:3374 - msgid "" -@@ -20547,7 +20535,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Benin is..." --msgstr "貝南（Benin）的國旗是..." -+msgstr "貝南（Benin）的國旗是…" - - #: mapsdatatranslation.cpp:3376 - msgid "" -@@ -20571,7 +20559,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Botswana is..." --msgstr "波札那（Botswana）的首都是..." -+msgstr "波札那（Botswana）的首都是…" - - #: mapsdatatranslation.cpp:3380 - msgid "" -@@ -20584,7 +20572,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Botswana is..." --msgstr "波札那（Botswana）的國旗是..." -+msgstr "波札那（Botswana）的國旗是…" - - #: mapsdatatranslation.cpp:3382 - msgid "" -@@ -20608,7 +20596,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Burkina Faso is..." --msgstr "布吉納法索（Burkina Faso）的首都是..." -+msgstr "布吉納法索（Burkina Faso）的首都是…" - - #: mapsdatatranslation.cpp:3386 - msgid "" -@@ -20621,7 +20609,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Burkina Faso is..." --msgstr "布吉納法索（Burkina Faso）的國旗是..." -+msgstr "布吉納法索（Burkina Faso）的國旗是…" - - #: mapsdatatranslation.cpp:3388 - msgid "" -@@ -20645,7 +20633,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Burundi is..." --msgstr "蒲隆地（Burundi）的首都是..." -+msgstr "蒲隆地（Burundi）的首都是…" - - #: mapsdatatranslation.cpp:3392 - msgid "" -@@ -20658,7 +20646,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Burundi is..." --msgstr "蒲隆地（Burundi）的國旗是..." -+msgstr "蒲隆地（Burundi）的國旗是…" - - #: mapsdatatranslation.cpp:3394 - msgid "" -@@ -20682,7 +20670,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Cameroon is..." --msgstr "喀麥隆（Cameroon）的首都是..." -+msgstr "喀麥隆（Cameroon）的首都是…" - - #: mapsdatatranslation.cpp:3398 - msgid "" -@@ -20695,7 +20683,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Cameroon is..." --msgstr "喀麥隆（Cameroon）的國旗是..." -+msgstr "喀麥隆（Cameroon）的國旗是…" - - #: mapsdatatranslation.cpp:3400 - msgid "" -@@ -20719,7 +20707,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Central African Republic is..." --msgstr "中非共和國（Central African Republic）的首都是..." -+msgstr "中非共和國（Central African Republic）的首都是…" - - #: mapsdatatranslation.cpp:3404 - msgid "" -@@ -20732,7 +20720,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Central African Republic is..." --msgstr "中非共和國（Central African Republic）的國旗是..." -+msgstr "中非共和國（Central African Republic）的國旗是…" - - #: mapsdatatranslation.cpp:3406 - msgid "" -@@ -20756,7 +20744,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Chad is..." --msgstr "查德（Chad）的首都是..." -+msgstr "查德（Chad）的首都是…" - - #: mapsdatatranslation.cpp:3410 - msgid "" -@@ -20769,7 +20757,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Chad is..." --msgstr "查德（Chad）的國旗是..." -+msgstr "查德（Chad）的國旗是…" - - #: mapsdatatranslation.cpp:3412 - msgid "" -@@ -20793,7 +20781,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Côte d'Ivoire is..." --msgstr "象牙海岸（Côte d'Ivoire）的首都是..." -+msgstr "象牙海岸（Côte d'Ivoire）的首都是…" - - #: mapsdatatranslation.cpp:3416 - msgid "" -@@ -20806,7 +20794,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Côte d'Ivoire is..." --msgstr "象牙海岸（Côte d'Ivoire）的國旗是..." -+msgstr "象牙海岸（Côte d'Ivoire）的國旗是…" - - #: mapsdatatranslation.cpp:3418 - msgid "" -@@ -20830,7 +20818,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Democratic Republic of the Congo is..." --msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是..." -+msgstr "剛果民主共和國（Democratic Republic of the Congo）的首都是…" - - #: mapsdatatranslation.cpp:3422 - msgid "" -@@ -20843,7 +20831,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Democratic Republic of the Congo is..." --msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是..." -+msgstr "剛果民主共和國（Democratic Republic of the Congo）的國旗是…" - - #: mapsdatatranslation.cpp:3424 - msgid "" -@@ -20880,7 +20868,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Djibouti is..." --msgstr "吉布地（Djibouti）的國旗是..." -+msgstr "吉布地（Djibouti）的國旗是…" - - #: mapsdatatranslation.cpp:3431 - msgid "" -@@ -20898,7 +20886,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Egypt is..." --msgstr "埃及（Egypt）的首都是..." -+msgstr "埃及（Egypt）的首都是…" - - #: mapsdatatranslation.cpp:3434 - msgid "" -@@ -20911,7 +20899,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Egypt is..." --msgstr "埃及（Egypt）的國旗是..." -+msgstr "埃及（Egypt）的國旗是…" - - #: mapsdatatranslation.cpp:3436 - msgid "" -@@ -20935,7 +20923,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Equatorial Guinea is..." --msgstr "赤道幾內亞（Equatorial Guinea）的首都是..." -+msgstr "赤道幾內亞（Equatorial Guinea）的首都是…" - - #: mapsdatatranslation.cpp:3440 - msgid "" -@@ -20948,7 +20936,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Equatorial Guinea is..." --msgstr "赤道幾內亞（Equatorial Guinea）的國旗是..." -+msgstr "赤道幾內亞（Equatorial Guinea）的國旗是…" - - #: mapsdatatranslation.cpp:3442 - msgid "" -@@ -20972,7 +20960,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Eritrea is..." --msgstr "厄利垂亞（Eritrea）的首都是..." -+msgstr "厄利垂亞（Eritrea）的首都是…" - - #: mapsdatatranslation.cpp:3446 - msgid "" -@@ -20985,7 +20973,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Eritrea is..." --msgstr "厄利垂亞（Eritrea）的國旗是..." -+msgstr "厄利垂亞（Eritrea）的國旗是…" - - #: mapsdatatranslation.cpp:3448 - msgid "" -@@ -21009,7 +20997,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Ethiopia is..." --msgstr "衣索匹亞（Ethiopia）的首都是..." -+msgstr "衣索匹亞（Ethiopia）的首都是…" - - #: mapsdatatranslation.cpp:3452 - msgid "" -@@ -21022,7 +21010,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Ethiopia is..." --msgstr "衣索匹亞（Ethiopia）的國旗是..." -+msgstr "衣索匹亞（Ethiopia）的國旗是…" - - #: mapsdatatranslation.cpp:3454 - msgid "" -@@ -21046,7 +21034,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Gabon is..." --msgstr "加彭（Gabon）的首都是..." -+msgstr "加彭（Gabon）的首都是…" - - #: mapsdatatranslation.cpp:3458 - msgid "" -@@ -21059,7 +21047,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Gabon is..." --msgstr "加彭（Gabon）的國旗是..." -+msgstr "加彭（Gabon）的國旗是…" - - #: mapsdatatranslation.cpp:3460 - msgid "" -@@ -21083,7 +21071,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Ghana is..." --msgstr "迦納（Ghana）的首都是..." -+msgstr "迦納（Ghana）的首都是…" - - #: mapsdatatranslation.cpp:3464 - msgid "" -@@ -21096,7 +21084,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Ghana is..." --msgstr "迦納（Ghana）的國旗是..." -+msgstr "迦納（Ghana）的國旗是…" - - #: mapsdatatranslation.cpp:3466 - msgid "" -@@ -21108,7 +21096,7 @@ - msgid "" - "_: world.kgm\n" - "Accra is the capital of..." --msgstr "阿克拉（Accra）的首都是..." -+msgstr "阿克拉（Accra）的首都是…" - - #: mapsdatatranslation.cpp:3468 - msgid "" -@@ -21120,7 +21108,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Guinea is..." --msgstr "幾內亞（Guinea）的首都是..." -+msgstr "幾內亞（Guinea）的首都是…" - - #: mapsdatatranslation.cpp:3470 - msgid "" -@@ -21133,7 +21121,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Guinea is..." --msgstr "幾內亞（Guinea）的國旗是..." -+msgstr "幾內亞（Guinea）的國旗是…" - - #: mapsdatatranslation.cpp:3472 - msgid "" -@@ -21157,7 +21145,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Guinea-Bissau is..." --msgstr "幾內亞比索（Guinea-Bissau）的首都是..." -+msgstr "幾內亞比索（Guinea-Bissau）的首都是…" - - #: mapsdatatranslation.cpp:3476 - msgid "" -@@ -21170,7 +21158,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Guinea-Bissau is..." --msgstr "幾內亞比索（Guinea-Bissau）的國旗是..." -+msgstr "幾內亞比索（Guinea-Bissau）的國旗是…" - - #: mapsdatatranslation.cpp:3478 - msgid "" -@@ -21194,7 +21182,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Iran is..." --msgstr "伊朗（Iran）的首都是..." -+msgstr "伊朗（Iran）的首都是…" - - #: mapsdatatranslation.cpp:3482 - msgid "" -@@ -21207,7 +21195,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Iran is..." --msgstr "伊朗（Iran）的國旗是..." -+msgstr "伊朗（Iran）的國旗是…" - - #: mapsdatatranslation.cpp:3484 - msgid "" -@@ -21231,7 +21219,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Iraq is..." --msgstr "伊拉克（Iraq）的首都是..." -+msgstr "伊拉克（Iraq）的首都是…" - - #: mapsdatatranslation.cpp:3488 - msgid "" -@@ -21244,7 +21232,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Iraq is..." --msgstr "伊拉克（Iraq）的國旗是..." -+msgstr "伊拉克（Iraq）的國旗是…" - - #: mapsdatatranslation.cpp:3490 - msgid "" -@@ -21268,7 +21256,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Israel is..." --msgstr "以色列（Israel）的首都是..." -+msgstr "以色列（Israel）的首都是…" - - #: mapsdatatranslation.cpp:3494 - msgid "" -@@ -21281,7 +21269,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Israel is..." --msgstr "以色列（Israel）的國旗是..." -+msgstr "以色列（Israel）的國旗是…" - - #: mapsdatatranslation.cpp:3496 - msgid "" -@@ -21305,7 +21293,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Jordan is..." --msgstr "約旦（Jordan）的首都是..." -+msgstr "約旦（Jordan）的首都是…" - - #: mapsdatatranslation.cpp:3500 - msgid "" -@@ -21318,7 +21306,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Jordan is..." --msgstr "約旦（Jordan）的國旗是..." -+msgstr "約旦（Jordan）的國旗是…" - - #: mapsdatatranslation.cpp:3502 - msgid "" -@@ -21342,7 +21330,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Kenya is..." --msgstr "肯亞（Kenya）的首都是..." -+msgstr "肯亞（Kenya）的首都是…" - - #: mapsdatatranslation.cpp:3506 - msgid "" -@@ -21355,7 +21343,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Kenya is..." --msgstr "肯亞（Kenya）的國旗是..." -+msgstr "肯亞（Kenya）的國旗是…" - - #: mapsdatatranslation.cpp:3508 - msgid "" -@@ -21379,7 +21367,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Kuwait is..." --msgstr "科威特（Kuwait）的首都是..." -+msgstr "科威特（Kuwait）的首都是…" - - #: mapsdatatranslation.cpp:3512 - msgid "" -@@ -21392,7 +21380,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Kuwait is..." --msgstr "科威特（Kuwait）的國旗是..." -+msgstr "科威特（Kuwait）的國旗是…" - - #: mapsdatatranslation.cpp:3514 - msgid "" -@@ -21416,7 +21404,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Lebanon is..." --msgstr "黎巴嫩（Lebanon）的首都是..." -+msgstr "黎巴嫩（Lebanon）的首都是…" - - #: mapsdatatranslation.cpp:3518 - msgid "" -@@ -21429,7 +21417,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Lebanon is..." --msgstr "黎巴嫩（Lebanon）的國旗是..." -+msgstr "黎巴嫩（Lebanon）的國旗是…" - - #: mapsdatatranslation.cpp:3520 - msgid "" -@@ -21453,7 +21441,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Lesotho is..." --msgstr "賴索托（Lesotho）的首都是..." -+msgstr "賴索托（Lesotho）的首都是…" - - #: mapsdatatranslation.cpp:3524 - msgid "" -@@ -21466,7 +21454,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Lesotho is..." --msgstr "賴索托（Lesotho）的國旗是..." -+msgstr "賴索托（Lesotho）的國旗是…" - - #: mapsdatatranslation.cpp:3526 - msgid "" -@@ -21478,7 +21466,7 @@ - msgid "" - "_: world.kgm\n" - "Maseru is the capital of..." --msgstr "馬賽魯（Maseru）的國旗是..." -+msgstr "馬賽魯（Maseru）的國旗是…" - - #: mapsdatatranslation.cpp:3528 - msgid "" -@@ -21490,7 +21478,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Liberia is..." --msgstr "賴比瑞亞（Liberia）的首都是..." -+msgstr "賴比瑞亞（Liberia）的首都是…" - - #: mapsdatatranslation.cpp:3530 - msgid "" -@@ -21503,7 +21491,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Liberia is..." --msgstr "賴比瑞亞（Liberia）的國旗是..." -+msgstr "賴比瑞亞（Liberia）的國旗是…" - - #: mapsdatatranslation.cpp:3532 - msgid "" -@@ -21527,7 +21515,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Libya is..." --msgstr "利比亞（Libya）的首都是..." -+msgstr "利比亞（Libya）的首都是…" - - #: mapsdatatranslation.cpp:3536 - msgid "" -@@ -21540,7 +21528,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Libya is..." --msgstr "利比亞（Libya）的國旗是..." -+msgstr "利比亞（Libya）的國旗是…" - - #: mapsdatatranslation.cpp:3538 - msgid "" -@@ -21564,7 +21552,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Liechtenstein is..." --msgstr "列支敦斯登（Liechtenstein）的首都是..." -+msgstr "列支敦斯登（Liechtenstein）的首都是…" - - #: mapsdatatranslation.cpp:3542 - msgid "" -@@ -21577,7 +21565,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Liechtenstein is..." --msgstr "列支敦斯登（Liechtenstein）的國旗是..." -+msgstr "列支敦斯登（Liechtenstein）的國旗是…" - - #: mapsdatatranslation.cpp:3544 - msgid "" -@@ -21601,7 +21589,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Madagascar is..." --msgstr "馬達加斯加（Madagascar）的首都是..." -+msgstr "馬達加斯加（Madagascar）的首都是…" - - #: mapsdatatranslation.cpp:3548 - msgid "" -@@ -21614,7 +21602,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Madagascar is..." --msgstr "馬達加斯加（Madagascar）的國旗是..." -+msgstr "馬達加斯加（Madagascar）的國旗是…" - - #: mapsdatatranslation.cpp:3550 - msgid "" -@@ -21638,7 +21626,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Malawi is..." --msgstr "馬拉威（Malawi）的首都是..." -+msgstr "馬拉威（Malawi）的首都是…" - - #: mapsdatatranslation.cpp:3554 - msgid "" -@@ -21651,7 +21639,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Malawi is..." --msgstr "馬拉威（Malawi）的國旗是..." -+msgstr "馬拉威（Malawi）的國旗是…" - - #: mapsdatatranslation.cpp:3556 - msgid "" -@@ -21675,7 +21663,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Mali is..." --msgstr "馬利（Mali）的首都是..." -+msgstr "馬利（Mali）的首都是…" - - #: mapsdatatranslation.cpp:3560 - msgid "" -@@ -21688,7 +21676,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Mali is..." --msgstr "馬利（Mali）的國旗是..." -+msgstr "馬利（Mali）的國旗是…" - - #: mapsdatatranslation.cpp:3562 - msgid "" -@@ -21712,7 +21700,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Mauritania is..." --msgstr "茅利塔尼亞（Mauritania）的首都是..." -+msgstr "茅利塔尼亞（Mauritania）的首都是…" - - #: mapsdatatranslation.cpp:3566 - msgid "" -@@ -21725,7 +21713,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Mauritania is..." --msgstr "茅利塔尼亞（Mauritania）的國旗是..." -+msgstr "茅利塔尼亞（Mauritania）的國旗是…" - - #: mapsdatatranslation.cpp:3568 - msgid "" -@@ -21749,7 +21737,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Morocco is..." --msgstr "摩洛哥（Morocco）的首都是..." -+msgstr "摩洛哥（Morocco）的首都是…" - - #: mapsdatatranslation.cpp:3572 - msgid "" -@@ -21762,7 +21750,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Morocco is..." --msgstr "摩洛哥（Morocco）的國旗是..." -+msgstr "摩洛哥（Morocco）的國旗是…" - - #: mapsdatatranslation.cpp:3574 - msgid "" -@@ -21786,7 +21774,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Mozambique is..." --msgstr "莫三比克（Mozambique）的首都是..." -+msgstr "莫三比克（Mozambique）的首都是…" - - #: mapsdatatranslation.cpp:3578 - msgid "" -@@ -21799,7 +21787,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Mozambique is..." --msgstr "莫三比克（Mozambique）的國旗是..." -+msgstr "莫三比克（Mozambique）的國旗是…" - - #: mapsdatatranslation.cpp:3580 - msgid "" -@@ -21823,7 +21811,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Namibia is..." --msgstr "納米比亞（Namibia）的首都是..." -+msgstr "納米比亞（Namibia）的首都是…" - - #: mapsdatatranslation.cpp:3584 - msgid "" -@@ -21836,7 +21824,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Namibia is..." --msgstr "納米比亞（Namibia）的國旗是..." -+msgstr "納米比亞（Namibia）的國旗是…" - - #: mapsdatatranslation.cpp:3586 - msgid "" -@@ -21860,7 +21848,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Niger is..." --msgstr "尼日（Niger）的首都是..." -+msgstr "尼日（Niger）的首都是…" - - #: mapsdatatranslation.cpp:3590 - msgid "" -@@ -21873,7 +21861,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Niger is..." --msgstr "尼日（Niger）的國旗是..." -+msgstr "尼日（Niger）的國旗是…" - - #: mapsdatatranslation.cpp:3592 - msgid "" -@@ -21897,7 +21885,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Nigeria is..." --msgstr "奈及利亞（Nigeria）的首都是..." -+msgstr "奈及利亞（Nigeria）的首都是…" - - #: mapsdatatranslation.cpp:3596 - msgid "" -@@ -21910,7 +21898,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Nigeria is..." --msgstr "奈及利亞（Nigeria）的國旗是..." -+msgstr "奈及利亞（Nigeria）的國旗是…" - - #: mapsdatatranslation.cpp:3598 - msgid "" -@@ -21922,7 +21910,7 @@ - msgid "" - "_: world.kgm\n" - "Abuja is the capital of..." --msgstr "阿布加（Abuja）的國旗是..." -+msgstr "阿布加（Abuja）的國旗是…" - - #: mapsdatatranslation.cpp:3600 - msgid "" -@@ -21934,7 +21922,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Qatar is..." --msgstr "卡達（Qatar）的首都是..." -+msgstr "卡達（Qatar）的首都是…" - - #: mapsdatatranslation.cpp:3602 - msgid "" -@@ -21947,7 +21935,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Qatar is..." --msgstr "卡達（Qatar）的國旗是..." -+msgstr "卡達（Qatar）的國旗是…" - - #: mapsdatatranslation.cpp:3604 - msgid "" -@@ -21971,7 +21959,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Republic of the Congo is..." --msgstr "剛果（Republic of the Congo）的首都是..." -+msgstr "剛果（Republic of the Congo）的首都是…" - - #: mapsdatatranslation.cpp:3608 - msgid "" -@@ -21984,7 +21972,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Republic of the Congo is..." --msgstr "剛果（Republic of the Congo）的國旗是..." -+msgstr "剛果（Republic of the Congo）的國旗是…" - - #: mapsdatatranslation.cpp:3610 - msgid "" -@@ -21996,7 +21984,7 @@ - msgid "" - "_: world.kgm\n" - "Brazzaville is the capital of..." --msgstr "布拉薩市（Brazzaville）的國旗是..." -+msgstr "布拉薩市（Brazzaville）的國旗是…" - - #: mapsdatatranslation.cpp:3612 - msgid "" -@@ -22008,7 +21996,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Rwanda is..." --msgstr "盧安達（Rwanda）的首都是..." -+msgstr "盧安達（Rwanda）的首都是…" - - #: mapsdatatranslation.cpp:3614 - msgid "" -@@ -22021,7 +22009,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Rwanda is..." --msgstr "盧安達（Rwanda）的國旗是..." -+msgstr "盧安達（Rwanda）的國旗是…" - - #: mapsdatatranslation.cpp:3616 - msgid "" -@@ -22045,7 +22033,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Saudi Arabia is..." --msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是..." -+msgstr "沙烏地阿拉伯（Saudi Arabia）的首都是…" - - #: mapsdatatranslation.cpp:3620 - msgid "" -@@ -22058,7 +22046,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Saudi Arabia is..." --msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是..." -+msgstr "沙烏地阿拉伯（Saudi Arabia）的國旗是…" - - #: mapsdatatranslation.cpp:3622 - msgid "" -@@ -22082,7 +22070,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Senegal is..." --msgstr "塞內加爾（Senegal）的首都是..." -+msgstr "塞內加爾（Senegal）的首都是…" - - #: mapsdatatranslation.cpp:3626 - msgid "" -@@ -22095,7 +22083,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Senegal is..." --msgstr "塞內加爾（Senegal）的國旗是..." -+msgstr "塞內加爾（Senegal）的國旗是…" - - #: mapsdatatranslation.cpp:3628 - msgid "" -@@ -22119,7 +22107,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Sierra Leone is..." --msgstr "獅子山共和國（Sierra Leone）的首都是..." -+msgstr "獅子山共和國（Sierra Leone）的首都是…" - - #: mapsdatatranslation.cpp:3632 - msgid "" -@@ -22132,7 +22120,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Sierra Leone is..." --msgstr "獅子山共和國（Sierra Leone）的國旗是..." -+msgstr "獅子山共和國（Sierra Leone）的國旗是…" - - #: mapsdatatranslation.cpp:3634 - msgid "" -@@ -22156,7 +22144,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Somalia is..." --msgstr "索馬利亞（Somalia）的首都是..." -+msgstr "索馬利亞（Somalia）的首都是…" - - #: mapsdatatranslation.cpp:3638 - msgid "" -@@ -22169,7 +22157,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Somalia is..." --msgstr "索馬利亞（Somalia）的國旗是..." -+msgstr "索馬利亞（Somalia）的國旗是…" - - #: mapsdatatranslation.cpp:3640 - msgid "" -@@ -22193,7 +22181,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of South Africa is..." --msgstr "南非（South Africa）的首都是..." -+msgstr "南非（South Africa）的首都是…" - - #: mapsdatatranslation.cpp:3644 - msgid "" -@@ -22206,7 +22194,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of South Africa is..." --msgstr "南非（South Africa）的國旗是..." -+msgstr "南非（South Africa）的國旗是…" - - #: mapsdatatranslation.cpp:3646 - msgid "" -@@ -22230,7 +22218,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Sudan is..." --msgstr "蘇丹（Sudan）的首都是..." -+msgstr "蘇丹（Sudan）的首都是…" - - #: mapsdatatranslation.cpp:3650 - msgid "" -@@ -22243,7 +22231,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Sudan is..." --msgstr "蘇丹（Sudan）的國旗是..." -+msgstr "蘇丹（Sudan）的國旗是…" - - #: mapsdatatranslation.cpp:3652 - msgid "" -@@ -22267,7 +22255,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Swaziland is..." --msgstr "史瓦濟蘭（Swaziland）的首都是..." -+msgstr "史瓦濟蘭（Swaziland）的首都是…" - - #: mapsdatatranslation.cpp:3656 - msgid "" -@@ -22280,7 +22268,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Swaziland is..." --msgstr "史瓦濟蘭（Swaziland）的國旗是..." -+msgstr "史瓦濟蘭（Swaziland）的國旗是…" - - #: mapsdatatranslation.cpp:3658 - msgid "" -@@ -22304,7 +22292,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Syria is..." --msgstr "敘利亞（Syria）的首都是..." -+msgstr "敘利亞（Syria）的首都是…" - - #: mapsdatatranslation.cpp:3662 - msgid "" -@@ -22317,7 +22305,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Syria is..." --msgstr "敘利亞（Syria）的國旗是..." -+msgstr "敘利亞（Syria）的國旗是…" - - #: mapsdatatranslation.cpp:3664 - msgid "" -@@ -22341,7 +22329,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Tanzania is..." --msgstr "坦尚尼亞（Tanzania）的首都是..." -+msgstr "坦尚尼亞（Tanzania）的首都是…" - - #: mapsdatatranslation.cpp:3668 - msgid "" -@@ -22354,7 +22342,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Tanzania is..." --msgstr "坦尚尼亞（Tanzania）的國旗是..." -+msgstr "坦尚尼亞（Tanzania）的國旗是…" - - #: mapsdatatranslation.cpp:3670 - msgid "" -@@ -22378,7 +22366,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of The Gambia is..." --msgstr "甘比亞（The Gambia）的首都是..." -+msgstr "甘比亞（The Gambia）的首都是…" - - #: mapsdatatranslation.cpp:3674 - msgid "" -@@ -22391,7 +22379,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of The Gambia is..." --msgstr "甘比亞（The Gambia）的國旗是..." -+msgstr "甘比亞（The Gambia）的國旗是…" - - #: mapsdatatranslation.cpp:3676 - msgid "" -@@ -22415,7 +22403,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Togo is..." --msgstr "多哥（Togo）的首都是..." -+msgstr "多哥（Togo）的首都是…" - - #: mapsdatatranslation.cpp:3680 - msgid "" -@@ -22428,7 +22416,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Togo is..." --msgstr "多哥（Togo）的國旗是..." -+msgstr "多哥（Togo）的國旗是…" - - #: mapsdatatranslation.cpp:3682 - msgid "" -@@ -22452,7 +22440,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Tunisia is..." --msgstr "突尼西亞（Tunisia）的首都是..." -+msgstr "突尼西亞（Tunisia）的首都是…" - - #: mapsdatatranslation.cpp:3686 - msgid "" -@@ -22465,7 +22453,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Tunisia is..." --msgstr "突尼西亞（Tunisia）的國旗是..." -+msgstr "突尼西亞（Tunisia）的國旗是…" - - #: mapsdatatranslation.cpp:3688 - msgid "" -@@ -22489,7 +22477,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Uganda is..." --msgstr "烏干達（Uganda）的首都是..." -+msgstr "烏干達（Uganda）的首都是…" - - #: mapsdatatranslation.cpp:3692 - msgid "" -@@ -22502,7 +22490,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Uganda is..." --msgstr "烏干達（Uganda）的國旗是..." -+msgstr "烏干達（Uganda）的國旗是…" - - #: mapsdatatranslation.cpp:3694 - msgid "" -@@ -22526,7 +22514,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of United Arab Emirates is..." --msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是..." -+msgstr "阿拉伯聯合大公國（United Arab Emirates）的首都是…" - - #: mapsdatatranslation.cpp:3698 - msgid "" -@@ -22539,7 +22527,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of United Arab Emirates is..." --msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是..." -+msgstr "阿拉伯聯合大公國（United Arab Emirates）的國旗是…" - - #: mapsdatatranslation.cpp:3700 - msgid "" -@@ -22563,7 +22551,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Oman is..." --msgstr "阿曼（Oman）的首都是..." -+msgstr "阿曼（Oman）的首都是…" - - #: mapsdatatranslation.cpp:3704 - msgid "" -@@ -22576,7 +22564,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Oman is..." --msgstr "阿曼（Oman）的國旗是..." -+msgstr "阿曼（Oman）的國旗是…" - - #: mapsdatatranslation.cpp:3706 - msgid "" -@@ -22606,7 +22594,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Western Sahara is..." --msgstr "西撒哈拉（Western Sahara）的首都是..." -+msgstr "西撒哈拉（Western Sahara）的首都是…" - - #: mapsdatatranslation.cpp:3711 - msgid "" -@@ -22619,7 +22607,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Western Sahara is..." --msgstr "西撒哈拉（Western Sahara）的國旗是..." -+msgstr "西撒哈拉（Western Sahara）的國旗是…" - - #: mapsdatatranslation.cpp:3713 - msgid "" -@@ -22643,7 +22631,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Yemen is..." --msgstr "葉門（Yemen）的首都是..." -+msgstr "葉門（Yemen）的首都是…" - - #: mapsdatatranslation.cpp:3717 - msgid "" -@@ -22656,7 +22644,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Yemen is..." --msgstr "葉門（Yemen）的國旗是..." -+msgstr "葉門（Yemen）的國旗是…" - - #: mapsdatatranslation.cpp:3719 - msgid "" -@@ -22680,7 +22668,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Zambia is..." --msgstr "尚比亞（Zambia）的首都是..." -+msgstr "尚比亞（Zambia）的首都是…" - - #: mapsdatatranslation.cpp:3723 - msgid "" -@@ -22693,7 +22681,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Zambia is..." --msgstr "尚比亞（Zambia）的國旗是..." -+msgstr "尚比亞（Zambia）的國旗是…" - - #: mapsdatatranslation.cpp:3725 - msgid "" -@@ -22717,7 +22705,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Zimbabwe is..." --msgstr "辛巴威（Zimbabwe）的首都是..." -+msgstr "辛巴威（Zimbabwe）的首都是…" - - #: mapsdatatranslation.cpp:3729 - msgid "" -@@ -22730,7 +22718,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Zimbabwe is..." --msgstr "辛巴威（Zimbabwe）的國旗是..." -+msgstr "辛巴威（Zimbabwe）的國旗是…" - - #: mapsdatatranslation.cpp:3731 - msgid "" -@@ -22754,7 +22742,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Albania is..." --msgstr "阿爾巴尼亞（Albania）的首都是..." -+msgstr "阿爾巴尼亞（Albania）的首都是…" - - #: mapsdatatranslation.cpp:3735 - msgid "" -@@ -22767,7 +22755,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Albania is..." --msgstr "阿爾巴尼亞（Albania）的國旗是..." -+msgstr "阿爾巴尼亞（Albania）的國旗是…" - - #: mapsdatatranslation.cpp:3737 - msgid "" -@@ -22791,7 +22779,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Austria is..." --msgstr "奧地利（Austria）的首都是..." -+msgstr "奧地利（Austria）的首都是…" - - #: mapsdatatranslation.cpp:3741 - msgid "" -@@ -22804,7 +22792,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Austria is..." --msgstr "奧地利（Austria）的國旗是..." -+msgstr "奧地利（Austria）的國旗是…" - - #: mapsdatatranslation.cpp:3743 - msgid "" -@@ -22828,7 +22816,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Belarus is..." --msgstr "白俄羅斯（Belarus）的首都是..." -+msgstr "白俄羅斯（Belarus）的首都是…" - - #: mapsdatatranslation.cpp:3747 - msgid "" -@@ -22841,7 +22829,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Belarus is..." --msgstr "白俄羅斯（Belarus）的國旗是..." -+msgstr "白俄羅斯（Belarus）的國旗是…" - - #: mapsdatatranslation.cpp:3749 - msgid "" -@@ -22865,7 +22853,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Belgium is..." --msgstr "比利時（Belgium）的首都是..." -+msgstr "比利時（Belgium）的首都是…" - - #: mapsdatatranslation.cpp:3753 - msgid "" -@@ -22878,7 +22866,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Belgium is..." --msgstr "比利時（Belgium）的國旗是..." -+msgstr "比利時（Belgium）的國旗是…" - - #: mapsdatatranslation.cpp:3755 - msgid "" -@@ -22902,7 +22890,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bosnia and Herzegovina is..." --msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是..." -+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的首都是…" - - #: mapsdatatranslation.cpp:3759 - msgid "" -@@ -22915,7 +22903,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bosnia and Herzegovina is..." --msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是..." -+msgstr "波士尼亞赫塞哥維納（Bosnia and Herzegovina）的國旗是…" - - #: mapsdatatranslation.cpp:3761 - msgid "" -@@ -22939,7 +22927,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bulgaria is..." --msgstr "保加利亞（Bulgaria）的首都是..." -+msgstr "保加利亞（Bulgaria）的首都是…" - - #: mapsdatatranslation.cpp:3765 - msgid "" -@@ -22952,7 +22940,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bulgaria is..." --msgstr "保加利亞（Bulgaria）的國旗是..." -+msgstr "保加利亞（Bulgaria）的國旗是…" - - #: mapsdatatranslation.cpp:3767 - msgid "" -@@ -22964,7 +22952,7 @@ - msgid "" - "_: world.kgm\n" - "Sofia is the capital of..." --msgstr "索菲亞（Sofia）的國旗是..." -+msgstr "索菲亞（Sofia）的國旗是…" - - #: mapsdatatranslation.cpp:3769 - msgid "" -@@ -22976,7 +22964,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Croatia is..." --msgstr "克羅埃西亞（Croatia）的首都是..." -+msgstr "克羅埃西亞（Croatia）的首都是…" - - #: mapsdatatranslation.cpp:3771 - msgid "" -@@ -22989,7 +22977,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Croatia is..." --msgstr "克羅埃西亞（Croatia）的國旗是..." -+msgstr "克羅埃西亞（Croatia）的國旗是…" - - #: mapsdatatranslation.cpp:3773 - msgid "" -@@ -23013,7 +23001,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Czech Republic is..." --msgstr "捷克（Czech Republic）的首都是..." -+msgstr "捷克（Czech Republic）的首都是…" - - #: mapsdatatranslation.cpp:3777 - msgid "" -@@ -23026,7 +23014,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Czech Republic is..." --msgstr "捷克（Czech Republic）的國旗是..." -+msgstr "捷克（Czech Republic）的國旗是…" - - #: mapsdatatranslation.cpp:3779 - msgid "" -@@ -23050,7 +23038,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Denmark is..." --msgstr "丹麥（Denmark）的首都是..." -+msgstr "丹麥（Denmark）的首都是…" - - #: mapsdatatranslation.cpp:3783 - msgid "" -@@ -23063,7 +23051,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Denmark is..." --msgstr "丹麥（Denmark）的國旗是..." -+msgstr "丹麥（Denmark）的國旗是…" - - #: mapsdatatranslation.cpp:3785 - msgid "" -@@ -23087,7 +23075,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Estonia is..." --msgstr "愛沙尼亞（Estonia）的首都是..." -+msgstr "愛沙尼亞（Estonia）的首都是…" - - #: mapsdatatranslation.cpp:3789 - msgid "" -@@ -23100,7 +23088,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Estonia is..." --msgstr "愛沙尼亞（Estonia）的國旗是..." -+msgstr "愛沙尼亞（Estonia）的國旗是…" - - #: mapsdatatranslation.cpp:3791 - msgid "" -@@ -23124,7 +23112,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Finland is..." --msgstr "芬蘭（Finland）的首都是..." -+msgstr "芬蘭（Finland）的首都是…" - - #: mapsdatatranslation.cpp:3795 - msgid "" -@@ -23137,7 +23125,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Finland is..." --msgstr "芬蘭（Finland）的國旗是..." -+msgstr "芬蘭（Finland）的國旗是…" - - #: mapsdatatranslation.cpp:3797 - msgid "" -@@ -23161,7 +23149,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Macedonia is..." --msgstr "馬其頓（Macedonia）的首都是..." -+msgstr "馬其頓（Macedonia）的首都是…" - - #: mapsdatatranslation.cpp:3801 - msgid "" -@@ -23174,7 +23162,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Macedonia is..." --msgstr "馬其頓（Macedonia）的國旗是..." -+msgstr "馬其頓（Macedonia）的國旗是…" - - #: mapsdatatranslation.cpp:3803 - msgid "" -@@ -23198,7 +23186,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of France is..." --msgstr "法蘭西（France）的首都是..." -+msgstr "法蘭西（France）的首都是…" - - #: mapsdatatranslation.cpp:3807 - msgid "" -@@ -23211,7 +23199,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of France is..." --msgstr "法蘭西（France）的國旗是..." -+msgstr "法蘭西（France）的國旗是…" - - #: mapsdatatranslation.cpp:3809 - msgid "" -@@ -23235,7 +23223,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Germany is..." --msgstr "德意志（Germany）的首都是..." -+msgstr "德意志（Germany）的首都是…" - - #: mapsdatatranslation.cpp:3813 - msgid "" -@@ -23248,7 +23236,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Germany is..." --msgstr "德意志（Germany）的國旗是..." -+msgstr "德意志（Germany）的國旗是…" - - #: mapsdatatranslation.cpp:3815 - msgid "" -@@ -23272,7 +23260,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Greece is..." --msgstr "希臘（Greece）的首都是..." -+msgstr "希臘（Greece）的首都是…" - - #: mapsdatatranslation.cpp:3819 - msgid "" -@@ -23285,7 +23273,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Greece is..." --msgstr "希臘（Greece）的國旗是..." -+msgstr "希臘（Greece）的國旗是…" - - #: mapsdatatranslation.cpp:3821 - msgid "" -@@ -23309,7 +23297,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Hungary is..." --msgstr "匈牙利（Hungary）的首都是..." -+msgstr "匈牙利（Hungary）的首都是…" - - #: mapsdatatranslation.cpp:3825 - msgid "" -@@ -23322,7 +23310,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Hungary is..." --msgstr "匈牙利（Hungary）的國旗是..." -+msgstr "匈牙利（Hungary）的國旗是…" - - #: mapsdatatranslation.cpp:3827 - msgid "" -@@ -23346,7 +23334,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Iceland is..." --msgstr "冰島（Iceland）的首都是..." -+msgstr "冰島（Iceland）的首都是…" - - #: mapsdatatranslation.cpp:3831 - msgid "" -@@ -23359,7 +23347,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Iceland is..." --msgstr "冰島（Iceland）的國旗是..." -+msgstr "冰島（Iceland）的國旗是…" - - #: mapsdatatranslation.cpp:3833 - msgid "" -@@ -23383,7 +23371,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Ireland is..." --msgstr "愛爾蘭（Ireland）的首都是..." -+msgstr "愛爾蘭（Ireland）的首都是…" - - #: mapsdatatranslation.cpp:3837 - msgid "" -@@ -23396,7 +23384,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Ireland is..." --msgstr "愛爾蘭（Ireland）的國旗是..." -+msgstr "愛爾蘭（Ireland）的國旗是…" - - #: mapsdatatranslation.cpp:3839 - msgid "" -@@ -23420,7 +23408,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Italy is..." --msgstr "義大利（Italy）的首都是..." -+msgstr "義大利（Italy）的首都是…" - - #: mapsdatatranslation.cpp:3843 - msgid "" -@@ -23433,7 +23421,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Italy is..." --msgstr "義大利（Italy）的國旗是..." -+msgstr "義大利（Italy）的國旗是…" - - #: mapsdatatranslation.cpp:3845 - msgid "" -@@ -23457,7 +23445,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Latvia is..." --msgstr "拉脫維亞（Latvia）的首都是..." -+msgstr "拉脫維亞（Latvia）的首都是…" - - #: mapsdatatranslation.cpp:3849 - msgid "" -@@ -23470,7 +23458,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Latvia is..." --msgstr "拉脫維亞（Latvia）的國旗是..." -+msgstr "拉脫維亞（Latvia）的國旗是…" - - #: mapsdatatranslation.cpp:3851 - msgid "" -@@ -23494,7 +23482,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Lithuania is..." --msgstr "立陶宛（Lithuania）的首都是..." -+msgstr "立陶宛（Lithuania）的首都是…" - - #: mapsdatatranslation.cpp:3855 - msgid "" -@@ -23507,7 +23495,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Lithuania is..." --msgstr "立陶宛（Lithuania）的國旗是..." -+msgstr "立陶宛（Lithuania）的國旗是…" - - #: mapsdatatranslation.cpp:3857 - msgid "" -@@ -23531,7 +23519,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Luxembourg is..." --msgstr "盧森堡（Luxembourg）的首都是..." -+msgstr "盧森堡（Luxembourg）的首都是…" - - #: mapsdatatranslation.cpp:3861 - msgid "" -@@ -23544,7 +23532,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Luxembourg is..." --msgstr "盧森堡（Luxembourg）的國旗是..." -+msgstr "盧森堡（Luxembourg）的國旗是…" - - #: mapsdatatranslation.cpp:3864 - msgid "" -@@ -23562,7 +23550,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Moldova is..." --msgstr "摩爾多瓦（Moldova）的首都是..." -+msgstr "摩爾多瓦（Moldova）的首都是…" - - #: mapsdatatranslation.cpp:3867 - msgid "" -@@ -23575,7 +23563,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Moldova is..." --msgstr "摩爾多瓦（Moldova）的國旗是..." -+msgstr "摩爾多瓦（Moldova）的國旗是…" - - #: mapsdatatranslation.cpp:3869 - msgid "" -@@ -23599,7 +23587,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Netherlands is..." --msgstr "荷蘭（Netherlands）的首都是..." -+msgstr "荷蘭（Netherlands）的首都是…" - - #: mapsdatatranslation.cpp:3873 - msgid "" -@@ -23612,7 +23600,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Netherlands is..." --msgstr "荷蘭（Netherlands）的國旗是..." -+msgstr "荷蘭（Netherlands）的國旗是…" - - #: mapsdatatranslation.cpp:3875 - msgid "" -@@ -23636,7 +23624,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Norway is..." --msgstr "挪威（Norway）的首都是..." -+msgstr "挪威（Norway）的首都是…" - - #: mapsdatatranslation.cpp:3879 - msgid "" -@@ -23649,7 +23637,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Norway is..." --msgstr "挪威（Norway）的國旗是..." -+msgstr "挪威（Norway）的國旗是…" - - #: mapsdatatranslation.cpp:3881 - msgid "" -@@ -23673,7 +23661,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Poland is..." --msgstr "波蘭（Poland）的首都是..." -+msgstr "波蘭（Poland）的首都是…" - - #: mapsdatatranslation.cpp:3885 - msgid "" -@@ -23686,7 +23674,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Poland is..." --msgstr "波蘭（Poland）的國旗是..." -+msgstr "波蘭（Poland）的國旗是…" - - #: mapsdatatranslation.cpp:3887 - msgid "" -@@ -23710,7 +23698,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Portugal is..." --msgstr "葡萄牙（Portugal）的首都是..." -+msgstr "葡萄牙（Portugal）的首都是…" - - #: mapsdatatranslation.cpp:3891 - msgid "" -@@ -23723,7 +23711,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Portugal is..." --msgstr "葡萄牙（Portugal）的國旗是..." -+msgstr "葡萄牙（Portugal）的國旗是…" - - #: mapsdatatranslation.cpp:3893 - msgid "" -@@ -23747,7 +23735,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Romania is..." --msgstr "羅馬尼亞（Romania）的首都是..." -+msgstr "羅馬尼亞（Romania）的首都是…" - - #: mapsdatatranslation.cpp:3897 - msgid "" -@@ -23760,7 +23748,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Romania is..." --msgstr "羅馬尼亞（Romania）的國旗是..." -+msgstr "羅馬尼亞（Romania）的國旗是…" - - #: mapsdatatranslation.cpp:3899 - msgid "" -@@ -23784,7 +23772,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Russia is..." --msgstr "俄羅斯（Russia）的首都是..." -+msgstr "俄羅斯（Russia）的首都是…" - - #: mapsdatatranslation.cpp:3903 - msgid "" -@@ -23797,7 +23785,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Russia is..." --msgstr "俄羅斯（Russia）的國旗是..." -+msgstr "俄羅斯（Russia）的國旗是…" - - #: mapsdatatranslation.cpp:3905 - msgid "" -@@ -23821,7 +23809,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of San Marino is..." --msgstr "聖馬利諾（San Marino）的首都是..." -+msgstr "聖馬利諾（San Marino）的首都是…" - - #: mapsdatatranslation.cpp:3909 - msgid "" -@@ -23834,7 +23822,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of San Marino is..." --msgstr "聖馬利諾（San Marino）的國旗是..." -+msgstr "聖馬利諾（San Marino）的國旗是…" - - #: mapsdatatranslation.cpp:3912 - msgid "" -@@ -23852,7 +23840,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Serbia is..." --msgstr "塞爾維亞（Serbia）的首都是..." -+msgstr "塞爾維亞（Serbia）的首都是…" - - #: mapsdatatranslation.cpp:3915 - msgid "" -@@ -23865,7 +23853,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Serbia is..." --msgstr "塞爾維亞（Serbia）的國旗是..." -+msgstr "塞爾維亞（Serbia）的國旗是…" - - #: mapsdatatranslation.cpp:3917 - msgid "" -@@ -23889,7 +23877,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Montenegro is..." --msgstr "蒙特內哥羅（Montenegro）的首都是..." -+msgstr "蒙特內哥羅（Montenegro）的首都是…" - - #: mapsdatatranslation.cpp:3921 - msgid "" -@@ -23902,7 +23890,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Montenegro is..." --msgstr "蒙特內哥羅（Montenegro）的國旗是..." -+msgstr "蒙特內哥羅（Montenegro）的國旗是…" - - #: mapsdatatranslation.cpp:3923 - msgid "" -@@ -23926,7 +23914,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Slovakia is..." --msgstr "斯洛伐克（Slovakia）的首都是..." -+msgstr "斯洛伐克（Slovakia）的首都是…" - - #: mapsdatatranslation.cpp:3927 - msgid "" -@@ -23939,7 +23927,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Slovakia is..." --msgstr "斯洛伐克（Slovakia）的國旗是..." -+msgstr "斯洛伐克（Slovakia）的國旗是…" - - #: mapsdatatranslation.cpp:3929 - msgid "" -@@ -23963,7 +23951,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Slovenia is..." --msgstr "斯洛伐尼亞（Slovenia）的首都是..." -+msgstr "斯洛伐尼亞（Slovenia）的首都是…" - - #: mapsdatatranslation.cpp:3933 - msgid "" -@@ -23976,7 +23964,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Slovenia is..." --msgstr "斯洛伐尼亞（Slovenia）的國旗是..." -+msgstr "斯洛伐尼亞（Slovenia）的國旗是…" - - #: mapsdatatranslation.cpp:3935 - msgid "" -@@ -24000,7 +23988,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Spain is..." --msgstr "西班牙（Spain）的首都是..." -+msgstr "西班牙（Spain）的首都是…" - - #: mapsdatatranslation.cpp:3939 - msgid "" -@@ -24013,7 +24001,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Spain is..." --msgstr "西班牙（Spain）的國旗是..." -+msgstr "西班牙（Spain）的國旗是…" - - #: mapsdatatranslation.cpp:3941 - msgid "" -@@ -24037,7 +24025,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Sweden is..." --msgstr "瑞典（Sweden）的首都是..." -+msgstr "瑞典（Sweden）的首都是…" - - #: mapsdatatranslation.cpp:3945 - msgid "" -@@ -24050,7 +24038,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Sweden is..." --msgstr "瑞典（Sweden）的國旗是..." -+msgstr "瑞典（Sweden）的國旗是…" - - #: mapsdatatranslation.cpp:3947 - msgid "" -@@ -24074,7 +24062,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Switzerland is..." --msgstr "瑞士（Switzerland）的首都是..." -+msgstr "瑞士（Switzerland）的首都是…" - - #: mapsdatatranslation.cpp:3951 - msgid "" -@@ -24087,7 +24075,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Switzerland is..." --msgstr "瑞士（Switzerland）的國旗是..." -+msgstr "瑞士（Switzerland）的國旗是…" - - #: mapsdatatranslation.cpp:3953 - msgid "" -@@ -24111,7 +24099,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Turkey is..." --msgstr "土耳其（Turkey）的首都是..." -+msgstr "土耳其（Turkey）的首都是…" - - #: mapsdatatranslation.cpp:3957 - msgid "" -@@ -24124,7 +24112,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Turkey is..." --msgstr "土耳其（Turkey）的國旗是..." -+msgstr "土耳其（Turkey）的國旗是…" - - #: mapsdatatranslation.cpp:3959 - msgid "" -@@ -24148,7 +24136,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Ukraine is..." --msgstr "烏克蘭（Ukraine）的首都是..." -+msgstr "烏克蘭（Ukraine）的首都是…" - - #: mapsdatatranslation.cpp:3963 - msgid "" -@@ -24161,7 +24149,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Ukraine is..." --msgstr "烏克蘭（Ukraine）的國旗是..." -+msgstr "烏克蘭（Ukraine）的國旗是…" - - #: mapsdatatranslation.cpp:3965 - msgid "" -@@ -24185,7 +24173,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of United Kingdom is..." --msgstr "大英國協（United Kingdom）的首都是..." -+msgstr "大英國協（United Kingdom）的首都是…" - - #: mapsdatatranslation.cpp:3969 - msgid "" -@@ -24198,7 +24186,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of United Kingdom is..." --msgstr "大英國協（United Kingdom）的國旗是..." -+msgstr "大英國協（United Kingdom）的國旗是…" - - #: mapsdatatranslation.cpp:3971 - msgid "" -@@ -24222,7 +24210,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Canada is..." --msgstr "加拿大（Canada）的首都是..." -+msgstr "加拿大（Canada）的首都是…" - - #: mapsdatatranslation.cpp:3975 - msgid "" -@@ -24235,7 +24223,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Canada is..." --msgstr "加拿大（Canada）的國旗是..." -+msgstr "加拿大（Canada）的國旗是…" - - #: mapsdatatranslation.cpp:3977 - msgid "" -@@ -24259,7 +24247,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of El Salvador is..." --msgstr "薩爾瓦多（El Salvador）的首都是..." -+msgstr "薩爾瓦多（El Salvador）的首都是…" - - #: mapsdatatranslation.cpp:3981 - msgid "" -@@ -24272,7 +24260,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of El Salvador is..." --msgstr "薩爾瓦多（El Salvador）的國旗是..." -+msgstr "薩爾瓦多（El Salvador）的國旗是…" - - #: mapsdatatranslation.cpp:3983 - msgid "" -@@ -24296,7 +24284,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of The United States of America is..." --msgstr "美利堅合眾國（The United States of America）的首都是..." -+msgstr "美利堅合眾國（The United States of America）的首都是…" - - #: mapsdatatranslation.cpp:3987 - msgid "" -@@ -24309,7 +24297,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of The United States of America is..." --msgstr "美利堅合眾國（The United States of America）的國旗是..." -+msgstr "美利堅合眾國（The United States of America）的國旗是…" - - #: mapsdatatranslation.cpp:3989 - msgid "" -@@ -24333,7 +24321,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of The Bahamas is..." --msgstr "巴哈馬（The Bahamas）的首都是..." -+msgstr "巴哈馬（The Bahamas）的首都是…" - - #: mapsdatatranslation.cpp:3993 - msgid "" -@@ -24346,7 +24334,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of The Bahamas is..." --msgstr "巴哈馬（The Bahamas）的國旗是..." -+msgstr "巴哈馬（The Bahamas）的國旗是…" - - #: mapsdatatranslation.cpp:3995 - msgid "" -@@ -24370,7 +24358,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of The Dominican Republic is..." --msgstr "多明尼加（The Dominican Republic）的首都是..." -+msgstr "多明尼加（The Dominican Republic）的首都是…" - - #: mapsdatatranslation.cpp:3999 - msgid "" -@@ -24383,7 +24371,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of The Dominican Republic is..." --msgstr "多明尼加（The Dominican Republic）的國旗是..." -+msgstr "多明尼加（The Dominican Republic）的國旗是…" - - #: mapsdatatranslation.cpp:4001 - msgid "" -@@ -24407,7 +24395,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Haiti is..." --msgstr "海地（Haiti）的首都是..." -+msgstr "海地（Haiti）的首都是…" - - #: mapsdatatranslation.cpp:4005 - msgid "" -@@ -24420,7 +24408,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Haiti is..." --msgstr "海地（Haiti）的國旗是..." -+msgstr "海地（Haiti）的國旗是…" - - #: mapsdatatranslation.cpp:4007 - msgid "" -@@ -24444,7 +24432,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Cuba is..." --msgstr "古巴（Cuba）的首都是..." -+msgstr "古巴（Cuba）的首都是…" - - #: mapsdatatranslation.cpp:4011 - msgid "" -@@ -24457,7 +24445,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Cuba is..." --msgstr "古巴（Cuba）的國旗是..." -+msgstr "古巴（Cuba）的國旗是…" - - #: mapsdatatranslation.cpp:4013 - msgid "" -@@ -24481,7 +24469,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Jamaica is..." --msgstr "牙買加（Jamaica）的首都是..." -+msgstr "牙買加（Jamaica）的首都是…" - - #: mapsdatatranslation.cpp:4017 - msgid "" -@@ -24494,7 +24482,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Jamaica is..." --msgstr "牙買加（Jamaica）的國旗是..." -+msgstr "牙買加（Jamaica）的國旗是…" - - #: mapsdatatranslation.cpp:4019 - msgid "" -@@ -24518,7 +24506,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Dominica is..." --msgstr "多米尼克（Dominica）的首都是..." -+msgstr "多米尼克（Dominica）的首都是…" - - #: mapsdatatranslation.cpp:4023 - msgid "" -@@ -24531,7 +24519,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Dominica is..." --msgstr "多米尼克（Dominica）的國旗是..." -+msgstr "多米尼克（Dominica）的國旗是…" - - #: mapsdatatranslation.cpp:4025 - msgid "" -@@ -24555,7 +24543,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Barbados is..." --msgstr "巴貝多（Barbados）的首都是..." -+msgstr "巴貝多（Barbados）的首都是…" - - #: mapsdatatranslation.cpp:4029 - msgid "" -@@ -24568,7 +24556,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Barbados is..." --msgstr "巴貝多（Barbados）的國旗是..." -+msgstr "巴貝多（Barbados）的國旗是…" - - #: mapsdatatranslation.cpp:4031 - msgid "" -@@ -24592,7 +24580,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Antigua and Barbuda is..." --msgstr "安地卡（Antigua and Barbuda）的首都是..." -+msgstr "安地卡（Antigua and Barbuda）的首都是…" - - #: mapsdatatranslation.cpp:4035 - msgid "" -@@ -24605,7 +24593,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Antigua and Barbuda is..." --msgstr "安地卡（Antigua and Barbuda）的國旗是..." -+msgstr "安地卡（Antigua and Barbuda）的國旗是…" - - #: mapsdatatranslation.cpp:4037 - msgid "" -@@ -24629,7 +24617,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Trinidad and Tobago is..." --msgstr "千里達（Trinidad and Tobago）的首都是..." -+msgstr "千里達（Trinidad and Tobago）的首都是…" - - #: mapsdatatranslation.cpp:4041 - msgid "" -@@ -24642,7 +24630,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Trinidad and Tobago is..." --msgstr "千里達（Trinidad and Tobago）的國旗是..." -+msgstr "千里達（Trinidad and Tobago）的國旗是…" - - #: mapsdatatranslation.cpp:4043 - msgid "" -@@ -24666,7 +24654,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Mexico is..." --msgstr "墨西哥（Mexico）的首都是..." -+msgstr "墨西哥（Mexico）的首都是…" - - #: mapsdatatranslation.cpp:4047 - msgid "" -@@ -24679,7 +24667,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Mexico is..." --msgstr "墨西哥（Mexico）的國旗是..." -+msgstr "墨西哥（Mexico）的國旗是…" - - #: mapsdatatranslation.cpp:4049 - msgid "" -@@ -24703,7 +24691,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Guatemala is..." --msgstr "瓜地馬拉（Guatemala）的首都是..." -+msgstr "瓜地馬拉（Guatemala）的首都是…" - - #: mapsdatatranslation.cpp:4053 - msgid "" -@@ -24716,7 +24704,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Guatemala is..." --msgstr "瓜地馬拉（Guatemala）的國旗是..." -+msgstr "瓜地馬拉（Guatemala）的國旗是…" - - #: mapsdatatranslation.cpp:4055 - msgid "" -@@ -24740,7 +24728,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Belize is..." --msgstr "貝里斯（Belize）的首都是..." -+msgstr "貝里斯（Belize）的首都是…" - - #: mapsdatatranslation.cpp:4059 - msgid "" -@@ -24753,7 +24741,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Belize is..." --msgstr "貝里斯（Belize）的國旗是..." -+msgstr "貝里斯（Belize）的國旗是…" - - #: mapsdatatranslation.cpp:4061 - msgid "" -@@ -24777,7 +24765,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Honduras is..." --msgstr "宏都拉斯（Honduras）的首都是..." -+msgstr "宏都拉斯（Honduras）的首都是…" - - #: mapsdatatranslation.cpp:4065 - msgid "" -@@ -24790,7 +24778,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Honduras is..." --msgstr "宏都拉斯（Honduras）的國旗是..." -+msgstr "宏都拉斯（Honduras）的國旗是…" - - #: mapsdatatranslation.cpp:4067 - msgid "" -@@ -24814,7 +24802,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Nicaragua is..." --msgstr "尼加拉瓜（Nicaragua）的首都是..." -+msgstr "尼加拉瓜（Nicaragua）的首都是…" - - #: mapsdatatranslation.cpp:4071 - msgid "" -@@ -24827,7 +24815,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Nicaragua is..." --msgstr "尼加拉瓜（Nicaragua）的國旗是..." -+msgstr "尼加拉瓜（Nicaragua）的國旗是…" - - #: mapsdatatranslation.cpp:4073 - msgid "" -@@ -24851,7 +24839,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Costa Rica is..." --msgstr "哥斯大黎加（Costa Rica）的首都是..." -+msgstr "哥斯大黎加（Costa Rica）的首都是…" - - #: mapsdatatranslation.cpp:4077 - msgid "" -@@ -24864,7 +24852,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Costa Rica is..." --msgstr "哥斯大黎加（Costa Rica）的國旗是..." -+msgstr "哥斯大黎加（Costa Rica）的國旗是…" - - #: mapsdatatranslation.cpp:4079 - msgid "" -@@ -24888,7 +24876,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Panama is..." --msgstr "巴拿馬（Panama）的首都是..." -+msgstr "巴拿馬（Panama）的首都是…" - - #: mapsdatatranslation.cpp:4083 - msgid "" -@@ -24901,7 +24889,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Panama is..." --msgstr "巴拿馬（Panama）的國旗是..." -+msgstr "巴拿馬（Panama）的國旗是…" - - #: mapsdatatranslation.cpp:4085 - msgid "" -@@ -24925,7 +24913,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Colombia is..." --msgstr "哥倫比亞（Colombia）的首都是..." -+msgstr "哥倫比亞（Colombia）的首都是…" - - #: mapsdatatranslation.cpp:4089 - msgid "" -@@ -24938,7 +24926,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Colombia is..." --msgstr "哥倫比亞（Colombia）的國旗是..." -+msgstr "哥倫比亞（Colombia）的國旗是…" - - #: mapsdatatranslation.cpp:4091 - msgid "" -@@ -24962,7 +24950,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Venezuela is..." --msgstr "委內瑞拉（Venezuela）的首都是..." -+msgstr "委內瑞拉（Venezuela）的首都是…" - - #: mapsdatatranslation.cpp:4095 - msgid "" -@@ -24975,7 +24963,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Venezuela is..." --msgstr "委內瑞拉（Venezuela）的國旗是..." -+msgstr "委內瑞拉（Venezuela）的國旗是…" - - #: mapsdatatranslation.cpp:4097 - msgid "" -@@ -24999,7 +24987,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Guyana is..." --msgstr "蓋亞那（Guyana）的首都是..." -+msgstr "蓋亞那（Guyana）的首都是…" - - #: mapsdatatranslation.cpp:4101 - msgid "" -@@ -25012,7 +25000,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Guyana is..." --msgstr "蓋亞那（Guyana）的國旗是..." -+msgstr "蓋亞那（Guyana）的國旗是…" - - #: mapsdatatranslation.cpp:4103 - msgid "" -@@ -25036,7 +25024,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Suriname is..." --msgstr "蘇利南（Suriname）的首都是..." -+msgstr "蘇利南（Suriname）的首都是…" - - #: mapsdatatranslation.cpp:4107 - msgid "" -@@ -25049,7 +25037,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Suriname is..." --msgstr "蘇利南（Suriname）的國旗是..." -+msgstr "蘇利南（Suriname）的國旗是…" - - #: mapsdatatranslation.cpp:4109 - msgid "" -@@ -25073,7 +25061,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of French Guiana is..." --msgstr "法屬蓋亞那（French Guiana）的首都是..." -+msgstr "法屬蓋亞那（French Guiana）的首都是…" - - #: mapsdatatranslation.cpp:4113 - msgid "" -@@ -25086,7 +25074,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of French Guiana is..." --msgstr "法屬蓋亞那（French Guiana）的國旗是..." -+msgstr "法屬蓋亞那（French Guiana）的國旗是…" - - #: mapsdatatranslation.cpp:4115 - msgid "" -@@ -25110,7 +25098,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Ecuador is..." --msgstr "厄瓜多（Ecuador）的首都是..." -+msgstr "厄瓜多（Ecuador）的首都是…" - - #: mapsdatatranslation.cpp:4119 - msgid "" -@@ -25123,7 +25111,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Ecuador is..." --msgstr "厄瓜多（Ecuador）的國旗是..." -+msgstr "厄瓜多（Ecuador）的國旗是…" - - #: mapsdatatranslation.cpp:4121 - msgid "" -@@ -25141,26 +25129,26 @@ - msgid "" - "_: world.kgm\n" - "Peru" --msgstr "秘魯（Peru）" -+msgstr "祕魯（Peru）" - - #: mapsdatatranslation.cpp:4124 - msgid "" - "_: world.kgm\n" - "The capital of Peru is..." --msgstr "秘魯（Peru）的首都是..." -+msgstr "祕魯（Peru）的首都是…" - - #: mapsdatatranslation.cpp:4125 - msgid "" - "_: world.kgm\n" - "Please click on:\n" - "Peru" --msgstr "請點選：秘魯（Peru）" -+msgstr "請點選：祕魯（Peru）" - - #: mapsdatatranslation.cpp:4126 - msgid "" - "_: world.kgm\n" - "The flag of Peru is..." --msgstr "秘魯（Peru）的國旗是..." -+msgstr "祕魯（Peru）的國旗是…" - - #: mapsdatatranslation.cpp:4127 - msgid "" -@@ -25184,7 +25172,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Brazil is..." --msgstr "巴西（Brazil）的首都是..." -+msgstr "巴西（Brazil）的首都是…" - - #: mapsdatatranslation.cpp:4131 - msgid "" -@@ -25197,7 +25185,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Brazil is..." --msgstr "巴西（Brazil）的國旗是..." -+msgstr "巴西（Brazil）的國旗是…" - - #: mapsdatatranslation.cpp:4133 - msgid "" -@@ -25221,7 +25209,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bolivia is..." --msgstr "玻利維亞（Bolivia）的首都是..." -+msgstr "玻利維亞（Bolivia）的首都是…" - - #: mapsdatatranslation.cpp:4137 - msgid "" -@@ -25234,7 +25222,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bolivia is..." --msgstr "玻利維亞（Bolivia）的國旗是..." -+msgstr "玻利維亞（Bolivia）的國旗是…" - - #: mapsdatatranslation.cpp:4139 - msgid "" -@@ -25258,7 +25246,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Chile is..." --msgstr "智利（Chile）的首都是..." -+msgstr "智利（Chile）的首都是…" - - #: mapsdatatranslation.cpp:4143 - msgid "" -@@ -25271,7 +25259,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Chile is..." --msgstr "智利（Chile）的國旗是..." -+msgstr "智利（Chile）的國旗是…" - - #: mapsdatatranslation.cpp:4145 - msgid "" -@@ -25295,7 +25283,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Paraguay is..." --msgstr "巴拉圭（Paraguay）的首都是..." -+msgstr "巴拉圭（Paraguay）的首都是…" - - #: mapsdatatranslation.cpp:4149 - msgid "" -@@ -25308,7 +25296,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Paraguay is..." --msgstr "巴拉圭（Paraguay）的國旗是..." -+msgstr "巴拉圭（Paraguay）的國旗是…" - - #: mapsdatatranslation.cpp:4151 - msgid "" -@@ -25332,7 +25320,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Argentina is..." --msgstr "阿根廷（Argentina）的首都是..." -+msgstr "阿根廷（Argentina）的首都是…" - - #: mapsdatatranslation.cpp:4155 - msgid "" -@@ -25345,7 +25333,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Argentina is..." --msgstr "阿根廷（Argentina）的國旗是..." -+msgstr "阿根廷（Argentina）的國旗是…" - - #: mapsdatatranslation.cpp:4157 - msgid "" -@@ -25369,7 +25357,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Uruguay is..." --msgstr "烏拉圭（Uruguay）的首都是..." -+msgstr "烏拉圭（Uruguay）的首都是…" - - #: mapsdatatranslation.cpp:4161 - msgid "" -@@ -25382,7 +25370,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Uruguay is..." --msgstr "烏拉圭（Uruguay）的國旗是..." -+msgstr "烏拉圭（Uruguay）的國旗是…" - - #: mapsdatatranslation.cpp:4163 - msgid "" -@@ -25406,7 +25394,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Australia is..." --msgstr "澳大利亞（Australia）的首都是..." -+msgstr "澳大利亞（Australia）的首都是…" - - #: mapsdatatranslation.cpp:4167 - msgid "" -@@ -25419,7 +25407,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Australia is..." --msgstr "澳大利亞（Australia）的國旗是..." -+msgstr "澳大利亞（Australia）的國旗是…" - - #: mapsdatatranslation.cpp:4169 - msgid "" -@@ -25443,7 +25431,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of New Zealand is..." --msgstr "紐西蘭（New Zealand）的首都是..." -+msgstr "紐西蘭（New Zealand）的首都是…" - - #: mapsdatatranslation.cpp:4173 - msgid "" -@@ -25456,7 +25444,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of New Zealand is..." --msgstr "紐西蘭（New Zealand）的國旗是..." -+msgstr "紐西蘭（New Zealand）的國旗是…" - - #: mapsdatatranslation.cpp:4175 - msgid "" -@@ -25480,7 +25468,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Vatican City is..." --msgstr "梵蒂岡（Vatican City）的首都是..." -+msgstr "梵蒂岡（Vatican City）的首都是…" - - #: mapsdatatranslation.cpp:4179 - msgid "" -@@ -25493,7 +25481,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Vatican City is..." --msgstr "梵蒂岡（Vatican City）的國旗是..." -+msgstr "梵蒂岡（Vatican City）的國旗是…" - - #: mapsdatatranslation.cpp:4182 - msgid "" -@@ -25511,7 +25499,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Andorra is..." --msgstr "安道爾（Andorra）的首都是..." -+msgstr "安道爾（Andorra）的首都是…" - - #: mapsdatatranslation.cpp:4185 - msgid "" -@@ -25524,7 +25512,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Andorra is..." --msgstr "安道爾（Andorra）的國旗是..." -+msgstr "安道爾（Andorra）的國旗是…" - - #: mapsdatatranslation.cpp:4187 - msgid "" -@@ -25548,7 +25536,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Monaco is..." --msgstr "摩納哥（Monaco）的首都是..." -+msgstr "摩納哥（Monaco）的首都是…" - - #: mapsdatatranslation.cpp:4191 - msgid "" -@@ -25561,7 +25549,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Monaco is..." --msgstr "摩納哥（Monaco）的國旗是..." -+msgstr "摩納哥（Monaco）的國旗是…" - - #: mapsdatatranslation.cpp:4193 - msgid "" -@@ -25585,7 +25573,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of China is..." --msgstr "中華人民共和國（China）的首都是..." -+msgstr "中華人民共和國（China）的首都是…" - - #: mapsdatatranslation.cpp:4197 - msgid "" -@@ -25598,7 +25586,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of China is..." --msgstr "中華人民共和國（China）的國旗是..." -+msgstr "中華人民共和國（China）的國旗是…" - - #: mapsdatatranslation.cpp:4199 - msgid "" -@@ -25622,7 +25610,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of India is..." --msgstr "印度（India）的首都是..." -+msgstr "印度（India）的首都是…" - - #: mapsdatatranslation.cpp:4203 - msgid "" -@@ -25635,7 +25623,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of India is..." --msgstr "印度（India）的國旗是..." -+msgstr "印度（India）的國旗是…" - - #: mapsdatatranslation.cpp:4205 - msgid "" -@@ -25659,7 +25647,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Sri Lanka is..." --msgstr "斯里蘭卡（Sri Lanka）的首都是..." -+msgstr "斯里蘭卡（Sri Lanka）的首都是…" - - #: mapsdatatranslation.cpp:4209 - msgid "" -@@ -25672,7 +25660,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Sri Lanka is..." --msgstr "斯里蘭卡（Sri Lanka）的國旗是..." -+msgstr "斯里蘭卡（Sri Lanka）的國旗是…" - - #: mapsdatatranslation.cpp:4211 - msgid "" -@@ -25696,7 +25684,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Mongolia is..." --msgstr "蒙古（Mongolia）的首都是..." -+msgstr "蒙古（Mongolia）的首都是…" - - #: mapsdatatranslation.cpp:4215 - msgid "" -@@ -25709,7 +25697,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Mongolia is..." --msgstr "蒙古（Mongolia）的國旗是..." -+msgstr "蒙古（Mongolia）的國旗是…" - - #: mapsdatatranslation.cpp:4217 - msgid "" -@@ -25733,7 +25721,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Kazakhstan is..." --msgstr "哈薩克（Kazakhstan）的首都是..." -+msgstr "哈薩克（Kazakhstan）的首都是…" - - #: mapsdatatranslation.cpp:4221 - msgid "" -@@ -25746,7 +25734,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Kazakhstan is..." --msgstr "哈薩克（Kazakhstan）的國旗是..." -+msgstr "哈薩克（Kazakhstan）的國旗是…" - - #: mapsdatatranslation.cpp:4223 - msgid "" -@@ -25770,7 +25758,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Japan is..." --msgstr "日本（Japan）的首都是..." -+msgstr "日本（Japan）的首都是…" - - #: mapsdatatranslation.cpp:4227 - msgid "" -@@ -25783,7 +25771,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Japan is..." --msgstr "日本（Japan）的國旗是..." -+msgstr "日本（Japan）的國旗是…" - - #: mapsdatatranslation.cpp:4229 - msgid "" -@@ -25807,7 +25795,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Myanmar is..." --msgstr "緬甸（Myanmar）的首都是..." -+msgstr "緬甸（Myanmar）的首都是…" - - #: mapsdatatranslation.cpp:4233 - msgid "" -@@ -25820,7 +25808,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Myanmar is..." --msgstr "緬甸（Myanmar）的國旗是..." -+msgstr "緬甸（Myanmar）的國旗是…" - - #: mapsdatatranslation.cpp:4235 - msgid "" -@@ -25844,7 +25832,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Nepal is..." --msgstr "尼泊爾（Nepal）的首都是..." -+msgstr "尼泊爾（Nepal）的首都是…" - - #: mapsdatatranslation.cpp:4239 - msgid "" -@@ -25857,7 +25845,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Nepal is..." --msgstr "尼泊爾（Nepal）的國旗是..." -+msgstr "尼泊爾（Nepal）的國旗是…" - - #: mapsdatatranslation.cpp:4241 - msgid "" -@@ -25881,7 +25869,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bhutan is..." --msgstr "不丹（Bhutan）的首都是..." -+msgstr "不丹（Bhutan）的首都是…" - - #: mapsdatatranslation.cpp:4245 - msgid "" -@@ -25894,7 +25882,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bhutan is..." --msgstr "不丹（Bhutan）的國旗是..." -+msgstr "不丹（Bhutan）的國旗是…" - - #: mapsdatatranslation.cpp:4247 - msgid "" -@@ -25918,7 +25906,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Indonesia is..." --msgstr "印度尼西亞（Indonesia）的首都是..." -+msgstr "印度尼西亞（Indonesia）的首都是…" - - #: mapsdatatranslation.cpp:4251 - msgid "" -@@ -25931,7 +25919,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Indonesia is..." --msgstr "印度尼西亞（Indonesia）的國旗是..." -+msgstr "印度尼西亞（Indonesia）的國旗是…" - - #: mapsdatatranslation.cpp:4253 - msgid "" -@@ -25955,7 +25943,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Malaysia is..." --msgstr "馬來西亞（Malaysia）的首都是..." -+msgstr "馬來西亞（Malaysia）的首都是…" - - #: mapsdatatranslation.cpp:4257 - msgid "" -@@ -25968,7 +25956,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Malaysia is..." --msgstr "馬來西亞（Malaysia）的國旗是..." -+msgstr "馬來西亞（Malaysia）的國旗是…" - - #: mapsdatatranslation.cpp:4259 - msgid "" -@@ -25992,7 +25980,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bangladesh is..." --msgstr "孟加拉（Bangladesh）的首都是..." -+msgstr "孟加拉（Bangladesh）的首都是…" - - #: mapsdatatranslation.cpp:4263 - msgid "" -@@ -26005,7 +25993,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bangladesh is..." --msgstr "孟加拉（Bangladesh）的國旗是..." -+msgstr "孟加拉（Bangladesh）的國旗是…" - - #: mapsdatatranslation.cpp:4265 - msgid "" -@@ -26029,7 +26017,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Cyprus is..." --msgstr "賽普勒斯（Cyprus）的首都是..." -+msgstr "賽普勒斯（Cyprus）的首都是…" - - #: mapsdatatranslation.cpp:4269 - msgid "" -@@ -26042,7 +26030,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Cyprus is..." --msgstr "賽普勒斯（Cyprus）的國旗是..." -+msgstr "賽普勒斯（Cyprus）的國旗是…" - - #: mapsdatatranslation.cpp:4271 - msgid "" -@@ -26066,7 +26054,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Afghanistan is..." --msgstr "阿富汗（Afghanistan）的首都是..." -+msgstr "阿富汗（Afghanistan）的首都是…" - - #: mapsdatatranslation.cpp:4275 - msgid "" -@@ -26079,7 +26067,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Afghanistan is..." --msgstr "阿富汗（Afghanistan）的國旗是..." -+msgstr "阿富汗（Afghanistan）的國旗是…" - - #: mapsdatatranslation.cpp:4277 - msgid "" -@@ -26103,7 +26091,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Azerbaijan is..." --msgstr "亞塞拜然（Azerbaijan）的首都是..." -+msgstr "亞塞拜然（Azerbaijan）的首都是…" - - #: mapsdatatranslation.cpp:4281 - msgid "" -@@ -26116,7 +26104,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Azerbaijan is..." --msgstr "亞塞拜然（Azerbaijan）的國旗是..." -+msgstr "亞塞拜然（Azerbaijan）的國旗是…" - - #: mapsdatatranslation.cpp:4283 - msgid "" -@@ -26140,7 +26128,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Armenia is..." --msgstr "亞美尼亞（Armenia）的首都是..." -+msgstr "亞美尼亞（Armenia）的首都是…" - - #: mapsdatatranslation.cpp:4287 - msgid "" -@@ -26153,7 +26141,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Armenia is..." --msgstr "亞美尼亞（Armenia）的國旗是..." -+msgstr "亞美尼亞（Armenia）的國旗是…" - - #: mapsdatatranslation.cpp:4289 - msgid "" -@@ -26177,7 +26165,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Bahrain is..." --msgstr "巴林（Bahrain）的首都是..." -+msgstr "巴林（Bahrain）的首都是…" - - #: mapsdatatranslation.cpp:4293 - msgid "" -@@ -26190,7 +26178,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Bahrain is..." --msgstr "巴林（Bahrain）的國旗是..." -+msgstr "巴林（Bahrain）的國旗是…" - - #: mapsdatatranslation.cpp:4295 - msgid "" -@@ -26214,7 +26202,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Georgia is..." --msgstr "喬治亞（Georgia）的首都是..." -+msgstr "喬治亞（Georgia）的首都是…" - - #: mapsdatatranslation.cpp:4299 - msgid "" -@@ -26251,7 +26239,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Turkmenistan is..." --msgstr "土庫曼（Turkmenistan）的首都是..." -+msgstr "土庫曼（Turkmenistan）的首都是…" - - #: mapsdatatranslation.cpp:4305 - msgid "" -@@ -26264,7 +26252,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Turkmenistan is..." --msgstr "土庫曼（Turkmenistan）的國旗是..." -+msgstr "土庫曼（Turkmenistan）的國旗是…" - - #: mapsdatatranslation.cpp:4307 - msgid "" -@@ -26288,7 +26276,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Uzbekistan is..." --msgstr "烏茲別克（Uzbekistan）的首都是..." -+msgstr "烏茲別克（Uzbekistan）的首都是…" - - #: mapsdatatranslation.cpp:4311 - msgid "" -@@ -26301,7 +26289,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Uzbekistan is..." --msgstr "烏茲別克（Uzbekistan）的國旗是..." -+msgstr "烏茲別克（Uzbekistan）的國旗是…" - - #: mapsdatatranslation.cpp:4313 - msgid "" -@@ -26325,7 +26313,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Kyrgyzstan is..." --msgstr "吉爾吉斯（Kyrgyzstan）的首都是..." -+msgstr "吉爾吉斯（Kyrgyzstan）的首都是…" - - #: mapsdatatranslation.cpp:4317 - msgid "" -@@ -26338,7 +26326,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Kyrgyzstan is..." --msgstr "吉爾吉斯（Kyrgyzstan）的國旗是..." -+msgstr "吉爾吉斯（Kyrgyzstan）的國旗是…" - - #: mapsdatatranslation.cpp:4319 - msgid "" -@@ -26362,7 +26350,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Tajikistan is..." --msgstr "塔吉克（Tajikistan）的首都是..." -+msgstr "塔吉克（Tajikistan）的首都是…" - - #: mapsdatatranslation.cpp:4323 - msgid "" -@@ -26375,7 +26363,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Tajikistan is..." --msgstr "塔吉克（Tajikistan）的國旗是..." -+msgstr "塔吉克（Tajikistan）的國旗是…" - - #: mapsdatatranslation.cpp:4325 - msgid "" -@@ -26399,7 +26387,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Pakistan is..." --msgstr "巴基斯坦（Pakistan）的首都是..." -+msgstr "巴基斯坦（Pakistan）的首都是…" - - #: mapsdatatranslation.cpp:4329 - msgid "" -@@ -26412,7 +26400,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Pakistan is..." --msgstr "巴基斯坦（Pakistan）的國旗是..." -+msgstr "巴基斯坦（Pakistan）的國旗是…" - - #: mapsdatatranslation.cpp:4331 - msgid "" -@@ -26436,7 +26424,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Laos is..." --msgstr "寮國（Laos）的首都是..." -+msgstr "寮國（Laos）的首都是…" - - #: mapsdatatranslation.cpp:4335 - msgid "" -@@ -26449,7 +26437,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Laos is..." --msgstr "寮國（Laos）的國旗是..." -+msgstr "寮國（Laos）的國旗是…" - - #: mapsdatatranslation.cpp:4337 - msgid "" -@@ -26473,7 +26461,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Cambodia is..." --msgstr "柬埔寨（Cambodia）的首都是..." -+msgstr "柬埔寨（Cambodia）的首都是…" - - #: mapsdatatranslation.cpp:4341 - msgid "" -@@ -26486,7 +26474,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Cambodia is..." --msgstr "柬埔寨（Cambodia）的國旗是..." -+msgstr "柬埔寨（Cambodia）的國旗是…" - - #: mapsdatatranslation.cpp:4343 - msgid "" -@@ -26510,7 +26498,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of East Timor is..." --msgstr "東帝汶（East Timor）的首都是..." -+msgstr "東帝汶（East Timor）的首都是…" - - #: mapsdatatranslation.cpp:4347 - msgid "" -@@ -26523,7 +26511,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of East Timor is..." --msgstr "東帝汶（East Timor）的國旗是..." -+msgstr "東帝汶（East Timor）的國旗是…" - - #: mapsdatatranslation.cpp:4349 - msgid "" -@@ -26547,7 +26535,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Brunei is..." --msgstr "汶萊（Brunei）的首都是..." -+msgstr "汶萊（Brunei）的首都是…" - - #: mapsdatatranslation.cpp:4353 - msgid "" -@@ -26560,7 +26548,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Brunei is..." --msgstr "汶萊（Brunei）的國旗是..." -+msgstr "汶萊（Brunei）的國旗是…" - - #: mapsdatatranslation.cpp:4355 - msgid "" -@@ -26584,7 +26572,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Philippines is..." --msgstr "菲律賓（Philippines）的首都是..." -+msgstr "菲律賓（Philippines）的首都是…" - - #: mapsdatatranslation.cpp:4359 - msgid "" -@@ -26597,7 +26585,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Philippines is..." --msgstr "菲律賓（Philippines）的國旗是..." -+msgstr "菲律賓（Philippines）的國旗是…" - - #: mapsdatatranslation.cpp:4361 - msgid "" -@@ -26621,7 +26609,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Thailand is..." --msgstr "泰國（Thailand）的首都是..." -+msgstr "泰國（Thailand）的首都是…" - - #: mapsdatatranslation.cpp:4365 - msgid "" -@@ -26634,7 +26622,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Thailand is..." --msgstr "泰國（Thailand）的國旗是..." -+msgstr "泰國（Thailand）的國旗是…" - - #: mapsdatatranslation.cpp:4367 - msgid "" -@@ -26658,7 +26646,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Vietnam is..." --msgstr "越南（Vietnam）的首都是..." -+msgstr "越南（Vietnam）的首都是…" - - #: mapsdatatranslation.cpp:4371 - msgid "" -@@ -26671,7 +26659,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Vietnam is..." --msgstr "越南（Vietnam）的國旗是..." -+msgstr "越南（Vietnam）的國旗是…" - - #: mapsdatatranslation.cpp:4373 - msgid "" -@@ -26689,38 +26677,38 @@ - msgid "" - "_: world.kgm\n" - "Republic of China (Taiwan)" --msgstr "中華民國（台灣）" -+msgstr "中華民國（臺灣）" - - #: mapsdatatranslation.cpp:4376 - msgid "" - "_: world.kgm\n" - "The capital of Republic of China (Taiwan) is..." --msgstr "中華民國（台灣）的首都是..." -+msgstr "中華民國（臺灣）的首都是…" - - #: mapsdatatranslation.cpp:4377 - msgid "" - "_: world.kgm\n" - "Please click on:\n" - "Republic of China (Taiwan)" --msgstr "請點選：中華民國（台灣）" -+msgstr "請點選：中華民國（臺灣）" - - #: mapsdatatranslation.cpp:4378 - msgid "" - "_: world.kgm\n" - "The flag of Republic of China (Taiwan) is..." --msgstr "中華民國（台灣）的國旗是..." -+msgstr "中華民國（臺灣）的國旗是…" - - #: mapsdatatranslation.cpp:4379 - msgid "" - "_: world.kgm\n" - "Taipei" --msgstr "台北" -+msgstr "臺北" - - #: mapsdatatranslation.cpp:4380 - msgid "" - "_: world.kgm\n" - "Taipei is the capital of..." --msgstr "台北是哪個國家的首都？" -+msgstr "臺北是哪個國家的首都？" - - #: mapsdatatranslation.cpp:4381 mapsdatatranslation.cpp:4385 - msgid "" -@@ -26732,7 +26720,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Singapore is..." --msgstr "新加坡（Singapore）的首都是..." -+msgstr "新加坡（Singapore）的首都是…" - - #: mapsdatatranslation.cpp:4383 - msgid "" -@@ -26745,7 +26733,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Singapore is..." --msgstr "新加坡（Singapore）的國旗是..." -+msgstr "新加坡（Singapore）的國旗是…" - - #: mapsdatatranslation.cpp:4386 - msgid "" -@@ -26763,7 +26751,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Democratic People's Republic of Korea is..." --msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的首都是..." -+msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的首都是…" - - #: mapsdatatranslation.cpp:4389 - msgid "" -@@ -26776,7 +26764,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Democratic People's Republic of Korea is..." --msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的國旗是..." -+msgstr "朝鮮人民共和國（Democratic People's Republic of Korea）的國旗是…" - - #: mapsdatatranslation.cpp:4391 - msgid "" -@@ -26800,7 +26788,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Republic of Korea is..." --msgstr "大韓民國（Republic of Korea）的首都是..." -+msgstr "大韓民國（Republic of Korea）的首都是…" - - #: mapsdatatranslation.cpp:4395 - msgid "" -@@ -26813,7 +26801,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Republic of Korea is..." --msgstr "大韓民國（Republic of Korea）的國旗是..." -+msgstr "大韓民國（Republic of Korea）的國旗是…" - - #: mapsdatatranslation.cpp:4397 - msgid "" -@@ -26837,7 +26825,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Fiji is..." --msgstr "斐濟（Fiji）的首都是..." -+msgstr "斐濟（Fiji）的首都是…" - - #: mapsdatatranslation.cpp:4401 - msgid "" -@@ -26850,7 +26838,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Fiji is..." --msgstr "斐濟（Fiji）的國旗是..." -+msgstr "斐濟（Fiji）的國旗是…" - - #: mapsdatatranslation.cpp:4403 - msgid "" -@@ -26874,7 +26862,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Tonga is..." --msgstr "東加（Tonga）的首都是..." -+msgstr "東加（Tonga）的首都是…" - - #: mapsdatatranslation.cpp:4407 - msgid "" -@@ -26887,7 +26875,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Tonga is..." --msgstr "東加（Tonga）的國旗是..." -+msgstr "東加（Tonga）的國旗是…" - - #: mapsdatatranslation.cpp:4409 - msgid "" -@@ -26911,7 +26899,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Papua New Guinea is..." --msgstr "巴布亞紐幾內亞（Papua New Guinea）的首都是..." -+msgstr "巴布亞紐幾內亞（Papua New Guinea）的首都是…" - - #: mapsdatatranslation.cpp:4413 - msgid "" -@@ -26924,7 +26912,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Papua New Guinea is..." --msgstr "巴布亞紐幾內亞（Papua New Guinea）的國旗是..." -+msgstr "巴布亞紐幾內亞（Papua New Guinea）的國旗是…" - - #: mapsdatatranslation.cpp:4415 - msgid "" -@@ -26948,7 +26936,7 @@ - msgid "" - "_: world.kgm\n" - "The capital of Greenland (Denmark) is..." --msgstr "格陵蘭【丹麥】的首都是..." -+msgstr "格陵蘭【丹麥】的首都是…" - - #: mapsdatatranslation.cpp:4419 - msgid "" -@@ -26961,7 +26949,7 @@ - msgid "" - "_: world.kgm\n" - "The flag of Greenland (Denmark) is..." --msgstr "格陵蘭【丹麥】的國旗是..." -+msgstr "格陵蘭【丹麥】的國旗是…" - - #: mapsdatatranslation.cpp:4421 - msgid "" -@@ -26980,3 +26968,27 @@ - #, no-c-format - msgid "The last opened map" - msgstr "最後開啟的地圖" -+ -+#, fuzzy -+#~ msgid "" -+#~ "_: asia.kgm\n" -+#~ "Rangoon" -+#~ msgstr "Rangoon" -+ -+#, fuzzy -+#~ msgid "" -+#~ "_: asia.kgm\n" -+#~ "Rangoon is the capital of..." -+#~ msgstr "-" -+ -+#, fuzzy -+#~ msgid "" -+#~ "_: world.kgm\n" -+#~ "Rangoon" -+#~ msgstr "Rangoon" -+ -+#, fuzzy -+#~ msgid "" -+#~ "_: world.kgm\n" -+#~ "Rangoon is the capital of..." -+#~ msgstr "-" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/khangman.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/khangman.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/khangman.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/khangman.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: khangman\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-07-04 11:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -244,21 +243,25 @@ - #: rc.cpp:9 - #, no-c-format - msgid "" --"If you check it, a hint will be displayed by right-clicking on the game window." -+"If you check it, a hint will be displayed by right-clicking on the game " -+"window." - msgstr "勾選此選項的話，在遊戲視窗中點選右鍵可以看到提示。" - - #. i18n: file advanced.ui line 53 - #: rc.cpp:12 - #, no-c-format - msgid "" --"Some languages have hints to help you guess the word more easily. If this is " --"disabled, there is no such option for your current language data file.\n" -+"Some languages have hints to help you guess the word more easily. If this is " -+"disabled, there is no such option for your current language data " -+"file.\n" - "If this is enabled, then hints are available and you can get them by " - "checking this box. You will then see the hint for the word you are trying to " --"guess by right-clicking somewhere on the KHangMan window, the hint will then be " --"displayed for 4 seconds in a tooltip." -+"guess by right-clicking somewhere on the KHangMan window, the hint will then " -+"be displayed for 4 seconds in a tooltip." - msgstr "" --"有些語言會有個提示來幫助您猜測單字。如果無法選取此選項，則表示您使用的語言資料檔中沒有相關選項，反之，則在您勾選此選項時，您可以在遊戲主視窗中點選右鍵獲得提示。" -+"有些語言會有個提示來幫助您猜測單字。如果無法選取此選項，則表示您使用的語言資" -+"料檔中沒有相關選項，反之，則在您勾選此選項時，您可以在遊戲主視窗中點選右鍵獲" -+"得提示。" - - #. i18n: file advanced.ui line 63 - #: rc.cpp:16 -@@ -284,25 +287,23 @@ - #: rc.cpp:25 - #, no-c-format - msgid "" --"If this is disabled, then the selected language does not support it. If " --"this is enabled and if you check it, then you should type accented " --"letters on their own. If it is not checked, accented letters will be displayed " --"with normal letters." --"
                                  \n" -+"If this is disabled, then the selected language does not support it. " -+"If this is enabled and if you check it, then you should type accented " -+"letters on their own. If it is not checked, accented letters will be " -+"displayed with normal letters.
                                  \n" - "Default is that accented letters will be shown when the corresponding " --"unaccented letter is guessed." --"
                                  \n" --"For example, in Catalan, if this is unchecked and you type \"o\", the o and ò " --"will be displayed in the word xenofòbia. If this option is checked, when " --"you type \"o\", only \"o\" will be displayed and you will then have to type " --"\"ò\" for this letter to be displayed." -+"unaccented letter is guessed.
                                  \n" -+"For example, in Catalan, if this is unchecked and you type \"o\", the o and " -+"ò will be displayed in the word xenofòbia. If this option is checked, " -+"when you type \"o\", only \"o\" will be displayed and you will then have to " -+"type \"ò\" for this letter to be displayed." - msgstr "" --"如果無法選取此選項，表示您所選擇的語言不支援這個功能。反之，若您勾選此選項，您必須輸入重音字母。若您沒有勾選此選項，則重音字母會以一般字母顯示。" --"
                                  \n" --"預設是輸入相關非重音字母時，重音字母自己會顯示出來。" --"
                                  \n" --"例如，在加泰隆語中，如果沒有勾選此選項，單字為 xenofòbia ，則您輸入 o 時，o 與 ò 會同時出現。如果有勾選此選項，在您輸入 o 時則只有 o " --"會出現，您必須輸入 ò 才會出現這個字母。" -+"如果無法選取此選項，表示您所選擇的語言不支援這個功能。反之，若您勾選此選項，" -+"您必須輸入重音字母。若您沒有勾選此選項，則重音字母會以一般字母顯示。
                                  \n" -+"預設是輸入相關非重音字母時，重音字母自己會顯示出來。
                                  \n" -+"例如，在加泰隆語中，如果沒有勾選此選項，單字為 xenofòbia ，則您輸入 o 時，o " -+"與 ò 會同時出現。如果有勾選此選項，在您輸入 o 時則只有 o 會出現，您必須輸入 " -+"ò 才會出現這個字母。" - - #. i18n: file normal.ui line 32 - #: rc.cpp:30 -@@ -321,19 +322,21 @@ - #: rc.cpp:36 - #, no-c-format - msgid "" --"If you check this box, only the first letter will be written if the letter is " --"found in several places in the word. Then when you rechoose this letter, it " --"will replace the second instance in the word until there are no more instances " --"of this letter.\n" --"For example, the word to guess is \"potato\". If this option is unchecked, when " --"you try \"o\", the 2 \"o\" in the word will be discovered at the same time. If " --"this is checked, you will need to try \"o\" twice.\n" -+"If you check this box, only the first letter will be written if the letter " -+"is found in several places in the word. Then when you rechoose this letter, " -+"it will replace the second instance in the word until there are no more " -+"instances of this letter.\n" -+"For example, the word to guess is \"potato\". If this option is unchecked, " -+"when you try \"o\", the 2 \"o\" in the word will be discovered at the same " -+"time. If this is checked, you will need to try \"o\" twice.\n" - "\n" --"Default is that for one letter typed, all instances of that letter in the word " --"are displayed." -+"Default is that for one letter typed, all instances of that letter in the " -+"word are displayed." - msgstr "" --"勾選此選項的話，若單字中有重複出現的字母，則在您輸入該單字時，只會出現第一個。您必須再輸入才會出現下一個字母。\n" --"例如，單字為 potato，如果沒有勾選此選項，則在您輸入 o 時兩個 o 都會同時出現。反之，則只會出現第一個 o。 \n" -+"勾選此選項的話，若單字中有重複出現的字母，則在您輸入該單字時，只會出現第一" -+"個。您必須再輸入才會出現下一個字母。\n" -+"例如，單字為 potato，如果沒有勾選此選項，則在您輸入 o 時兩個 o 都會同時出現。" -+"反之，則只會出現第一個 o。 \n" - "預設為不使用此選項。" - - #. i18n: file normal.ui line 49 -@@ -348,23 +351,26 @@ - msgid "" - "If checked, the dialog 'Congratulations! You won!' is not displayed. After 3 " - "seconds, a new game will start automatically." --msgstr "勾選此選項的話，就不會出現「恭喜！您贏了！」的對話框。遊戲會在三秒之後自動重新開始。" -+msgstr "" -+"勾選此選項的話，就不會出現「恭喜！您贏了！」的對話框。遊戲會在三秒之後自動重" -+"新開始。" - - #. i18n: file normal.ui line 58 - #: rc.cpp:48 - #, no-c-format - msgid "" --"If this option is not checked, when a game is won a dialog will appear saying " --"'Congratulations! You won!'. It also asks you if you want to play again and you " --"have to say Yes or No.\n" -+"If this option is not checked, when a game is won a dialog will appear " -+"saying 'Congratulations! You won!'. It also asks you if you want to play " -+"again and you have to say Yes or No.\n" - "This is the default state.\n" - "\n" - "If this option is checked, this dialog will not appear and a new game will " --"automatically start after four seconds. A passive popup tells you you have won " --"the game. When this opton is checked you don't have an intrusive dialog each " --"time you won a game." -+"automatically start after four seconds. A passive popup tells you you have " -+"won the game. When this opton is checked you don't have an intrusive dialog " -+"each time you won a game." - msgstr "" --"如果沒有勾選此選項的話，在您猜中單字之後，會顯示一個「恭喜！您贏了！」的對話框。它會問您是否要再玩一次。\n" -+"如果沒有勾選此選項的話，在您猜中單字之後，會顯示一個「恭喜！您贏了！」的對話" -+"框。它會問您是否要再玩一次。\n" - "這是預設的狀況。\n" - "\n" - "如果勾選此選項的話，這個對話框就不會出現，新的遊戲會在三四秒鐘之後自動開始。" -@@ -391,8 +397,8 @@ - #: rc.cpp:63 - #, no-c-format - msgid "" --"If this box is checked, you will have some sounds played for each new game and " --"when you win a game. If this is not checked, there will be no sound in " -+"If this box is checked, you will have some sounds played for each new game " -+"and when you win a game. If this is not checked, there will be no sound in " - "KHangMan.\n" - "Default is no sound." - msgstr "" -@@ -415,9 +421,11 @@ - #: rc.cpp:73 - #, no-c-format - msgid "" --"You can set the time for displaying the Hint tooltip. Default is 3 seconds but " --"younger children might need longer time to be able to read the Hint." --msgstr "您可以設定提示顯示的時間。預設是三秒，不過年紀小的孩子可能會需要較長的時間來讀取提示。" -+"You can set the time for displaying the Hint tooltip. Default is 3 seconds " -+"but younger children might need longer time to be able to read the Hint." -+msgstr "" -+"您可以設定提示顯示的時間。預設是三秒，不過年紀小的孩子可能會需要較長的時間來" -+"讀取提示。" - - #. i18n: file timerdlg.ui line 120 - #: rc.cpp:76 -@@ -441,11 +449,13 @@ - #: rc.cpp:85 - #, no-c-format - msgid "" --"You can set the time for displaying the Already Guessed tooltip after you try a " --"letter that was already guessed. Default is 3 seconds but younger children " --"might need longer time to be able to understand they are trying a letter that " --"was already guessed." --msgstr "您可以設定顯示「已猜過的字母」的時間。預設是三秒，不過年紀小的孩子可能會需要較多的時間。" -+"You can set the time for displaying the Already Guessed tooltip after you " -+"try a letter that was already guessed. Default is 3 seconds but younger " -+"children might need longer time to be able to understand they are trying a " -+"letter that was already guessed." -+msgstr "" -+"您可以設定顯示「已猜過的字母」的時間。預設是三秒，不過年紀小的孩子可能會需要" -+"較多的時間。" - - #. i18n: file khangmanui.rc line 27 - #: rc.cpp:94 -@@ -469,7 +479,7 @@ - - #: khangman.cpp:81 - msgid "&Get Words in New Language..." --msgstr "取得新語言的單字(&G)..." -+msgstr "取得新語言的單字(&G)…" - - #: khangman.cpp:85 - msgid "Le&vel" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kig.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kig.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kig\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-11-01 14:01+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -24,16 +23,18 @@ - "document. You can use them to give objects names, change their colors\n" - "and line styles, and lots of other interesting things.

                                  \n" - msgstr "" --"

                                  Kig " --"中最強大的工具之一，就是您在物件上或檔案空白處點選右鍵所出現的選單。您可以用此選單來命名物件，修改物件的顏色與線條樣式，還有許多有趣的東西。

                                  \n" -+"

                                  Kig 中最強大的工具之一，就是您在物件上或檔案空白處點選右鍵所出現的選單。您" -+"可以用此選單來命名物件，修改物件的顏色與線條樣式，還有許多有趣的東西。

                                  \n" - - #: tips.cpp:11 - msgid "" --"

                                  You can construct new points without using the menu or the toolbar, simply\n" -+"

                                  You can construct new points without using the menu or the toolbar, " -+"simply\n" - "clicking somewhere on the Kig document with the middle mouse\n" - "button.

                                  \n" - msgstr "" --"

                                  您要建構新的點的話，不需要跑到選單裡去找，或使用工具列。只要在 Kig 檔案中的某處點選滑鼠中鍵即可。

                                  \n" -+"

                                  您要建構新的點的話，不需要跑到選單裡去找，或使用工具列。只要在 Kig 檔案中" -+"的某處點選滑鼠中鍵即可。

                                  \n" - - #: tips.cpp:18 - msgid "" -@@ -41,8 +42,9 @@ - "KGeo files, KSeg files, and, partially, Dr. Geo\n" - "and Cabri™ files.

                                  \n" - msgstr "" --"

                                  Kig 可以開啟幾種不同的檔案格式：它本身的檔案（.kig 檔），KGeo 檔，KSeg " --"檔，還有一部份的 Dr. Geo 與 Cabri™ 檔。

                                  \n" -+"

                                  Kig 可以開啟幾種不同的檔案格式：它本身的檔案（.kig 檔），" -+"KGeo 檔，KSeg 檔，還有一部份的 Dr. Geo 與 " -+"Cabri™ 檔。

                                  \n" - - #: tips.cpp:25 - msgid "" -@@ -50,18 +52,21 @@ - "use\n" - "in your documents: open the Objects menu to see them all.

                                  \n" - msgstr "" --"

                                  在 Kig 中您可以建構超過 40 種物件與做 10 種以上的轉換，您只要在檔案中選取「物件」選單就可以看到。

                                  \n" -+"

                                  在 Kig 中您可以建構超過 40 種物件與做 10 種以上的轉換，您只要在檔案中選取" -+"「物件」選單就可以看到。

                                  \n" - - #: tips.cpp:31 - msgid "" - "

                                  You can use the selected objects to start the construction of an object\n" --"which requires the selected objects as arguments. For example, if you have two\n" --"points selected, you can choose Start->Circle by Three Points " --"from the\n" -+"which requires the selected objects as arguments. For example, if you have " -+"two\n" -+"points selected, you can choose Start->Circle by Three Points from " -+"the\n" - "popup menu to start constructing a circle by three points.

                                  \n" - msgstr "" --"若是建構物件時需要現有物件做為參數，您可以選取該物件後再來建構新物件。例如，您選取兩個點，然後在彈出式選單中選取「開始」->" --"「用三點決定圓」，就可以開始建構一個圓。

                                  \n" -+"若是建構物件時需要現有物件做為參數，您可以選取該物件後再來建構新物件。例如，" -+"您選取兩個點，然後在彈出式選單中選取「開始」->「用三點決定圓」，就可以開始建" -+"構一個圓。

                                  \n" - - #: tips.cpp:39 - msgid "" -@@ -69,19 +74,21 @@ - "interesting macro on Kig website:\n" - "http://edu.kde.org/kig.

                                  \n" - msgstr "" --"

                                  Kig 可以使用外部巨集來延伸它的物件集。您可以在 Kig 網站 " --"http://edu.kde.org/kig 中找到一些有趣的巨集。

                                  \n" -+"

                                  Kig 可以使用外部巨集來延伸它的物件集。您可以在 Kig 網站 http://edu.kde.org/kig 中找到一些有趣的巨集。

                                  \n" - - #: tips.cpp:46 - msgid "" - "

                                  If you have more than one object under the mouse, and you want to select " - "any\n" --"of them, you can click with the left mouse button, while holding the\n" --"Shift key, to get a list of the objects under the mouse cursor which\n" -+"of them, you can click with the left mouse button, while holding " -+"the\n" -+"Shift key, to get a list of the objects under the mouse cursor " -+"which\n" - "you can then select from.

                                  \n" - msgstr "" --"

                                  如果在滑鼠下有一個以上的物件，而您想要選取其中一個，您可以按住 Shift " --"鍵，再點選滑鼠左鍵，就會出現一個在滑鼠游標下的物件清單讓您選擇。

                                  \n" -+"

                                  如果在滑鼠下有一個以上的物件，而您想要選取其中一個，您可以按住 Shift 鍵，再點選滑鼠左鍵，就會出現一個在滑鼠游標下的物件清單讓您選擇。

                                  \n" - - #. i18n: file kig/kigpartui.rc line 35 - #: rc.cpp:12 -@@ -301,7 +308,8 @@ - #: rc.cpp:166 - #, no-c-format - msgid "" --"Here you can modify the name, the description and the icon of this macro type." -+"Here you can modify the name, the description and the icon of this macro " -+"type." - msgstr "您可在此修改此巨集類型的名稱、描述和圖示。" - - #. i18n: file modes/edittypebase.ui line 79 -@@ -327,9 +335,10 @@ - #, no-c-format - msgid "" - "Here you can edit the description of the current macro type. This field is " --"optional, so you can also leave this empty: if you do so, then your macro type " --"will have no description." --msgstr "您可以在此編輯目前巨集型態的描述。這個欄位是選擇性的，表示您可以將它留白。" -+"optional, so you can also leave this empty: if you do so, then your macro " -+"type will have no description." -+msgstr "" -+"您可以在此編輯目前巨集型態的描述。這個欄位是選擇性的，表示您可以將它留白。" - - #. i18n: file modes/edittypebase.ui line 142 - #: rc.cpp:181 -@@ -400,7 +409,8 @@ - "places (e.g. \"This segment is %1 units long.\")." - msgstr "" - "在此輸入您的標籤上的文字，並點選「下一步」。\n" --"如果您要顯示變數的部份，則在適當的位置上放入 %1, %2, ...（例如：「這個線段長度為 %1。」）" -+"如果您要顯示變數的部份，則在適當的位置上放入 %1, %2, ...（例如：「這個線段長" -+"度為 %1。」）" - - #. i18n: file modes/textlabelwizardbase.ui line 51 - #: rc.cpp:230 -@@ -418,10 +428,12 @@ - #: rc.cpp:236 - #, no-c-format - msgid "" --"Now select the argument(s) you need. For every argument, click on it, select " --"an object and a property in the Kig window, and click finish when you are " --"done..." --msgstr "現在來選擇您需要的參數。在每個參數上點擊，在 Kig 視窗中選擇物件與屬性，並在完成後點選「完成」。" -+"Now select the argument(s) you need. For every argument, click on it, " -+"select an object and a property in the Kig window, and click finish when you " -+"are done..." -+msgstr "" -+"現在來選擇您需要的參數。在每個參數上點擊，在 Kig 視窗中選擇物件與屬性，並在完" -+"成後點選「完成」。" - - #. i18n: file modes/typesdialogbase.ui line 16 - #: rc.cpp:239 -@@ -433,9 +445,9 @@ - #: rc.cpp:242 - #, no-c-format - msgid "" --"Here you can manage types; you can remove them, and load and save them from and " --"to files..." --msgstr "這裡您可以管理、刪除巨集的類型，也可以從檔案載入，或儲存到檔案..." -+"Here you can manage types; you can remove them, and load and save them from " -+"and to files..." -+msgstr "這裡您可以管理、刪除巨集的類型，也可以從檔案載入，或儲存到檔案…" - - #. i18n: file modes/typesdialogbase.ui line 42 - #: rc.cpp:245 -@@ -453,7 +465,7 @@ - #: rc.cpp:254 - #, no-c-format - msgid "Select types here..." --msgstr "在此選擇類型..." -+msgstr "在此選擇類型…" - - #. i18n: file modes/typesdialogbase.ui line 86 - #: rc.cpp:257 -@@ -461,13 +473,13 @@ - msgid "" - "This is a list of the current macro types... You can select, edit, delete, " - "export and import them..." --msgstr "這是目前巨集類型的列表，您可以選擇、刪除、匯出、匯入..." -+msgstr "這是目前巨集類型的列表，您可以選擇、刪除、匯出、匯入…" - - #. i18n: file modes/typesdialogbase.ui line 112 - #: rc.cpp:260 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file modes/typesdialogbase.ui line 115 - #: rc.cpp:263 -@@ -485,7 +497,7 @@ - #: rc.cpp:272 - #, no-c-format - msgid "Export..." --msgstr "匯出..." -+msgstr "匯出…" - - #. i18n: file modes/typesdialogbase.ui line 164 - #: rc.cpp:275 -@@ -497,7 +509,7 @@ - #: rc.cpp:278 - #, no-c-format - msgid "Import..." --msgstr "匯入..." -+msgstr "匯入…" - - #. i18n: file modes/typesdialogbase.ui line 175 - #: rc.cpp:281 -@@ -549,11 +561,11 @@ - - #: rc.cpp:311 - msgid "Select the line that the new circle should be tangent to..." --msgstr "選取要與新的圓相切的線..." -+msgstr "選取要與新的圓相切的線…" - - #: objects/circle_type.cc:36 rc.cpp:312 rc.cpp:317 rc.cpp:323 - msgid "Select the center of the new circle..." --msgstr "選擇新圓的圓心..." -+msgstr "選擇新圓的圓心…" - - #: rc.cpp:313 - msgid "Circle by Point && Segment (as the Diameter)" -@@ -571,7 +583,7 @@ - - #: rc.cpp:318 - msgid "Select the segment whose length gives the diameter of the new circle..." --msgstr "選擇要建構新圓參考直徑的線段..." -+msgstr "選擇要建構新圓參考直徑的線段…" - - #: rc.cpp:319 - msgid "Circle by Point && Segment (as the Radius)" -@@ -588,7 +600,7 @@ - - #: rc.cpp:324 - msgid "Select the segment whose length gives the radius of the new circle..." --msgstr "選擇要建構新圓參考半徑的線段..." -+msgstr "選擇要建構新圓參考半徑的線段…" - - #: rc.cpp:325 - msgid "Equilateral Triangle" -@@ -613,7 +625,7 @@ - #: objects/centerofcurvature_type.cc:35 objects/tangent_type.cc:36 rc.cpp:330 - #: rc.cpp:335 - msgid "Select the curve..." --msgstr "選擇曲線..." -+msgstr "選擇曲線…" - - #: rc.cpp:331 - msgid "Osculating Circle" -@@ -633,7 +645,7 @@ - - #: rc.cpp:336 - msgid "Select the point..." --msgstr "選擇點..." -+msgstr "選擇點…" - - #: rc.cpp:337 - msgid "Segment Axis" -@@ -649,7 +661,7 @@ - - #: rc.cpp:340 - msgid "Select the segment of which you want to draw the axis..." --msgstr "選擇您想要繪製垂直平分線的線段..." -+msgstr "選擇您想要繪製垂直平分線的線段…" - - #: rc.cpp:341 - msgid "Square" -@@ -683,17 +695,17 @@ - msgid "" - "Select the first of the two vectors of which you want to construct the " - "difference..." --msgstr "選擇您想要建構向量差的兩個向量中的第一個..." -+msgstr "選擇您想要建構向量差的兩個向量中的第一個…" - - #: rc.cpp:349 - msgid "" - "Select the other of the two vectors of which you want to construct the " - "difference..." --msgstr "選擇您想要建構向量差的兩個向量中的另外一個..." -+msgstr "選擇您想要建構向量差的兩個向量中的另外一個…" - - #: rc.cpp:350 - msgid "Select the point to construct the difference vector in..." --msgstr "選擇所建構向量差的起點..." -+msgstr "選擇所建構向量差的起點…" - - #: kig/aboutdata.h:26 - msgid "KDE Interactive Geometry" -@@ -711,19 +723,24 @@ - msgid "" - "Did a lot of important work all around Kig, including, but not limited to " - "conics, cubics, transformations and property tests support." --msgstr "對 Kig 做了很多很重要的貢獻，包括圓錐、三次曲線、轉換、屬性測試等，還有更多。" -+msgstr "" -+"對 Kig 做了很多很重要的貢獻，包括圓錐、三次曲線、轉換、屬性測試等，還有更多。" - - #: kig/aboutdata.h:43 - msgid "" - "Actual maintainer, Dr. Geo import filter, point and line styles, Italian " - "translation, miscellaneous stuff here and there." --msgstr "實際維護者，Dr. Geo 匯入過濾器，點與線的樣式，義大利文翻譯，以及一些其他的貢獻。" -+msgstr "" -+"實際維護者，Dr. Geo 匯入過濾器，點與線的樣式，義大利文翻譯，以及一些其他的貢" -+"獻。" - - #: kig/aboutdata.h:49 - msgid "" - "Helped a lot with the implementation of the Locus object, there's quite some " - "math involved in doing it right, and Franco wrote the most difficult parts." --msgstr "協助實作 Locus 物件。這當中有很多跟數學有關的東西，而 Franco 幫忙寫了其中最困難的部份。" -+msgstr "" -+"協助實作 Locus 物件。這當中有很多跟數學有關的東西，而 Franco 幫忙寫了其中最困" -+"難的部份。" - - #: kig/aboutdata.h:55 - msgid "" -@@ -733,14 +750,14 @@ - - #: kig/aboutdata.h:60 - msgid "" --"Author of KGeo, where I got inspiration, some source, and most of the artwork " --"from." -+"Author of KGeo, where I got inspiration, some source, and most of the " -+"artwork from." - msgstr "KGeo 的作者，我從他那裡得到了靈感、一些程式碼以及大部分的美工。" - - #: kig/aboutdata.h:65 - msgid "" --"Domi's brother, who he got to write the algorithm for calculating the center of " --"the circle with three points given." -+"Domi's brother, who he got to write the algorithm for calculating the center " -+"of the circle with three points given." - msgstr "Domi 的兄弟，撰寫計算給定三點形成的圓的圓心的演算法。" - - #: kig/aboutdata.h:71 -@@ -751,7 +768,9 @@ - msgid "" - "Gave me some good feedback on Kig, some feature requests, cleanups and style " - "fixes, and someone to chat with on irc :)" --msgstr "給了我關於 Kig 的一些很好的回饋，一些功能需求，整理程式碼，以及樣式修補，而且給了我一些在 irc 可以聊天的人 :)" -+msgstr "" -+"給了我關於 Kig 的一些很好的回饋，一些功能需求，整理程式碼，以及樣式修補，而且" -+"給了我一些在 irc 可以聊天的人 :)" - - #: kig/aboutdata.h:81 - msgid "Responsible for the nice application SVG Icon." -@@ -767,7 +786,8 @@ - - #: filters/cabri-filter.cc:551 - msgid "" --"This Cabri file contains a \"%1\" object, which Kig does not currently support." -+"This Cabri file contains a \"%1\" object, which Kig does not currently " -+"support." - msgstr "此 Cabri 檔案包含 %1 物件，Kig 現在不支援。" - - #: filters/drgeo-filter-chooser.cc:46 -@@ -795,8 +815,8 @@ - - #: filters/drgeo-filter.cc:372 - msgid "" --"This Dr. Geo file contains an intersection type, which Kig does not currently " --"support." -+"This Dr. Geo file contains an intersection type, which Kig does not " -+"currently support." - msgstr "此 Dr. Geo 檔案包含一個扇形，Kig 現在不支援。" - - #: filters/exporter.cc:101 -@@ -805,7 +825,7 @@ - - #: filters/exporter.cc:106 - msgid "&Image..." --msgstr "圖像(&I)..." -+msgstr "圖像(&I)…" - - #: filters/exporter.cc:125 - msgid "Export as Image" -@@ -822,8 +842,8 @@ - #: filters/exporter.cc:158 filters/exporter.cc:594 - #: filters/latexexporter.cc:508 filters/svgexporter.cc:82 - msgid "" --"The file \"%1\" could not be opened. Please check if the file permissions are " --"set correctly." -+"The file \"%1\" could not be opened. Please check if the file permissions " -+"are set correctly." - msgstr "檔案 %1 無法開啟。請檢查檔案權限是否設定正確。" - - #: filters/exporter.cc:172 -@@ -840,7 +860,7 @@ - - #: filters/exporter.cc:219 - msgid "&XFig File..." --msgstr "XFig 檔案(&X)..." -+msgstr "XFig 檔案(&X)…" - - #: filters/exporter.cc:582 - msgid "*.fig|XFig Documents (*.fig)" -@@ -881,7 +901,8 @@ - - #: filters/kseg-filter.cc:559 - msgid "" --"This KSeg file contains a filled circle, which Kig does not currently support." -+"This KSeg file contains a filled circle, which Kig does not currently " -+"support." - msgstr "此 KSeg 檔案包含一個填充的圓，Kig 現在不支援。" - - #: filters/kseg-filter.cc:565 -@@ -896,11 +917,11 @@ - - #: filters/latexexporter.cc:72 - msgid "Export to &Latex..." --msgstr "匯出到 Latex(&L)..." -+msgstr "匯出到 Latex(&L)…" - - #: filters/latexexporter.cc:77 - msgid "&Latex..." --msgstr "Latex(&L)..." -+msgstr "Latex(&L)…" - - #: filters/latexexporter.cc:486 - msgid "*.tex|Latex Documents (*.tex)" -@@ -933,7 +954,8 @@ - - #: filters/native-filter.cc:232 filters/native-filter.cc:421 - msgid "" --"This Kig file has a coordinate system that this Kig version does not support.\n" -+"This Kig file has a coordinate system that this Kig version does not " -+"support.\n" - "A standard coordinate system will be used instead." - msgstr "" - "此 Kig 檔案有一個在此版本的 Kig 中不支援的座標系。\n" -@@ -943,17 +965,19 @@ - #: misc/object_hierarchy.cc:543 objects/object_imp_factory.cc:503 - msgid "" - "This Kig file uses an object of type \"%1\", which this Kig version does not " --"support.Perhaps you have compiled Kig without support for this object type,or " --"perhaps you are using an older Kig version." --msgstr "此 Kig 檔案使用了 %1 物件類型，它不被此版本的 Kig 支援。可能您編譯時沒有支援此物件類型，或者可能您使用了一個舊版本的 Kig。" -+"support.Perhaps you have compiled Kig without support for this object type," -+"or perhaps you are using an older Kig version." -+msgstr "" -+"此 Kig 檔案使用了 %1 物件類型，它不被此版本的 Kig 支援。可能您編譯時沒有支援" -+"此物件類型，或者可能您使用了一個舊版本的 Kig。" - - #: filters/svgexporter.cc:45 - msgid "&Export to SVG..." --msgstr "匯出為 SVG(&E)..." -+msgstr "匯出為 SVG(&E)…" - - #: filters/svgexporter.cc:50 - msgid "&SVG..." --msgstr "SVG(&S)..." -+msgstr "SVG(&S)…" - - #: filters/svgexporter.cc:62 - msgid "*.svg|Scalable Vector Graphics (*.svg)" -@@ -1035,7 +1059,7 @@ - - #: misc/builtin_stuff.cc:121 - msgid "Select the angle you want to construct the bisector of..." --msgstr "選擇您想要建構角平分線的角..." -+msgstr "選擇您想要建構角平分線的角…" - - #: misc/builtin_stuff.cc:122 objects/other_imp.cc:104 - msgid "Angle Bisector" -@@ -1282,7 +1306,8 @@ - - #: misc/builtin_stuff.cc:379 - msgid "" --"Scale an object over a point, by the ratio given by the length of two segments" -+"Scale an object over a point, by the ratio given by the length of two " -+"segments" - msgstr "將物件根據一個點做縮放，縮放方式為給定兩個線段長度的比例。" - - #: misc/builtin_stuff.cc:386 -@@ -1291,7 +1316,8 @@ - - #: misc/builtin_stuff.cc:387 - msgid "" --"An object scaled over a line, by the ratio given by the length of two segments" -+"An object scaled over a line, by the ratio given by the length of two " -+"segments" - msgstr "將物件根據一條直線做縮放，縮放方式為給定兩個線段長度的比例。" - - #: misc/builtin_stuff.cc:394 -@@ -1300,8 +1326,8 @@ - - #: misc/builtin_stuff.cc:395 - msgid "" --"Apply a similitude to an object ( the sequence of a scaling and rotation around " --"a center )" -+"Apply a similitude to an object ( the sequence of a scaling and rotation " -+"around a center )" - msgstr "對一物件產生其相似形（給定一中心點與物件上某一點，產生一個相似形）" - - #: misc/builtin_stuff.cc:402 -@@ -1402,8 +1428,8 @@ - - #: misc/builtin_stuff.cc:535 - msgid "" --"Test whether a given point have the same distance from a given point and from " --"another given point" -+"Test whether a given point have the same distance from a given point and " -+"from another given point" - msgstr "測試一給定點與其它兩點之間的距離是否相等" - - #: misc/builtin_stuff.cc:543 -@@ -1500,14 +1526,12 @@ - - #: misc/kiginputdialog.cc:154 - msgid "" --"Choose from this list the goniometric unit you want to use to modify the size " --"of this angle." --"
                                  \n" --"If you switch to another unit, the value in the edit field on the left will be " --"converted to the new selected unit." -+"Choose from this list the goniometric unit you want to use to modify the " -+"size of this angle.
                                  \n" -+"If you switch to another unit, the value in the edit field on the left will " -+"be converted to the new selected unit." - msgstr "" --"從此清單中選取您要用來改變此角的角度單位。" --"
                                  \n" -+"從此清單中選取您要用來改變此角的角度單位。
                                  \n" - "如果您切換到其它的單位，在編輯欄位中的值會轉換成新單位的值。" - - #: misc/lists.cc:304 misc/lists.cc:310 -@@ -1522,11 +1546,12 @@ - msgid "" - "This file was created by a very old Kig version (pre-0.4). Support for this " - "format has been removed from recent Kig versions. You can try to import this " --"macro using a previous Kig version (0.4 to 0.6) and then export it again in the " --"new format." -+"macro using a previous Kig version (0.4 to 0.6) and then export it again in " -+"the new format." - msgstr "" --"此檔案是 Kig 的早先版本版本（0.4 之前）建立的。而對此格式的支援已經從最近的 Kig 中刪除。您可以嘗試使用 Kig 的先前版本（0.4 到 " --"0.6）匯入此巨集，然後再將其匯出為新格式。" -+"此檔案是 Kig 的早先版本版本（0.4 之前）建立的。而對此格式的支援已經從最近的 " -+"Kig 中刪除。您可以嘗試使用 Kig 的先前版本（0.4 到 0.6）匯入此巨集，然後再將其" -+"匯出為新格式。" - - #: misc/lists.cc:375 - #, c-format -@@ -1549,8 +1574,9 @@ - - #: misc/special_constructors.cc:157 - msgid "" --"Select the moving point, which will be moved around while drawing the locus..." --msgstr "選取移動點，在繪製軌跡時會被移動..." -+"Select the moving point, which will be moved around while drawing the " -+"locus..." -+msgstr "選取移動點，在繪製軌跡時會被移動…" - - #: misc/special_constructors.cc:158 - msgid "Following Point" -@@ -1558,8 +1584,9 @@ - - #: misc/special_constructors.cc:159 - msgid "" --"Select the following point, whose locations the locus will be drawn through..." --msgstr "選取跟隨點，繪製軌跡時會通過這些點..." -+"Select the following point, whose locations the locus will be drawn " -+"through..." -+msgstr "選取跟隨點，繪製軌跡時會通過這些點…" - - #: misc/special_constructors.cc:163 - msgid "Locus" -@@ -1584,7 +1611,7 @@ - #: misc/special_constructors.cc:366 - msgid "" - "... with this vertex (click on the first vertex to terminate construction)" --msgstr "... 此為頂點（點選第一個頂點則結束建構）" -+msgstr "… 此為頂點（點選第一個頂點則結束建構）" - - #: misc/special_constructors.cc:367 - msgid "Construct a polygon with this vertex" -@@ -1600,7 +1627,7 @@ - - #: misc/special_constructors.cc:430 - msgid "Construct the vertices of this polygon..." --msgstr "建構此多邊形的頂點..." -+msgstr "建構此多邊形的頂點…" - - #: misc/special_constructors.cc:434 - msgid "Vertices of a Polygon" -@@ -1612,7 +1639,7 @@ - - #: misc/special_constructors.cc:497 - msgid "Construct the sides of this polygon..." --msgstr "建構此多邊形的邊..." -+msgstr "建構此多邊形的邊…" - - #: misc/special_constructors.cc:501 - msgid "Sides of a Polygon" -@@ -1648,15 +1675,15 @@ - - #: misc/special_constructors.cc:777 - msgid "Select the center of the new polygon..." --msgstr "選擇新多邊形的中心..." -+msgstr "選擇新多邊形的中心…" - - #: misc/special_constructors.cc:781 - msgid "Select a vertex for the new polygon..." --msgstr "選擇新多邊形的頂點..." -+msgstr "選擇新多邊形的頂點…" - - #: misc/special_constructors.cc:785 - msgid "Move the cursor to get the desired number of sides..." --msgstr "移動游標以取得希望的邊數..." -+msgstr "移動游標以取得希望的邊數…" - - #: misc/special_constructors.cc:977 - msgid "Construct the Radical Lines of This Circle" -@@ -1682,9 +1709,10 @@ - - #: misc/special_constructors.cc:1019 - msgid "" --"The unique projective transformation that maps four points (or a quadrilateral) " --"onto four other points (or a quadrilateral)" --msgstr "利用某四點（或某四邊形）映射到其他四點（或其他四邊形）產生的唯一投影轉換" -+"The unique projective transformation that maps four points (or a " -+"quadrilateral) onto four other points (or a quadrilateral)" -+msgstr "" -+"利用某四點（或某四邊形）映射到其他四點（或其他四邊形）產生的唯一投影轉換" - - #: misc/special_constructors.cc:1046 - msgid "Inversion of Point, Line or Circle" -@@ -1793,7 +1821,7 @@ - #: misc/special_constructors.cc:1371 - msgid "" - "Select the first of the points of which you want to construct the midpoint..." --msgstr "選擇建構中點的第一點..." -+msgstr "選擇建構中點的第一點…" - - #: misc/special_constructors.cc:1372 - msgid "Construct the midpoint of this point and another one" -@@ -1801,15 +1829,15 @@ - - #: misc/special_constructors.cc:1373 - msgid "Select the other of the points of which to construct the midpoint..." --msgstr "選擇建構中點的另外一點..." -+msgstr "選擇建構中點的另外一點…" - - #: misc/special_constructors.cc:1483 - msgid "Select the first object to intersect..." --msgstr "選擇相交的第一個物件..." -+msgstr "選擇相交的第一個物件…" - - #: misc/special_constructors.cc:1485 - msgid "Select the second object to intersect..." --msgstr "選擇相交的第二個物件..." -+msgstr "選擇相交的第二個物件…" - - #: misc/special_constructors.cc:1490 - msgid "Tangent" -@@ -1873,9 +1901,9 @@ - - #: modes/construct_mode.cc:298 - msgid "" --"Click the location where you want to place the new point, or the curve that you " --"want to attach it to..." --msgstr "點選您要放置新點的位置，或是您要附加的曲線..." -+"Click the location where you want to place the new point, or the curve that " -+"you want to attach it to..." -+msgstr "點選您要放置新點的位置，或是您要附加的曲線…" - - #: modes/construct_mode.cc:475 - msgid "Now select the location for the result label." -@@ -1892,8 +1920,8 @@ - #: modes/label.cc:295 - #, c-format - msgid "" --"There are '%n' parts in the text that you have not selected a value for. Please " --"remove them or select enough arguments." -+"There are '%n' parts in the text that you have not selected a value for. " -+"Please remove them or select enough arguments." - msgstr "文字中有 %n 個部份沒有選取值。請將它們移除，或是選擇足夠的參數。" - - #: modes/label.cc:379 -@@ -1915,14 +1943,18 @@ - "One of the result objects you selected cannot be calculated from the given " - "objects. Kig cannot calculate this macro because of this. Please press Back, " - "and construct the objects in the correct order..." --msgstr "您所選取的結果物件中有一個無法根據給定的物件計算出來。Kig 因此而無法執行此巨集。請按「回去」鍵並重新依正確的順序建構物件..." -+msgstr "" -+"您所選取的結果物件中有一個無法根據給定的物件計算出來。Kig 因此而無法執行此巨" -+"集。請按「回去」鍵並重新依正確的順序建構物件..." - - #: modes/macro.cc:116 - msgid "" - "One of the given objects is not used in the calculation of the resultant " --"objects. This probably means you are expecting Kig to do something impossible. " --" Please check the macro and try again." --msgstr "給定的物件中有一個並未用於計算此結果物件。這有可能是您希望 Kig 做到不可能的事。請檢查此巨集並再試一次。" -+"objects. This probably means you are expecting Kig to do something " -+"impossible. Please check the macro and try again." -+msgstr "" -+"給定的物件中有一個並未用於計算此結果物件。這有可能是您希望 Kig 做到不可能的" -+"事。請檢查此巨集並再試一次。" - - #: modes/moving.cc:157 - msgid "Move %1 Objects" -@@ -1962,7 +1994,7 @@ - - #: modes/popup.cc:282 - msgid "Set &Pen Width" --msgstr "設定筆寬(&L)..." -+msgstr "設定筆寬(&L)…" - - #: modes/popup.cc:283 - msgid "Set St&yle" -@@ -1990,7 +2022,7 @@ - - #: modes/popup.cc:502 - msgid "Set &Name..." --msgstr "設定名稱(&N)..." -+msgstr "設定名稱(&N)…" - - #: modes/popup.cc:506 - msgid "&Name" -@@ -2026,7 +2058,7 @@ - - #: modes/popup.cc:1065 - msgid "Edit Script..." --msgstr "編輯文稿..." -+msgstr "編輯文稿…" - - #: objects/angle_type.cc:39 - msgid "Construct an angle through this point" -@@ -2035,7 +2067,7 @@ - #: objects/angle_type.cc:44 - msgid "" - "Select a point that the first half-line of the angle should go through..." --msgstr "選擇一個點，此角的第一條線會通過此點..." -+msgstr "選擇一個點，此角的第一條線會通過此點…" - - #: objects/angle_type.cc:45 - msgid "Construct an angle at this point" -@@ -2043,12 +2075,12 @@ - - #: objects/angle_type.cc:46 - msgid "Select the point to construct the angle in..." --msgstr "選擇一個點以建構此角..." -+msgstr "選擇一個點以建構此角…" - - #: objects/angle_type.cc:48 - msgid "" - "Select a point that the second half-line of the angle should go through..." --msgstr "選擇一個點，此角的第二條線會通過此點..." -+msgstr "選擇一個點，此角的第二條線會通過此點…" - - #: objects/angle_type.cc:103 - msgid "Set Si&ze" -@@ -2064,7 +2096,7 @@ - - #: objects/arc_type.cc:46 objects/arc_type.cc:148 - msgid "Select the start point of the new arc..." --msgstr "選擇新弧的起點..." -+msgstr "選擇新弧的起點…" - - #: objects/arc_type.cc:47 - msgid "Construct an arc through this point" -@@ -2072,7 +2104,7 @@ - - #: objects/arc_type.cc:48 - msgid "Select a point for the new arc to go through..." --msgstr "選擇新弧通過的一點..." -+msgstr "選擇新弧通過的一點…" - - #: objects/arc_type.cc:49 - msgid "Construct an arc ending at this point" -@@ -2080,7 +2112,7 @@ - - #: objects/arc_type.cc:50 - msgid "Select the end point of the new arc..." --msgstr "選擇新戶的終點..." -+msgstr "選擇新戶的終點…" - - #: objects/arc_type.cc:145 - msgid "Construct an arc with this center" -@@ -2088,7 +2120,7 @@ - - #: objects/arc_type.cc:146 - msgid "Select the center of the new arc..." --msgstr "選擇新弧的圓心..." -+msgstr "選擇新弧的圓心…" - - #: objects/arc_type.cc:149 - msgid "Construct an arc with this angle" -@@ -2096,7 +2128,7 @@ - - #: objects/arc_type.cc:150 - msgid "Select the angle of the new arc..." --msgstr "選擇新弧的角度..." -+msgstr "選擇新弧的角度…" - - #: objects/bogus_imp.cc:338 - msgid "Test Result" -@@ -2104,7 +2136,7 @@ - - #: objects/centerofcurvature_type.cc:36 - msgid "Select a point on the curve..." --msgstr "選擇曲線上的點..." -+msgstr "選擇曲線上的點…" - - #: objects/circle_imp.cc:145 objects/polygon_imp.cc:227 - msgid "Surface" -@@ -2186,7 +2218,7 @@ - #: objects/circle_type.cc:38 objects/circle_type.cc:72 - #: objects/circle_type.cc:74 objects/circle_type.cc:76 - msgid "Select a point for the new circle to go through..." --msgstr "選擇新圓要通過的點..." -+msgstr "選擇新圓要通過的點…" - - #: objects/conic_imp.cc:81 - msgid "Conic Type" -@@ -2271,7 +2303,7 @@ - #: objects/conic_types.cc:46 objects/conic_types.cc:88 - #: objects/conic_types.cc:222 - msgid "Select a point for the new conic to go through..." --msgstr "選擇新的二次曲線要通過的點..." -+msgstr "選擇新的二次曲線要通過的點…" - - #: objects/conic_types.cc:83 objects/conic_types.cc:85 - msgid "Construct a conic with this asymptote" -@@ -2279,11 +2311,11 @@ - - #: objects/conic_types.cc:84 - msgid "Select the first asymptote of the new conic..." --msgstr "擇新的二次曲線的第一條漸近線..." -+msgstr "擇新的二次曲線的第一條漸近線…" - - #: objects/conic_types.cc:86 - msgid "Select the second asymptote of the new conic..." --msgstr "擇新的二次曲線的第二條漸近線..." -+msgstr "擇新的二次曲線的第二條漸近線…" - - #: objects/conic_types.cc:140 - msgid "Construct an ellipse with this focus" -@@ -2291,11 +2323,11 @@ - - #: objects/conic_types.cc:145 - msgid "Select the first focus of the new ellipse..." --msgstr "選擇新橢圓的第一個焦點..." -+msgstr "選擇新橢圓的第一個焦點…" - - #: objects/conic_types.cc:147 - msgid "Select the second focus of the new ellipse..." --msgstr "選擇新橢圓的第二個焦點..." -+msgstr "選擇新橢圓的第二個焦點…" - - #: objects/conic_types.cc:148 - msgid "Construct an ellipse through this point" -@@ -2303,7 +2335,7 @@ - - #: objects/conic_types.cc:149 - msgid "Select a point for the new ellipse to go through..." --msgstr "選擇新橢圓要通過的點..." -+msgstr "選擇新橢圓要通過的點…" - - #: objects/conic_types.cc:175 - msgid "Construct a hyperbola with this focus" -@@ -2311,11 +2343,11 @@ - - #: objects/conic_types.cc:180 - msgid "Select the first focus of the new hyperbola..." --msgstr "選擇新雙曲線的第一個焦點..." -+msgstr "選擇新雙曲線的第一個焦點…" - - #: objects/conic_types.cc:182 - msgid "Select the second focus of the new hyperbola..." --msgstr "選擇新雙曲線的第二個焦點..." -+msgstr "選擇新雙曲線的第二個焦點…" - - #: objects/conic_types.cc:183 objects/conic_types.cc:417 - msgid "Construct a hyperbola through this point" -@@ -2325,7 +2357,7 @@ - #: objects/conic_types.cc:424 objects/conic_types.cc:426 - #: objects/conic_types.cc:428 - msgid "Select a point for the new hyperbola to go through..." --msgstr "選擇新雙曲線要通過的點..." -+msgstr "選擇新雙曲線要通過的點…" - - #: objects/conic_types.cc:217 - msgid "Construct a conic with this line as directrix" -@@ -2333,7 +2365,7 @@ - - #: objects/conic_types.cc:218 - msgid "Select the directrix of the new conic..." --msgstr "選擇新二次曲線的準線..." -+msgstr "選擇新二次曲線的準線…" - - #: objects/conic_types.cc:219 - msgid "Construct a conic with this point as focus" -@@ -2341,7 +2373,7 @@ - - #: objects/conic_types.cc:220 - msgid "Select the focus of the new conic..." --msgstr "選擇新二次曲線的角度..." -+msgstr "選擇新二次曲線的角度…" - - #: objects/conic_types.cc:260 - msgid "Construct a parabola through this point" -@@ -2350,7 +2382,7 @@ - #: objects/conic_types.cc:265 objects/conic_types.cc:267 - #: objects/conic_types.cc:269 - msgid "Select a point for the new parabola to go through..." --msgstr "選擇新拋物線要通過的點..." -+msgstr "選擇新拋物線要通過的點…" - - #: objects/conic_types.cc:307 - msgid "Construct a polar point wrt. this conic" -@@ -2366,7 +2398,7 @@ - - #: objects/conic_types.cc:310 objects/conic_types.cc:346 - msgid "Select the line of which you want to construct the polar point..." --msgstr "選擇您要建構極點的直線..." -+msgstr "選擇您要建構極點的直線…" - - #: objects/conic_types.cc:343 - msgid "Construct a polar line wrt. this conic" -@@ -2382,7 +2414,7 @@ - - #: objects/conic_types.cc:381 - msgid "Select the conic of which you want to construct the directrix..." --msgstr "選擇您要建構準線的二次曲線..." -+msgstr "選擇您要建構準線的二次曲線…" - - #: objects/conic_types.cc:465 - msgid "Construct a parabola with this directrix" -@@ -2390,7 +2422,7 @@ - - #: objects/conic_types.cc:466 - msgid "Select the directrix of the new parabola..." --msgstr "選擇新拋物線的準線..." -+msgstr "選擇新拋物線的準線…" - - #: objects/conic_types.cc:467 - msgid "Construct a parabola with this focus" -@@ -2398,7 +2430,7 @@ - - #: objects/conic_types.cc:468 - msgid "Select the focus of the new parabola..." --msgstr "選擇新拋物線的焦點..." -+msgstr "選擇新拋物線的焦點…" - - #: objects/conic_types.cc:505 - msgid "Construct the asymptotes of this conic" -@@ -2406,7 +2438,7 @@ - - #: objects/conic_types.cc:506 - msgid "Select the conic of which you want to construct the asymptotes..." --msgstr "選擇您要建構漸近線的二次曲線..." -+msgstr "選擇您要建構漸近線的二次曲線…" - - #: objects/conic_types.cc:543 - msgid "Construct the radical lines of this conic" -@@ -2414,15 +2446,15 @@ - - #: objects/conic_types.cc:548 - msgid "" --"Select the first of the two conics of which you want to construct the radical " --"line..." --msgstr "選擇您要建構公弦的第一個二次曲線..." -+"Select the first of the two conics of which you want to construct the " -+"radical line..." -+msgstr "選擇您要建構公弦的第一個二次曲線…" - - #: objects/conic_types.cc:550 - msgid "" - "Select the other of the two conic of which you want to construct the radical " - "line..." --msgstr "選擇您要建構公弦的第二個二次曲線..." -+msgstr "選擇您要建構公弦的第二個二次曲線…" - - #: objects/conic_types.cc:669 - msgid "Switch Radical Lines" -@@ -2485,7 +2517,7 @@ - #: objects/cubic_type.cc:133 objects/cubic_type.cc:135 - #: objects/cubic_type.cc:137 objects/cubic_type.cc:139 - msgid "Select a point for the new cubic to go through..." --msgstr "選擇新三次曲線通過的一點..." -+msgstr "選擇新三次曲線通過的一點…" - - #: objects/curve_imp.cc:25 - msgid "curve" -@@ -2554,7 +2586,7 @@ - - #: objects/inversion_type.cc:30 - msgid "Select the circle we want to invert against..." --msgstr "選擇要做為反演基準的圓..." -+msgstr "選擇要做為反演基準的圓…" - - #: objects/inversion_type.cc:34 - msgid "Compute the inversion of this point" -@@ -2562,7 +2594,7 @@ - - #: objects/inversion_type.cc:35 - msgid "Select the point to invert..." --msgstr "選擇要反演的點..." -+msgstr "選擇要反演的點…" - - #: objects/inversion_type.cc:80 - msgid "Compute the inversion of this line" -@@ -2570,7 +2602,7 @@ - - #: objects/inversion_type.cc:81 - msgid "Select the line to invert..." --msgstr "選擇要反演的直線..." -+msgstr "選擇要反演的直線…" - - #: objects/inversion_type.cc:133 - msgid "Compute the inversion of this segment" -@@ -2578,7 +2610,7 @@ - - #: objects/inversion_type.cc:134 - msgid "Select the segment to invert..." --msgstr "選擇要反演的線段..." -+msgstr "選擇要反演的線段…" - - #: objects/inversion_type.cc:224 - msgid "Compute the inversion of this circle" -@@ -2586,7 +2618,7 @@ - - #: objects/inversion_type.cc:225 - msgid "Select the circle to invert..." --msgstr "選擇要反演的圓..." -+msgstr "選擇要反演的圓…" - - #: objects/inversion_type.cc:289 - msgid "Compute the inversion of this arc" -@@ -2594,7 +2626,7 @@ - - #: objects/inversion_type.cc:290 - msgid "Select the arc to invert..." --msgstr "選擇要反演的弧..." -+msgstr "選擇要反演的弧…" - - #: objects/line_imp.cc:96 - msgid "Slope" -@@ -2737,7 +2769,7 @@ - - #: objects/line_type.cc:39 - msgid "Select the start point of the new segment..." --msgstr "選擇新線段的起點..." -+msgstr "選擇新線段的起點…" - - #: objects/line_type.cc:40 - msgid "Construct a segment ending at this point" -@@ -2745,7 +2777,7 @@ - - #: objects/line_type.cc:41 - msgid "Select the end point of the new segment..." --msgstr "選擇新線段的終點..." -+msgstr "選擇新線段的終點…" - - #: objects/line_type.cc:66 - msgid "Construct a line through this point" -@@ -2753,11 +2785,11 @@ - - #: objects/line_type.cc:71 - msgid "Select a point for the line to go through..." --msgstr "選擇直線通過的一點..." -+msgstr "選擇直線通過的一點…" - - #: objects/line_type.cc:73 - msgid "Select another point for the line to go through..." --msgstr "選擇直線通過的另一點..." -+msgstr "選擇直線通過的另一點…" - - #: objects/line_type.cc:98 - msgid "Construct a half-line starting at this point" -@@ -2765,7 +2797,7 @@ - - #: objects/line_type.cc:103 objects/line_type.cc:301 - msgid "Select the start point of the new half-line..." --msgstr "選擇新半線的起點..." -+msgstr "選擇新半線的起點…" - - #: objects/line_type.cc:104 - msgid "Construct a half-line through this point" -@@ -2773,7 +2805,7 @@ - - #: objects/line_type.cc:105 - msgid "Select a point for the half-line to go through..." --msgstr "選擇半線通過的一點..." -+msgstr "選擇半線通過的一點…" - - #: objects/line_type.cc:146 - msgid "Construct a line parallel to this line" -@@ -2781,7 +2813,7 @@ - - #: objects/line_type.cc:147 - msgid "Select a line parallel to the new line..." --msgstr "選擇平行於新直線的直線..." -+msgstr "選擇平行於新直線的直線…" - - #: objects/line_type.cc:148 - msgid "Construct the parallel line through this point" -@@ -2789,7 +2821,7 @@ - - #: objects/line_type.cc:149 objects/line_type.cc:182 objects/line_type.cc:261 - msgid "Select a point for the new line to go through..." --msgstr "選擇新直線通過的一點..." -+msgstr "選擇新直線通過的一點…" - - #: objects/line_type.cc:179 - msgid "Construct a line perpendicular to this line" -@@ -2797,7 +2829,7 @@ - - #: objects/line_type.cc:180 - msgid "Select a line perpendicular to the new line..." --msgstr "選擇垂直於新直線的直線..." -+msgstr "選擇垂直於新直線的直線…" - - #: objects/line_type.cc:181 - msgid "Construct a perpendicular line through this point" -@@ -2805,7 +2837,7 @@ - - #: objects/line_type.cc:224 - msgid "Set &Length..." --msgstr "設定長度(&L)..." -+msgstr "設定長度(&L)…" - - #: objects/line_type.cc:243 - msgid "Set Segment Length" -@@ -2825,7 +2857,7 @@ - - #: objects/line_type.cc:259 - msgid "Select a vector in the direction of the new line..." --msgstr "選擇新直線方向上的向量..." -+msgstr "選擇新直線方向上的向量…" - - #: objects/line_type.cc:298 - msgid "Construct a half-line by this vector" -@@ -2833,7 +2865,7 @@ - - #: objects/line_type.cc:299 - msgid "Select a vector in the direction of the new half-line..." --msgstr "選擇新半線方向上的向量..." -+msgstr "選擇新半線方向上的向量…" - - #: objects/locus_imp.cc:357 - msgid "locus" -@@ -3117,17 +3149,17 @@ - msgid "" - "Select the first of the two points of which you want to construct the " - "midpoint..." --msgstr "選擇您要建構中點的第一個點..." -+msgstr "選擇您要建構中點的第一個點…" - - #: objects/point_type.cc:264 - msgid "" - "Select the other of the two points of which you want to construct the " - "midpoint..." --msgstr "選擇您要建構中點的另一個點..." -+msgstr "選擇您要建構中點的另一個點…" - - #: objects/point_type.cc:366 - msgid "Set &Coordinate..." --msgstr "設定座標(&C)..." -+msgstr "設定座標(&C)…" - - #: objects/point_type.cc:367 objects/point_type.cc:375 - msgid "Redefine" -@@ -3135,7 +3167,7 @@ - - #: objects/point_type.cc:374 - msgid "Set &Parameter..." --msgstr "設定參數(&P)..." -+msgstr "設定參數(&P)…" - - #: objects/point_type.cc:397 - msgid "Set Coordinate" -@@ -3159,11 +3191,11 @@ - - #: objects/point_type.cc:635 - msgid "Select the circle on which to transport a measure..." --msgstr "選擇要在哪個圓上取弧..." -+msgstr "選擇要在哪個圓上取弧…" - - #: objects/point_type.cc:637 - msgid "Select a point on the circle..." --msgstr "選擇圓上一點..." -+msgstr "選擇圓上一點…" - - #: objects/point_type.cc:639 - msgid "Select the segment to transport on the circle..." -@@ -3302,7 +3334,7 @@ - - #: objects/polygon_type.cc:37 - msgid "Select a point to be a vertex of the new triangle..." --msgstr "選擇新三角形的頂點..." -+msgstr "選擇新三角形的頂點…" - - #: objects/polygon_type.cc:406 - msgid "Intersect this polygon with a line" -@@ -3310,7 +3342,7 @@ - - #: objects/polygon_type.cc:407 - msgid "Select the polygon of which you want the intersection with a line..." --msgstr "選擇您要相交的多邊形..." -+msgstr "選擇您要相交的多邊形…" - - #: objects/polygon_type.cc:543 - msgid "Construct the vertices of this polygon" -@@ -3318,7 +3350,7 @@ - - #: objects/polygon_type.cc:544 - msgid "Select the polygon of which you want to construct the vertices..." --msgstr "選擇您要建構頂點的多邊形..." -+msgstr "選擇您要建構頂點的多邊形…" - - #: objects/polygon_type.cc:586 - msgid "Construct the sides of this polygon" -@@ -3326,7 +3358,7 @@ - - #: objects/polygon_type.cc:587 - msgid "Select the polygon of which you want to construct the sides..." --msgstr "選擇您要建構邊的多邊形..." -+msgstr "選擇您要建構邊的多邊形…" - - #: objects/polygon_type.cc:632 - msgid "Construct the convex hull of this polygon" -@@ -3334,7 +3366,7 @@ - - #: objects/polygon_type.cc:633 - msgid "Select the polygon of which you want to construct the convex hull..." --msgstr "選擇您要建構凸包的多邊形..." -+msgstr "選擇您要建構凸包的多邊形…" - - #: objects/special_calcers.cc:23 - msgid "Project this point onto the circle" -@@ -3342,7 +3374,7 @@ - - #: objects/tangent_type.cc:38 - msgid "Select the point for the tangent to go through..." --msgstr "選擇切線要經過的點..." -+msgstr "選擇切線要經過的點…" - - #: objects/tests_type.cc:30 - msgid "Is this line parallel?" -@@ -3350,7 +3382,7 @@ - - #: objects/tests_type.cc:31 - msgid "Select the first of the two possibly parallel lines..." --msgstr "選擇要檢查是否為平行線的第一條線..." -+msgstr "選擇要檢查是否為平行線的第一條線…" - - #: objects/tests_type.cc:32 - msgid "Parallel to this line?" -@@ -3358,7 +3390,7 @@ - - #: objects/tests_type.cc:33 - msgid "Select the other of the two possibly parallel lines..." --msgstr "選擇要檢查是否為平行線的另一條線..." -+msgstr "選擇要檢查是否為平行線的另一條線…" - - #: objects/tests_type.cc:61 - msgid "These lines are parallel." -@@ -3374,7 +3406,7 @@ - - #: objects/tests_type.cc:75 - msgid "Select the first of the two possibly orthogonal lines..." --msgstr "選擇要檢查是否相互垂直的第一條線..." -+msgstr "選擇要檢查是否相互垂直的第一條線…" - - #: objects/tests_type.cc:76 - msgid "Orthogonal to this line?" -@@ -3382,7 +3414,7 @@ - - #: objects/tests_type.cc:77 - msgid "Select the other of the two possibly orthogonal lines..." --msgstr "選擇要檢查是否相互垂直的另一條線..." -+msgstr "選擇要檢查是否相互垂直的另一條線…" - - #: objects/tests_type.cc:105 - msgid "These lines are orthogonal." -@@ -3398,7 +3430,7 @@ - - #: objects/tests_type.cc:119 - msgid "Select the first of the three possibly collinear points..." --msgstr "選擇要檢查是否共線的第一個點..." -+msgstr "選擇要檢查是否共線的第一個點…" - - #: objects/tests_type.cc:120 - msgid "and this second point" -@@ -3406,7 +3438,7 @@ - - #: objects/tests_type.cc:121 - msgid "Select the second of the three possibly collinear points..." --msgstr "選擇要檢查是否共線的第二個點..." -+msgstr "選擇要檢查是否共線的第二個點…" - - #: objects/tests_type.cc:122 - msgid "with this third point" -@@ -3414,7 +3446,7 @@ - - #: objects/tests_type.cc:123 - msgid "Select the last of the three possibly collinear points..." --msgstr "選擇要檢查是否共線的第三個點..." -+msgstr "選擇要檢查是否共線的第三個點…" - - #: objects/tests_type.cc:152 - msgid "These points are collinear." -@@ -3438,7 +3470,7 @@ - - #: objects/tests_type.cc:167 - msgid "Select the curve that the point might be on..." --msgstr "選擇您要檢查的曲線..." -+msgstr "選擇您要檢查的曲線…" - - #: objects/tests_type.cc:194 - msgid "This curve contains the point." -@@ -3458,7 +3490,7 @@ - - #: objects/tests_type.cc:213 - msgid "Select the polygon that the point might be in..." --msgstr "選擇您要檢查的多邊形..." -+msgstr "選擇您要檢查的多邊形…" - - #: objects/tests_type.cc:240 - msgid "This polygon contains the point." -@@ -3474,7 +3506,7 @@ - - #: objects/tests_type.cc:257 - msgid "Select the polygon you want to test for convexity..." --msgstr "選擇您要檢查的多邊形..." -+msgstr "選擇您要檢查的多邊形…" - - #: objects/tests_type.cc:283 - msgid "This polygon is convex." -@@ -3491,7 +3523,7 @@ - #: objects/tests_type.cc:300 - msgid "" - "Select the point which might have the same distance from two other points..." --msgstr "選擇要檢查是否與其他兩點等距的點..." -+msgstr "選擇要檢查是否與其他兩點等距的點…" - - #: objects/tests_type.cc:301 - msgid "from this point" -@@ -3499,7 +3531,7 @@ - - #: objects/tests_type.cc:302 - msgid "Select the first of the two other points..." --msgstr "選擇另外兩點中的第一個點..." -+msgstr "選擇另外兩點中的第一個點…" - - #: objects/tests_type.cc:303 - msgid "and from this second point" -@@ -3507,7 +3539,7 @@ - - #: objects/tests_type.cc:304 - msgid "Select the other of the two other points..." --msgstr "選擇另外兩點中的第二個點..." -+msgstr "選擇另外兩點中的第二個點…" - - #: objects/tests_type.cc:332 - msgid "The two distances are the same." -@@ -3523,7 +3555,7 @@ - - #: objects/tests_type.cc:345 - msgid "Select the first of the two possibly equal vectors..." --msgstr "選擇要檢查的第一個向量..." -+msgstr "選擇要檢查的第一個向量…" - - #: objects/tests_type.cc:346 - msgid "Check whether this vector is equal to the other vector" -@@ -3531,7 +3563,7 @@ - - #: objects/tests_type.cc:347 - msgid "Select the other of the two possibly equal vectors..." --msgstr "選擇要檢查的第二個向量..." -+msgstr "選擇要檢查的第二個向量…" - - #: objects/tests_type.cc:374 - msgid "The two vectors are the same." -@@ -3592,7 +3624,7 @@ - - #: objects/text_type.cc:128 - msgid "&Redefine..." --msgstr "重新定義(&R)..." -+msgstr "重新定義(&R)…" - - #: objects/text_type.cc:157 - msgid "Toggle Label Frame" -@@ -3604,7 +3636,7 @@ - - #: objects/transform_types.cc:33 - msgid "Select the object to translate..." --msgstr "選擇要平移的物件..." -+msgstr "選擇要平移的物件…" - - #: objects/transform_types.cc:34 - msgid "Translate by this vector" -@@ -3612,7 +3644,7 @@ - - #: objects/transform_types.cc:35 - msgid "Select the vector to translate by..." --msgstr "選擇平移的向量..." -+msgstr "選擇平移的向量…" - - #: objects/transform_types.cc:67 objects/transform_types.cc:102 - msgid "Reflect this object" -@@ -3620,7 +3652,7 @@ - - #: objects/transform_types.cc:68 objects/transform_types.cc:103 - msgid "Select the object to reflect..." --msgstr "選擇要映射的物件..." -+msgstr "選擇要映射的物件…" - - #: objects/transform_types.cc:69 - msgid "Reflect in this point" -@@ -3628,7 +3660,7 @@ - - #: objects/transform_types.cc:70 - msgid "Select the point to reflect in..." --msgstr "選擇要映射的點..." -+msgstr "選擇要映射的點…" - - #: objects/transform_types.cc:104 - msgid "Reflect in this line" -@@ -3636,7 +3668,7 @@ - - #: objects/transform_types.cc:105 - msgid "Select the line to reflect in..." --msgstr "選擇要映射的線..." -+msgstr "選擇要映射的線…" - - #: objects/transform_types.cc:137 - msgid "Rotate this object" -@@ -3644,7 +3676,7 @@ - - #: objects/transform_types.cc:138 - msgid "Select the object to rotate..." --msgstr "選擇要旋轉的物件..." -+msgstr "選擇要旋轉的物件…" - - #: objects/transform_types.cc:139 - msgid "Rotate around this point" -@@ -3652,7 +3684,7 @@ - - #: objects/transform_types.cc:140 - msgid "Select the center point of the rotation..." --msgstr "選擇旋轉的中心點..." -+msgstr "選擇旋轉的中心點…" - - #: objects/transform_types.cc:141 - msgid "Rotate by this angle" -@@ -3660,7 +3692,7 @@ - - #: objects/transform_types.cc:142 - msgid "Select the angle of the rotation..." --msgstr "選擇旋轉的角度..." -+msgstr "選擇旋轉的角度…" - - #: objects/transform_types.cc:174 objects/transform_types.cc:211 - #: objects/transform_types.cc:251 objects/transform_types.cc:285 -@@ -3669,7 +3701,7 @@ - - #: objects/transform_types.cc:175 objects/transform_types.cc:212 - msgid "Select the object to scale..." --msgstr "選擇要縮放的物件..." -+msgstr "選擇要縮放的物件…" - - #: objects/transform_types.cc:176 objects/transform_types.cc:213 - msgid "Scale with this center" -@@ -3677,7 +3709,7 @@ - - #: objects/transform_types.cc:177 objects/transform_types.cc:214 - msgid "Select the center point of the scaling..." --msgstr "選擇要縮放的中心點..." -+msgstr "選擇要縮放的中心點…" - - #: objects/transform_types.cc:178 objects/transform_types.cc:253 - msgid "Scale by the length of this segment" -@@ -3685,16 +3717,16 @@ - - #: objects/transform_types.cc:179 - msgid "Select a segment whose length is the factor of the scaling..." --msgstr "選擇要用於決定縮放比例的線段長度..." -+msgstr "選擇要用於決定縮放比例的線段長度…" - - #: objects/transform_types.cc:215 objects/transform_types.cc:287 - msgid "Scale the length of this segment..." --msgstr "將此線段的長度..." -+msgstr "將此線段的長度…" - - #: objects/transform_types.cc:216 - msgid "" - "Select the first of two segments whose ratio is the factor of the scaling..." --msgstr "選擇兩個用於決定縮放比例的線段的第一個..." -+msgstr "選擇兩個用於決定縮放比例的線段的第一個…" - - #: objects/transform_types.cc:217 - msgid "...to the length of this other segment" -@@ -3703,7 +3735,7 @@ - #: objects/transform_types.cc:218 - msgid "" - "Select the second of two segments whose ratio is the factor of the scaling..." --msgstr "選擇兩個用於決定縮放比例的線段的第二個..." -+msgstr "選擇兩個用於決定縮放比例的線段的第二個…" - - #: objects/transform_types.cc:251 objects/transform_types.cc:285 - msgid "Select the object to scale" -@@ -3724,7 +3756,7 @@ - #: objects/transform_types.cc:287 - msgid "" - "Select the first of two segments whose ratio is the factor for the scaling" --msgstr "選擇兩個用於決定縮放比例的線段的第一個..." -+msgstr "選擇兩個用於決定縮放比例的線段的第一個…" - - #: objects/transform_types.cc:288 - msgid "...to the length of this segment" -@@ -3733,7 +3765,7 @@ - #: objects/transform_types.cc:288 - msgid "" - "Select the second of two segments whose ratio is the factor for the scaling" --msgstr "選擇兩個用於決定縮放比例的線段的第二個..." -+msgstr "選擇兩個用於決定縮放比例的線段的第二個…" - - #: objects/transform_types.cc:321 - msgid "Projectively rotate this object" -@@ -3749,8 +3781,8 @@ - - #: objects/transform_types.cc:322 - msgid "" --"Select the half line of the projective rotation that you want to apply to the " --"object" -+"Select the half line of the projective rotation that you want to apply to " -+"the object" - msgstr "選擇要做投影旋轉的半線" - - #: objects/transform_types.cc:323 -@@ -3771,7 +3803,7 @@ - #: objects/transform_types.cc:438 objects/transform_types.cc:495 - #: objects/transform_types.cc:537 objects/transform_types.cc:860 - msgid "Select the object to transform..." --msgstr "選擇要轉換的物件..." -+msgstr "選擇要轉換的物件…" - - #: objects/transform_types.cc:360 - msgid "Harmonic Homology with this center" -@@ -3779,7 +3811,7 @@ - - #: objects/transform_types.cc:361 - msgid "Select the center point of the harmonic homology..." --msgstr "選擇調和同調的中心點..." -+msgstr "選擇調和同調的中心點…" - - #: objects/transform_types.cc:362 - msgid "Harmonic Homology with this axis" -@@ -3787,7 +3819,7 @@ - - #: objects/transform_types.cc:363 - msgid "Select the axis of the harmonic homology..." --msgstr "選擇調和同調的軸線..." -+msgstr "選擇調和同調的軸線…" - - #: objects/transform_types.cc:395 objects/transform_types.cc:437 - msgid "Generic affinity of this object" -@@ -3799,7 +3831,7 @@ - - #: objects/transform_types.cc:398 - msgid "Select the triangle that has to be transformed onto a given triangle..." --msgstr "選擇要映射的三角形..." -+msgstr "選擇要映射的三角形…" - - #: objects/transform_types.cc:399 - msgid "onto this other triangle" -@@ -3807,8 +3839,9 @@ - - #: objects/transform_types.cc:400 - msgid "" --"Select the triangle that is the image by the affinity of the first triangle..." --msgstr "選擇第一個三角形..." -+"Select the triangle that is the image by the affinity of the first " -+"triangle..." -+msgstr "選擇第一個三角形…" - - #: objects/transform_types.cc:439 - msgid "First of 3 starting points" -@@ -3817,7 +3850,7 @@ - #: objects/transform_types.cc:440 - msgid "" - "Select the first of the three starting points of the generic affinity..." --msgstr "選擇三個起點中的第一個..." -+msgstr "選擇三個起點中的第一個…" - - #: objects/transform_types.cc:441 - msgid "Second of 3 starting points" -@@ -3826,7 +3859,7 @@ - #: objects/transform_types.cc:442 - msgid "" - "Select the second of the three starting points of the generic affinity..." --msgstr "選擇三個起點中的第二個..." -+msgstr "選擇三個起點中的第二個…" - - #: objects/transform_types.cc:443 - msgid "Third of 3 starting points" -@@ -3835,7 +3868,7 @@ - #: objects/transform_types.cc:444 - msgid "" - "Select the third of the three starting points of the generic affinity..." --msgstr "選擇三個起點中的第三個..." -+msgstr "選擇三個起點中的第三個…" - - #: objects/transform_types.cc:445 objects/transform_types.cc:546 - msgid "Transformed position of first point" -@@ -3843,7 +3876,7 @@ - - #: objects/transform_types.cc:446 - msgid "Select the first of the three end points of the generic affinity..." --msgstr "選擇三個結束點的第一個..." -+msgstr "選擇三個結束點的第一個…" - - #: objects/transform_types.cc:447 objects/transform_types.cc:548 - msgid "Transformed position of second point" -@@ -3851,7 +3884,7 @@ - - #: objects/transform_types.cc:448 - msgid "Select the second of the three end points of the generic affinity..." --msgstr "選擇三個結束點的第二個..." -+msgstr "選擇三個結束點的第二個…" - - #: objects/transform_types.cc:449 objects/transform_types.cc:550 - msgid "Transformed position of third point" -@@ -3859,7 +3892,7 @@ - - #: objects/transform_types.cc:450 - msgid "Select the third of the three end points of the generic affinity..." --msgstr "選擇三個結束點的第三個..." -+msgstr "選擇三個結束點的第三個…" - - #: objects/transform_types.cc:494 objects/transform_types.cc:536 - msgid "Generic projective transformation of this object" -@@ -3873,7 +3906,7 @@ - msgid "" - "Select the quadrilateral that has to be transformed onto a given " - "quadrilateral..." --msgstr "選擇要映射的四邊形..." -+msgstr "選擇要映射的四邊形…" - - #: objects/transform_types.cc:498 - msgid "onto this other quadrilateral" -@@ -3881,9 +3914,9 @@ - - #: objects/transform_types.cc:499 - msgid "" --"Select the quadrilateral that is the image by the projective transformation of " --"the first quadrilateral..." --msgstr "選擇要映射的第一個四邊形..." -+"Select the quadrilateral that is the image by the projective transformation " -+"of the first quadrilateral..." -+msgstr "選擇要映射的第一個四邊形…" - - #: objects/transform_types.cc:538 - msgid "First of 4 starting points" -@@ -3923,15 +3956,15 @@ - - #: objects/transform_types.cc:547 - msgid "Select the first of the four end points of the generic projectivity..." --msgstr "選擇四個結束點的第一個..." -+msgstr "選擇四個結束點的第一個…" - - #: objects/transform_types.cc:549 - msgid "Select the second of the four end points of the generic projectivity..." --msgstr "選擇四個結束點的第二個..." -+msgstr "選擇四個結束點的第二個…" - - #: objects/transform_types.cc:551 - msgid "Select the third of the four end points of the generic projectivity..." --msgstr "選擇四個結束點的第三個..." -+msgstr "選擇四個結束點的第三個…" - - #: objects/transform_types.cc:552 - msgid "Transformed position of fourth point" -@@ -3939,7 +3972,7 @@ - - #: objects/transform_types.cc:553 - msgid "Select the fourth of the four end points of the generic projectivity..." --msgstr "選擇四個結束點的第四個..." -+msgstr "選擇四個結束點的第四個…" - - #: objects/transform_types.cc:597 - msgid "Cast the shadow of this object" -@@ -3947,7 +3980,7 @@ - - #: objects/transform_types.cc:598 - msgid "Select the object of which you want to construct the shadow..." --msgstr "選擇您要建構陰影的物件..." -+msgstr "選擇您要建構陰影的物件…" - - #: objects/transform_types.cc:599 - msgid "Cast a shadow from this light source" -@@ -3955,7 +3988,7 @@ - - #: objects/transform_types.cc:600 - msgid "Select the light source from which the shadow should originate..." --msgstr "選擇您要產生陰影的光源..." -+msgstr "選擇您要產生陰影的光源…" - - #: objects/transform_types.cc:602 - msgid "Cast a shadow on the horizon represented by this line" -@@ -3963,7 +3996,7 @@ - - #: objects/transform_types.cc:603 - msgid "Select the horizon for the shadow..." --msgstr "選擇投影的水平面..." -+msgstr "選擇投影的水平面…" - - #: objects/transform_types.cc:785 - msgid "Transform this object" -@@ -3983,7 +4016,7 @@ - - #: objects/transform_types.cc:862 - msgid "Select the center for the similitude..." --msgstr "選擇中心點..." -+msgstr "選擇中心點…" - - #: objects/transform_types.cc:863 - msgid "Apply a similitude mapping this point onto another point" -@@ -3991,7 +4024,7 @@ - - #: objects/transform_types.cc:864 - msgid "Select the point which the similitude should map onto another point..." --msgstr "選擇要映射的點..." -+msgstr "選擇要映射的點…" - - #: objects/transform_types.cc:865 - msgid "Apply a similitude mapping a point onto this point" -@@ -4000,7 +4033,7 @@ - #: objects/transform_types.cc:866 - msgid "" - "Select the point onto which the similitude should map the first point..." --msgstr "選擇第一個點要映設到哪個點..." -+msgstr "選擇第一個點要映設到哪個點…" - - #: objects/vector_type.cc:26 - msgid "Construct a vector from this point" -@@ -4008,7 +4041,7 @@ - - #: objects/vector_type.cc:27 - msgid "Select the start point of the new vector..." --msgstr "選擇新向量的起點..." -+msgstr "選擇新向量的起點…" - - #: objects/vector_type.cc:28 - msgid "Construct a vector to this point" -@@ -4016,7 +4049,7 @@ - - #: objects/vector_type.cc:29 - msgid "Select the end point of the new vector..." --msgstr "選擇新向量的終點..." -+msgstr "選擇新向量的終點…" - - #: objects/vector_type.cc:61 - msgid "Construct the vector sum of this vector and another one." -@@ -4025,7 +4058,7 @@ - #: objects/vector_type.cc:62 - msgid "" - "Select the first of the two vectors of which you want to construct the sum..." --msgstr "選擇您要建構向量和的第一個向量..." -+msgstr "選擇您要建構向量和的第一個向量…" - - #: objects/vector_type.cc:63 - msgid "Construct the vector sum of this vector and the other one." -@@ -4034,7 +4067,7 @@ - #: objects/vector_type.cc:64 - msgid "" - "Select the other of the two vectors of which you want to construct the sum..." --msgstr "選擇您要建構向量和的另一個向量..." -+msgstr "選擇您要建構向量和的另一個向量…" - - #: objects/vector_type.cc:65 - msgid "Construct the vector sum starting at this point." -@@ -4042,7 +4075,7 @@ - - #: objects/vector_type.cc:66 - msgid "Select the point to construct the sum vector in..." --msgstr "選擇要建構向量和的點..." -+msgstr "選擇要建構向量和的點…" - - #: scripting/script-common.cc:35 - msgid "Now fill in the Python code:" -@@ -4051,8 +4084,8 @@ - #: scripting/script-common.cc:53 - msgid "" - "_: Note to translators: this should be a default name for an argument in a " --"Python function. The default is \"arg%1\" which would become arg1, arg2, etc. " --"Give something which seems appropriate for your language.\n" -+"Python function. The default is \"arg%1\" which would become arg1, arg2, " -+"etc. Give something which seems appropriate for your language.\n" - "arg%1" - msgstr "arg%1" - -@@ -4060,7 +4093,8 @@ - msgid "" - "The Python interpreter caught an error during the execution of your script. " - "Please fix the script and click the Finish button again." --msgstr "Python 直譯器在執行您的文稿時發生了錯誤。請修正文稿，再點選「完成」按鈕。" -+msgstr "" -+"Python 直譯器在執行您的文稿時發生了錯誤。請修正文稿，再點選「完成」按鈕。" - - #: scripting/script_mode.cc:207 scripting/script_mode.cc:325 - #, c-format -@@ -4073,10 +4107,12 @@ - - #: scripting/script_mode.cc:212 - msgid "" --"There seems to be an error in your script. The Python interpreter reported no " --"errors, but the script does not generate a valid object. Please fix the script, " --"and click the Finish button again." --msgstr "在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物件。請修正此文稿，再點選「完成」按鈕。" -+"There seems to be an error in your script. The Python interpreter reported " -+"no errors, but the script does not generate a valid object. Please fix the " -+"script, and click the Finish button again." -+msgstr "" -+"在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物" -+"件。請修正此文稿，再點選「完成」按鈕。" - - #: scripting/script_mode.cc:290 - msgid "" -@@ -4096,9 +4132,12 @@ - - #: scripting/script_mode.cc:330 - msgid "" --"There seems to be an error in your script. The Python interpreter reported no " --"errors, but the script does not generate a valid object. Please fix the script." --msgstr "在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物件。請修正此文稿。" -+"There seems to be an error in your script. The Python interpreter reported " -+"no errors, but the script does not generate a valid object. Please fix the " -+"script." -+msgstr "" -+"在您的文稿中似乎有錯誤。Python 直譯器回報沒有錯誤，但是文稿並未產生合法的物" -+"件。請修正此文稿。" - - #: kig/kig.cpp:88 - msgid "Could not find the necessary Kig library, check your installation." -@@ -4176,7 +4215,7 @@ - - #: kig/kig_part.cpp:251 - msgid "&New Macro..." --msgstr "新增巨集(&N)..." -+msgstr "新增巨集(&N)…" - - #: kig/kig_part.cpp:253 - msgid "Define a new macro" -@@ -4184,7 +4223,7 @@ - - #: kig/kig_part.cpp:256 - msgid "Manage &Types..." --msgstr "管理類型(&T)..." -+msgstr "管理類型(&T)…" - - #: kig/kig_part.cpp:258 - msgid "Manage macro types." -@@ -4260,11 +4299,12 @@ - msgid "" - "You tried to open a document of type \"%1\"; unfortunately, Kig does not " - "support this format. If you think the format in question would be worth " --"implementing support for, you can always ask us nicely on " --"mailto:toscano.pino@tiscali.it or do the work yourself and send me a patch." -+"implementing support for, you can always ask us nicely on mailto:toscano." -+"pino@tiscali.it or do the work yourself and send me a patch." - msgstr "" --"您試圖開啟型態為 %1 的文件。不過，Kig 無法支援此格式。如果您認為這個格式很重要，Kig 應該要支援它，您可以寄信到 " --"toscano.pino@tiscali.it 跟我們討論，或是您也可以自己做，並將修補檔送來給我們。" -+"您試圖開啟型態為 %1 的文件。不過，Kig 無法支援此格式。如果您認為這個格式很重" -+"要，Kig 應該要支援它，您可以寄信到 toscano.pino@tiscali.it 跟我們討論，或是您" -+"也可以自己做，並將修補檔送來給我們。" - - #: kig/kig_part.cpp:396 kig/kig_part.cpp:439 - msgid "Format Not Supported" -@@ -4332,21 +4372,24 @@ - - #: kig/kig_view.cpp:569 - msgid "" --"Select the zoom area by entering the coordinates of the upper left corner and " --"the lower right corner." -+"Select the zoom area by entering the coordinates of the upper left corner " -+"and the lower right corner." - msgstr "請輸入左上角與右下角的座標來選擇要縮放的區域。" - - #: kig/main.cpp:35 - msgid "" --"Do not show a GUI. Convert the specified file to the native Kig format. Output " --"goes to stdout unless --outfile is specified." --msgstr "不要顯示使用者介面。將指定的檔案轉換成 Kig 格式。除非有指定 --outfile 否則將輸出送到標準輸出（stdout）。" -+"Do not show a GUI. Convert the specified file to the native Kig format. " -+"Output goes to stdout unless --outfile is specified." -+msgstr "" -+"不要顯示使用者介面。將指定的檔案轉換成 Kig 格式。除非有指定 --outfile 否則將" -+"輸出送到標準輸出（stdout）。" - - #: kig/main.cpp:37 - msgid "" --"File to output the created native file to. '-' means output to stdout. Default " --"is stdout as well." --msgstr "要輸出的檔案名稱。\"-\" 表示輸出到標準輸出（stdout）。預設是使用標準輸出。" -+"File to output the created native file to. '-' means output to stdout. " -+"Default is stdout as well." -+msgstr "" -+"要輸出的檔案名稱。\"-\" 表示輸出到標準輸出（stdout）。預設是使用標準輸出。" - - #: kig/main.cpp:38 - msgid "Document to open" -@@ -4366,9 +4409,10 @@ - - #: misc/coordinate_system.cpp:321 - msgid "" --"Enter coordinates in the following format: \"x;y\"" --", where x is the x coordinate, and y is the y coordinate." --msgstr "請用以下格式輸入座標：\"x,y\"，這裡 x 是 x 軸座標，y 是 y 軸座標。" -+"Enter coordinates in the following format: \"x;y\", where x is the x " -+"coordinate, and y is the y coordinate." -+msgstr "" -+"請用以下格式輸入座標：\"x,y\"，這裡 x 是 x 軸座標，y 是 y 軸座標。" - - #: misc/coordinate_system.cpp:363 - msgid "" -@@ -4380,8 +4424,8 @@ - - #: misc/coordinate_system.cpp:370 - msgid "" --"Enter coordinates in the following format: \"r; θ°\"" --", where r and θ are the polar coordinates." -+"Enter coordinates in the following format: \"r; θ°\", where r and θ " -+"are the polar coordinates." - msgstr "請用以下格式輸入座標：\"r; θ°\"，這裡 r 和 θ 是極座標。" - - #: misc/coordinate_system.cpp:522 -@@ -4402,11 +4446,11 @@ - - #: modes/typesdialog.cpp:82 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: modes/typesdialog.cpp:85 - msgid "E&xport..." --msgstr "匯出(&X)..." -+msgstr "匯出(&X)…" - - #: modes/typesdialog.cpp:141 - #, c-format -@@ -4439,7 +4483,9 @@ - msgid "" - "There is more than one type selected. You can only edit one type at a time. " - "Please select only the type you want to edit and try again." --msgstr "已選取了一個以上的類型。您一次只能編輯其中一個類型。請只選擇您要編輯的類型，並且再試一次。" -+msgstr "" -+"已選取了一個以上的類型。您一次只能編輯其中一個類型。請只選擇您要編輯的類型，" -+"並且再試一次。" - - #: modes/typesdialog.cpp:237 - msgid "More Than One Type Selected" -@@ -4450,8 +4496,8 @@ - "_: NAME OF TRANSLATORS\n" - "Your names" - msgstr "" --"簡體中文：開源軟件國際化簡體中文組(http://i18n.linux.net.cn),陶勇慧\n" --"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+"簡化字漢語：開源軟件國際化簡化字漢語組(http://i18n.linux.net.cn),陶勇慧\n" -+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kiten.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kiten.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kiten.po 2006-07-22 10:04:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kiten.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kiten\n" - "POT-Creation-Date: 2005-04-20 15:09+0200\n" - "PO-Revision-Date: 2006-06-20 15:52+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -41,8 +40,8 @@ - - #: deinf.cpp:52 - msgid "" --"Verb deinflection information could not be loaded, so verb deinflection cannot " --"be used." -+"Verb deinflection information could not be loaded, so verb deinflection " -+"cannot be used." - msgstr "無法載入動詞反變調資訊，所以動詞反變調無法使用。" - - #: dict.cpp:115 -@@ -100,11 +99,11 @@ - - #: kiten.cpp:71 - msgid "&Dictionary Editor..." --msgstr "字典編輯器(&D)..." -+msgstr "字典編輯器(&D)…" - - #: kiten.cpp:72 - msgid "Ra&dical Search..." --msgstr "字根搜尋(&D)..." -+msgstr "字根搜尋(&D)…" - - #: kiten.cpp:73 - msgid "Search Edit" -@@ -164,7 +163,7 @@ - - #: kiten.cpp:88 - msgid "Configure &Global Shortcuts..." --msgstr "設定全域捷徑(&G)..." -+msgstr "設定全域捷徑(&G)…" - - #: kiten.cpp:90 - msgid "&History" -@@ -184,7 +183,7 @@ - - #: kiten.cpp:188 kiten.cpp:226 - msgid "Searching..." --msgstr "搜尋中..." -+msgstr "搜尋中…" - - #: kiten.cpp:260 - #, c-format -@@ -409,7 +408,8 @@ - - #: main.cpp:48 - msgid "" --"Wrote xjdic, of which Kiten borrows code, and the xjdic index file generator.\n" -+"Wrote xjdic, of which Kiten borrows code, and the xjdic index file " -+"generator.\n" - "Also is main author of edict and kanjidic, which Kiten essentially require." - msgstr "" - "寫上 xjdic ，一個 Kiten 瀏覽碼，和 xjdic 的索引檔產生器。\n" -@@ -457,8 +457,8 @@ - - #: rad.cpp:66 - msgid "" --"Kanji radical information could not be loaded, so radical searching cannot be " --"used." -+"Kanji radical information could not be loaded, so radical searching cannot " -+"be used." - msgstr "漢字字根資訊檔無法載入，所以字根搜尋無法使用。" - - #: rad.cpp:229 -@@ -515,7 +515,7 @@ - #: rc.cpp:39 rc.cpp:57 - #, no-c-format - msgid "Add..." --msgstr "增加..." -+msgstr "增加…" - - #. i18n: file configdictionariesbase.ui line 199 - #: rc.cpp:48 rc.cpp:117 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klatin.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/klatin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klatin.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/klatin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: klatin\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-06-20 16:19+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -274,12 +273,13 @@ - #: klatinverbs.cpp:205 - msgid "" - "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 " --"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of " --"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb " --"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, " --"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and " --"should not be translated. The output string in English is something like: What " --"is the first person singular present indicative active of amo?\n" -+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense " -+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the " -+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb " -+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in " -+"Latin and should not be translated. The output string in English is " -+"something like: What is the first person singular present indicative active " -+"of amo?\n" - "What is the %1 person %2 %3 %4 %5 of %6?" - msgstr "%6 的%1人稱%2%3%4%5是？" - -@@ -471,9 +471,9 @@ - "Line 4" - msgstr "" - "問題單字\n" --"第二行\n" --"第三行\n" --"第四行" -+"第二列\n" -+"第三列\n" -+"第四列" - - #. i18n: file klatingrammarwidget.ui line 119 - #: rc.cpp:83 rc.cpp:269 -@@ -599,8 +599,8 @@ - #: rc.cpp:149 rc.cpp:155 - #, no-c-format - msgid "" --"This shows the percentage of the questions you answered correctly out of those " --"attempted." -+"This shows the percentage of the questions you answered correctly out of " -+"those attempted." - msgstr "這裡顯示您正確回答題目的百分比。" - - #. i18n: file klatinresultsdialog.ui line 137 -@@ -661,8 +661,8 @@ - #: rc.cpp:194 - #, no-c-format - msgid "" --"Choose to be tested from your language to Latin, which means the word will be " --"displayed in your language and you will have to choose from 4 Latin " -+"Choose to be tested from your language to Latin, which means the word will " -+"be displayed in your language and you will have to choose from 4 Latin " - "translations." - msgstr "選擇用您的語言來顯示問題，而您要從四個拉丁翻譯中選擇答案。" - -@@ -682,9 +682,9 @@ - #: rc.cpp:203 - #, no-c-format - msgid "" --"Choose to be tested from Latin to your language, which means the word will be " --"displayed in Latin and you will have to choose from 4 translations in your " --"language." -+"Choose to be tested from Latin to your language, which means the word will " -+"be displayed in Latin and you will have to choose from 4 translations in " -+"your language." - msgstr "選擇用拉丁來顯示問題，而四個答案以您的語言顯示。" - - #. i18n: file klatinsettings_vocabpage.ui line 110 -@@ -819,8 +819,8 @@ - #: rc.cpp:323 - #, no-c-format - msgid "" --"Your score appears on this display. Number of correct answers/total number of " --"answers." -+"Your score appears on this display. Number of correct answers/total number " -+"of answers." - msgstr "顯示您目前的分數。正確的答案數/總共答案數。" - - #. i18n: file klatinvocabwidget.ui line 265 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klettres.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/klettres.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/klettres.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/klettres.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: klettres\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-12-06 10:02+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -64,7 +63,7 @@ - - #: klettres.cpp:201 - msgid "Get Alphabet in New Language..." --msgstr "取得新語言的字母..." -+msgstr "取得新語言的字母…" - - #: klettres.cpp:202 - msgid "Replay Sound" -@@ -76,8 +75,8 @@ - - #: klettres.cpp:204 - msgid "" --"You can replay the same sound again by clicking this button or using the File " --"menu, Replay Sound." -+"You can replay the same sound again by clicking this button or using the " -+"File menu, Replay Sound." - msgstr "您可以按此鍵重播此發音，或是從選單中選取。" - - #: klettres.cpp:208 -@@ -99,10 +98,11 @@ - #: klettres.cpp:214 - msgid "" - "You can select the level: level 1 displays a letter and you hear it; level 2 " --"does not display the letter, you only hear it; level 3 displays a syllable and " --"you hear it; level 4 does not display the syllable, you only hear it." -+"does not display the letter, you only hear it; level 3 displays a syllable " -+"and you hear it; level 4 does not display the syllable, you only hear it." - msgstr "" --"您可以選擇等級：等級 1 顯示您聽到的字母；等級二不會顯示字母，您只聽得到發音；等級三顯示您所聽到的音節，等級四不會顯示音節，您只聽得到發音。" -+"您可以選擇等級：等級 1 顯示您聽到的字母；等級二不會顯示字母，您只聽得到發音；" -+"等級三顯示您所聽到的音節，等級四不會顯示音節，您只聽得到發音。" - - #: klettres.cpp:216 - msgid "&Language" -@@ -126,7 +126,7 @@ - - #: klettres.cpp:225 - msgid "Themes" --msgstr "佈景主題" -+msgstr "布景主題" - - #: klettres.cpp:226 - msgid "Classroom" -@@ -142,13 +142,13 @@ - - #: klettres.cpp:230 - msgid "Select the theme" --msgstr "選擇一個佈景主題" -+msgstr "選擇一個布景主題" - - #: klettres.cpp:231 - msgid "" --"Here you can change the theme for KLettres. A theme consists in the background " --"picture and the font color for the letter displayed." --msgstr "您可以改變 KLettres 的佈景。佈景包括背景圖片及字型顏色等。" -+"Here you can change the theme for KLettres. A theme consists in the " -+"background picture and the font color for the letter displayed." -+msgstr "您可以改變 KLettres 的布景。布景包括背景圖片及字型顏色等。" - - #: klettres.cpp:233 - msgid "Mode Kid" -@@ -158,7 +158,9 @@ - msgid "" - "If you are in the Grown-up mode, clicking on this button will set up the Kid " - "mode. The Kid mode has no menubar and the font is bigger in the statusbar." --msgstr "如果您在大人模式，按此鍵會進入兒童模式。兒童模式沒有選單列，狀態列中的字型也會比較大。" -+msgstr "" -+"如果您在大人模式，按此鍵會進入兒童模式。兒童模式沒有選單列，狀態列中的字型也" -+"會比較大。" - - #: klettres.cpp:235 - msgid "Mode Grown-up" -@@ -239,9 +241,10 @@ - "13 languages are available: British, Czech, Danish, Dutch, English, French,\n" - "German, Hebrew, Italian, Luganda, Romanized Hindi, Spanish and Slovak." - msgstr "" --"KLettres 能協助很小的孩子，或是在學習新語言的大人將語言中的字母與發音連結起來。\n" --"目前有十三種語言可以選擇：捷克、丹麥、荷蘭、（美式與英式）英語、法語、德語、希伯來語、義大利、Luganda、Romanized " --"Hindi、西班牙與斯洛伐克語。" -+"KLettres 能協助很小的孩子，或是在學習新語言的大人將語言中的字母與發音連結起" -+"來。\n" -+"目前有十三種語言可以選擇：捷克、丹麥、荷蘭、（美式與英式）英語、法語、德語、" -+"希伯來語、義大利、Luganda、Romanized Hindi、西班牙與斯洛伐克語。" - - #: main.cpp:48 - msgid "KLettres" -@@ -389,7 +392,7 @@ - #: rc.cpp:42 - #, no-c-format - msgid "Theme" --msgstr "佈景主題" -+msgstr "布景主題" - - #. i18n: file klettres.kcfg line 21 - #: rc.cpp:45 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kmplot.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kmplot.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kmplot.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kmplot.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kmplot\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-10-30 09:40+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -218,16 +217,16 @@ - "_: NAME OF TRANSLATORS\n" - "Your names" - msgstr "" --"簡體中文：Sarah Smith,Funda Wang\n" --"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+"簡化字漢語：Sarah Smith,Funda Wang\n" -+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"簡體中文：sarahs@redhat.com,fundawang@linux.net.cn\n" --"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+"簡化字漢語：sarahs@redhat.com,fundawang@linux.net.cn\n" -+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: main.cpp:43 - msgid "Mathematical function plotter for KDE" -@@ -287,9 +286,9 @@ - - #: kparametereditor.cpp:182 - msgid "" --"Line %1 is not a valid parameter value and will therefore not be included. Do " --"you want to continue?" --msgstr "第 %1 行不是有效的參數值，所以不會被引入。您要繼續嗎？" -+"Line %1 is not a valid parameter value and will therefore not be included. " -+"Do you want to continue?" -+msgstr "第 %1 列不是有效的參數值，所以不會被引入。您要繼續嗎？" - - #: kparametereditor.cpp:188 - msgid "Would you like to be informed about other lines that cannot be read?" -@@ -348,8 +347,8 @@ - #: rc.cpp:712 rc.cpp:1952 rc.cpp:2278 rc.cpp:2366 - #, no-c-format - msgid "" --"Enter the lower boundary of the plot range. Expressions like 2*pi are allowed, " --"too." -+"Enter the lower boundary of the plot range. Expressions like 2*pi are " -+"allowed, too." - msgstr "輸入繪圖範圍的下邊界。像 2*pi 這樣的表示式也可以。" - - #: kminmax.cpp:76 kminmax.cpp:120 -@@ -361,8 +360,8 @@ - #: rc.cpp:2272 rc.cpp:2372 - #, no-c-format - msgid "" --"Enter the upper boundary of the plot range. Expressions like 2*pi are allowed, " --"too." -+"Enter the upper boundary of the plot range. Expressions like 2*pi are " -+"allowed, too." - msgstr "輸入繪圖範圍的上邊界。像 2*pi 這樣的表示式也可以。" - - #: kminmax.cpp:81 -@@ -375,8 +374,8 @@ - - #: kminmax.cpp:83 - msgid "" --"Search for the highest y-value in the x-range you specified and show the result " --"in a message box." -+"Search for the highest y-value in the x-range you specified and show the " -+"result in a message box." - msgstr "在您指定的 x 範圍內搜尋最大的 y 值，並在訊息盒中顯示結果。" - - #. i18n: file qminmax.ui line 16 -@@ -391,8 +390,8 @@ - - #: kminmax.cpp:89 - msgid "" --"Search for the lowest y-value in the x-range you specified and show the result " --"in a message box." -+"Search for the lowest y-value in the x-range you specified and show the " -+"result in a message box." - msgstr "在您指定的 x 範圍內搜尋最小的 y 值，並在訊息盒中顯示結果。" - - #: kminmax.cpp:94 -@@ -415,7 +414,8 @@ - msgid "" - "Here you will see the y-value which you got from the x-value in the textbox " - "above. To calculate the y-value, press the Calculate button." --msgstr "您將在此看到與上面文字框中 x 值對應的 y 值。要計算 y 值，請按計算按鈕。" -+msgstr "" -+"您將在此看到與上面文字框中 x 值對應的 y 值。要計算 y 值，請按計算按鈕。" - - #: kminmax.cpp:105 kminmax.cpp:126 - msgid "&Calculate" -@@ -444,8 +444,8 @@ - - #: kminmax.cpp:128 - msgid "" --"Calculate the numeric integral between the x-values and draw the result as an " --"area." -+"Calculate the numeric integral between the x-values and draw the result as " -+"an area." - msgstr "計算 x 值和繪製結果所圍成區域的定積分" - - #: kminmax.cpp:221 -@@ -486,8 +486,8 @@ - - #: kminmax.cpp:329 - msgid "" --"Here you see the result of the calculation: the returned y-value you got from " --"the x-value in the textbox above" -+"Here you see the result of the calculation: the returned y-value you got " -+"from the x-value in the textbox above" - msgstr "您可在此看到計算結果：你得到的 y 值與上方文字框中的 x 值相對應" - - #: kminmax.cpp:339 -@@ -592,10 +592,12 @@ - #: rc.cpp:81 rc.cpp:1735 - #, no-c-format - msgid "" --"Here you see the list of all functions to be plotted. The checked functions are " --"visible, the others are hidden. Click on a checkbox to show or hide the " -+"Here you see the list of all functions to be plotted. The checked functions " -+"are visible, the others are hidden. Click on a checkbox to show or hide the " - "function." --msgstr "您可在此看到要進行繪圖的全部函數的清單。選中的函數是可見的，其它函數是不可見的。點選勾選盒可以顯示或隱藏函數。" -+msgstr "" -+"您可在此看到要進行繪圖的全部函數的清單。選中的函數是可見的，其它函數是不可見" -+"的。點選勾選盒可以顯示或隱藏函數。" - - #. i18n: file FktDlgData.ui line 155 - #: rc.cpp:87 rc.cpp:1741 -@@ -613,7 +615,7 @@ - #: rc.cpp:93 rc.cpp:1747 - #, no-c-format - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #. i18n: file FktDlgData.ui line 180 - #: rc.cpp:96 rc.cpp:1750 -@@ -631,7 +633,7 @@ - #: rc.cpp:102 rc.cpp:1756 - #, no-c-format - msgid "Ne&w Function Plot..." --msgstr "新增函數圖(&W)..." -+msgstr "新增函數圖(&W)…" - - #. i18n: file FktDlgData.ui line 205 - #: rc.cpp:105 rc.cpp:114 rc.cpp:123 rc.cpp:132 rc.cpp:141 rc.cpp:1759 -@@ -646,33 +648,35 @@ - #, no-c-format - msgid "" - "Click here to define a new function. There are 3 types of function, explicit " --"given functions, parametric plots and polar plots. Choose the appropriate type " --"from the drop down list." --msgstr "單擊此處定義新函數。您可選擇三種函數類型之一，外部函數、參數函數和極座標函數。您可從下拉列表中選擇相應的類型。" -+"given functions, parametric plots and polar plots. Choose the appropriate " -+"type from the drop down list." -+msgstr "" -+"單擊此處定義新函數。您可選擇三種函數類型之一，外部函數、參數函數和極座標函" -+"數。您可從下拉列表中選擇相應的類型。" - - #. i18n: file FktDlgData.ui line 224 - #: rc.cpp:111 rc.cpp:1765 - #, no-c-format - msgid "New &Parametric Plot..." --msgstr "新增參數方程式圖(&P)..." -+msgstr "新增參數方程式圖(&P)…" - - #. i18n: file FktDlgData.ui line 246 - #: rc.cpp:120 rc.cpp:1774 - #, no-c-format - msgid "&New Polar Plot..." --msgstr "新增極座標圖(&N)..." -+msgstr "新增極座標圖(&N)…" - - #. i18n: file FktDlgData.ui line 288 - #: rc.cpp:129 rc.cpp:1783 - #, no-c-format - msgid "Cop&y Function..." --msgstr "複製函數(&Y)..." -+msgstr "複製函數(&Y)…" - - #. i18n: file FktDlgData.ui line 313 - #: rc.cpp:138 rc.cpp:1792 - #, no-c-format - msgid "&Move Function..." --msgstr "移動函數(&M)..." -+msgstr "移動函數(&M)…" - - #. i18n: file editderivativespage.ui line 16 - #: rc.cpp:147 rc.cpp:1801 -@@ -846,9 +850,12 @@ - #: rc.cpp:247 rc.cpp:1901 - #, no-c-format - msgid "" --"Check this to change the parameter value by moving a slider. Select the slider " --"from the list box on the right. The values vary from 0 (left) to 100 (right)." --msgstr "勾選此項目可透過移動滑動器更改參數值。從右側的列表框中選擇滑動器。值的變化範圍是 0(最左側) 到 100(最右側)。" -+"Check this to change the parameter value by moving a slider. Select the " -+"slider from the list box on the right. The values vary from 0 (left) to 100 " -+"(right)." -+msgstr "" -+"勾選此項目可透過移動滑動器更改參數值。從右側的列表框中選擇滑動器。值的變化範" -+"圍是 0(最左側) 到 100(最右側)。" - - #. i18n: file editfunctionpage.ui line 135 - #: rc.cpp:250 rc.cpp:1904 -@@ -860,9 +867,10 @@ - #: rc.cpp:253 rc.cpp:1907 - #, no-c-format - msgid "" --"Select one of the sliders to change the parameter value dynamically. The values " --"vary from 0 (left) to 100 (right)." --msgstr "選擇滑動器之一，以便動態更改參數值。值的變化範圍是 0(最左側) 到 100(最右側)。" -+"Select one of the sliders to change the parameter value dynamically. The " -+"values vary from 0 (left) to 100 (right)." -+msgstr "" -+"選擇滑動器之一，以便動態更改參數值。值的變化範圍是 0(最左側) 到 100(最右側)。" - - #. i18n: file editfunctionpage.ui line 146 - #: rc.cpp:256 rc.cpp:1910 -@@ -880,15 +888,16 @@ - #: rc.cpp:262 rc.cpp:1916 - #, no-c-format - msgid "" --"Check this to let KmPlot use parameter values given in a list. Edit this list " --"by clicking the button on the right." --msgstr "勾選此項目可讓 KmPlot 使用列表中給出的參數值。單擊右側按鈕可編輯此列表。" -+"Check this to let KmPlot use parameter values given in a list. Edit this " -+"list by clicking the button on the right." -+msgstr "" -+"勾選此項目可讓 KmPlot 使用列表中給出的參數值。單擊右側按鈕可編輯此列表。" - - #. i18n: file editfunctionpage.ui line 163 - #: rc.cpp:265 rc.cpp:1919 - #, no-c-format - msgid "Edit List..." --msgstr "編輯列表..." -+msgstr "編輯列表…" - - #. i18n: file editfunctionpage.ui line 166 - #: rc.cpp:268 rc.cpp:1922 -@@ -1023,7 +1032,8 @@ - #: rc.cpp:364 rc.cpp:2018 - #, no-c-format - msgid "" --"Enter the initial x-value or expression for the integral, for example 2 or pi/2" -+"Enter the initial x-value or expression for the integral, for example 2 or " -+"pi/2" - msgstr "輸入積分起始點的 x 值或表示式，如 2 或 pi/2" - - #. i18n: file editintegralpage.ui line 88 -@@ -1036,7 +1046,8 @@ - #: rc.cpp:370 rc.cpp:2024 - #, no-c-format - msgid "" --"Enter the initial y-value or expression for the integral, for example 2 or pi/2" -+"Enter the initial y-value or expression for the integral, for example 2 or " -+"pi/2" - msgstr "輸入積分起始點的 y 值或表示式，如 2 或 pi/2" - - #. i18n: file editintegralpage.ui line 118 -@@ -1085,15 +1096,15 @@ - #: rc.cpp:412 rc.cpp:820 rc.cpp:2066 rc.cpp:2474 - #, no-c-format - msgid "" --"Click here to delete the selected constant; it can only be removed if it is not " --"currently used by a plot." -+"Click here to delete the selected constant; it can only be removed if it is " -+"not currently used by a plot." - msgstr "單擊此處刪除選中的常數；僅當該常數不被任何圖像使用時，才可刪除該常數。" - - #. i18n: file qconstanteditor.ui line 47 - #: rc.cpp:415 rc.cpp:781 rc.cpp:2069 rc.cpp:2435 - #, no-c-format - msgid "&Change Value..." --msgstr "更改值(&C)..." -+msgstr "更改值(&C)…" - - #. i18n: file qconstanteditor.ui line 50 - #: rc.cpp:418 rc.cpp:784 rc.cpp:2072 rc.cpp:2438 -@@ -1127,13 +1138,14 @@ - msgid "" - "Click here to Copy the selected constant to another constant. You can choose " - "the new name from a list." --msgstr "單擊此處將把選中的常數複製到另外一個常數中。您可以從列表中選擇一個新名稱。" -+msgstr "" -+"單擊此處將把選中的常數複製到另外一個常數中。您可以從列表中選擇一個新名稱。" - - #. i18n: file qconstanteditor.ui line 78 - #: rc.cpp:433 rc.cpp:796 rc.cpp:2087 rc.cpp:2450 - #, no-c-format - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #. i18n: file qconstanteditor.ui line 81 - #: rc.cpp:436 rc.cpp:799 rc.cpp:2090 rc.cpp:2453 -@@ -1201,7 +1213,9 @@ - msgid "" - "Enter the name of the constant here. User-defined constant names only have 1 " - "character; the constant \"E\" (Euler number) is reserved." --msgstr "在此輸入常數的名稱。使用者定義的常數只能有一個字符；常數“E”（尤拉常數，Euler number）已被保留。" -+msgstr "" -+"在此輸入常數的名稱。使用者定義的常數只能有一個字符；常數“E”（尤拉常數，Euler " -+"number）已被保留。" - - #. i18n: file qeditconstant.ui line 106 - #: rc.cpp:475 rc.cpp:2129 -@@ -1263,11 +1277,12 @@ - #, no-c-format - msgid "" - "Enter the name of the function.\n" --"The name of a function must be unique. If you leave this line empty KmPlot will " --"set a default name. You can change it later." -+"The name of a function must be unique. If you leave this line empty KmPlot " -+"will set a default name. You can change it later." - msgstr "" - "輸入函數名稱。\n" --"函數名稱必須唯一。如果您將此行留空，KmPlot 將會設定一個預設名稱。您稍後可進行更改。" -+"函數名稱必須唯一。如果您將此行留空，KmPlot 將會設定一個預設名稱。您稍後可進行" -+"更改。" - - #. i18n: file qeditparametric.ui line 110 - #: rc.cpp:508 rc.cpp:2162 -@@ -1465,7 +1480,7 @@ - #: rc.cpp:769 rc.cpp:2423 - #, no-c-format - msgid "Choose Parameter Value..." --msgstr "選擇參數值..." -+msgstr "選擇參數值…" - - #. i18n: file qminmax.ui line 133 - #: rc.cpp:772 rc.cpp:2426 -@@ -1513,7 +1528,7 @@ - #: rc.cpp:823 rc.cpp:2477 - #, no-c-format - msgid "&Export..." --msgstr "匯出(&E)..." -+msgstr "匯出(&E)…" - - #. i18n: file qparametereditor.ui line 140 - #: rc.cpp:826 rc.cpp:2480 -@@ -1525,15 +1540,15 @@ - #: rc.cpp:829 rc.cpp:2483 - #, no-c-format - msgid "" --"Export values to a textfile. Every value in the parameter list will be written " --"to one line in the file." --msgstr "將值匯出為文字檔案。參數列表中的每個值都會寫入為檔案中的一行。" -+"Export values to a textfile. Every value in the parameter list will be " -+"written to one line in the file." -+msgstr "將值匯出為文字檔案。參數列表中的每個值都會寫入為檔案中的一列。" - - #. i18n: file qparametereditor.ui line 171 - #: rc.cpp:832 rc.cpp:2486 - #, no-c-format - msgid "&Import..." --msgstr "匯入(&I)..." -+msgstr "匯入(&I)…" - - #. i18n: file qparametereditor.ui line 174 - #: rc.cpp:835 rc.cpp:2489 -@@ -1545,9 +1560,9 @@ - #: rc.cpp:838 rc.cpp:2492 - #, no-c-format - msgid "" --"Import values from a textfile. Every line in the file is parsed as a value or " --"expression." --msgstr "從文字檔案匯入值。檔案的每一行都會被分析為值或表示式。" -+"Import values from a textfile. Every line in the file is parsed as a value " -+"or expression." -+msgstr "從文字檔案匯入值。檔案的每一列都會被分析為值或表示式。" - - #. i18n: file settingspagecolor.ui line 28 - #: rc.cpp:841 rc.cpp:2495 -@@ -1571,8 +1586,8 @@ - #: rc.cpp:850 rc.cpp:2504 - #, no-c-format - msgid "" --"Specify the color of the axes. The change will appear as soon as you press the " --"OK button." -+"Specify the color of the axes. The change will appear as soon as you press " -+"the OK button." - msgstr "指定軸的顏色。當您單擊確定按鈕時，更改將會立即生效。" - - #. i18n: file settingspagecolor.ui line 75 -@@ -1585,8 +1600,8 @@ - #: rc.cpp:856 rc.cpp:2510 - #, no-c-format - msgid "" --"Specify the color of the grid. The change will appear as soon as you press the " --"OK button." -+"Specify the color of the grid. The change will appear as soon as you press " -+"the OK button." - msgstr "指定格線的顏色。當您單擊確定按鈕時，更改將會立即生效。" - - #. i18n: file settingspagecolor.ui line 86 -@@ -1612,11 +1627,13 @@ - #, no-c-format - msgid "" - "The default color for function number 2. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第二個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第二個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 162 - #: rc.cpp:871 rc.cpp:2525 -@@ -1629,11 +1646,13 @@ - #, no-c-format - msgid "" - "The default color for function number 5. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第五個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第五個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 176 - #: rc.cpp:877 rc.cpp:2531 -@@ -1646,11 +1665,13 @@ - #, no-c-format - msgid "" - "The default color for function number 1. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第一個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第一個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 187 - #: rc.cpp:883 rc.cpp:2537 -@@ -1669,11 +1690,13 @@ - #, no-c-format - msgid "" - "The default color for function number 3. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第三個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第三個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 212 - #: rc.cpp:892 rc.cpp:2546 -@@ -1704,11 +1727,13 @@ - #, no-c-format - msgid "" - "The default color for function number 4. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第四個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第四個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 259 - #: rc.cpp:907 rc.cpp:2561 -@@ -1739,11 +1764,13 @@ - #, no-c-format - msgid "" - "The default color for function number 9. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第九個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第九個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 333 - #: rc.cpp:922 rc.cpp:2576 -@@ -1762,11 +1789,13 @@ - #, no-c-format - msgid "" - "The default color for function number 7. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第七個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第七個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 361 - #: rc.cpp:931 rc.cpp:2585 -@@ -1779,11 +1808,13 @@ - #, no-c-format - msgid "" - "The default color for function number 8. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第八個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第八個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 375 - #: rc.cpp:937 rc.cpp:2591 -@@ -1796,11 +1827,13 @@ - #, no-c-format - msgid "" - "The default color for function number 6. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第六個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"only affects empty functions, so if you have defined a function at number 1 " -+"and you change the color for that number here, the setting will be shown " -+"next time you define a new function at number 1." -+msgstr "" -+"第六個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 386 - #: rc.cpp:943 rc.cpp:2597 -@@ -1818,12 +1851,14 @@ - #: rc.cpp:949 rc.cpp:2603 - #, no-c-format - msgid "" --"The default color for function number 10. Please note that this color setting " --"only affects empty functions, so if you have defined a function at number 1 and " --"you change the color for that number here, the setting will be shown next time " --"you define a new function at number 1." --msgstr "" --"第十個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時生效。" -+"The default color for function number 10. Please note that this color " -+"setting only affects empty functions, so if you have defined a function at " -+"number 1 and you change the color for that number here, the setting will be " -+"shown next time you define a new function at number 1." -+msgstr "" -+"第十個函數的預設顏色。請注意，此顏色設定只影響空函數，所以如果您定義了第一個" -+"函數，而您稍後又在此更改了第一個函數的顏色，設定將會在您下次定義第一個函數時" -+"生效。" - - #. i18n: file settingspagecolor.ui line 411 - #: rc.cpp:952 rc.cpp:2606 -@@ -2131,9 +2166,11 @@ - #, no-c-format - msgid "" - "Select the font you want to use for the axis labels. If you cannot see the " --"labels, check that you have enabled \"Show labels\" in the coordinate setting " --"dialog." --msgstr "選擇您想要為軸標籤使用的字型。如果您看不到標籤，請確定您在座標設定對話框中啟用了“顯示標籤”。" -+"labels, check that you have enabled \"Show labels\" in the coordinate " -+"setting dialog." -+msgstr "" -+"選擇您想要為軸標籤使用的字型。如果您看不到標籤，請確定您在座標設定對話框中啟" -+"用了“顯示標籤”。" - - #. i18n: file settingspagefonts.ui line 101 - #: rc.cpp:1204 rc.cpp:2858 -@@ -2207,8 +2244,8 @@ - #: rc.cpp:1243 rc.cpp:2897 - #, no-c-format - msgid "" --"Click on the button the choose the color of the background. This option has no " --"effect on printing nor export." -+"Click on the button the choose the color of the background. This option has " -+"no effect on printing nor export." - msgstr "單擊此按鈕可選擇背景顏色。此選項與列印或匯出無關。" - - #. i18n: file settingspageprecision.ui line 166 -@@ -2233,8 +2270,8 @@ - #: rc.cpp:1255 rc.cpp:2909 - #, no-c-format - msgid "" --"Check this button to use radian mode to measure angles. This is important for " --"trigonometric functions only." -+"Check this button to use radian mode to measure angles. This is important " -+"for trigonometric functions only." - msgstr "選中此按鈕可使用弧度模式度量角度。這只對三角函數非常重要。" - - #. i18n: file settingspageprecision.ui line 191 -@@ -2253,8 +2290,8 @@ - #: rc.cpp:1264 rc.cpp:2918 - #, no-c-format - msgid "" --"Check this button to use degree mode to measure angles. This is important for " --"trigonometric functions only." -+"Check this button to use degree mode to measure angles. This is important " -+"for trigonometric functions only." - msgstr "選中此按鈕可使用度數模式度量角度。這只對三角函數非常重要。" - - #. i18n: file settingspageprecision.ui line 207 -@@ -2281,7 +2318,9 @@ - msgid "" - "Enter the amount of points per pixel which shall be calculated. For slow " - "computers or very complex plots use higher values." --msgstr "輸入要在每個像素計算多少個點。對於較慢的計算機，或者較複雜的圖形，請使用較高的值。" -+msgstr "" -+"輸入要在每個像素計算多少個點。對於較慢的計算機，或者較複雜的圖形，請使用較高" -+"的值。" - - #. i18n: file settingspageprecision.ui line 256 - #: rc.cpp:1279 rc.cpp:2933 -@@ -2396,7 +2435,8 @@ - msgid "" - "This is similar to the setting above, but this sets the distance between two " - "x-axis-grids when printing or drawing on the screen." --msgstr "與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 x 軸上格線間的距離。" -+msgstr "" -+"與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 x 軸上格線間的距離。" - - #. i18n: file settingspagescaling.ui line 146 - #: rc.cpp:1333 rc.cpp:1414 rc.cpp:2987 rc.cpp:3068 -@@ -2436,7 +2476,8 @@ - msgid "" - "This is similar to the setting above, but this sets the distance between two " - "y-axis-grids when printing or drawing on the screen." --msgstr "與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 y 軸上格線間的距離。" -+msgstr "" -+"與上面的設定類型類似，但此處設定列印或在螢幕上繪製時 y 軸上格線間的距離。" - - #. i18n: file settingspagescaling.ui line 382 - #: rc.cpp:1447 rc.cpp:3101 -@@ -3047,11 +3088,11 @@ - - #: MainDlg.cpp:133 - msgid "Configure KmPlot..." --msgstr "設定 KmPlot..." -+msgstr "設定 KmPlot…" - - #: MainDlg.cpp:140 - msgid "E&xport..." --msgstr "匯出(&X)..." -+msgstr "匯出(&X)…" - - #: MainDlg.cpp:143 - msgid "&No Zoom" -@@ -3083,19 +3124,19 @@ - - #: MainDlg.cpp:160 - msgid "&Colors..." --msgstr "顏色(&C)..." -+msgstr "顏色(&C)…" - - #: MainDlg.cpp:161 - msgid "&Coordinate System..." --msgstr "座標系(&C)..." -+msgstr "座標系(&C)…" - - #: MainDlg.cpp:163 - msgid "&Scaling..." --msgstr "縮放(&S)..." -+msgstr "縮放(&S)…" - - #: MainDlg.cpp:164 - msgid "&Fonts..." --msgstr "字型(&F)..." -+msgstr "字型(&F)…" - - #: MainDlg.cpp:166 - msgid "Coordinate System I" -@@ -3111,31 +3152,31 @@ - - #: MainDlg.cpp:171 - msgid "&New Function Plot..." --msgstr "新增函數圖(&N)..." -+msgstr "新增函數圖(&N)…" - - #: MainDlg.cpp:172 - msgid "New Parametric Plot..." --msgstr "新增參數函數圖..." -+msgstr "新增參數函數圖…" - - #: MainDlg.cpp:173 - msgid "New Polar Plot..." --msgstr "新增極座標圖..." -+msgstr "新增極座標圖…" - - #: MainDlg.cpp:174 - msgid "Edit Plots..." --msgstr "編輯圖..." -+msgstr "編輯圖…" - - #: MainDlg.cpp:177 - msgid "&Get y-Value..." --msgstr "獲得 y 值(&G)..." -+msgstr "獲得 y 值(&G)…" - - #: MainDlg.cpp:178 - msgid "&Search for Minimum Value..." --msgstr "搜尋最小值(&S)..." -+msgstr "搜尋最小值(&S)…" - - #: MainDlg.cpp:179 - msgid "&Search for Maximum Value..." --msgstr "搜尋最大值(&S)..." -+msgstr "搜尋最大值(&S)…" - - #: MainDlg.cpp:180 - msgid "&Calculate Integral" -@@ -3185,9 +3226,11 @@ - - #: MainDlg.cpp:252 - msgid "" --"This file is saved with an old file format; if you save it, you cannot open the " --"file with older versions of Kmplot. Are you sure you want to continue?" --msgstr "此檔案是以舊檔案格式儲存的；如果您儲存的話，您將無法使用舊版本的 KmPlot 開啟該檔案。您確定想要繼續嗎？" -+"This file is saved with an old file format; if you save it, you cannot open " -+"the file with older versions of Kmplot. Are you sure you want to continue?" -+msgstr "" -+"此檔案是以舊檔案格式儲存的；如果您儲存的話，您將無法使用舊版本的 KmPlot 開啟" -+"該檔案。您確定想要繼續嗎？" - - #: MainDlg.cpp:252 - msgid "Save New Format" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kpercentage.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kpercentage.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kpercentage.po 2006-07-22 10:04:14.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kpercentage.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kpercentage\n" - "POT-Creation-Date: 2005-03-18 01:27+0100\n" - "PO-Revision-Date: 2006-06-19 12:53+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -95,7 +94,8 @@ - - #: kpercentage.cpp:165 - msgid "" --"Click here to start a sequence of exercises where the percent value is omitted." -+"Click here to start a sequence of exercises where the percent value is " -+"omitted." - msgstr "點選以開始一連串的計算百分比率練習。" - - #: kpercentage.cpp:166 -@@ -280,7 +280,7 @@ - - #: feedback_i18n.cpp:17 - msgid "Oh no!" --msgstr "拜託..." -+msgstr "拜託…" - - #: feedback_i18n.cpp:18 - msgid "That's not right!" -@@ -296,7 +296,7 @@ - - #: kanswer.cpp:163 - msgid "Oops!" --msgstr "呃..." -+msgstr "呃…" - - #: kanswer.cpp:164 - msgid "Mistyped!" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kstars.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kstars.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kstars.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kstars.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kstars\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2007-01-09 12:42+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -82,19 +81,19 @@ - - #: addcatdialog.cpp:77 - msgid "" --"A valid custom catalog file has one line per object, with the following fields " --"in each line:" --msgstr "合法的自訂星表檔中，每個物件會有一行，每一行中會有以下欄位：" -+"A valid custom catalog file has one line per object, with the following " -+"fields in each line:" -+msgstr "合法的自訂星表檔中，每個物件會有一列，每一列中會有以下欄位：" - - #: addcatdialog.cpp:79 - msgid "" - "1. Type identifier. Must be one of: 0 (star), 3 (open cluster), 4 (globular " --"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), or 8 " --"(galaxy)" -+"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), " -+"or 8 (galaxy)" - msgstr "" --"1. 型態代碼。必須是以下的一種：0（星體，Star），3（開放星團，Open cluster），4（球狀星團，Globular " --"cluster），5（氣體星雲，Gaseous nebula），6（行星星雲，Planetary nebula），7（超新星殘跡，Supernova " --"remnant）或 8（星系，Galaxy）" -+"1. 型態代碼。必須是以下的一種：0（星體，Star），3（開放星團，Open cluster），" -+"4（球狀星團，Globular cluster），5（氣體星雲，Gaseous nebula），6（行星星雲，" -+"Planetary nebula），7（超新星殘跡，Supernova remnant）或 8（星系，Galaxy）" - - #: addcatdialog.cpp:81 - msgid "2. Right Ascension (floating-point value)" -@@ -114,8 +113,11 @@ - - #: addcatdialog.cpp:85 - msgid "" --"6. Star name (if type=0); otherwise object's common name. [field 6 is optional]" --msgstr "6. 如果型態代碼為 0，則此欄為星體名稱，否則為物件的通用名稱【第 6 欄為選擇性的】" -+"6. Star name (if type=0); otherwise object's common name. [field 6 is " -+"optional]" -+msgstr "" -+"6. 如果型態代碼為 0，則此欄為星體名稱，否則為物件的通用名稱【第 6 欄為選擇性" -+"的】" - - #: addcatdialog.cpp:87 - msgid "" -@@ -542,36 +544,39 @@ - "or a floating-point value, or space- or colon-delimited values \n" - "specifying degrees, arcminutes and arcseconds." - msgstr "" --"角度值，單位為度（degree）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒（arcsecond）值。" -+"角度值，單位為度（degree）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔" -+"開的度數、弧分（arcminute）與弧秒（arcsecond）值。" - - #: dmsbox.cpp:95 - msgid "" - "Enter an angle value in degrees. The angle can be expressed as a simple " --"integer (\"45\") or floating-point (\"45.333\") value, or as space- or " --"colon-delimited values specifying degrees, arcminutes and arcseconds " --"(\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", etc.)." --msgstr "" --"在此輸入角度值，單位為度（degree）。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 " --"\"45.333\"），或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒（arcsecond）值（如 " --"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。" -+"integer (\"45\") or floating-point (\"45.333\") value, or as space- or colon-" -+"delimited values specifying degrees, arcminutes and arcseconds (\"45:20\", " -+"\"45:20:00\", \"45:20\", \"45 20.0\", etc.)." -+msgstr "" -+"在此輸入角度值，單位為度（degree）。角度可以為一個簡單整數（如 \"45\"）或浮點" -+"數（如 \"45.333\"），或者是以空白或冒號隔開的度數、弧分（arcminute）與弧秒" -+"（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。" - - #: dmsbox.cpp:97 - msgid "" - "Angle value in hours. You may enter a simple integer \n" - "or floating-point value, or space- or colon-delimited values \n" - "specifying hours, minutes and seconds." --msgstr "角度值，單位為時（hour）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開的時（hour）、分（minute）與秒（second）值。" -+msgstr "" -+"角度值，單位為時（hour）。您可以輸入一個整數或浮點數，或者是以空白或冒號隔開" -+"的時（hour）、分（minute）與秒（second）值。" - - #: dmsbox.cpp:98 - msgid "" --"Enter an angle value in hours. The angle can be expressed as a simple integer " --"(\"12\") or floating-point (\"12.333\") value, or as space- or colon-delimited " --"values specifying hours, minutes and seconds (\"12:20\", \"12:20:00\", " --"\"12:20\", \"12 20.0\", etc.)." --msgstr "" --"在此輸入角度值，單位為時（hour）。角度可以為一個簡單整數（如 \"12\"）或浮點數（如 " --"\"12.333\"），或者是以空白或冒號隔開的時、分（minute）與秒（second）值（如 \"12:20\"，\"12:20:00\"，\"12 " --"20.0\"等）。" -+"Enter an angle value in hours. The angle can be expressed as a simple " -+"integer (\"12\") or floating-point (\"12.333\") value, or as space- or colon-" -+"delimited values specifying hours, minutes and seconds (\"12:20\", \"12:20:00" -+"\", \"12:20\", \"12 20.0\", etc.)." -+msgstr "" -+"在此輸入角度值，單位為時（hour）。角度可以為一個簡單整數（如 \"12\"）或浮點數" -+"（如 \"12.333\"），或者是以空白或冒號隔開的時、分（minute）與秒（second）值" -+"（如 \"12:20\"，\"12:20:00\"，\"12 20.0\"等）。" - - #: finddialog.cpp:37 - msgid "Find Object" -@@ -693,7 +698,7 @@ - - #: fitsimage.cpp:262 - msgid "Loading FITS..." --msgstr "載入 FITS 中..." -+msgstr "載入 FITS 中…" - - #: fitsimage.cpp:280 fitsviewer.cpp:307 - msgid "Not enough memory to load FITS." -@@ -705,11 +710,11 @@ - - #: fitsprocess.cpp:50 - msgid "Image Loading Process..." --msgstr "影像載入中..." -+msgstr "影像載入中…" - - #: fitsprocess.cpp:263 - msgid "Image Reduction Process..." --msgstr "影像復原進度..." -+msgstr "影像復原進度…" - - #. i18n: file imagereductionui.ui line 16 - #: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138 -@@ -755,10 +760,8 @@ - msgstr "目前的 FITS 檔中有未儲存的變更。您要在關閉前先儲存嗎？" - - #: fitsviewer.cpp:314 --msgid "" --"Unable to read FITS data from file. %1.\n" --msgstr "" --"無法從檔案讀取 FITS 資料。錯誤：%1。\n" -+msgid "Unable to read FITS data from file. %1.\n" -+msgstr "無法從檔案讀取 FITS 資料。錯誤：%1。\n" - - #: fitsviewer.cpp:571 - msgid "Error: Low memory. Saving is aborted." -@@ -818,9 +821,11 @@ - - #: fovdialog.cpp:187 - msgid "" --"You have removed all FOV symbols. If the list remains empty when you exit this " --"tool, the default symbols will be regenerated." --msgstr "您已移除所有的視場符號。如果在您離開此工具時此清單仍然是空的，將會自動建立預設的符號。" -+"You have removed all FOV symbols. If the list remains empty when you exit " -+"this tool, the default symbols will be regenerated." -+msgstr "" -+"您已移除所有的視場符號。如果在您離開此工具時此清單仍然是空的，將會自動建立預" -+"設的符號。" - - #: fovdialog.cpp:188 - msgid "FOV list is empty" -@@ -868,8 +873,8 @@ - - #: imagesequence.cpp:328 imagesequence.cpp:406 imagesequence.cpp:464 - msgid "" --"%1 is disconnected. Establish a connection to the device using the INDI Control " --"Panel." -+"%1 is disconnected. Establish a connection to the device using the INDI " -+"Control Panel." - msgstr "%1 已斷線。請使用 INDI 控制面板建立到裝置的連線。" - - #: imagesequence.cpp:476 -@@ -882,8 +887,8 @@ - - #: imagesequence.cpp:571 - msgid "" --"Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds " --"only." -+"Expose duration is invalid. %1 supports expose durations from %2 to %3 " -+"seconds only." - msgstr "曝光時間不正確。%1 只支援曝光時間從 %2 到 %3 秒。" - - #: imageviewer.cpp:40 -@@ -987,8 +992,8 @@ - - #: indimenu.cpp:96 indimenu.cpp:102 - msgid "" --"No INDI devices currently running. To run devices, please select devices from " --"the Device Manager in the devices menu." -+"No INDI devices currently running. To run devices, please select devices " -+"from the Device Manager in the devices menu." - msgstr "目前沒有執行中的 INDI 裝置。要執行裝置，請從「裝置管理員」中選取裝置。" - - #: indiproperty.cpp:181 -@@ -1022,7 +1027,7 @@ - - #: indistd.cpp:83 - msgid "Downloading Data..." --msgstr "下載資料中..." -+msgstr "下載資料中…" - - #: indistd.cpp:195 - #, c-format -@@ -1194,11 +1199,11 @@ - - #: ksnewstuff.cpp:85 - msgid "Installing Steinicke NGC/IC catalog..." --msgstr "安裝 Steinicke NGC/IC 星表中..." -+msgstr "安裝 Steinicke NGC/IC 星表中…" - - #: ksnewstuff.cpp:133 - msgid "Installing comet and asteroid ephemerides..." --msgstr "安裝慧星與小行星星曆表中..." -+msgstr "安裝慧星與小行星星曆表中…" - - #: ksplanetbase.cpp:139 - msgid "KSPlanetBase::setRearth(): Error: Need an Earth pointer. (" -@@ -1237,7 +1242,7 @@ - #: kspopupmenu.cpp:132 rc.cpp:210 - #, no-c-format - msgid "Add Link..." --msgstr "新增連結..." -+msgstr "新增連結…" - - #: kspopupmenu.cpp:213 - msgid "Center && Track Crosshair" -@@ -1263,7 +1268,7 @@ - - #: kspopupmenu.cpp:300 - msgid "Angular Distance To... [" --msgstr "角距離到... [" -+msgstr "角距離到… [" - - #: kspopupmenu.cpp:302 - msgid "Compute Angular Distance ]" -@@ -11732,7 +11737,7 @@ - msgid "" - "_: City name (optional, probably does not need a translation)\n" - "Nassau Obs." --msgstr "Nassau Obs.（拿索天文台）" -+msgstr "Nassau Obs.（拿索天文臺）" - - #: kstars_i18n.cpp:1734 - msgid "" -@@ -12248,7 +12253,7 @@ - msgid "" - "_: City name (optional, probably does not need a translation)\n" - "Obs. Milan" --msgstr "Obs. Milan（米蘭天文台）" -+msgstr "Obs. Milan（米蘭天文臺）" - - #: kstars_i18n.cpp:1820 - msgid "" -@@ -12926,7 +12931,7 @@ - msgid "" - "_: City name (optional, probably does not need a translation)\n" - "Peru" --msgstr "Peru（秘魯）" -+msgstr "Peru（祕魯）" - - #: kstars_i18n.cpp:1933 - msgid "" -@@ -13454,7 +13459,7 @@ - msgid "" - "_: City name (optional, probably does not need a translation)\n" - "Princeton Obs." --msgstr "Princeton Obs.（普林斯頓天文台）" -+msgstr "Princeton Obs.（普林斯頓天文臺）" - - #: kstars_i18n.cpp:2021 - msgid "" -@@ -15584,7 +15589,7 @@ - msgid "" - "_: City name (optional, probably does not need a translation)\n" - "Taipei" --msgstr "Taipei（台北）" -+msgstr "Taipei（臺北）" - - #: kstars_i18n.cpp:2376 - msgid "" -@@ -19304,7 +19309,7 @@ - msgid "" - "_: Country name (optional, but should be translated)\n" - "Peru" --msgstr "Peru（秘魯）" -+msgstr "Peru（祕魯）" - - #: kstars_i18n.cpp:2997 - msgid "" -@@ -19478,7 +19483,7 @@ - msgid "" - "_: Country name (optional, but should be translated)\n" - "Taiwan" --msgstr "Taiwan（中華民國台灣）" -+msgstr "Taiwan（中華民國臺灣）" - - #: kstars_i18n.cpp:3026 - msgid "" -@@ -20276,7 +20281,7 @@ - msgid "" - "_: star name\n" - "Alula Borealis" --msgstr "下台一，三台五（Alula Borealis）" -+msgstr "下臺一，三臺五（Alula Borealis）" - - #: kstars_i18n.cpp:3163 - msgid "" -@@ -21110,7 +21115,7 @@ - msgid "" - "_: star name\n" - "Sheliak" --msgstr "漸台二（Sheliak）" -+msgstr "漸臺二（Sheliak）" - - #: kstars_i18n.cpp:3302 - msgid "" -@@ -21146,7 +21151,7 @@ - msgid "" - "_: star name\n" - "Sulaphat" --msgstr "漸台三（Sulaphat）" -+msgstr "漸臺三（Sulaphat）" - - #: kstars_i18n.cpp:3308 - msgid "" -@@ -21176,13 +21181,13 @@ - msgid "" - "_: star name\n" - "Tania Australis" --msgstr "中台二，三台四（Tania Australis）" -+msgstr "中臺二，三臺四（Tania Australis）" - - #: kstars_i18n.cpp:3313 - msgid "" - "_: star name\n" - "Tania Borealis" --msgstr "中台一，三台三（Tania Borealis）" -+msgstr "中臺一，三臺三（Tania Borealis）" - - #: kstars_i18n.cpp:3314 - msgid "" -@@ -22245,10 +22250,13 @@ - - #: kstarsactions.cpp:556 - msgid "" --"The selected script contains unrecognized elements,indicating that it was not " --"created using the KStars script builder. This script may not function properly, " --"and it may even contain malicious code. Would you like to execute it anyway?" --msgstr "選擇的文稿包含未知的元素，它可能不是由 KStars 文稿建立器建立的。這個文稿可能不能正確執行，也可能包含危險的程式碼。您確定要執行嗎？" -+"The selected script contains unrecognized elements,indicating that it was " -+"not created using the KStars script builder. This script may not function " -+"properly, and it may even contain malicious code. Would you like to execute " -+"it anyway?" -+msgstr "" -+"選擇的文稿包含未知的元素，它可能不是由 KStars 文稿建立器建立的。這個文稿可能" -+"不能正確執行，也可能包含危險的程式碼。您確定要執行嗎？" - - #: kstarsactions.cpp:560 - msgid "Script Validation Failed" -@@ -22260,10 +22268,12 @@ - - #: kstarsactions.cpp:581 - msgid "" --"You can save printer ink by using the \"Star Chart\" color scheme, which uses a " --"white background. Would you like to temporarily switch to the Star Chart color " --"scheme for printing?" --msgstr "使用「星體圖表」顏色機制的話，背景為白色，可以節省印表機墨水。您要暫時切換過去嗎？" -+"You can save printer ink by using the \"Star Chart\" color scheme, which " -+"uses a white background. Would you like to temporarily switch to the Star " -+"Chart color scheme for printing?" -+msgstr "" -+"使用「星體圖表」顏色機制的話，背景為白色，可以節省印表機墨水。您要暫時切換過" -+"去嗎？" - - #: kstarsactions.cpp:586 - msgid "Switch to Star Chart Colors?" -@@ -22302,7 +22312,7 @@ - - #: kstarsactions.cpp:887 kstarsinit.cpp:342 - msgid "Edit FOV Symbols..." --msgstr "編輯視場符號..." -+msgstr "編輯視場符號…" - - #: kstarsdata.cpp:129 - msgid "multiple star" -@@ -22362,11 +22372,11 @@ - - #: kstarsdata.cpp:587 kstarsdata.cpp:1842 - msgid "Loading Star Data (%1%)" --msgstr "載入星體資料中...（%1%）" -+msgstr "載入星體資料中…（%1%）" - - #: kstarsdata.cpp:791 kstarsdata.cpp:1853 - msgid "Loading NGC/IC Data (%1%)" --msgstr "載入 NGC/IC 資料中...（%1%）" -+msgstr "載入 NGC/IC 資料中…（%1%）" - - #: kstarsdata.cpp:887 - msgid "Unnamed Object" -@@ -22393,7 +22403,8 @@ - - #: kstarsdata.cpp:1230 - msgid "" --"Some lines in the custom catalog could not be parsed; see error messages below." -+"Some lines in the custom catalog could not be parsed; see error messages " -+"below." - msgstr "自訂星表中某些行無法剖析，請看底下的錯誤訊息。" - - #: kstarsdata.cpp:1231 -@@ -22528,7 +22539,7 @@ - - #: kstarsdata.cpp:1543 - msgid "Cities.dat: Ran out of fields. Line was:" --msgstr "Cities.dat：欄位不足。行數：" -+msgstr "Cities.dat：欄位不足。列數：" - - #: kstarsdata.cpp:1561 kstarsdata.cpp:1567 kstarsdata.cpp:1573 - #: kstarsdata.cpp:1586 kstarsdata.cpp:1592 kstarsdata.cpp:1598 -@@ -22537,7 +22548,7 @@ - "Cities.dat: Bad integer. Line was:\n" - msgstr "" - "\n" --"Cities.dat：錯誤的整數。行數：\n" -+"Cities.dat：錯誤的整數。列數：\n" - - #: kstarsdata.cpp:1580 - msgid "" -@@ -22545,7 +22556,7 @@ - "Cities.dat: Invalid latitude sign. Line was:\n" - msgstr "" - "\n" --"Cities.dat：錯誤的緯度符號。行數：\n" -+"Cities.dat：錯誤的緯度符號。列數：\n" - - #: kstarsdata.cpp:1605 - msgid "" -@@ -22553,7 +22564,7 @@ - "Cities.dat: Invalid longitude sign. Line was:\n" - msgstr "" - "\n" --"Cities.dat：錯誤的經度符號。行數：\n" -+"Cities.dat：錯誤的經度符號。列數：\n" - - #: kstarsdata.cpp:1623 - msgid "" -@@ -22561,16 +22572,17 @@ - "Cities.dat: Bad time zone. Line was:\n" - msgstr "" - "\n" --"Cities.dat：錯誤的時區。行數：\n" -+"Cities.dat：錯誤的時區。列數：\n" - - #: kstarsdata.cpp:1774 - msgid "" --"The file %1 could not be found. KStars cannot run properly without this file. " --"To continue loading, place the file in one of the following locations, then " --"press Retry:\n" -+"The file %1 could not be found. KStars cannot run properly without this " -+"file. To continue loading, place the file in one of the following locations, " -+"then press Retry:\n" - "\n" - msgstr "" --"找不到檔案 %1，KStars 沒有此檔將無法正確執行。要繼續載入，請將此檔放到以下的位置其中之一，然後按下「重試」：\n" -+"找不到檔案 %1，KStars 沒有此檔將無法正確執行。要繼續載入，請將此檔放到以下的" -+"位置其中之一，然後按下「重試」：\n" - "\n" - - #: kstarsdata.cpp:1780 -@@ -22585,11 +22597,12 @@ - #: kstarsdata.cpp:1783 - msgid "" - "The file %1 could not be found. KStars can still run without this file. " --"However, to avoid seeing this message in the future, you can place the file in " --"one of the following locations, then press Retry:\n" -+"However, to avoid seeing this message in the future, you can place the file " -+"in one of the following locations, then press Retry:\n" - "\n" - msgstr "" --"找不到檔案 %1，KStars 沒有此檔還是可以執行。不過，如果您不想再看到這個訊息，請將此檔放到以下的位置其中之一，然後按下「重試」：\n" -+"找不到檔案 %1，KStars 沒有此檔還是可以執行。不過，如果您不想再看到這個訊息，" -+"請將此檔放到以下的位置其中之一，然後按下「重試」：\n" - "\n" - - #: kstarsdata.cpp:1789 -@@ -22718,29 +22731,29 @@ - - #: kstarsinit.cpp:55 - msgid "&Download Data..." --msgstr "下載資料(&D)..." -+msgstr "下載資料(&D)…" - - #: kstarsinit.cpp:57 - msgid "Open FITS..." --msgstr "開啟 FITS..." -+msgstr "開啟 FITS…" - - #: kstarsinit.cpp:58 - msgid "&Save Sky Image..." --msgstr "儲存天體影像...(&S)" -+msgstr "儲存天體影像…(&S)" - - #: kstarsinit.cpp:60 - msgid "&Run Script..." --msgstr "執行文稿(&R)..." -+msgstr "執行文稿(&R)…" - - #: kstarsinit.cpp:66 - msgid "Set Time to &Now" --msgstr "設定時間為現在時間 (&N)" -+msgstr "設定時間為現在時間(&N)" - - #: kstarsinit.cpp:68 - msgid "" - "_: set Clock to New Time\n" - "&Set Time..." --msgstr "設定時間(&S)..." -+msgstr "設定時間(&S)…" - - #: kstarsinit.cpp:70 - msgid "Stop &Clock" -@@ -22760,7 +22773,7 @@ - - #: kstarsinit.cpp:81 - msgid "&Zenith" --msgstr "天頂 (&Z)" -+msgstr "天頂(&Z)" - - #: kstarsinit.cpp:83 - msgid "&North" -@@ -22780,7 +22793,7 @@ - - #: kstarsinit.cpp:93 - msgid "&Find Object..." --msgstr "尋找物件(&F)..." -+msgstr "尋找物件(&F)…" - - #: kstarsinit.cpp:94 - msgid "Find object" -@@ -22788,11 +22801,11 @@ - - #: kstarsinit.cpp:99 - msgid "Set Focus &Manually..." --msgstr "手動設定焦點(&M)..." -+msgstr "手動設定焦點(&M)…" - - #: kstarsinit.cpp:107 - msgid "&Zoom to Angular Size..." --msgstr "縮放角度大小(&Z)..." -+msgstr "縮放角度大小(&Z)…" - - #: kstarsinit.cpp:109 - msgid "Horizontal &Coordinates" -@@ -22874,67 +22887,67 @@ - msgid "" - "_: Location on Earth\n" - "&Geographic..." --msgstr "地理(&G)..." -+msgstr "地理(&G)…" - - #: kstarsinit.cpp:199 - msgid "Startup Wizard..." --msgstr "啟動精靈..." -+msgstr "啟動精靈…" - - #: kstarsinit.cpp:203 - msgid "Calculator..." --msgstr "計算機..." -+msgstr "計算機…" - - #: kstarsinit.cpp:206 - msgid "Observing List..." --msgstr "觀測清單..." -+msgstr "觀測清單…" - - #: kstarsinit.cpp:211 - msgid "AAVSO Light Curves..." --msgstr "AAVSO 光曲線..." -+msgstr "AAVSO 光曲線…" - - #: kstarsinit.cpp:214 - msgid "Altitude vs. Time..." --msgstr "高度仰角vs時間..." -+msgstr "高度仰角vs時間…" - - #: kstarsinit.cpp:216 - msgid "What's up Tonight..." --msgstr "今晚有什麼..." -+msgstr "今晚有什麼…" - - #: kstarsinit.cpp:221 - msgid "Script Builder..." --msgstr "文稿建立器..." -+msgstr "文稿建立器…" - - #: kstarsinit.cpp:223 - msgid "Solar System..." --msgstr "太陽系..." -+msgstr "太陽系…" - - #: kstarsinit.cpp:225 - msgid "Jupiter's Moons..." --msgstr "木星的衛星..." -+msgstr "木星的衛星…" - - #: kstarsinit.cpp:229 - msgid "Telescope Wizard..." --msgstr "望遠鏡精靈..." -+msgstr "望遠鏡精靈…" - - #: kstarsinit.cpp:230 - msgid "Telescope Properties..." --msgstr "望遠鏡內容..." -+msgstr "望遠鏡內容…" - - #: kstarsinit.cpp:231 - msgid "Device Manager..." --msgstr "裝置管理者..." -+msgstr "裝置管理者…" - - #: kstarsinit.cpp:233 - msgid "Capture Image Sequence..." --msgstr "抓取影像序列..." -+msgstr "抓取影像序列…" - - #: kstarsinit.cpp:236 - msgid "INDI Control Panel..." --msgstr "INDI 控制面板..." -+msgstr "INDI 控制面板…" - - #: kstarsinit.cpp:239 - msgid "Configure INDI..." --msgstr "設定 INDI..." -+msgstr "設定 INDI…" - - #: kstarsinit.cpp:244 - msgid "Tip of the Day" -@@ -23045,11 +23058,11 @@ - - #: kstarssplash.cpp:29 - msgid "Loading KStars..." --msgstr "載入 KStars 中..." -+msgstr "載入 KStars 中…" - - #: kstarssplash.cpp:63 - msgid "Welcome to KStars. Please stand by while loading..." --msgstr "歡迎使用 KStars。請等待程式載入..." -+msgstr "歡迎使用 KStars。請等待程式載入…" - - #: locationdialog.cpp:40 - msgid "Set Geographic Location" -@@ -23543,9 +23556,11 @@ - #, no-c-format - msgid "" - "To import an existing data file, enter its filename here. You will then " --"describe the contents of the file below. You can leave the filename blank to " --"construct a catalog file with a valid header, but no data." --msgstr "要匯入現有的資料檔，請輸入它的檔名，然後在底下描述檔案內容。您可以將檔名留白，以建立有合法標頭但沒有資料的星表檔。" -+"describe the contents of the file below. You can leave the filename blank " -+"to construct a catalog file with a valid header, but no data." -+msgstr "" -+"要匯入現有的資料檔，請輸入它的檔名，然後在底下描述檔案內容。您可以將檔名留" -+"白，以建立有合法標頭但沒有資料的星表檔。" - - #. i18n: file addcatdialogui.ui line 57 - #: rc.cpp:15 -@@ -23557,7 +23572,8 @@ - #: rc.cpp:18 - #, no-c-format - msgid "" --"When you select a data file in the above line, its contents are displayed here." -+"When you select a data file in the above line, its contents are displayed " -+"here." - msgstr "若您選擇了資料檔，它的內容會顯示在這裡。" - - #. i18n: file addcatdialogui.ui line 70 -@@ -23584,7 +23600,9 @@ - msgid "" - "Build a list of data fields for your import data file (in the correct order " - "from left to right), by dragging items from the \"Available fields\" list." --msgstr "請依序建立在您匯入資料檔案的資料欄位清單。您可以從「可用的欄位」清單中拖曳過來。" -+msgstr "" -+"請依序建立在您匯入資料檔案的資料欄位清單。您可以從「可用的欄位」清單中拖曳過" -+"來。" - - #. i18n: file addcatdialogui.ui line 128 - #: rc.cpp:33 -@@ -23602,8 +23620,8 @@ - #: rc.cpp:39 - #, no-c-format - msgid "" --"Drag items from this box to the \"Catalog fields\" box to describe the contents " --"of your imported data file." -+"Drag items from this box to the \"Catalog fields\" box to describe the " -+"contents of your imported data file." - msgstr "從此盒中拖曳到「星表欄位」盒中，以描述您匯入資料檔案的內容。" - - #. i18n: file addcatdialogui.ui line 167 -@@ -23809,8 +23827,8 @@ - #: rc.cpp:162 - #, no-c-format - msgid "" --"A small thumbnail image of the object is shown here. You can modify the image " --"by clicking on it." -+"A small thumbnail image of the object is shown here. You can modify the " -+"image by clicking on it." - msgstr "此物件的小縮圖會顯示無此。您可以點選它以改變影像。" - - #. i18n: file details_data.ui line 293 -@@ -23907,7 +23925,7 @@ - #: rc.cpp:213 - #, no-c-format - msgid "Edit Link..." --msgstr "編輯連結..." -+msgstr "編輯連結…" - - #. i18n: file details_links.ui line 153 - #: rc.cpp:216 -@@ -24124,7 +24142,7 @@ - #: rc.cpp:360 rc.cpp:513 rc.cpp:537 rc.cpp:561 - #, no-c-format - msgid "Add..." --msgstr "新增..." -+msgstr "新增…" - - #. i18n: file devmanager.ui line 329 - #: rc.cpp:369 rc.cpp:2315 -@@ -24239,19 +24257,19 @@ - #: rc.cpp:438 - #, no-c-format - msgid "" --"The list of defined field-of-view (FOV) symbols. You can add a symbol to the " --"list using the \"New\" button, remove a symbol using the \"Remove\" button, and " --"modify a symbol using the \"Edit\" button. A schematic of the highlighted " --"symbol is drawn at right." -+"The list of defined field-of-view (FOV) symbols. You can add a symbol to " -+"the list using the \"New\" button, remove a symbol using the \"Remove\" " -+"button, and modify a symbol using the \"Edit\" button. A schematic of the " -+"highlighted symbol is drawn at right." - msgstr "" --"這個清單定義了視場（field of " --"view，FOV）符號。您可以用「新增」按鍵新增符號到此清單中，「移除」按鍵移除清單中的符號，還有「編輯」按鍵來編輯符號。" -+"這個清單定義了視場（field of view，FOV）符號。您可以用「新增」按鍵新增符號到" -+"此清單中，「移除」按鍵移除清單中的符號，還有「編輯」按鍵來編輯符號。" - - #. i18n: file fovdialogui.ui line 52 - #: rc.cpp:441 - #, no-c-format - msgid "New..." --msgstr "新增..." -+msgstr "新增…" - - #. i18n: file fovdialogui.ui line 55 - #: rc.cpp:444 -@@ -24271,7 +24289,7 @@ - #: rc.cpp:450 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file fovdialogui.ui line 86 - #: rc.cpp:453 -@@ -24684,13 +24702,14 @@ - #: rc.cpp:753 - #, no-c-format - msgid "" --"

                                  This Wizard will help you set up some basic options to help you get the most " --"out of KStars. You can press Finish at any time to save the settings " --"you've made so far, and skip the remaining steps.

                                  \n" -+"

                                  This Wizard will help you set up some basic options to help you get the " -+"most out of KStars. You can press Finish at any time to save the " -+"settings you've made so far, and skip the remaining steps.

                                  \n" - "\n" - "

                                  To get started, press the Next button.

                                  " - msgstr "" --"

                                  這個精靈幫您設定一些基本的選項，協助您使用 KStars。您可以在任何時間點選「完成」以儲存設定，並省略接下來的步驟。

                                  \n" -+"

                                  這個精靈幫您設定一些基本的選項，協助您使用 KStars。您可以在任何時間點選" -+"「完成」以儲存設定，並省略接下來的步驟。

                                  \n" - "\n" - "

                                  按下一步開始。

                                  " - -@@ -24718,7 +24737,8 @@ - "\n" - "

                                  Once you have selected a City, press Next.

                                  " - msgstr "" --"

                                  從清單中選擇靠近您的位置的城市。您可以用過濾城市的名稱、所在的省（或州）與所在的國家。

                                  \n" -+"

                                  從清單中選擇靠近您的位置的城市。您可以用過濾城市的名稱、所在的省（或州）與" -+"所在的國家。

                                  \n" - "\n" - "

                                  選定城市之後，請按下一步。

                                  " - -@@ -24783,7 +24803,9 @@ - "KStars can control most popular computerized telescope\n" - "mounts, as well as some focusers and CCD cameras. It\n" - "can also control telescopes remotely over the Internet." --msgstr "KStars 可以控制大部份常用的電腦化的望遠鏡，以及一些 CCD 相機等。它也可以透過網際網路來控制遠端的望遠鏡。" -+msgstr "" -+"KStars 可以控制大部份常用的電腦化的望遠鏡，以及一些 CCD 相機等。它也可以透過" -+"網際網路來控制遠端的望遠鏡。" - - #. i18n: file kswizardui.ui line 525 - #: rc.cpp:817 -@@ -24802,7 +24824,7 @@ - #: rc.cpp:823 - #, no-c-format - msgid "Telescope Setup Wizard..." --msgstr "望遠鏡設定精靈..." -+msgstr "望遠鏡設定精靈…" - - #. i18n: file kswizardui.ui line 578 - #: rc.cpp:826 -@@ -24816,7 +24838,8 @@ - msgid "" - "The Telescope Setup Wizard will help you configure telescopes\n" - "and other astronomical devices such as CCD cameras and focusers." --msgstr "望遠鏡設定精靈能協助您設定望遠鏡及其他的天文裝置如 CCD 相機及焦距放大鏡等。" -+msgstr "" -+"望遠鏡設定精靈能協助您設定望遠鏡及其他的天文裝置如 CCD 相機及焦距放大鏡等。" - - #. i18n: file kswizardui.ui line 634 - #: rc.cpp:833 -@@ -24842,8 +24865,8 @@ - "

                                  You can also use this tool later, by selecting\n" - "Download data from the File menu.

                                  " - msgstr "" --"

                                  您現在可以下載一下選擇性的資料檔來加強 KStars 的功能，如梅西爾物件影像，或是更完整的 NGC/IC 星表。按下「下載額外資料」就可以開始。

                                  " --"\n" -+"

                                  您現在可以下載一下選擇性的資料檔來加強 KStars 的功能，如梅西爾物件影像，或" -+"是更完整的 NGC/IC 星表。按下「下載額外資料」就可以開始。

                                  \n" - "

                                  您也可以稍後再用此工具，在「檔案」＞「下載資料」中。

                                  " - - #. i18n: file kswizardui.ui line 775 -@@ -24868,8 +24891,8 @@ - #: rc.cpp:860 - #, no-c-format - msgid "" --"The name of the field-of-view (FOV) symbol. This name appears in the FOV menu " --"and in the \"Edit FOV Symbols\" tool." -+"The name of the field-of-view (FOV) symbol. This name appears in the FOV " -+"menu and in the \"Edit FOV Symbols\" tool." - msgstr "視場（FOV）符號的名稱" - - #. i18n: file newfovui.ui line 69 -@@ -24983,7 +25006,8 @@ - "The computed FOV angle (in arcminutes) will be displayed in the \"Field of " - "view\" edit box." - msgstr "" --"這個按鍵會計算指定的目鏡/望遠鏡組合的視場角度。您必須先在上方的欄位指定望遠鏡與目鏡的焦距，還有目鏡的視場角度。\n" -+"這個按鍵會計算指定的目鏡/望遠鏡組合的視場角度。您必須先在上方的欄位指定望遠鏡" -+"與目鏡的焦距，還有目鏡的視場角度。\n" - "\n" - "計算出來的視場角度（以弧分為單位）會顯示在「視場」編輯盒內。" - -@@ -24997,14 +25021,15 @@ - #: rc.cpp:928 - #, no-c-format - msgid "" --"This button will compute the field-of-view (FOV) angle for a specific " --"camera/telescope combination. You must first specify the focal length of the " -+"This button will compute the field-of-view (FOV) angle for a specific camera/" -+"telescope combination. You must first specify the focal length of the " - "telescope and the size of the CCD chip or film negative.\n" - "\n" - "The computed FOV angle (in arcminutes) will be displayed in the \"Field of " - "view\" edit box." - msgstr "" --"這個按鍵會計算指定的相機/望遠鏡組合的視場角度。您必須先指定望遠鏡的焦距，還有 CCD 晶片或底片的尺寸。\n" -+"這個按鍵會計算指定的相機/望遠鏡組合的視場角度。您必須先指定望遠鏡的焦距，還" -+"有 CCD 晶片或底片的尺寸。\n" - "\n" - "計算出來的視場角度（以弧分為單位）會顯示在「視場」編輯盒內。" - -@@ -25092,16 +25117,17 @@ - #: rc.cpp:998 - #, no-c-format - msgid "" --"This button will compute the Half Power Beam Width (HPBW) angle for a specific " --"radiotelescope and observing wavelength combination, assuming no multibeam " --"receiver is available at the telescope. You must first specify the diameter of " --"the radiotelescope and the observing wavelength.\n" -+"This button will compute the Half Power Beam Width (HPBW) angle for a " -+"specific radiotelescope and observing wavelength combination, assuming no " -+"multibeam receiver is available at the telescope. You must first specify " -+"the diameter of the radiotelescope and the observing wavelength.\n" - "\n" - "The computed HPBW angle (in arcminutes) will be displayed in the \"Field of " - "view\" edit box." - msgstr "" --"這個按鍵會計算指定的無線電望遠鏡的半功率波束寬度（Half Power Beam " --"Width，HPBW）角度，以及觀察波長組合等。它假設望遠鏡沒有使用多重波束。您必須先指定無線電望遠鏡的直徑，及觀察波長。\n" -+"這個按鍵會計算指定的無線電望遠鏡的半功率波束寬度（Half Power Beam Width，" -+"HPBW）角度，以及觀察波長組合等。它假設望遠鏡沒有使用多重波束。您必須先指定無" -+"線電望遠鏡的直徑，及觀察波長。\n" - "\n" - "計算出來的 HPBW 角度（以弧分為單位）會顯示在「視場」編輯盒內。" - -@@ -25188,7 +25214,8 @@ - #: rc.cpp:1041 - #, no-c-format - msgid "" --"Select a shape for the field-of-view (FOV) symbol. The possible shapes are:\n" -+"Select a shape for the field-of-view (FOV) symbol. The possible shapes " -+"are:\n" - "\n" - "Circle, Square, Crosshairs, Bullseye." - msgstr "" -@@ -25226,9 +25253,11 @@ - msgid "" - "The atmosphere bends light passing through it, like a lens. If this item is " - "checked, this \"atmospheric refraction\" will be simulated in the sky map. " --"Note that this correction is only applied when using the Horizontal coordinate " --"system." --msgstr "大氣會將光線折射，如同透鏡一般。如果勾選此選項，則會在天體圖中模擬「大氣折射」。注意，這個修正只有在使用水平座標系統時才會套用。" -+"Note that this correction is only applied when using the Horizontal " -+"coordinate system." -+msgstr "" -+"大氣會將光線折射，如同透鏡一般。如果勾選此選項，則會在天體圖中模擬「大氣折" -+"射」。注意，這個修正只有在使用水平座標系統時才會套用。" - - #. i18n: file opsadvancedui.ui line 41 - #: rc.cpp:1061 -@@ -25249,7 +25278,9 @@ - "If checked, changing the focus position will result in a visible animated " - "\"slew\" to the new position. Otherwise, the display will center on the new " - "position instantaneously." --msgstr "勾選此選項的話，改變焦點位置時會以動態旋轉的方式換到新位置，否則會直接跳過去。" -+msgstr "" -+"勾選此選項的話，改變焦點位置時會以動態旋轉的方式換到新位置，否則會直接跳過" -+"去。" - - #. i18n: file opsadvancedui.ui line 55 - #: rc.cpp:1070 -@@ -25267,10 +25298,12 @@ - #: rc.cpp:1076 rc.cpp:1085 - #, no-c-format - msgid "" --"If checked, a name label will be temporarily attached to an object while it is " --"centered in the display. You can attach a more persistent label to any object " --"using the right-click popup menu." --msgstr "勾選此選項的話，物件顯示在中央時會貼上一個暫時性的名稱標籤。您可以點選右鍵，在選單中選擇加上一個永久性的標籤。" -+"If checked, a name label will be temporarily attached to an object while it " -+"is centered in the display. You can attach a more persistent label to any " -+"object using the right-click popup menu." -+msgstr "" -+"勾選此選項的話，物件顯示在中央時會貼上一個暫時性的名稱標籤。您可以點選右鍵，" -+"在選單中選擇加上一個永久性的標籤。" - - #. i18n: file opsadvancedui.ui line 69 - #: rc.cpp:1079 -@@ -25312,10 +25345,12 @@ - #: rc.cpp:1103 - #, no-c-format - msgid "" --"When the map is in motion, smooth animation is compromised if the program has " --"too many objects to draw on the map; check this item to temporarily hide some " --"of the objects while the display is in motion." --msgstr "天體圖在移動時，若是有太多的物件，則沒辦法很平順的移動。勾選此選項可以在移動時暫時隱藏物件。" -+"When the map is in motion, smooth animation is compromised if the program " -+"has too many objects to draw on the map; check this item to temporarily hide " -+"some of the objects while the display is in motion." -+msgstr "" -+"天體圖在移動時，若是有太多的物件，則沒辦法很平順的移動。勾選此選項可以在移動" -+"時暫時隱藏物件。" - - #. i18n: file opsadvancedui.ui line 154 - #: rc.cpp:1106 -@@ -25449,8 +25484,8 @@ - #: rc.cpp:1169 - #, no-c-format - msgid "" --"If checked, then objects in the Messier catalog will be hidden when the map is " --"in motion." -+"If checked, then objects in the Messier catalog will be hidden when the map " -+"is in motion." - msgstr "勾選此選項的話，在移動天體圖時會隱藏梅西爾（Messier）星表中的物件。" - - #. i18n: file opsadvancedui.ui line 347 -@@ -25469,7 +25504,8 @@ - #: rc.cpp:1178 - #, no-c-format - msgid "" --"If checked, then the coordinate grid will be hidden when the map is in motion." -+"If checked, then the coordinate grid will be hidden when the map is in " -+"motion." - msgstr "勾選此選項的話，在移動天體圖時會隱藏座標格。" - - #. i18n: file opsadvancedui.ui line 361 -@@ -25488,8 +25524,8 @@ - #: rc.cpp:1187 - #, no-c-format - msgid "" --"If checked, then objects in the NGC catalog will be hidden when the map is in " --"motion." -+"If checked, then objects in the NGC catalog will be hidden when the map is " -+"in motion." - msgstr "勾選此選項的話，在移動天體圖時會隱藏 NGC 物件。" - - #. i18n: file opsadvancedui.ui line 375 -@@ -25508,7 +25544,8 @@ - #: rc.cpp:1196 - #, no-c-format - msgid "" --"If checked, then constellation lines will be hidden when the map is in motion." -+"If checked, then constellation lines will be hidden when the map is in " -+"motion." - msgstr "勾選此選項的話，在移動天體圖時會隱藏星座線條。" - - #. i18n: file opsadvancedui.ui line 389 -@@ -25527,7 +25564,8 @@ - #: rc.cpp:1205 - #, no-c-format - msgid "" --"If checked, then constellation names will be hidden when the map is in motion." -+"If checked, then constellation names will be hidden when the map is in " -+"motion." - msgstr "勾選此選項的話，在移動天體圖時會隱藏星座名稱。" - - #. i18n: file opscatalogui.ui line 16 -@@ -25554,7 +25592,8 @@ - msgid "" - "When selected, stars are drawn in the skymap. Use the other options in this " - "box to control how many stars are drawn." --msgstr "勾選此選項的話，會在天體圖上繪製星體。使用其他的選項來控制要畫出多少星體。" -+msgstr "" -+"勾選此選項的話，會在天體圖上繪製星體。使用其他的選項來控制要畫出多少星體。" - - #. i18n: file opscatalogui.ui line 69 - #: rc.cpp:1223 rc.cpp:1320 -@@ -25566,8 +25605,8 @@ - #: rc.cpp:1226 rc.cpp:1323 - #, no-c-format - msgid "" --"Set the faintest magnitude that will be drawn at the maximum zoom level. The " --"faint limit varies smoothly between these two values, as the zoom level " -+"Set the faintest magnitude that will be drawn at the maximum zoom level. " -+"The faint limit varies smoothly between these two values, as the zoom level " - "changes.\n" - "\n" - "Magnitude is a measure of brightness; the larger the number, the fainter the " -@@ -25575,7 +25614,8 @@ - msgstr "" - "設定最大放大等級時最暗的星等。這個限制在在放大等級變更時會平順地變化。\n" - "\n" --"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。" -+"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到" -+"的亮度。" - - #. i18n: file opscatalogui.ui line 90 - #: rc.cpp:1234 rc.cpp:1331 -@@ -25593,8 +25633,8 @@ - #: rc.cpp:1243 rc.cpp:1340 - #, no-c-format - msgid "" --"Set the faintest magnitude that will be drawn at the minimum zoom level. The " --"faint limit varies smoothly between these two values, as the zoom level " -+"Set the faintest magnitude that will be drawn at the minimum zoom level. " -+"The faint limit varies smoothly between these two values, as the zoom level " - "changes.\n" - "\n" - "Magnitude is a measure of brightness; the larger the number, the fainter the " -@@ -25602,7 +25642,8 @@ - msgstr "" - "設定最小放大等級時最暗的星等。這個限制在在放大等級變更時會平順地變化。\n" - "\n" --"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。" -+"星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到" -+"的亮度。" - - #. i18n: file opscatalogui.ui line 122 - #: rc.cpp:1248 rc.cpp:1345 -@@ -25626,11 +25667,13 @@ - #: rc.cpp:1257 - #, no-c-format - msgid "" --"Sets the faintest magnitude for which name and magnitude labels may be " --"attached to stars. Magnitude is a measure of brightness; the larger the " --"number, the fainter the object. Magnitude 6.0 is about as faint as the unaided " --"human eye can see." --msgstr "設定星體可以附加名稱與亮度標籤的最暗亮度星等。星等是用來測量亮度的。數值越大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。" -+"Sets the faintest magnitude for which name and magnitude labels may " -+"be attached to stars. Magnitude is a measure of brightness; the larger the " -+"number, the fainter the object. Magnitude 6.0 is about as faint as the " -+"unaided human eye can see." -+msgstr "" -+"設定星體可以附加名稱與亮度標籤的最暗亮度星等。星等是用來測量亮度的。數值越" -+"大，物件就越暗。6.0 等差不多是一般人用肉眼看得到的亮度。" - - #. i18n: file opscatalogui.ui line 265 - #: rc.cpp:1263 -@@ -25690,16 +25733,18 @@ - #: rc.cpp:1290 - #, no-c-format - msgid "" --"The list of catalogs available, other than the star catalog. By default, the " --"list includes the Messier, NGC and IC catalogs. You can add your own object " --"catalogs as well." --msgstr "除了星體星表之外其他可用的星表清單。預設包括梅西爾（Messier），NGC 與 IC 星表。您也可以加入您自己的星表。" -+"The list of catalogs available, other than the star catalog. By default, " -+"the list includes the Messier, NGC and IC catalogs. You can add your own " -+"object catalogs as well." -+msgstr "" -+"除了星體星表之外其他可用的星表清單。預設包括梅西爾（Messier），NGC 與 IC 星" -+"表。您也可以加入您自己的星表。" - - #. i18n: file opscatalogui.ui line 376 - #: rc.cpp:1293 - #, no-c-format - msgid "Import Catalog..." --msgstr "匯入星表..." -+msgstr "匯入星表…" - - #. i18n: file opscatalogui.ui line 379 - #: rc.cpp:1296 -@@ -25711,16 +25756,18 @@ - #: rc.cpp:1299 - #, no-c-format - msgid "" --"Press this button to create a custom object catalog. Use this button instead " --"of \"Load Catalog\", even if you already have a data file. We will add a " --"header to your data file to create the catalog." --msgstr "按此鍵以建立自訂物件星表。請用此鍵而不要用「載入星表」，即使您已經有了資料檔。我們會在您的資料檔中加入標頭以建立星表。" -+"Press this button to create a custom object catalog. Use this button " -+"instead of \"Load Catalog\", even if you already have a data file. We will " -+"add a header to your data file to create the catalog." -+msgstr "" -+"按此鍵以建立自訂物件星表。請用此鍵而不要用「載入星表」，即使您已經有了資料" -+"檔。我們會在您的資料檔中加入標頭以建立星表。" - - #. i18n: file opscatalogui.ui line 390 - #: rc.cpp:1302 - #, no-c-format - msgid "Load Catalog..." --msgstr "載入星表..." -+msgstr "載入星表…" - - #. i18n: file opscatalogui.ui line 393 - #: rc.cpp:1305 -@@ -25734,7 +25781,9 @@ - msgid "" - "Load an existing custom catalog. Only use this button if you have a catalog " - "file that was created by KStars (or one that has the proper header)." --msgstr "載入現有的自訂星表。如果您已經有了由 KStars 建立的星表檔，或是星表檔內容中有正確的標頭，才能使用這個功能。" -+msgstr "" -+"載入現有的自訂星表。如果您已經有了由 KStars 建立的星表檔，或是星表檔內容中有" -+"正確的標頭，才能使用這個功能。" - - #. i18n: file opscatalogui.ui line 407 - #: rc.cpp:1311 -@@ -25755,7 +25804,8 @@ - "Press this button to remove a custom object catalog that you had added " - "previously. You cannot remove the Messier, NGC or IC catalogs with this " - "button." --msgstr "按此鍵以移除您先前加入的自訂星表。您不能用此按鍵移除梅西爾、NGC 或 IC 星表。" -+msgstr "" -+"按此鍵以移除您先前加入的自訂星表。您不能用此按鍵移除梅西爾、NGC 或 IC 星表。" - - #. i18n: file opscolorsui.ui line 16 - #: rc.cpp:1348 -@@ -25780,9 +25830,11 @@ - #, no-c-format - msgid "" - "The list of all customizable colors in the program. Next to each item is a " --"square showing the color it is currently set to. Click on any item to change " --"its color." --msgstr "此程式中所有可自訂的顏色清單。每個項目都有個小方塊顯示目前設定的顏色。點選該項目以改變顏色。" -+"square showing the color it is currently set to. Click on any item to " -+"change its color." -+msgstr "" -+"此程式中所有可自訂的顏色清單。每個項目都有個小方塊顯示目前設定的顏色。點選該" -+"項目以改變顏色。" - - #. i18n: file opscolorsui.ui line 57 - #: rc.cpp:1360 -@@ -25825,11 +25877,13 @@ - #, no-c-format - msgid "" - "There are four ways to draw stars on the map. By default, stars are circles " --"with a white core and a rim which is tinted to reflect the star's actual color. " --" You may also choose to draw the stars as solid white, red, or black circles, " --"to match the needs of your overall color scheme." --msgstr "" --"有四種方法在天體圖上畫星體。預設畫星體的方法是畫一個圓圈，有白色的核心與該星體實際顏色的邊框。您也可以選擇用實心白、紅與黑色的圓圈，以符合您所選擇的顏色機制。" -+"with a white core and a rim which is tinted to reflect the star's actual " -+"color. You may also choose to draw the stars as solid white, red, or black " -+"circles, to match the needs of your overall color scheme." -+msgstr "" -+"有四種方法在天體圖上畫星體。預設畫星體的方法是畫一個圓圈，有白色的核心與該星" -+"體實際顏色的邊框。您也可以選擇用實心白、紅與黑色的圓圈，以符合您所選擇的顏色" -+"機制。" - - #. i18n: file opscolorsui.ui line 127 - #: rc.cpp:1381 -@@ -25847,9 +25901,12 @@ - #: rc.cpp:1387 - #, no-c-format - msgid "" --"When using the realistic-color star mode, this option will set the saturation " --"level of the star's colors. A higher value means more intense colors." --msgstr "使用實際彩色星體模式時，這個選項會設定星體顏色的飽和度。數值越高表示顏色越明亮。" -+"When using the realistic-color star mode, this option will set the " -+"saturation level of the star's colors. A higher value means more intense " -+"colors." -+msgstr "" -+"使用實際彩色星體模式時，這個選項會設定星體顏色的飽和度。數值越高表示顏色越明" -+"亮。" - - #. i18n: file opscolorsui.ui line 153 - #: rc.cpp:1390 -@@ -25867,8 +25924,8 @@ - #: rc.cpp:1396 - #, no-c-format - msgid "" --"List of all known color schemes. Several are provided by default, and you may " --"also define your own." -+"List of all known color schemes. Several are provided by default, and you " -+"may also define your own." - msgstr "列出所有的顏色機制。有一些是預設提供的，您也可以定義您自己的。" - - #. i18n: file opscolorsui.ui line 200 -@@ -25887,15 +25944,15 @@ - #: rc.cpp:1405 - #, no-c-format - msgid "" --"Press this button to remove the highlighted color scheme. This will only work " --"on your custom color schemes." -+"Press this button to remove the highlighted color scheme. This will only " -+"work on your custom color schemes." - msgstr "按此鍵以移除所選取的顏色機制。這只能用於您自己定義的顏色機制。" - - #. i18n: file opscolorsui.ui line 265 - #: rc.cpp:1408 - #, no-c-format - msgid "Save Current Colors..." --msgstr "儲存目前的顏色..." -+msgstr "儲存目前的顏色…" - - #. i18n: file opscolorsui.ui line 268 - #: rc.cpp:1411 -@@ -25911,7 +25968,9 @@ - "create a new scheme using those colors. Your scheme will appear here in the " - "list of presets, and will also be available in the \"Settings\" menu of the " - "main window." --msgstr "改變了一些顏色後，您可以用此按鍵來將目前的顏色儲存為新的顏色機制。儲存後您可以在此清單中看到，或是在「設定」選單中也可以看到。" -+msgstr "" -+"改變了一些顏色後，您可以用此按鍵來將目前的顏色儲存為新的顏色機制。儲存後您可" -+"以在此清單中看到，或是在「設定」選單中也可以看到。" - - #. i18n: file opsguidesui.ui line 16 - #: rc.cpp:1417 -@@ -26020,8 +26079,8 @@ - #: rc.cpp:1468 - #, no-c-format - msgid "" --"Select this to use abbreviations from the International Astronomical Union as " --"constellation labels" -+"Select this to use abbreviations from the International Astronomical Union " -+"as constellation labels" - msgstr "使用國際天文學協會（International Astronomical Union，IAU）定義的縮寫" - - #. i18n: file opsguidesui.ui line 135 -@@ -26079,9 +26138,11 @@ - #: rc.cpp:1495 - #, no-c-format - msgid "" --"If checked, a grid of lines will be drawn every 2 hours in Right Ascension and " --"every 20 degrees in Declination." --msgstr "勾選此選項的話，會畫出座標格。赤經每兩小時畫一條線，赤緯則是每 20 度畫一條線。" -+"If checked, a grid of lines will be drawn every 2 hours in Right Ascension " -+"and every 20 degrees in Declination." -+msgstr "" -+"勾選此選項的話，會畫出座標格。赤經每兩小時畫一條線，赤緯則是每 20 度畫一條" -+"線。" - - #. i18n: file opsguidesui.ui line 194 - #: rc.cpp:1498 -@@ -26111,10 +26172,12 @@ - #: rc.cpp:1513 - #, no-c-format - msgid "" --"If checked, the ecliptic will be drawn on the sky map. The ecliptic is a great " --"circle on the sky that the Sun appears to follow over the course of one year. " --"All other solar system bodies roughly follow the ecliptic as well." --msgstr "勾選此選項的話，會畫出黃道。黃道是天空中的一個大圓圈，太陽每年都會遵循該路線。其他太陽系的星體也會大略遵循此路線。" -+"If checked, the ecliptic will be drawn on the sky map. The ecliptic is a " -+"great circle on the sky that the Sun appears to follow over the course of " -+"one year. All other solar system bodies roughly follow the ecliptic as well." -+msgstr "" -+"勾選此選項的話，會畫出黃道。黃道是天空中的一個大圓圈，太陽每年都會遵循該路" -+"線。其他太陽系的星體也會大略遵循此路線。" - - #. i18n: file opsguidesui.ui line 222 - #: rc.cpp:1516 -@@ -26154,7 +26217,9 @@ - "If checked, the area below the horizon will be filled in, to simulate the " - "ground beneath you. Note that the ground is never drawn when using the " - "Equatorial coordinate system." --msgstr "勾選的話，在水平面下的區域將被填滿，以模擬地面。注意如果使用赤道座標系統的話，則不會畫出地面。" -+msgstr "" -+"勾選的話，在水平面下的區域將被填滿，以模擬地面。注意如果使用赤道座標系統的" -+"話，則不會畫出地面。" - - #. i18n: file opssolarsystemui.ui line 16 - #: rc.cpp:1534 -@@ -26443,10 +26508,11 @@ - #, no-c-format - msgid "" - "Set the maximum distance from the Sun for a comet to have a name label, in " --"Astronomical Units (AU). 1 AU is the distance between the Earth and the Sun, " --"approximately 150 million km" -+"Astronomical Units (AU). 1 AU is the distance between the Earth and the " -+"Sun, approximately 150 million km" - msgstr "" --"設定慧星要貼上名稱標籤，離太陽的最大距離，以天文單位（Astronomical Units，AU）為單位。1 AU 是地球與太陽間的距離，約一億五千萬公里。" -+"設定慧星要貼上名稱標籤，離太陽的最大距離，以天文單位（Astronomical Units，" -+"AU）為單位。1 AU 是地球與太陽間的距離，約一億五千萬公里。" - - #. i18n: file opssolarsystemui.ui line 399 - #: rc.cpp:1714 -@@ -26467,7 +26533,9 @@ - "If checked, the comets near the Sun will have name labels attached. Comets " - "vary in brightness in their orbits, so a faint magnitude is not effective in " - "this case." --msgstr "勾選此選項的話，接近太陽的慧星會附加上名稱標籤。因為慧星的亮度會依軌道位置而不同，所以亮度（星等）在此不適用。" -+msgstr "" -+"勾選此選項的話，接近太陽的慧星會附加上名稱標籤。因為慧星的亮度會依軌道位置而" -+"不同，所以亮度（星等）在此不適用。" - - #. i18n: file opssolarsystemui.ui line 416 - #: rc.cpp:1723 -@@ -26535,8 +26603,8 @@ - #: rc.cpp:1753 - #, no-c-format - msgid "" --"If checked, the color of the planet trail will be blended into the background " --"sky color." -+"If checked, the color of the planet trail will be blended into the " -+"background sky color." - msgstr "勾選此選項的話，行星軌跡會淡出為背景顏色。" - - #. i18n: file opssolarsystemui.ui line 507 -@@ -26555,8 +26623,8 @@ - #: rc.cpp:1762 - #, no-c-format - msgid "" --"Press this to clear all orbit trails that you may have attached to solar system " --"bodies using the right-click popup menu." -+"Press this to clear all orbit trails that you may have attached to solar " -+"system bodies using the right-click popup menu." - msgstr "按下此鍵可以清除所有的軌跡。" - - #. i18n: file statform.ui line 27 -@@ -26690,25 +26758,23 @@ - #, no-c-format - msgid "" - "Welcome to the KStars Telescope Setup Wizard!\n" --"
                                  " --"
                                  \n" -+"

                                  \n" - "This Wizard will help you to connect to your telescope and control it from " - "KStars. You will be asked to verify some basic information.\n" - "
                                  \n" --"
                                  You can get extended information on telescope support in KStars by pressing " --"the help button at any point during the Wizard.\n" --"
                                  " --"
                                  \n" -+"
                                  You can get extended information on telescope support in KStars by " -+"pressing the help button at any point during the Wizard.\n" -+"

                                  \n" - "Please click next to continue." - msgstr "" - "歡迎來到KStars 望遠鏡設定精靈！\n" --"
                                  " --"
                                  \n" --"這個精靈能協助您連接到您的望遠鏡，並從 KStars 控制。您會被詢問一些基本的資訊。\n" --"
                                  \n" --"
                                  在使用此精靈期間，您隨時可以點選「說明」鍵以取得更多關於 KStars 支援望遠鏡功能的資訊。\n" --"
                                  " -+"

                                  \n" -+"這個精靈能協助您連接到您的望遠鏡，並從 KStars 控制。您會被詢問一些基本的資" -+"訊。\n" - "
                                  \n" -+"
                                  在使用此精靈期間，您隨時可以點選「說明」鍵以取得更多關於 KStars 支援望遠" -+"鏡功能的資訊。\n" -+"

                                  \n" - "請點選「下一步」以繼續。" - - #. i18n: file telescopewizard.ui line 168 -@@ -26729,11 +26795,12 @@ - #, no-c-format - msgid "" - "Tip\n" --"
                                  Some non-Meade telescopes support a subset of the LX200 command set. Select " --"LX200 Generic to control such devices." -+"
                                  Some non-Meade telescopes support a subset of the LX200 command set. " -+"Select LX200 Generic to control such devices." - msgstr "" - "提示\n" --"
                                  有些非 Meade 牌的望遠鏡會支援 LX200 命令集。請選擇 一般的 LX200 來控制這些裝置。" -+"
                                  有些非 Meade 牌的望遠鏡會支援 LX200 命令集。請選擇 一般的 LX200 " -+"來控制這些裝置。" - - #. i18n: file telescopewizard.ui line 280 - #: rc.cpp:1876 -@@ -26743,23 +26810,18 @@ - "\n" - "You need to align your telescope before you can control it properly from " - "KStars. Please refer to your telescope manual for alignment instructions.\n" --"
                                  " --"
                                  \n" --"After a successful alignment, connect your telescope's RS232 interface to your " --"computer's serial or USB port.\n" --"
                                  " --"
                                  " --"
                                  Click next to continue." -+"

                                  \n" -+"After a successful alignment, connect your telescope's RS232 interface to " -+"your computer's serial or USB port.\n" -+"


                                  Click next to continue." - msgstr "" - "

                                  2. 調整（Align）您的望遠鏡

                                  \n" - "\n" --"在從 KStars 控制您的望遠鏡之前，您必須先調整（Align）好。請參考您的望遠鏡手冊以取得說明。\n" --"
                                  " --"
                                  \n" -+"在從 KStars 控制您的望遠鏡之前，您必須先調整（Align）好。請參考您的望遠鏡手冊" -+"以取得說明。\n" -+"

                                  \n" - "排列好之後，請將望遠鏡的 RS232 介面連接到您的電腦的 RS232 或 USB 埠。\n" --"
                                  " --"
                                  " --"
                                  點選「下一步」以繼續。" -+"


                                  點選「下一步」以繼續。" - - #. i18n: file telescopewizard.ui line 307 - #: rc.cpp:1884 -@@ -26767,13 +26829,14 @@ - msgid "" - "

                                  3. Verify Local Settings

                                  \n" - "\n" --"Verify if the following time, date, and location settings are correct. If any " --"of the settings are incorrect, you can correct them via the Set time " --"and Set Location buttons.\n" -+"Verify if the following time, date, and location settings are correct. If " -+"any of the settings are incorrect, you can correct them via the Set " -+"time and Set Location buttons.\n" - msgstr "" - "

                                  3. 檢驗本地端設定

                                  \n" - "\n" --"檢查底下的時間、日期與位置設定是否正確。如果有不正確的，請用「設定時間」、「設定位置」等按鍵來修正。\n" -+"檢查底下的時間、日期與位置設定是否正確。如果有不正確的，請用「設定時間」、" -+"「設定位置」等按鍵來修正。\n" - - #. i18n: file telescopewizard.ui line 367 - #: rc.cpp:1890 -@@ -26797,13 +26860,13 @@ - #: rc.cpp:1899 - #, no-c-format - msgid "Set Time..." --msgstr "設定時間..." -+msgstr "設定時間…" - - #. i18n: file telescopewizard.ui line 472 - #: rc.cpp:1902 - #, no-c-format - msgid "Set Location..." --msgstr "設定位置..." -+msgstr "設定位置…" - - #. i18n: file telescopewizard.ui line 525 - #: rc.cpp:1905 -@@ -26813,16 +26876,16 @@ - "\n" - "Enter the port number your telescope is connected to. If you only have one " - "serial port in your computer, the port is usually /dev/ttyS0\n" --"
                                  " --"
                                  If you are unsure about the port number, you can leave the field empty and " --"KStars will try to scan the ports for attached telescopes. Beware that the " --"autoscan process might take a few minutes to complete. " -+"

                                  If you are unsure about the port number, you can leave the field " -+"empty and KStars will try to scan the ports for attached telescopes. Beware " -+"that the autoscan process might take a few minutes to complete. " - msgstr "" - "

                                  4. 決定連接埠

                                  \n" - "\n" --"輸入您的望遠鏡的連接埠。如果您的電腦只有一個序列埠，通常會是 /dev/ttyS0\n" --"
                                  " --"
                                  如果您不確定，您可以將此欄位空白，KStars 會試著掃描連接望遠鏡的連接埠。自動掃描可能要花一點時間才能完成。" -+"輸入您的望遠鏡的連接埠。如果您的電腦只有一個序列埠，通常會是 /dev/ttyS0\n" -+"

                                  如果您不確定，您可以將此欄位空白，KStars 會試著掃描連接望遠鏡的連接" -+"埠。自動掃描可能要花一點時間才能完成。" - - #. i18n: file telescopewizard.ui line 561 - #: rc.cpp:1911 -@@ -26882,7 +26945,7 @@ - #: rc.cpp:1938 - #, no-c-format - msgid "Edit Ima&ge..." --msgstr "編輯影像(&G)..." -+msgstr "編輯影像(&G)…" - - #. i18n: file thumbnailpickerui.ui line 258 - #: rc.cpp:1941 -@@ -26927,24 +26990,26 @@ - "There are two ways to use this field: \n" - "\n" - "1. Simply type the name of a known object and press the \"Plot\" button (or " --"press Enter). The object's Altitude vs. Time curve will be added to the plot, " --"and its coordinates will be displayed below.\n" -+"press Enter). The object's Altitude vs. Time curve will be added to the " -+"plot, and its coordinates will be displayed below.\n" - "\n" --"2. Type a name label for a custom object. You will also need to specify the RA " --"and Dec coordinates of the object, and then press the \"Plot\" button to add " --"its curve to the plot." -+"2. Type a name label for a custom object. You will also need to specify the " -+"RA and Dec coordinates of the object, and then press the \"Plot\" button to " -+"add its curve to the plot." - msgstr "" - "有兩種方式使用此欄位：\n" - "\n" --"1. 只要輸入已知的物件名稱，並按下「繪製」鍵（或按 Enter）。物件的高度仰角vs時間的曲線會加入圖中，並在底下顯示它的座標。\n" -+"1. 只要輸入已知的物件名稱，並按下「繪製」鍵（或按 Enter）。物件的高度仰角vs時" -+"間的曲線會加入圖中，並在底下顯示它的座標。\n" - "\n" --"2. 輸入自訂物件的名稱標籤。您也需要指定物件的赤經與赤緯座標，並按下「繪製」鍵。" -+"2. 輸入自訂物件的名稱標籤。您也需要指定物件的赤經與赤緯座標，並按下「繪製」" -+"鍵。" - - #. i18n: file tools/altvstimeui.ui line 200 - #: rc.cpp:1972 - #, no-c-format - msgid "Find Object..." --msgstr "尋找物件..." -+msgstr "尋找物件…" - - #. i18n: file tools/altvstimeui.ui line 216 - #: rc.cpp:1975 -@@ -26976,7 +27041,7 @@ - #: rc.cpp:1990 - #, no-c-format - msgid "Choose City..." --msgstr "選擇城市..." -+msgstr "選擇城市…" - - #. i18n: file tools/altvstimeui.ui line 361 - #: rc.cpp:1993 rc.cpp:2758 -@@ -27008,7 +27073,9 @@ - msgid "" - "Select an option from this list to set its value. You may also select the " - "option using an organized Tree List using the \"Browse Tree\" button." --msgstr "從此清單中選擇一個選項並設定值。您也可以用「瀏覽樹狀列表」從樹狀列表中選取選項。" -+msgstr "" -+"從此清單中選擇一個選項並設定值。您也可以用「瀏覽樹狀列表」從樹狀列表中選取選" -+"項。" - - #. i18n: file tools/argchangeviewoption.ui line 60 - #: rc.cpp:2008 -@@ -27032,10 +27099,12 @@ - #: rc.cpp:2017 - #, no-c-format - msgid "" --"Press this button to select a View Option from a Tree list, in which they are " --"grouped by subject. Also shown are a short description of each option, and the " --"data type of the option's value (string, integer, float or boolean)." --msgstr "按下此鍵以從樹狀列表中選取檢視選項。樹狀列表依主題將選項群組起來，也顯示每個選項的簡短描述，資料型態等等。" -+"Press this button to select a View Option from a Tree list, in which they " -+"are grouped by subject. Also shown are a short description of each option, " -+"and the data type of the option's value (string, integer, float or boolean)." -+msgstr "" -+"按下此鍵以從樹狀列表中選取檢視選項。樹狀列表依主題將選項群組起來，也顯示每個" -+"選項的簡短描述，資料型態等等。" - - #. i18n: file tools/argchangeviewoption.ui line 82 - #: rc.cpp:2020 -@@ -27047,14 +27116,15 @@ - #: rc.cpp:2023 - #, no-c-format - msgid "" --"Set the value for the selected view option here. Make sure the value you enter " --"matches the data type expected by the option. For example, the \"UseAltAz\" " --"option expects a boolean value, so you should enter \"true\", \"false\", \"1\", " --"or \"0\". If you are unsure what data type is expected, examine the Tree View " --"of options using the \"Browse Tree\" button." --msgstr "" --"在此設定選取檢視選項的值。請確定您輸入的值符合該選項的資料型態。例如，\"UseAltAz\" " --"選項需要的是布林值，您可以輸入\"true\"，\"false\"，\"1\"或\"0\"。如果不確定資料型態為何，請用「瀏覽樹狀列表」來檢視選項。" -+"Set the value for the selected view option here. Make sure the value you " -+"enter matches the data type expected by the option. For example, the " -+"\"UseAltAz\" option expects a boolean value, so you should enter \"true\", " -+"\"false\", \"1\", or \"0\". If you are unsure what data type is expected, " -+"examine the Tree View of options using the \"Browse Tree\" button." -+msgstr "" -+"在此設定選取檢視選項的值。請確定您輸入的值符合該選項的資料型態。例如，" -+"\"UseAltAz\" 選項需要的是布林值，您可以輸入\"true\"，\"false\"，\"1\"或\"0" -+"\"。如果不確定資料型態為何，請用「瀏覽樹狀列表」來檢視選項。" - - #. i18n: file tools/argchangeviewoption.ui line 110 - #: rc.cpp:2026 -@@ -27138,7 +27208,7 @@ - #: rc.cpp:2065 - #, no-c-format - msgid "zenith" --msgstr "天頂 (&Z)" -+msgstr "天頂(&Z)" - - #. i18n: file tools/arglooktoward.ui line 93 - #: rc.cpp:2068 -@@ -27151,11 +27221,13 @@ - #, no-c-format - msgid "" - "Select a direction or object to center on. The combo box provides a list of " --"known directions including cardinal compass points on the horizon, as well as " --"the Zenith. You may also enter the name of a known object here, or select an " --"object from the list of known objects by pressing the \"Object\" button." -+"known directions including cardinal compass points on the horizon, as well " -+"as the Zenith. You may also enter the name of a known object here, or " -+"select an object from the list of known objects by pressing the \"Object\" " -+"button." - msgstr "" --"選擇要置中的方向或物件。此下拉式選單提供了方向的清單，包括羅盤上的水平方位點，還有天頂等等。您也可以輸入物件的名稱，或按下「物件」鈕從清單中選取物件。" -+"選擇要置中的方向或物件。此下拉式選單提供了方向的清單，包括羅盤上的水平方位" -+"點，還有天頂等等。您也可以輸入物件的名稱，或按下「物件」鈕從清單中選取物件。" - - #. i18n: file tools/arglooktoward.ui line 109 - #: rc.cpp:2074 rc.cpp:2259 -@@ -27174,9 +27246,11 @@ - #, no-c-format - msgid "" - "Opens the Find Object dialog, which allows you to select an object from the " --"list of known objects. When an object has been selected, its name will appear " --"in the \"dir\" box at left." --msgstr "開啟尋找物件對話框，讓您可以從清單中選取物件。選取物件之後，它的名稱會顯示在左方「方向」盒中。" -+"list of known objects. When an object has been selected, its name will " -+"appear in the \"dir\" box at left." -+msgstr "" -+"開啟尋找物件對話框，讓您可以從清單中選取物件。選取物件之後，它的名稱會顯示在" -+"左方「方向」盒中。" - - #. i18n: file tools/argprintimage.ui line 24 - #: rc.cpp:2083 -@@ -27212,22 +27286,24 @@ - #: rc.cpp:2101 - #, no-c-format - msgid "" --"Set the Altitude coordinate to be focused on in the sky map, in degrees. You " --"can express the angle as a simple integer (\"45\") or floating-point " --"(\"45.333\") value, or as space- or colon-delimited values specifying degrees, " --"arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", " --"etc.).\n" -+"Set the Altitude coordinate to be focused on in the sky map, in degrees. " -+"You can express the angle as a simple integer (\"45\") or floating-point " -+"(\"45.333\") value, or as space- or colon-delimited values specifying " -+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 " -+"20.0\", etc.).\n" - "\n" --"The Altitude is one of the coordinates in the Horizontal coordinate system. It " --"is defined as the angle of an object above or below the horizon. For example, " --"the Zenith has an Altitude of 90 degrees. Altitude is also known as Elevation." --msgstr "" --"設定在天體圖中聚焦的高度仰角座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 " --"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 " --"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" -+"The Altitude is one of the coordinates in the Horizontal coordinate system. " -+"It is defined as the angle of an object above or below the horizon. For " -+"example, the Zenith has an Altitude of 90 degrees. Altitude is also known " -+"as Elevation." -+msgstr "" -+"設定在天體圖中聚焦的高度仰角座標，以度為單位。角度可以為一個簡單整數（如 \"45" -+"\"）或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）" -+"與弧秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" - "\n" --"高度仰角（Altitude）是水平座標系統裡的一種。它的定義是物件在水平上方或下方的角度。例如，天頂（Zenith）就是高度仰角 90 " --"度。高度仰角（Altitude）英文也有人使用 Elevation。" -+"高度仰角（Altitude）是水平座標系統裡的一種。它的定義是物件在水平上方或下方的" -+"角度。例如，天頂（Zenith）就是高度仰角 90 度。高度仰角（Altitude）英文也有人" -+"使用 Elevation。" - - #. i18n: file tools/argsetaltaz.ui line 56 - #: rc.cpp:2106 -@@ -27245,21 +27321,23 @@ - #: rc.cpp:2112 - #, no-c-format - msgid "" --"Set the Azimuth coordinate to be focused on in the skymap, in degrees. You can " --"express the angle as a simple integer (\"45\") or floating-point (\"45.333\") " --"value, or as space- or colon-delimited values specifying degrees, arcminutes " --"and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", etc.).\n" -+"Set the Azimuth coordinate to be focused on in the skymap, in degrees. You " -+"can express the angle as a simple integer (\"45\") or floating-point " -+"(\"45.333\") value, or as space- or colon-delimited values specifying " -+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 " -+"20.0\", etc.).\n" - "\n" --"The azimuth is one of the coordinates in the horizontal coordinate system. It " --"is defined as the angle measured along the horizon, between the North point and " --"the point on the horizon directly below the object. Azimuth increases " --"clockwise around the horizon" --msgstr "" --"設定在天體圖中聚焦的方位座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 " --"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 " --"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" -+"The azimuth is one of the coordinates in the horizontal coordinate system. " -+"It is defined as the angle measured along the horizon, between the North " -+"point and the point on the horizon directly below the object. Azimuth " -+"increases clockwise around the horizon" -+msgstr "" -+"設定在天體圖中聚焦的方位座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）" -+"或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧" -+"秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" - "\n" --"方位（Azimuth）是水平座標系統裡的一種。它的定義是物件在水平線上，在指北點與物件正下方間所形成的角度。方位度數在水平線上依順時針方向增加。" -+"方位（Azimuth）是水平座標系統裡的一種。它的定義是物件在水平線上，在指北點與物" -+"件正下方間所形成的角度。方位度數在水平線上依順時針方向增加。" - - #. i18n: file tools/argsetaltaz.ui line 88 - #: rc.cpp:2117 -@@ -27319,9 +27397,9 @@ - #: rc.cpp:2165 - #, no-c-format - msgid "" --"Enter the Country name for the desired location. It might be easier to use the " --"\"Find City\" location to choose your location from the list of predefined " --"cities." -+"Enter the Country name for the desired location. It might be easier to use " -+"the \"Find City\" location to choose your location from the list of " -+"predefined cities." - msgstr "輸入所要位置的國家名稱。您也可以用「尋找城市」從底下的城市清單中選取。" - - #. i18n: file tools/argsetgeolocation.ui line 83 -@@ -27350,9 +27428,10 @@ - #, no-c-format - msgid "" - "Enter the Province name for the desired location. It might be easier to use " --"the \"Find City\" location to choose your location from the list of predefined " --"cities." --msgstr "輸入所要位置的省份/州名稱。您也可以用「尋找城市」從底下的城市清單中選取。" -+"the \"Find City\" location to choose your location from the list of " -+"predefined cities." -+msgstr "" -+"輸入所要位置的省份/州名稱。您也可以用「尋找城市」從底下的城市清單中選取。" - - #. i18n: file tools/argsetgeolocation.ui line 132 - #: rc.cpp:2186 -@@ -27374,7 +27453,9 @@ - "choose a location from our list of over 2500 cities around the word. Once a " - "location has been selected, the City, Province and Country fields will be " - "filled in." --msgstr "按此鍵開啟「設定位置」對話框，讓您從我們超過兩千五百個城市的清單中選取位置。選定位置之後，會自動填入城市、省份與國家等欄位。" -+msgstr "" -+"按此鍵開啟「設定位置」對話框，讓您從我們超過兩千五百個城市的清單中選取位置。" -+"選定位置之後，會自動填入城市、省份與國家等欄位。" - - #. i18n: file tools/argsetgeolocationindi.ui line 48 - #: rc.cpp:2198 -@@ -27398,46 +27479,50 @@ - #: rc.cpp:2219 - #, no-c-format - msgid "" --"Enter the Declination coordinate to be focused on in the skymap, in degrees. " --"You can express the angle as a simple integer (\"45\") or floating-point " --"(\"45.333\") value, or as space- or colon-delimited values specifying degrees, " --"arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", " --"etc.).\n" -+"Enter the Declination coordinate to be focused on in the skymap, in " -+"degrees. You can express the angle as a simple integer (\"45\") or floating-" -+"point (\"45.333\") value, or as space- or colon-delimited values specifying " -+"degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 " -+"20.0\", etc.).\n" - "\n" --"Declination is one of the coordinates in the Equatorial coordinate system; it " --"measures the angle of an object North or South of the Celestial Equator. The " --"star Polaris, which is near the celestial north pole, has a Declination of " --"nearly 90 degrees." --msgstr "" --"設定在天體圖中聚焦的赤緯座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）或浮點數（如 " --"\"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧秒（arcsecond）值（如 " --"\"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" -+"Declination is one of the coordinates in the Equatorial coordinate system; " -+"it measures the angle of an object North or South of the Celestial Equator. " -+"The star Polaris, which is near the celestial north pole, has a Declination " -+"of nearly 90 degrees." -+msgstr "" -+"設定在天體圖中聚焦的赤緯座標，以度為單位。角度可以為一個簡單整數（如 \"45\"）" -+"或浮點數（如 \"45.333\"），或者是以空白或冒號隔開的度、弧分（arcminute）與弧" -+"秒（arcsecond）值（如 \"45:20\"，\"45:20:00\"，\"45 20.0\"等）。\n" - "\n" --"赤緯（Declination）是赤道座標系統中的一種。它測量物件在天體赤道（Celestial Equator）為基準的度數。以北為北赤緯（以 + " --"表示），以南為南赤緯（以 - 表示）。北極星（Polaris）位在靠近天體北極之處，其赤緯接近 90 度。" -+"赤緯（Declination）是赤道座標系統中的一種。它測量物件在天體赤道（Celestial " -+"Equator）為基準的度數。以北為北赤緯（以 + 表示），以南為南赤緯（以 - 表示）。" -+"北極星（Polaris）位在靠近天體北極之處，其赤緯接近 90 度。" - - #. i18n: file tools/argsetradec.ui line 80 - #: rc.cpp:2230 - #, no-c-format - msgid "" --"Enter the Right Ascension coordinate to be focused on in the skymap, in hours. " --"You can express the angle as a simple integer (\"12\") or floating-point " --"(\"12.333\") value, or as space- or colon-delimited values specifying hours, " --"minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", \"12 20.0\", etc.).\n" -+"Enter the Right Ascension coordinate to be focused on in the skymap, in " -+"hours. You can express the angle as a simple integer (\"12\") or floating-" -+"point (\"12.333\") value, or as space- or colon-delimited values specifying " -+"hours, minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", \"12 20.0\", " -+"etc.).\n" - "\n" --"Right Ascension is one of the coordinates in the Equatorial coordinate system. " --"It measures the angle around the celestial equator from the Vernal equinox, " --"increasing to the East. Right Ascension (RA) is almost always expressed in " --"Hours instead of Degrees; the Celestial Equator is divided into 24 Hours, so 1 " --"Hour of RA is equal to 360/24=15 Degrees. See the AstroInfo article for more " --"details," --msgstr "" --"設定在天體圖中聚焦的赤經座標，以小時為單位。角度可以為一個簡單整數（如 \"12\"）或浮點數（如 " --"\"12.333\"），或者是以空白或冒號隔開的度、分（minute）與秒（second）值（如 \"12:20\"，\"12:20:00\"，\"12 " --"20.0\"等）。\n" -+"Right Ascension is one of the coordinates in the Equatorial coordinate " -+"system. It measures the angle around the celestial equator from the Vernal " -+"equinox, increasing to the East. Right Ascension (RA) is almost always " -+"expressed in Hours instead of Degrees; the Celestial Equator is divided into " -+"24 Hours, so 1 Hour of RA is equal to 360/24=15 Degrees. See the AstroInfo " -+"article for more details," -+msgstr "" -+"設定在天體圖中聚焦的赤經座標，以小時為單位。角度可以為一個簡單整數（如 \"12" -+"\"）或浮點數（如 \"12.333\"），或者是以空白或冒號隔開的度、分（minute）與秒" -+"（second）值（如 \"12:20\"，\"12:20:00\"，\"12 20.0\"等）。\n" - "\n" --"赤經（Right Ascension，RA）是赤道座標系統中的一種。它的度數沿著天體赤道（Celestial Equator）由春分點（Vernal " --"equinox）起算，往東遞增。赤經通常都以小時而不是以度來表示。天體赤道被分為廿四小時，赤經一小時等於 360/24 = 15 度。詳情請參考天體資訊文章。" -+"赤經（Right Ascension，RA）是赤道座標系統中的一種。它的度數沿著天體赤道" -+"（Celestial Equator）由春分點（Vernal equinox）起算，往東遞增。赤經通常都以小" -+"時而不是以度來表示。天體赤道被分為廿四小時，赤經一小時等於 360/24 = 15 度。詳" -+"情請參考天體資訊文章。" - - #. i18n: file tools/argsettargetnameindi.ui line 48 - #: rc.cpp:2256 -@@ -27462,16 +27547,19 @@ - #, no-c-format - msgid "" - "If checked, the sky will remain focused on its current position or object as " --"time passes. This is called \"Tracking\". Note that tracking is automatically " --"engaged whenever an object is centered at the focus point. So, if you use " --"\"lookToward\" with an object name, you do not need to engage tracking. \n" -+"time passes. This is called \"Tracking\". Note that tracking is " -+"automatically engaged whenever an object is centered at the focus point. " -+"So, if you use \"lookToward\" with an object name, you do not need to engage " -+"tracking. \n" - "\n" - "If unchecked, then Tracking will be forced off, even if an object has been " - "centered, As time passes, the sky will then appear to drift by (due to the " - "rotation of the Earth)." - msgstr "" --"勾選此選項的話，不管時間過多久天體仍然會聚焦在同樣的物體會位置上。這稱為「追蹤」（Tracking）。注意當您置中某物件時，就會自動追蹤。\n" --"取消勾選的話，則不會強迫追蹤。即使將物件置中，天體也會自動依地球的旋轉而繼續運轉。" -+"勾選此選項的話，不管時間過多久天體仍然會聚焦在同樣的物體會位置上。這稱為「追" -+"蹤」（Tracking）。注意當您置中某物件時，就會自動追蹤。\n" -+"取消勾選的話，則不會強迫追蹤。即使將物件置中，天體也會自動依地球的旋轉而繼續" -+"運轉。" - - #. i18n: file tools/argsetutcindi.ui line 48 - #: rc.cpp:2282 -@@ -27501,8 +27589,8 @@ - #: rc.cpp:2330 - #, no-c-format - msgid "" --"Enter the number of seconds that the script should pause before executing the " --"remaining commands." -+"Enter the number of seconds that the script should pause before executing " -+"the remaining commands." - msgstr "輸入文稿要暫停的時間。" - - #. i18n: file tools/argwaitforkey.ui line 32 -@@ -27521,16 +27609,17 @@ - #: rc.cpp:2339 - #, no-c-format - msgid "" --"The script execution will pause until the user presses the key specified here. " --"\n" -+"The script execution will pause until the user presses the key specified " -+"here. \n" - "\n" - "Only simple keys can currently be used; you cannot use modifier keys such as " --"Ctrl or Shift. Type \"space\" to specify the spacebar, otherwise use the key " --"itself." -+"Ctrl or Shift. Type \"space\" to specify the spacebar, otherwise use the " -+"key itself." - msgstr "" - "文稿的執行將會暫停，直到使用者按下指定的按鍵。\n" - "\n" --"您只能使用簡單按鍵，而不能使用組合鍵如 Ctrl 或 Shift。如果要指定空白鍵請輸入 \"space\"。" -+"您只能使用簡單按鍵，而不能使用組合鍵如 Ctrl 或 Shift。如果要指定空白鍵請輸入 " -+"\"space\"。" - - #. i18n: file tools/argzoom.ui line 32 - #: rc.cpp:2344 -@@ -27556,7 +27645,8 @@ - msgstr "" - "設定顯示的縮放等級。\n" - "\n" --"縮放等級是指示一個弧度要用多少像素來表示。通常合理的數值從 300 到 10,000,000。\n" -+"縮放等級是指示一個弧度要用多少像素來表示。通常合理的數值從 300 到 " -+"10,000,000。\n" - - #. i18n: file tools/modcalcangdistdlg.ui line 16 - #: rc.cpp:2356 rc.cpp:2386 tools/astrocalc.cpp:84 tools/astrocalc.cpp:140 -@@ -27669,7 +27759,7 @@ - #: rc.cpp:3067 rc.cpp:3310 rc.cpp:3391 rc.cpp:3490 rc.cpp:3634 - #, no-c-format - msgid "Input File..." --msgstr "輸入檔案..." -+msgstr "輸入檔案…" - - #. i18n: file tools/modcalcangdistdlg.ui line 500 - #: rc.cpp:2425 rc.cpp:2515 rc.cpp:2632 rc.cpp:2785 rc.cpp:2860 rc.cpp:2968 -@@ -27683,7 +27773,7 @@ - #: rc.cpp:3073 rc.cpp:3316 rc.cpp:3397 rc.cpp:3496 rc.cpp:3640 - #, no-c-format - msgid "Output File..." --msgstr "輸出檔案..." -+msgstr "輸出檔案…" - - #. i18n: file tools/modcalcangdistdlg.ui line 521 - #: rc.cpp:2431 rc.cpp:2521 rc.cpp:2638 rc.cpp:2791 rc.cpp:2866 rc.cpp:2974 -@@ -27869,8 +27959,8 @@ - #: rc.cpp:3469 rc.cpp:3475 - #, no-c-format - msgid "" --"If checked, value will be read from input file. If not, value will be read from " --"adjacent box" -+"If checked, value will be read from input file. If not, value will be read " -+"from adjacent box" - msgstr "勾選此選項的話，會從輸入檔案中讀取數值，否則會從相鄰的對話盒中讀取。" - - #. i18n: file tools/modcalceclipticcoordsdlg.ui line 594 -@@ -28357,52 +28447,59 @@ - #: rc.cpp:3652 - #, no-c-format - msgid "" --"

                                  The Local Standard of Rest (LSR) is the location in which the mean value of " --"the velocity of a selection of the stars in solar neighboorhood is zero. The " --"local solar motion, that is, the velocity of the sun referred to the Local " --"Standard of Rest is not null: the sun moves with a velocity of 20 km/s towards " --"a point called, solar apex, whose coordinates are:

                                  \n" -+"

                                  The Local Standard of Rest (LSR) is the location in which the mean value " -+"of the velocity of a selection of the stars in solar neighboorhood is zero. " -+"The local solar motion, that is, the velocity of the sun referred to the " -+"Local Standard of Rest is not null: the sun moves with a velocity of 20 km/s " -+"towards a point called, solar apex, whose coordinates are:

                                  \n" - "
                                • Ra= 18:03:50.2 (J2000)
                                  • \n" - "
                                • Dec = 30:0:16.8 (J2000)
                                  • \n" - "

                                  Astronomical sources move relative to the Sun and their velocity can be " --"decomposed in radial velocity, and velocity on the plane of the sky, also know " --"as proper motion in right ascension and declination. The radial velocity is " --"usually obtained by analyzing their spectral emission and the frequency shift " --"of the lines due to Doppler effect. Observational astronomers usually refer " --"source's radial velocity to the LSR.

                                  \n" -+"decomposed in radial velocity, and velocity on the plane of the sky, also " -+"know as proper motion in right ascension and declination. The radial " -+"velocity is usually obtained by analyzing their spectral emission and the " -+"frequency shift of the lines due to Doppler effect. Observational " -+"astronomers usually refer source's radial velocity to the LSR.

                                  \n" - "

                                  This calculator module allows to obtain the radial velocity of the source " - "referred to the center of the sun (what we call heliocentric velocity), " --"referred to the center of the Earth (geocentric velocity) and to the observer " --"site (topocentric velocity) from the LSR radial velocity

                                  \n" -+"referred to the center of the Earth (geocentric velocity) and to the " -+"observer site (topocentric velocity) from the LSR radial velocity

                                  \n" - "
                                • The heliocentric velocity (Vhel) is computed by obtaining the " --"scalar product of the radial velocity of the source referred to the LSR (V" --"lsr) with the velocity of the Sun referred to the LSR (Vsun:\n" -+"scalar product of the radial velocity of the source referred to the LSR " -+"(Vlsr) with the velocity of the Sun referred to the LSR " -+"(Vsun:\n" - "\n" - "
                                  • \n" --"
                                • The geocentric velocity (Vgeo) is obtained from the heliocentric " --"velocity, the velocity of the Earth (VE) and its position for a " --"given date and time:\n" -+"
                                • The geocentric velocity (Vgeo) is obtained from the " -+"heliocentric velocity, the velocity of the Earth (VE) and its " -+"position for a given date and time:\n" - "\n" - "
                                  • \n" - "
                                • The topocentric velocity is obtained from the geocentric velocity, the " - "position on the Earth, and the date and time at which we desire to know the " - "radial velocity of the source.
                                  • " - msgstr "" --"

                                  本地靜止標準（LSR）是一個參考的基準點，在該點上選取一些跟太陽系鄰近的恆星，其速率平均值為 0。本地的太陽運動，也就是太陽對 LSR 的運動速率不是 " --"0，而是以相對於一個叫太陽向點（Solar apex）的點，以每秒 20 公里的速率運行。此太陽向點的座標為：

                                  \n" -+"

                                  本地靜止標準（LSR）是一個參考的基準點，在該點上選取一些跟太陽系鄰近的恆" -+"星，其速率平均值為 0。本地的太陽運動，也就是太陽對 LSR 的運動速率不是 0，而是" -+"以相對於一個叫太陽向點（Solar apex）的點，以每秒 20 公里的速率運行。此太陽向" -+"點的座標為：

                                  \n" - "
                                • 赤經：18:03:50.2 （J2000）
                                  • \n" - "
                                • 赤緯：30:0:16.8 （J2000）
                                  • \n" --"

                                  天文學中的物件來源會相對於太陽移動，它們的速率可以被分解為視向速率（Radial " --"velocity），以及天體平面，也就是自行於赤經與赤緯的速率。視向速率是由分析它們的光譜的放射及都卜勒效應下的頻率位移計算而來。觀測的天文學家通常是計算物件來" --"源對 LSR 的視向速率。

                                  \n" --"

                                  這個計算模組可以從 LSR 視向速率計算來源物件對太陽中央（對日速率）、對地球中央（對地球速率）與對觀測者（對地面速率）的視向速率。

                                  \n" --"
                                • 對日速度（Vhel）是計算來源物件對 LSR 的視向速率（Vlsr）與太陽對 LSR 的速率（V" --"sun）的內積：\n" -+"

                                  天文學中的物件來源會相對於太陽移動，它們的速率可以被分解為視向速率" -+"（Radial velocity），以及天體平面，也就是自行於赤經與赤緯的速率。視向速率是由" -+"分析它們的光譜的放射及都卜勒效應下的頻率位移計算而來。觀測的天文學家通常是計" -+"算物件來源對 LSR 的視向速率。

                                  \n" -+"

                                  這個計算模組可以從 LSR 視向速率計算來源物件對太陽中央（對日速率）、對地球" -+"中央（對地球速率）與對觀測者（對地面速率）的視向速率。

                                  \n" -+"
                                • 對日速度（Vhel）是計算來源物件對 LSR 的視向速率（Vlsr）與太陽對 LSR 的速率（Vsun）的內積：\n" - "
                                  • \n" --"
                                • 對地球速度（Vgeo）是由對日速度，還有給定日期與時間的地球的速度（VE）及位置計算而來：\n" -+"
                                • 對地球速度（Vgeo）是由對日速度，還有給定日期與時間的地球的速度" -+"（VE）及位置計算而來：\n" - "\n" - "
                                  • \n" --"
                                • 對地面速度是從對地球速度、地球的位置、以及我們想要知道物件視向速度的日期及時間計算而來。
                                  • " -+"
                                • 對地面速度是從對地球速度、地球的位置、以及我們想要知道物件視向速度的日期" -+"及時間計算而來。
                                  • " - - #. i18n: file tools/observinglistui.ui line 16 - #: rc.cpp:3666 tools/observinglist.cpp:57 -@@ -28438,7 +28535,7 @@ - #: rc.cpp:3681 - #, no-c-format - msgid "Save observing list as..." --msgstr "另存觀測清單為..." -+msgstr "另存觀測清單為…" - - #. i18n: file tools/observinglistui.ui line 129 - #: rc.cpp:3684 -@@ -28472,7 +28569,8 @@ - msgid "" - "This button toggles between large and small states. The small state may be " - "useful if you want the Observing list open while working in the main window." --msgstr "這個按鍵切換視窗的大小狀態。小的狀態在要在工作視窗上開啟觀測清單時有用。" -+msgstr "" -+"這個按鍵切換視窗的大小狀態。小的狀態在要在工作視窗上開啟觀測清單時有用。" - - #. i18n: file tools/observinglistui.ui line 240 - #: rc.cpp:3699 -@@ -28538,7 +28636,8 @@ - #: rc.cpp:3732 - #, no-c-format - msgid "" --"Open the Altitude vs. Time tool, with curves for the highlighted objects shown" -+"Open the Altitude vs. Time tool, with curves for the highlighted objects " -+"shown" - msgstr "開啟所選物件的高度仰角vs時間工具，顯示其曲線" - - #. i18n: file tools/observinglistui.ui line 337 -@@ -28581,8 +28680,8 @@ - #: rc.cpp:3759 - #, no-c-format - msgid "" --"Table showing the current observing list. The list can be sorted by any of the " --"data columns" -+"Table showing the current observing list. The list can be sorted by any of " -+"the data columns" - msgstr "顯示目前觀測清單的表格。清單可以由任何資料欄位來排序。" - - #. i18n: file tools/observinglistui.ui line 519 -@@ -28857,9 +28956,10 @@ - #: rc.cpp:3936 - #, no-c-format - msgid "" --"Discards current script and starts a new one. Will prompt to save any unsaved " --"changes in the current script." --msgstr "丟棄現有的文稿並建立新的。會先問您是否要儲存目前文稿中任何尚未儲存的變更。" -+"Discards current script and starts a new one. Will prompt to save any " -+"unsaved changes in the current script." -+msgstr "" -+"丟棄現有的文稿並建立新的。會先問您是否要儲存目前文稿中任何尚未儲存的變更。" - - #. i18n: file tools/scriptbuilderui.ui line 92 - #: rc.cpp:3939 -@@ -28893,7 +28993,7 @@ - #: rc.cpp:3951 - #, no-c-format - msgid "Save Script As..." --msgstr "儲存文稿為..." -+msgstr "儲存文稿為…" - - #. i18n: file tools/scriptbuilderui.ui line 163 - #: rc.cpp:3954 -@@ -28913,9 +29013,11 @@ - #: rc.cpp:3960 - #, no-c-format - msgid "" --"Executes the script in the KStars main window. You may want to reposition the " --"Script Builder tool so that the Sky map is visible. " --msgstr "在 KStars 主視窗中執行文稿。您可能要先將文稿建立器工具移到別處，好看得見天體圖。" -+"Executes the script in the KStars main window. You may want to reposition " -+"the Script Builder tool so that the Sky map is visible. " -+msgstr "" -+"在 KStars 主視窗中執行文稿。您可能要先將文稿建立器工具移到別處，好看得見天體" -+"圖。" - - #. i18n: file tools/scriptbuilderui.ui line 235 - #: rc.cpp:3963 -@@ -28931,7 +29033,9 @@ - "Highlighting any command will present a widget where you can specify its " - "arguments below. Use the action buttons at right to copy, remove, or change " - "the position of the selected command. " --msgstr "顯示目前文稿中的命令。點選任一命令會顯示一個元件讓您指定參數。用右方的按鍵來複製、移除或變更所選命令的位置。" -+msgstr "" -+"顯示目前文稿中的命令。點選任一命令會顯示一個元件讓您指定參數。用右方的按鍵來" -+"複製、移除或變更所選命令的位置。" - - #. i18n: file tools/scriptbuilderui.ui line 296 - #: rc.cpp:3969 -@@ -28943,11 +29047,12 @@ - #: rc.cpp:3972 - #, no-c-format - msgid "" --"If a function is highlighted in the \"Function Browser\" box, this button will " --"add it to the current working script. The new function is inserted directly " --"after the highlighted function in the \"Current Script\" box.\n" -+"If a function is highlighted in the \"Function Browser\" box, this button " -+"will add it to the current working script. The new function is inserted " -+"directly after the highlighted function in the \"Current Script\" box.\n" - msgstr "" --"如果在「函式瀏覽器」盒中選擇了一個函式，此按鍵會將它加到目前的文稿中。新函式會直接插入到「目前文稿」中所選函式的後面。\n" -+"如果在「函式瀏覽器」盒中選擇了一個函式，此按鍵會將它加到目前的文稿中。新函式" -+"會直接插入到「目前文稿」中所選函式的後面。\n" - - #. i18n: file tools/scriptbuilderui.ui line 323 - #: rc.cpp:3976 -@@ -29027,8 +29132,8 @@ - #: rc.cpp:4009 - #, no-c-format - msgid "" --"If a function is highlighted in the Function Browser, this area will show some " --"brief documentation about the function." -+"If a function is highlighted in the Function Browser, this area will show " -+"some brief documentation about the function." - msgstr "如果在「目前文稿」中有選擇函式，這個區域會顯示此函式的簡短說明。" - - #. i18n: file tools/scriptbuilderui.ui line 576 -@@ -29117,7 +29222,7 @@ - #: rc.cpp:4057 - #, no-c-format - msgid "Change Date..." --msgstr "變更日期..." -+msgstr "變更日期…" - - #. i18n: file tools/wutdialogui.ui line 179 - #: rc.cpp:4060 -@@ -29131,13 +29236,14 @@ - msgid "" - "Press this button to select a new date for the \"What's Up Tonight\" tool. " - "Note that the date of the main window is not changed." --msgstr "按下此鍵以選擇新的「今晚有什麼」工具的日期。注意在主視窗的日期不會改變。" -+msgstr "" -+"按下此鍵以選擇新的「今晚有什麼」工具的日期。注意在主視窗的日期不會改變。" - - #. i18n: file tools/wutdialogui.ui line 190 - #: rc.cpp:4066 - #, no-c-format - msgid "Change Location..." --msgstr "變更位置..." -+msgstr "變更位置…" - - #. i18n: file tools/wutdialogui.ui line 193 - #: rc.cpp:4069 -@@ -29151,7 +29257,9 @@ - msgid "" - "Press this button to select a new geographic location for the \"What's Up " - "Tonight\" tool. Note that the location of the main window is not changed." --msgstr "按下此鍵以選擇新的「今晚有什麼」工具的地理位置。注意在主視窗的地理位置不會改變。" -+msgstr "" -+"按下此鍵以選擇新的「今晚有什麼」工具的地理位置。注意在主視窗的地理位置不會改" -+"變。" - - #. i18n: file tools/wutdialogui.ui line 202 - #: rc.cpp:4075 -@@ -29181,14 +29289,15 @@ - #: rc.cpp:4087 - #, no-c-format - msgid "" --"By default, the \"What's Up Tonight\" tool displays all objects which are above " --"the horizon between sunset and midnight (i.e., \"in the evening\"). You can " --"also choose to show objects which are up between midnight and dawn (i.e., \"in " --"the morning\"), or objects which are up at any time between sunset and sunrise " --"(i.e., \"any time tonight\")" --msgstr "" --"「今晚有什麼」工具預設顯示所有在日落到午夜間（也就是「在傍晚」），在午夜到黎明間（也就是「在早上」），或是在日落跟日出之間（也就是「在今晚任何時間」），會出現在" --"地平線之上的物件。" -+"By default, the \"What's Up Tonight\" tool displays all objects which are " -+"above the horizon between sunset and midnight (i.e., \"in the evening\"). " -+"You can also choose to show objects which are up between midnight and dawn " -+"(i.e., \"in the morning\"), or objects which are up at any time between " -+"sunset and sunrise (i.e., \"any time tonight\")" -+msgstr "" -+"「今晚有什麼」工具預設顯示所有在日落到午夜間（也就是「在傍晚」），在午夜到黎" -+"明間（也就是「在早上」），或是在日落跟日出之間（也就是「在今晚任何時間」），" -+"會出現在地平線之上的物件。" - - #. i18n: file tools/wutdialogui.ui line 234 - #: rc.cpp:4090 -@@ -29322,7 +29431,9 @@ - msgid "" - "Objects listed here are above the horizon on the selected date, and have the " - "object type which is highlighted in the \"Choose a Category\" list." --msgstr "列在此的物件是會在所選日期時在地平線之上的物件，並且屬於「選擇星表」清單中被選取的物件型態。" -+msgstr "" -+"列在此的物件是會在所選日期時在地平線之上的物件，並且屬於「選擇星表」清單中被" -+"選取的物件型態。" - - #. i18n: file tools/wutdialogui.ui line 423 - #: rc.cpp:4156 -@@ -29368,8 +29479,8 @@ - #: rc.cpp:4174 - #, no-c-format - msgid "" --"Displays the time at which the highlighted object sets below the horizon on the " --"selected date." -+"Displays the time at which the highlighted object sets below the horizon on " -+"the selected date." - msgstr "顯示所選物件在所選日期的落下地平線的時間。" - - #. i18n: file tools/wutdialogui.ui line 493 -@@ -29414,9 +29525,10 @@ - #: rc.cpp:4198 - #, no-c-format - msgid "" --"Select an item in the Categories list to display objects in that category which " --"are above the horizon on the selected date." --msgstr "在星表清單中選擇一個項目，以顯示該星表中在所選日期時在地平線之上的物件。" -+"Select an item in the Categories list to display objects in that category " -+"which are above the horizon on the selected date." -+msgstr "" -+"在星表清單中選擇一個項目，以顯示該星表中在所選日期時在地平線之上的物件。" - - #. i18n: file tools/wutdialogui.ui line 546 - #: rc.cpp:4201 -@@ -29515,7 +29627,9 @@ - #: skymap.cpp:602 skymap.cpp:644 - msgid "" - "Digitized Sky Survey image provided by the Space Telescope Science Institute." --msgstr "將太空望遠鏡科學協會（Space Telescope Science Institute）提供的天體影像數位化。" -+msgstr "" -+"將太空望遠鏡科學協會（Space Telescope Science Institute）提供的天體影像數位" -+"化。" - - #: skymap.cpp:670 skymap.cpp:674 - msgid "Angular distance: " -@@ -29682,8 +29796,8 @@ - "%1: Advanced Observing Program at Kitt Peak National Observatory [free for " - "non-commercial use; no physical reproductions]" - msgstr "" --"%1：在 KPNO（Kitt Peak National Observatory）的進階觀測程式（Advanced Observing " --"Program，AOP）【非商業用途免費，沒有實際重製】" -+"%1：在 KPNO（Kitt Peak National Observatory）的進階觀測程式（Advanced " -+"Observing Program，AOP）【非商業用途免費，沒有實際重製】" - - #: skyobject.cpp:361 - msgid "Show NOAO Image" -@@ -29691,16 +29805,19 @@ - - #: skyobject.cpp:362 - msgid "" --"%1: National Optical Astronomy Observatories and AURA [free for non-commercial " --"use]" -+"%1: National Optical Astronomy Observatories and AURA [free for non-" -+"commercial use]" - msgstr "" --"%1：國家光學天文台（National Optical Astronomy Observatories ，NOAO）與 AURA【非商業用途免費】" -+"%1：國家光學天文臺（National Optical Astronomy Observatories ，NOAO）與 AURA" -+"【非商業用途免費】" - - #: skyobject.cpp:366 - msgid "" --"%1: Very Large Telescope, operated by the European Southern Observatory [free " --"for non-commercial use; no reproductions]" --msgstr "%1：超大型望遠鏡，由 European Southern Observatory 操作【非商業用途免費，沒有重製】" -+"%1: Very Large Telescope, operated by the European Southern Observatory " -+"[free for non-commercial use; no reproductions]" -+msgstr "" -+"%1：超大型望遠鏡，由 European Southern Observatory 操作【非商業用途免費，沒有" -+"重製】" - - #: skyobject.cpp:369 - msgid "Show" -@@ -29854,7 +29971,7 @@ - - #: telescopewizardprocess.cpp:152 - msgid "Please wait while KStars tries to connect to your telescope..." --msgstr "請稍候，KStars 正試著與您的望遠鏡聯絡..." -+msgstr "請稍候，KStars 正試著與您的望遠鏡聯絡…" - - #: telescopewizardprocess.cpp:154 - msgid "Error. Unable to locate telescope drivers." -@@ -29884,7 +30001,7 @@ - - #: thumbnailpicker.cpp:101 - msgid "Loading images..." --msgstr "載入影像中..." -+msgstr "載入影像中…" - - #: thumbnailpicker.cpp:316 - #, c-format -@@ -29995,20 +30112,23 @@ - - #: timestepbox.cpp:35 - msgid "" --"Set the timescale for the simulation clock. A setting of \"1 sec\" means the " --"clock advances in real-time, keeping up perfectly with your CPU clock. Higher " --"values make the simulation clock run faster, lower values make it run slower. " --"Negative values make it run backwards.\n" -+"Set the timescale for the simulation clock. A setting of \"1 sec\" means " -+"the clock advances in real-time, keeping up perfectly with your CPU clock. " -+"Higher values make the simulation clock run faster, lower values make it run " -+"slower. Negative values make it run backwards.\n" - "\n" --"There are two pairs of up/down buttons. The left pair will cycle through all " --"available timesteps in sequence. Since there are a large number of timesteps, " --"the right pair is provided to skip to the next higher/lower unit of time. For " --"example, if the timescale is currently \"1 min\", the right up button will make " --"it \"1 hour\", and the right down button will make it \"1 sec\"" -+"There are two pairs of up/down buttons. The left pair will cycle through " -+"all available timesteps in sequence. Since there are a large number of " -+"timesteps, the right pair is provided to skip to the next higher/lower unit " -+"of time. For example, if the timescale is currently \"1 min\", the right up " -+"button will make it \"1 hour\", and the right down button will make it \"1 " -+"sec\"" - msgstr "" --"設定模擬時中的時間刻度。設定為「1 秒」表示以實際時間進行，越高的值讓時鐘跑得越快，越低的值則跑得越慢。負值則往回跑。\n" -+"設定模擬時中的時間刻度。設定為「1 秒」表示以實際時間進行，越高的值讓時鐘跑得" -+"越快，越低的值則跑得越慢。負值則往回跑。\n" - "\n" --"有兩對上/下按鍵。左邊的那一對循環出現所有可用的時間刻度。不過因為有太多種選擇，因此右邊的那一對提供了較高/較低單位的時間。例如，若是時間刻度定為「1 " -+"有兩對上/下按鍵。左邊的那一對循環出現所有可用的時間刻度。不過因為有太多種選" -+"擇，因此右邊的那一對提供了較高/較低單位的時間。例如，若是時間刻度定為「1 " - "分」，則右邊的按鍵會將刻度設為「1 小時」或「1 秒」。" - - #: timezonerule.cpp:51 -@@ -30053,36 +30173,32 @@ - - #: tips.cpp:3 - msgid "" --"\t\t" --"

                                  You can locate objects in the sky by their name.\n" -+"\t\t

                                  You can locate objects in the sky by their name.\n" - "\t\t\tUse Ctrl+F, the \"Focus->Find Object\" menu item, or the \"Find\"\n" - "\t\t\tToolbar button.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以依物件的名稱在天體圖中找到物件。用 Ctrl+F，或是「焦點」＞「尋找物件」選單，或是「尋找」工具列按鍵。

                                  \n" -+"\t\t

                                  您可以依物件的名稱在天體圖中找到物件。用 Ctrl+F，或是「焦點」＞「尋找" -+"物件」選單，或是「尋找」工具列按鍵。

                                  \n" - "\t\n" - - #: tips.cpp:12 - msgid "" --"\t\t" --"

                                  To change your Geographic Location,\n" -+"\t\t

                                  To change your Geographic Location,\n" - "\t\t\tuse Ctrl+G, the \"Settings->Set Geographic Location...\" menu item,\n" - "\t\t\tor the \"globe\" Toolbar button.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  要改變您的地理位置，用 Ctrl+G，或是「設定」＞「設定地理位置」選單，或是「地球儀」工具列按鍵。

                                  \n" -+"\t\t

                                  要改變您的地理位置，用 Ctrl+G，或是「設定」＞「設定地理位置」選單，或" -+"是「地球儀」工具列按鍵。

                                  \n" - "\t\n" - - #: tips.cpp:21 - msgid "" --"\t\t" --"

                                  You can Track an object, so it will always be centered\n" --"\t\t\tin the display." --"
                                  \n" -+"\t\t

                                  You can Track an object, so it will always be centered\n" -+"\t\t\tin the display.
                                  \n" - "\t\t\tUse Ctrl+T, the \"Focus->Track Object\" menu item, or the \"lock\"\n" - "\t\t\tToolbar button. You can also simply center the object by\n" - "\t\t\tdouble-clicking on it or selecting \"Center and Track\" from the\n" -@@ -30090,129 +30206,122 @@ - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以追蹤物件，讓它總是置於天體圖中央。" --"
                                  用 " --"Ctrl+T，或是「焦點」＞「追蹤物件」選單，或是「鎖定」工具列按鍵。您也可以簡單地將物件置於中央，然後雙擊該物件並從選單中選擇「置中並追蹤」。

                                  \n" -+"\t\t

                                  您可以追蹤物件，讓它總是置於天體圖中央。
                                  用 Ctrl+T，或是「焦點」" -+"＞「追蹤物件」選單，或是「鎖定」工具列按鍵。您也可以簡單地將物件置於中央，然" -+"後雙擊該物件並從選單中選擇「置中並追蹤」。

                                  \n" - "\t\n" - - #: tips.cpp:33 - msgid "" --"\t\t" --"

                                  The KStars Handbook includes the AstroInfo Project, a series\n" -+"\t\t

                                  The KStars Handbook includes the AstroInfo Project, a series\n" - "\t\t\tof informative articles about Astronomy.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 手冊包含了「天文資訊專案」，一系列關於天文學資訊的文章。

                                  \n" -+"\t\t

                                  KStars 手冊包含了「天文資訊專案」，一系列關於天文學資訊的文章。

                                  \n" - "\t\n" - - #: tips.cpp:41 - msgid "" --"\t\t" --"

                                  There are three on-screen \"Info Boxes\" which show data related to the\n" --"\t\t\ttime/date, your geographic location, and the current central position on " -+"\t\t

                                  There are three on-screen \"Info Boxes\" which show data related to " - "the\n" --"\t\t\tsky (the focus). You can drag these boxes with the mouse, and \"shade\" " --"them\n" -+"\t\t\ttime/date, your geographic location, and the current central position " -+"on the\n" -+"\t\t\tsky (the focus). You can drag these boxes with the mouse, and \"shade" -+"\" them\n" - "\t\t\tby double-clicking them to show more (or less) information. You can " - "hide\n" - "\t\t\tthem altogether in the Settings->Info Boxes menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  在螢幕上有三個「資訊盒」，會顯示日期/時間，地理位置與目前聚焦的物件。您可以用滑鼠拖放、或雙擊以顯示更多（或更少）的資訊。您也可以在「設定」＞「資訊盒」選" --"單中設定。

                                  \n" -+"\t\t

                                  在螢幕上有三個「資訊盒」，會顯示日期/時間，地理位置與目前聚焦的物件。" -+"您可以用滑鼠拖放、或雙擊以顯示更多（或更少）的資訊。您也可以在「設定」＞「資" -+"訊盒」選單中設定。

                                  \n" - "\t\n" - - #: tips.cpp:52 - msgid "" --"\t\t" --"

                                  KStars has a full-screen mode; you can toggle this mode using the\n" -+"\t\t

                                  KStars has a full-screen mode; you can toggle this mode using the\n" - "\t\t\t\"fullscreen\" toolbar button, or by pressing Ctrl+Shift+F.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 有全螢幕模式，您可以用「全螢幕」工具列來切換，或是用 Ctrl+Shift+F。

                                  \n" -+"\t\t

                                  KStars 有全螢幕模式，您可以用「全螢幕」工具列來切換，或是用 Ctrl" -+"+Shift+F。

                                  \n" - "\t\n" - - #: tips.cpp:60 - msgid "" --"\t\t" --"

                                  The N,S,E,W keys will point the display at the North,\n" -+"\t\t

                                  The N,S,E,W keys will point the display at the North,\n" - "\t\t\tSouth, East and West points on the Horizon. The Z key will point the\n" - "\t\t\tdisplay at the Zenith.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  按下 N、S、E、W 等鍵可以將顯示指到水平方位的北、南、東、西。Z 鍵則指到天頂的所在。

                                  \n" -+"\t\t

                                  按下 N、S、E、W 等鍵可以將顯示指到水平方位的北、南、東、西。Z 鍵則指" -+"到天頂的所在。

                                  \n" - "\t\n" - - #: tips.cpp:69 - msgid "" --"\t\t" --"

                                  The 0-9 keys will center the display on one of the major solar system\n" -+"\t\t

                                  The 0-9 keys will center the display on one of the major solar " -+"system\n" - "\t\t\tbodies. 0 centers on the Sun, 3 centers on the Moon; the rest are the " - "eight\n" - "\t\t\tplanets, in order of their distance from the Sun.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  按下 0-9 鍵會將太陽系的幾個主星置中於天體圖。0 表示太陽，3 表示月球，其它的鍵則為行星，從離太陽最近的算起。

                                  \n" -+"\t\t

                                  按下 0-9 鍵會將太陽系的幾個主星置中於天體圖。0 表示太陽，3 表示月球，" -+"其它的鍵則為行星，從離太陽最近的算起。

                                  \n" - "\t\n" - - #: tips.cpp:78 - msgid "" --"\t\t" --"

                                  Click and Drag with the mouse to slew the skymap to a new position on\n" -+"\t\t

                                  Click and Drag with the mouse to slew the skymap to a new position " -+"on\n" - "\t\t\tthe sky.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  點選並拖曳滑鼠可以將天體圖旋轉到其他位置。

                                  \n" -+"\t\t

                                  點選並拖曳滑鼠可以將天體圖旋轉到其他位置。

                                  \n" - "\t\n" - - #: tips.cpp:86 - msgid "" --"\t\t" --"

                                  Double-click with the mouse to center the display on the location\n" -+"\t\t

                                  Double-click with the mouse to center the display on the location\n" - "\t\t\tof the mouse cursor. If you double-click on an object, KStars will\n" - "\t\t\tautomatically begin tracking it.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  雙擊滑鼠可以將天體圖置中於滑鼠游標所在的位置。如果您雙擊某物件，KStars 會自動開始追蹤該物件。

                                  \n" -+"\t\t

                                  雙擊滑鼠可以將天體圖置中於滑鼠游標所在的位置。如果您雙擊某物件，" -+"KStars 會自動開始追蹤該物件。

                                  \n" - "\t\n" - - #: tips.cpp:95 - msgid "" --"\t\t" --"

                                  The status bar displays the current sky coordinates of the mouse cursor,\n" -+"\t\t

                                  The status bar displays the current sky coordinates of the mouse " -+"cursor,\n" - "\t\t\tin both Equatorial and Horizontal coordinate systems.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  狀態列顯示目前滑鼠游標所在的天體座標，包括赤道座標系與水平座標系。

                                  \n" -+"\t\t

                                  狀態列顯示目前滑鼠游標所在的天體座標，包括赤道座標系與水平座標系。\n" - "\t\n" - - #: tips.cpp:103 - msgid "" --"\t\t" --"

                                  The display can be zoomed in or out by spinning your mouse's scroll wheel,\n" --"\t\t\tor by dragging the mouse up or down with the middle mouse button pressed. " --" You\n" --"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in the " --"toolbar and\n" --"\t\t\tin the View menu. The Zoom Level can be set manually using the \"Zoom to " --"Angular\n" -+"\t\t

                                  The display can be zoomed in or out by spinning your mouse's scroll " -+"wheel,\n" -+"\t\t\tor by dragging the mouse up or down with the middle mouse button " -+"pressed. You\n" -+"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in " -+"the toolbar and\n" -+"\t\t\tin the View menu. The Zoom Level can be set manually using the \"Zoom " -+"to Angular\n" - "\t\t\tSize\" item in the View menu (Shift+Ctrl+Z), and you can set it " - "graphically by\n" - "\t\t\tholding down the Ctrl button while dragging the mouse to define a " -@@ -30221,464 +30330,436 @@ - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用滑鼠的滾輪，或是按住中鍵後上下移動滑鼠游標來放大或縮小顯示。您也可以用 + 或 - " --"鍵，或是「檢視」選單及工具列中的「放大」、「縮小」等選項。縮放等級可以用「檢視」選單中的「縮放角度大小」（Shift+Ctrl+Z）來手動設定，您也可以按住 " --"Ctrl 鍵然後移動滑鼠來定義一個矩形範圍。

                                  \n" -+"\t\t

                                  您可以用滑鼠的滾輪，或是按住中鍵後上下移動滑鼠游標來放大或縮小顯示。" -+"您也可以用 + 或 - 鍵，或是「檢視」選單及工具列中的「放大」、「縮小」等選項。" -+"縮放等級可以用「檢視」選單中的「縮放角度大小」（Shift+Ctrl+Z）來手動設定，您" -+"也可以按住 Ctrl 鍵然後移動滑鼠來定義一個矩形範圍。

                                  \n" - "\t\n" - - #: tips.cpp:116 - msgid "" --"\t\t" --"

                                  You can manually set the coordinates of the central Focus point.\n" --"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, and " --"enter\n" -+"\t\t

                                  You can manually set the coordinates of the central Focus point.\n" -+"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, " -+"and enter\n" - "\t\t\tthe desired coordinates in the popup window.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以手動設定置中焦點的座標。按 Ctrl+M，或用「焦點」＞「手動設定焦點」，並輸入想要的座標。

                                  \n" -+"\t\t

                                  您可以手動設定置中焦點的座標。按 Ctrl+M，或用「焦點」＞「手動設定焦" -+"點」，並輸入想要的座標。

                                  \n" - "\t\n" - - #: tips.cpp:125 - msgid "" --"\t\t" --"

                                  To switch between Equatorial and Horizontal coordinate\n" --"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the spacebar.\n" -+"\t\t

                                  To switch between Equatorial and Horizontal coordinate\n" -+"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the " -+"spacebar.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  要在赤道座標系與水平座標系間切換，您可以用「檢視」＞「座標」選單，或按下空白鍵。

                                  \n" -+"\t\t

                                  要在赤道座標系與水平座標系間切換，您可以用「檢視」＞「座標」選單，或" -+"按下空白鍵。

                                  \n" - "\t\n" - - #: tips.cpp:133 - msgid "" --"\t\t" --"

                                  To set the Time and Date, type Ctrl+S, use the \"Time->" --"Set Time\" menu item,\n" --"\t\t\tor press the \"time\" toolbar button. Note that dates in KStars can be " --"very\n" -+"\t\t

                                  To set the Time and Date, type Ctrl+S, use the \"Time->Set Time\" " -+"menu item,\n" -+"\t\t\tor press the \"time\" toolbar button. Note that dates in KStars can " -+"be very\n" - "\t\t\tremote; you can use any year between -50,000 and +50,000.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  要設定日期與時間，按下 Ctrl+S，或用「時間」＞「設定時間」選單，或按下時間工具列按鈕。注意在 KStars 內的日期可以很遠，可以在 -50000 " --"到 +50000 年之間。

                                  \n" -+"\t\t

                                  要設定日期與時間，按下 Ctrl+S，或用「時間」＞「設定時間」選單，或按下" -+"時間工具列按鈕。注意在 KStars 內的日期可以很遠，可以在 -50000 到 +50000 年之" -+"間。

                                  \n" - "\t\n" - - #: tips.cpp:142 - msgid "" --"\t\t" --"

                                  You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to " -+"\t\t

                                  You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to " - "synchronize\n" - "\t\t\tthe simulation clock with your CPU clock.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用 Ctrl+E 或「時間」＞「設定時間為現在時間」來將模擬時鐘與您 CPU 的時鐘同步。

                                  \n" -+"\t\t

                                  您可以用 Ctrl+E 或「時間」＞「設定時間為現在時間」來將模擬時鐘與您 " -+"CPU 的時鐘同步。

                                  \n" - "\t\n" - - #: tips.cpp:150 - msgid "" --"\t\t" --"

                                  The Spin Box in the Toolbar allows you to adjust the time step\n" -+"\t\t

                                  The Spin Box in the Toolbar allows you to adjust the time step\n" - "\t\t\tused by the KStars clock; setting it to \"1.0 sec\" provides \"real " - "time\".\n" - "\t\t\tNote: negative values make time run backwards.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以調整 KStars 時鐘的時間間隔，設定為「1 秒」表示模擬實際時間。注意：負值可以讓時間往回走。

                                  \n" -+"\t\t

                                  您可以調整 KStars 時鐘的時間間隔，設定為「1 秒」表示模擬實際時間。注" -+"意：負值可以讓時間往回走。

                                  \n" - "\t\n" - - #: tips.cpp:159 - msgid "" --"\t\t" --"

                                  You can stop and start the clock with the \"Play/Pause\" button\n" -+"\t\t

                                  You can stop and start the clock with the \"Play/Pause\" button\n" - "\t\t\tin the Toolbar, or with the \"Time->Stop/Start Clock\" menu item.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「播放/暫停」鍵來停止或繼續時鐘，或是「時間」＞「停止/啟動時鐘」選項。

                                  \n" -+"\t\t

                                  您可以用「播放/暫停」鍵來停止或繼續時鐘，或是「時間」＞「停止/啟動時" -+"鐘」選項。

                                  \n" - "\t\n" - - #: tips.cpp:167 - msgid "" --"\t\t" --"

                                  You can advance the simulation clock forward or backward by a single\n" -+"\t\t

                                  You can advance the simulation clock forward or backward by a single\n" - "\t\t\ttime step by pressing the \">\" or \"<\" keys.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以按 \">\" 或 \"<\" 鍵來讓模擬時鐘的時間間隔向前或向後調整。

                                  \n" -+"\t\t

                                  您可以按 \">\" 或 \"<\" 鍵來讓模擬時鐘的時間間隔向前或向後調" -+"整。

                                  \n" - "\t\n" - - #: tips.cpp:175 - msgid "" --"\t\t" --"

                                  When you click your mouse in the map, the object in the sky nearest\n" -+"\t\t

                                  When you click your mouse in the map, the object in the sky nearest\n" - "\t\t\tthe mouse cursor is identified in the status bar.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  若您在天體圖中點擊滑鼠，則離滑鼠游標最近的物件會在狀態列中顯示。

                                  \n" -+"\t\t

                                  若您在天體圖中點擊滑鼠，則離滑鼠游標最近的物件會在狀態列中顯示。\n" - "\t\n" - - #: tips.cpp:183 - msgid "" --"\t\t" --"

                                  When you hold the mouse cursor still for a moment, the nearest object\n" -+"\t\t

                                  When you hold the mouse cursor still for a moment, the nearest " -+"object\n" - "\t\t\twill be identified by a temporary name label that automatically fades\n" - "\t\t\tout when you move the mouse again.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  若您滑鼠靜止不動一陣子，最接近的物件會顯示一個暫時的名稱標籤，若您滑鼠又再移動時，該標籤會自動淡出。

                                  \n" -+"\t\t

                                  若您滑鼠靜止不動一陣子，最接近的物件會顯示一個暫時的名稱標籤，若您滑" -+"鼠又再移動時，該標籤會自動淡出。

                                  \n" - "\t\n" - - #: tips.cpp:192 - msgid "" --"\t\t" --"

                                  Right-click with the mouse to open a popup menu of detailed options\n" -+"\t\t

                                  Right-click with the mouse to open a popup menu of detailed options\n" - "\t\t\tfor a particular object, including links to images and information on\n" - "\t\t\tthe Internet.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  點選滑鼠右鍵可以開啟特定物件的詳細選項選單，包括圖片的連結與網路上的資訊等。

                                  \n" -+"\t\t

                                  點選滑鼠右鍵可以開啟特定物件的詳細選項選單，包括圖片的連結與網路上的" -+"資訊等。

                                  \n" - "\t\n" - - #: tips.cpp:201 - msgid "" --"\t\t" --"

                                  The deep-sky objects with a special color (the default is Red)\n" -+"\t\t

                                  The deep-sky objects with a special color (the default is Red)\n" - "\t\t\thave extra URL links available in their popup menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  有特殊顏色（預設是紅色）的深天空物件在它們的選單中有外部網址連結。

                                  \n" -+"\t\t

                                  有特殊顏色（預設是紅色）的深天空物件在它們的選單中有外部網址連結。\n" - "\t\n" - - #: tips.cpp:209 - msgid "" --"\t\t" --"

                                  By default, stars in KStars are displayed with realistic colors.\n" -+"\t\t

                                  By default, stars in KStars are displayed with realistic colors.\n" - "\t\t\tA star's color depends on its temperature; cooler stars are red,\n" - "\t\t\twhile hotter stars are blue.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 中，星體預設是用實際顏色來顯示。它的顏色是根據溫度來決定，溫度較低則為紅色，較高的則為藍色。

                                  \n" -+"\t\t

                                  KStars 中，星體預設是用實際顏色來顯示。它的顏色是根據溫度來決定，溫度" -+"較低則為紅色，較高的則為藍色。

                                  \n" - "\t\n" - - #: tips.cpp:218 - msgid "" --"\t\t" --"

                                  If you want the very latest orbital information for asteroids and\n" -+"\t\t

                                  If you want the very latest orbital information for asteroids and\n" - "\t\t\tcomets (including recently-discovered objects), check the \"Download\n" - "\t\t\tData\" tool (\"File|Download Data\" or Ctrl+D) frequently for updated\n" - "\t\t\tephemerides.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  如果您要小行星與慧星（包括最近發現的物件）的最新軌道資訊，您可以用「下載資料」工具（「檔案」＞「下載資料」，或 Ctrl+D）來更新星曆表。

                                  \n" -+"\t\t

                                  如果您要小行星與慧星（包括最近發現的物件）的最新軌道資訊，您可以用" -+"「下載資料」工具（「檔案」＞「下載資料」，或 Ctrl+D）來更新星曆表。

                                  \n" - "\t\n" - - #: tips.cpp:228 - msgid "" --"\t\t" --"

                                  The Details window provides a large amount of information on any \n" -+"\t\t

                                  The Details window provides a large amount of information on any \n" - "\t\t\tobject in the sky, including coordinates, rise/set times, internet \n" - "\t\t\tlinks, and your own custom notes. Access the Details window through \n" - "\t\t\tthe popup menu, or by clicking on an object and then pressing \"D\".\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  「詳情」視窗提供許多關於該物件的資訊，包括座標，升起/落下時間，網際網路連結，及您自訂的筆記。您可以從彈出式選單中找到，或是點選物件後按下 D " --"鍵即可叫出。

                                  \n" -+"\t\t

                                  「詳情」視窗提供許多關於該物件的資訊，包括座標，升起/落下時間，網際網" -+"路連結，及您自訂的筆記。您可以從彈出式選單中找到，或是點選物件後按下 D 鍵即可" -+"叫出。

                                  \n" - "\t\n" - - #: tips.cpp:238 - msgid "" --"\t\t" --"

                                  You can attach a name label to any object in the sky. Toggle the \n" -+"\t\t

                                  You can attach a name label to any object in the sky. Toggle the \n" - "\t\t\tlabel in the popup menu, or by clicking on the object and then \n" - "\t\t\tpressing \"L\".\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以對天體圖中任何物件附加上名稱標籤。您可以在彈出式選單中切換標籤，或是點選物件然後按下 L 鍵。

                                  \n" -+"\t\t

                                  您可以對天體圖中任何物件附加上名稱標籤。您可以在彈出式選單中切換標" -+"籤，或是點選物件然後按下 L 鍵。

                                  \n" - "\t\n" - - #: tips.cpp:247 - msgid "" --"\t\t" --"

                                  The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n" -+"\t\t

                                  The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n" - "\t\t\tof the calculations that KStars does behind-the-scenes.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 天文計算機（Ctrl+C）能提供您直接存取許多 KStars 在私底下的計算。

                                  \n" -+"\t\t

                                  KStars 天文計算機（Ctrl+C）能提供您直接存取許多 KStars 在私底下的計" -+"算。

                                  \n" - "\t\n" - - #: tips.cpp:255 - msgid "" --"\t\t" --"

                                  The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at the\n" -+"\t\t

                                  The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at " -+"the\n" - "\t\t\tAmerican Association of Variable Star Observers, and constructs a\n" - "\t\t\tlightcurve for any of the 6000+ variable stars that they monitor\n" - "\t\t\ton a daily basis.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  AAVSO 光曲線產生器（Ctrl+V）能連結到美國業餘觀星協會（American Association of Variable Star " --"Observers）的伺服器，並產生它們每日監控的 6000 個以上的可變星的光曲線。

                                  \n" -+"\t\t

                                  AAVSO 光曲線產生器（Ctrl+V）能連結到美國業餘觀星協會（American " -+"Association of Variable Star Observers）的伺服器，並產生它們每日監控的 6000 " -+"個以上的可變星的光曲線。

                                  \n" - "\t\n" - - #: tips.cpp:265 - msgid "" --"\t\t" --"

                                  The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any group\n" -+"\t\t

                                  The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any " -+"group\n" - "\t\t\tof objects that you select. This is a great tool for planning\n" - "\t\t\tobserving sessions.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  高度仰角vs時間工具（Ctrl+A）會畫出任何您選取的物件群組的高度仰角曲線。這是計畫觀測的很好用的工具。

                                  \n" -+"\t\t

                                  高度仰角vs時間工具（Ctrl+A）會畫出任何您選取的物件群組的高度仰角曲" -+"線。這是計畫觀測的很好用的工具。

                                  \n" - "\t\n" - - #: tips.cpp:274 - msgid "" --"\t\t" --"

                                  With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance what\n" -+"\t\t

                                  With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance " -+"what\n" - "\t\t\tobjects will be visible from your location on a given night.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「今晚有什麼？」工具（Ctrl+U）來得知在您的位置，指定的夜晚中可以看到哪些物件。

                                  \n" -+"\t\t

                                  您可以用「今晚有什麼？」工具（Ctrl+U）來得知在您的位置，指定的夜晚中" -+"可以看到哪些物件。

                                  \n" - "\t\n" - - #: tips.cpp:282 - msgid "" --"\t\t" --"

                                  The Observing List tool (Ctrl+L) gives you easy access to a selected group \n" -+"\t\t

                                  The Observing List tool (Ctrl+L) gives you easy access to a selected " -+"group \n" - "\t\t\tof objects. Add objects to the list through the popup menu, or by\n" - "\t\t\tclicking on the object, and pressing \"O\".\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  觀測清單工具（Ctrl+L)讓您輕易存取所選群組的物件。您可以透過彈出式選單來將物件加入清單，或是點選該物件後按下 O 鍵。

                                  \n" -+"\t\t

                                  觀測清單工具（Ctrl+L)讓您輕易存取所選群組的物件。您可以透過彈出式選單" -+"來將物件加入清單，或是點選該物件後按下 O 鍵。

                                  \n" - "\t\n" - - #: tips.cpp:291 - msgid "" --"\t\t" --"

                                  The ScriptBuilder tool allows you to construct complex DCOP\n" -+"\t\t

                                  The ScriptBuilder tool allows you to construct complex DCOP\n" - "\t\t\tscripts using a simple GUI. The scripts can be played back later\n" - "\t\t\tfrom the command line, or from within KStars.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  文稿建立器工具讓您用簡單的介面來建立複雜的 DCOP 文稿。這些文稿可以稍後從命令列執行，或是在 KStars 中執行。

                                  \n" -+"\t\t

                                  文稿建立器工具讓您用簡單的介面來建立複雜的 DCOP 文稿。這些文稿可以稍" -+"後從命令列執行，或是在 KStars 中執行。

                                  \n" - "\t\n" - - #: tips.cpp:300 - msgid "" --"\t\t" --"

                                  The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the solar\n" -+"\t\t

                                  The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the " -+"solar\n" - "\t\t\tsystem, showing the positions of the major planets for the current\n" - "\t\t\tsimulation date.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  太陽系檢視器（Ctrl+Y）顯示太陽系主要行星目前的位置。

                                  \n" -+"\t\t

                                  太陽系檢視器（Ctrl+Y）顯示太陽系主要行星目前的位置。

                                  \n" - "\t\n" - - #: tips.cpp:309 - msgid "" --"\t\t" --"

                                  The Jupiter Moons tool (Ctrl+J) shows the relative positions of Jupiter's\n" -+"\t\t

                                  The Jupiter Moons tool (Ctrl+J) shows the relative positions of " -+"Jupiter's\n" - "\t\t\tfour largest moons (Io, Europa, Ganymede and Callisto), as seen from\n" - "\t\t\tEarth, and as a function of time.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  木星衛星工具（Ctrl+J）顯示從地球上在特定時間觀測木星與最大的四個衛星（艾奧（Io）、歐羅巴（Europa）、加尼美得（Ganymede)與卡利斯托（" --"Callisto））的相對位置。

                                  \n" -+"\t\t

                                  木星衛星工具（Ctrl+J）顯示從地球上在特定時間觀測木星與最大的四個衛星" -+"（艾奧（Io）、歐羅巴（Europa）、加尼美得（Ganymede)與卡利斯托（Callisto））的" -+"相對位置。

                                  \n" - "\t\n" - - #: tips.cpp:318 - msgid "" --"\t\t" --"

                                  You can export the sky image to a file using the \"Save Sky Image\"\n" -+"\t\t

                                  You can export the sky image to a file using the \"Save Sky Image\"\n" - "\t\t\titem in the File menu, or by pressing Ctrl+I. In addition, you can\n" --"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save a\n" -+"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save " -+"a\n" - "\t\t\tsky image to disk without even opening the program window. This can\n" - "\t\t\tbe used to generate dynamic wallpaper for your KDE desktop.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以將天體圖影像匯出到檔案中。使用「檔案」＞「儲存天體影像」，或按下 Ctrl+I。此外，您可以從命令列執行 KStars，並給 --dump " --"參數來儲存天體影像。這可以用於產生 KDE 桌面的動態桌布。

                                  \n" -+"\t\t

                                  您可以將天體圖影像匯出到檔案中。使用「檔案」＞「儲存天體影像」，或按" -+"下 Ctrl+I。此外，您可以從命令列執行 KStars，並給 --dump 參數來儲存天體影像。" -+"這可以用於產生 KDE 桌面的動態桌布。

                                  \n" - "\t\n" - - #: tips.cpp:329 - msgid "" --"\t\t" --"

                                  To add your own custom Object Catalogs, select\n" -+"\t\t

                                  To add your own custom Object Catalogs, select\n" - "\t\t\t\"Add Catalog\" from the Catalogs tab in the KStars Configuration " - "window.\n" - "\t\t\tSee the Handbook for instructions on formatting your catalog file.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以從 KStars 設定視窗中的「星表」頁中新增您自訂的物件星表。

                                  \n" -+"\t\t

                                  您可以從 KStars 設定視窗中的「星表」頁中新增您自訂的物件星表。

                                  \n" - "\t\n" - - #: tips.cpp:338 - msgid "" --"\t\t" --"

                                  To add your own custom image/information URLs to\n" -+"\t\t

                                  To add your own custom image/information URLs to\n" - "\t\t\tany object, select \"Add Link...\" from the object's popup menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  要新增您自訂的影像/資訊網址到任何物件，請從彈出式選單中選擇「新增連結...」。

                                  \n" -+"\t\t

                                  要新增您自訂的影像/資訊網址到任何物件，請從彈出式選單中選擇「新增連" -+"結...」。

                                  \n" - "\t\n" - - #: tips.cpp:346 - msgid "" --"\t\t" --"

                                  You can adjust dozens of display options by clicking the\n" --"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->" --"Configure KStars...\"\n" -+"\t\t

                                  You can adjust dozens of display options by clicking the\n" -+"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->Configure " -+"KStars...\"\n" - "\t\t\tmenu item.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以點選設定工具列，或從「設定」＞「設定 KStars」來調整許多顯示選項。

                                  \n" -+"\t\t

                                  您可以點選設定工具列，或從「設定」＞「設定 KStars」來調整許多顯示選" -+"項。

                                  \n" - "\t\n" - - #: tips.cpp:355 - msgid "" --"\t\t" --"

                                  The on-screen Info Boxes can be hidden or shown using the\n" -+"\t\t

                                  The on-screen Info Boxes can be hidden or shown using the\n" - "\t\t\t\"Settings->Info Boxes\" menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「設定」＞「資訊盒」來決定是否要隱藏資訊盒。

                                  \n" -+"\t\t

                                  您可以用「設定」＞「資訊盒」來決定是否要隱藏資訊盒。

                                  \n" - "\t\n" - - #: tips.cpp:363 - msgid "" --"\t\t" --"

                                  The Toolbars can be hidden or shown using the \"Settings->Toolbars\" menu.\n" -+"\t\t

                                  The Toolbars can be hidden or shown using the \"Settings->Toolbars\" " -+"menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「設定」＞「工具列」來決定是否要隱藏工具列。

                                  \n" -+"\t\t

                                  您可以用「設定」＞「工具列」來決定是否要隱藏工具列。

                                  \n" - "\t\n" - - #: tips.cpp:370 - msgid "" --"\t\t" --"

                                  You can hide either the Ra/Dec or Az/Alt coordinate fields in the " -+"\t\t

                                  You can hide either the Ra/Dec or Az/Alt coordinate fields in the " - "statusbar,\n" - "\t\t\tor hide the stausbar completely, using the Settings|Statusbar menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「設定」＞「狀態列」來決定是否要隱藏狀態列中的赤經/赤緯，方位/高度等座標欄位，或把整個狀態列隱藏起來。

                                  \n" -+"\t\t

                                  您可以用「設定」＞「狀態列」來決定是否要隱藏狀態列中的赤經/赤緯，方" -+"位/高度等座標欄位，或把整個狀態列隱藏起來。

                                  \n" - "\t\n" - - #: tips.cpp:378 - msgid "" --"\t\t" --"

                                  You can easily switch between predefined color schemes by selecting\n" -+"\t\t

                                  You can easily switch between predefined color schemes by selecting\n" - "\t\t\tthe scheme from the \"Settings->Color Schemes\" menu.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以用「設定」＞「顏色機制」來切換使用預設或自訂的顏色機制。

                                  \n" -+"\t\t

                                  您可以用「設定」＞「顏色機制」來切換使用預設或自訂的顏色機制。

                                  \n" - "\t\n" - - #: tips.cpp:386 - msgid "" --"\t\t" --"

                                  You can define your own Geographic Locations. Fill in the\n" -+"\t\t

                                  You can define your own Geographic Locations. Fill in the\n" - "\t\t\trequired fields in the \"Change Location\" Dialog and then press the\n" - "\t\t\t\"Add to List\" button. Your Locations will be available in all\n" - "\t\t\tfuture sessions.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以定義自己的地理位置。您只要填入「改變位置」對話框中的必要欄位，然後按下「加到清單」鍵即可。

                                  \n" -+"\t\t

                                  您可以定義自己的地理位置。您只要填入「改變位置」對話框中的必要欄位，" -+"然後按下「加到清單」鍵即可。

                                  \n" - "\t\n" - - #: tips.cpp:396 - msgid "" --"\t\t" --"

                                  You can define your own Color Schemes. Adjust the colors\n" --"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the \"Save\n" -+"\t\t

                                  You can define your own Color Schemes. Adjust the colors\n" -+"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the " -+"\"Save\n" - "\t\t\tCurrent Colors\" button. Your Color Scheme will appear in the list in\n" - "\t\t\tall future sessions.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以定義自己的顏色機制。用設定視窗中的「顏色」來調整顏色，然後按下「儲存目前的顏色」鍵即可。

                                  \n" -+"\t\t

                                  您可以定義自己的顏色機制。用設定視窗中的「顏色」來調整顏色，然後按下" -+"「儲存目前的顏色」鍵即可。

                                  \n" - "\t\n" - - #: tips.cpp:406 - msgid "" --"\t\t" --"

                                  You can construct your own field-of-view (FOV) symbols, using the\n" -+"\t\t

                                  You can construct your own field-of-view (FOV) symbols, using the\n" - "\t\t\tFOV Editor under the Tools menu. You can set the angular size, the\n" - "\t\t\tshape, and the color of your new symbols.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  您可以建立您自己的視場（Field of View，FOV）符號。使用「工具」＞「視場編輯器」，您可以設定角度大小，形狀及新符號的顏色。

                                  \n" -+"\t\t

                                  您可以建立您自己的視場（Field of View，FOV）符號。使用「工具」＞「視" -+"場編輯器」，您可以設定角度大小，形狀及新符號的顏色。

                                  \n" - "\t\n" - - #: tips.cpp:415 - msgid "" --"\t\t" --"

                                  The Advanced tab of the KStars Configuration window allows you to fine-tune\n" -+"\t\t

                                  The Advanced tab of the KStars Configuration window allows you to " -+"fine-tune\n" - "\t\t\tthe behavior of KStars. You can specify whether to correct for " - "atmospheric\n" - "\t\t\trefraction, and whether to use animated slewing. You can also specify " -@@ -30687,102 +30768,95 @@ - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 設定視窗中的「進階」頁能讓您微調 KStars " --"的行為。您可以指定是否要修正大氣折射，或是使用動畫旋轉，或是在移動時是否要隱藏物件等等。

                                  \n" -+"\t\t

                                  KStars 設定視窗中的「進階」頁能讓您微調 KStars 的行為。您可以指定是否" -+"要修正大氣折射，或是使用動畫旋轉，或是在移動時是否要隱藏物件等等。

                                  \n" - "\t\n" - - #: tips.cpp:425 - msgid "" --"\t\t" --"

                                  KStars displays 126,000 stars, 13,000 deep-sky objects, 88 constellations,\n" -+"\t\t

                                  KStars displays 126,000 stars, 13,000 deep-sky objects, 88 " -+"constellations,\n" - "\t\t\tall planets, the Sun, the Moon, thousands of comets and asteroids, and " - "the\n" - "\t\t\tMilky Way.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 顯示 126,000 個星體，13,000 個深天空物件，88 " --"個星座，太陽系所有的行星，太陽，及月球，還有數以千計的小行星與慧星，當然還有銀河。

                                  \n" -+"\t\t

                                  KStars 顯示 126,000 個星體，13,000 個深天空物件，88 個星座，太陽系所" -+"有的行星，太陽，及月球，還有數以千計的小行星與慧星，當然還有銀河。

                                  \n" - "\t\n" - - #: tips.cpp:434 - msgid "" --"\t\t" --"

                                  The line in the sky that the Sun and all the Planets seem to follow\n" -+"\t\t

                                  The line in the sky that the Sun and all the Planets seem to follow\n" - "\t\t\tis called the Ecliptic.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  在天空中，太陽與其他行星遵循的動線稱為黃道。

                                  \n" -+"\t\t

                                  在天空中，太陽與其他行星遵循的動線稱為黃道。

                                  \n" - "\t\n" - - #: tips.cpp:442 - msgid "" --"\t\t" --"

                                  Object positions in KStars include the effects of precession, nutation,\n" --"\t\t\taberration, atmospheric refraction, and light travel time (for planets).\n" -+"\t\t

                                  Object positions in KStars include the effects of precession, " -+"nutation,\n" -+"\t\t\taberration, atmospheric refraction, and light travel time (for " -+"planets).\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  KStars 中的物件位置計算會包含歲差、擺動、光行差、大氣折射及光旅行時間等因素。

                                  \n" -+"\t\t

                                  KStars 中的物件位置計算會包含歲差、擺動、光行差、大氣折射及光旅行時間" -+"等因素。

                                  \n" - "\t\n" - - #: tips.cpp:450 - msgid "" --"\t\t" --"

                                  The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n" -+"\t\t

                                  The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n" - "\t\t\tThe brightest star in the sky is Sirius (alpha Canis Majoris).\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  最接近太陽的星球為南門二（Rigel Kentaurus，alpha Centauri）。天體圖中最亮的星為天狼星（Sirius，alpha Canis " --"Majoris）。

                                  \n" -+"\t\t

                                  最接近太陽的星球為南門二（Rigel Kentaurus，alpha Centauri）。天體圖中" -+"最亮的星為天狼星（Sirius，alpha Canis Majoris）。

                                  \n" - "\t\n" - - #: tips.cpp:458 - msgid "" --"\t\t" --"

                                  The large group of galaxies between Leo, Virgo and Coma Berenices\n" -+"\t\t

                                  The large group of galaxies between Leo, Virgo and Coma Berenices\n" - "\t\t\tis called the Virgo Cluster of Galaxies.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  在獅子座（Leo)，室女座（Virgo）與后髮座（Coma Berenices）之間最大群的銀河稱為室女座星系團（Virgo Cluster of " --"Galaxies）。

                                  \n" -+"\t\t

                                  在獅子座（Leo)，室女座（Virgo）與后髮座（Coma Berenices）之間最大群的" -+"銀河稱為室女座星系團（Virgo Cluster of Galaxies）。

                                  \n" - "\t\n" - - #: tips.cpp:466 - msgid "" --"\t\t" --"

                                  The large group of clusters and nebulae near the south celestial pole\n" -+"\t\t

                                  The large group of clusters and nebulae near the south celestial " -+"pole\n" - "\t\t\tare objects in the Large Magellanic Cloud, which is a dwarf galaxy in\n" - "\t\t\torbit around the Milky Way.\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  靠近天體南極最大的星系團為大麥哲倫雲，在銀河軌道中的一個小銀河。

                                  \n" -+"\t\t

                                  靠近天體南極最大的星系團為大麥哲倫雲，在銀河軌道中的一個小銀河。\n" - "\t\n" - - #: tips.cpp:475 - msgid "" --"\t\t" --"

                                  The Messier Catalog is a list of 110 of the brightest non-stellar objects\n" --"\t\t\tin the sky. It includes such famous objects as the Orion Nebula (M 42), " --"the\n" -+"\t\t

                                  The Messier Catalog is a list of 110 of the brightest non-stellar " -+"objects\n" -+"\t\t\tin the sky. It includes such famous objects as the Orion Nebula (M " -+"42), the\n" - "\t\t\tAndromeda Galaxy (M 31), and the Pleiades (M 45).\n" - "\t\t

                                  \n" - "\t\n" - msgstr "" --"\t\t " --"

                                  梅西爾星表是一份包含了在天體圖中 110 個最亮的非恆星的物件清單。它包括有名的像獵戶座星雲（Orion Nebula，M " --"42），仙女座銀河（Andromeda Galaxy，M 31）及 Pleiades （M 45）等物件。

                                  \n" -+"\t\t

                                  梅西爾星表是一份包含了在天體圖中 110 個最亮的非恆星的物件清單。它包括" -+"有名的像獵戶座星雲（Orion Nebula，M 42），仙女座銀河（Andromeda Galaxy，M " -+"31）及 Pleiades （M 45）等物件。

                                  \n" - "\t\n" - - #: addlinkdialog.h:41 -@@ -30841,19 +30915,16 @@ - - #: tools/astrocalc.cpp:158 - msgid "" --"Section for time-related astronomical calculations
                                  • Julian Day: " --"Julian Day/Calendar conversion
                                  • Sidereal Time: " --"Sidereal/Universal time conversion
                                  • Day duration: " --"Sunrise, Sunset and noon time and positions for those events
                                  • " --"Equinoxes & Solstices: Equinoxes, Solstices and duration of the seasons
                                    • " --"
                                  " --msgstr "" --"跟時間有關的天文計算：" --"
                                    " --"
                                  • 儒略日：日曆與儒略日的轉換
                                    • \n" -+"Section for time-related astronomical calculations
                                    • Julian Day:" -+" Julian Day/Calendar conversion
                                    • Sidereal Time: Sidereal/" -+"Universal time conversion
                                    • Day duration: Sunrise, Sunset and " -+"noon time and positions for those events
                                    • Equinoxes & Solstices: Equinoxes, Solstices and duration of the seasons
                                    " -+msgstr "" -+"跟時間有關的天文計算：
                                    • 儒略日：日曆與儒略日的轉換
                                      • \n" - "
                                    • 恆星時間：恆星時間與國際標準時間的轉換
                                      • \n" --"
                                    • 日間持續時間：日出、日落與夜時間，還有相關位置
                                      • " --"
                                    • 春分、秋分、夏至與冬至：包括這四個節氣，及季節持續時間。
                                    " -+"
                                  • 日間持續時間：日出、日落與夜時間，還有相關位置
                                  • 春分、" -+"秋分、夏至與冬至：包括這四個節氣，及季節持續時間。
                                  " - - #: tools/astrocalc.cpp:185 - msgid "" -@@ -30861,23 +30932,20 @@ - "systems of coordinates
                                  • Precessor: Precession of coordinates " - "between epochs
                                  • Galactic: Galactic/Equatorial coordinates " - "conversion
                                  • Apparent: Computation of current equatorial " --"coordinates from a given epoch
                                  • Ecliptic: " --"Ecliptic/Equatorial coordinates conversion
                                  • Horizontal: " --"Computation of azimuth and elevation for a given source, time, and location on " --"the Earth
                                  • Angular Distance: Computation of angular distance " --"between two objects whose positions are given in equatorial coordinates
                                  • " --"LSR Velocity: Computation of the heliocentric, geocentric and " --"topocentric radial velocity of a source from its LSR velocity
                                  " --msgstr "" --"跟不同天文座標系統轉換有關的演算法： " --"
                                    " --"
                                  • 歲差：紀元間歲差座標轉換
                                    • " --"
                                  • 銀河：銀河/赤道座標系轉換
                                    • " --"
                                  • 外顯：計算給定紀元的赤道座標
                                    • " --"
                                  • 黃道：黃道/赤道座標轉換
                                    • " --"
                                  • 水平：給定來源與時間，計算地球上的位置方位與仰角
                                    • " --"
                                  • 角距離：給定兩個物件的赤道座標，計算兩者間的角距離
                                    • " --"
                                  • LSR 速率：從來源的 LSR 速率計算對日、對地球與對地面座標的速度。
                                  " -+"coordinates from a given epoch
                                • Ecliptic: Ecliptic/Equatorial " -+"coordinates conversion
                                • Horizontal: Computation of azimuth and " -+"elevation for a given source, time, and location on the Earth
                                • Angular Distance: Computation of angular distance between two " -+"objects whose positions are given in equatorial coordinates
                                • LSR " -+"Velocity: Computation of the heliocentric, geocentric and topocentric " -+"radial velocity of a source from its LSR velocity
                                " -+msgstr "" -+"跟不同天文座標系統轉換有關的演算法：
                                • 歲差：紀元間歲差座標" -+"轉換
                                • 銀河：銀河/赤道座標系轉換
                                • 外顯：計算給定" -+"紀元的赤道座標
                                • 黃道：黃道/赤道座標轉換
                                • 水平：" -+"給定來源與時間，計算地球上的位置方位與仰角
                                • 角距離：給定兩個物" -+"件的赤道座標，計算兩者間的角距離
                                • LSR 速率：從來源的 LSR 速率" -+"計算對日、對地球與對地面座標的速度。
                                " - - #: tools/astrocalc.cpp:221 - msgid "" -@@ -30885,20 +30953,18 @@ - "the Earth
                                • Geodetic Coordinates: Geodetic/XYZ coordinate " - "conversion
                                " - msgstr "" --"與地球座標系轉換有關的演算法： " --"
                                  " --"
                                • 對地球座標：以地球為中心/XYZ 軸的座標轉換。
                                " -+"與地球座標系轉換有關的演算法：
                                • 對地球座標：以地球為中心/" -+"XYZ 軸的座標轉換。
                                " - - #: tools/astrocalc.cpp:240 - msgid "" - "Section with algorithms regarding information on solar system bodies " --"coordinates and times
                                • Planets Coordinates: " --"Coordinates for the planets, moon and sun at a given time and from a given " --"position on Earth
                                " --msgstr "" --"與太陽系星體座標與時間資訊有關的演算法： " --"
                                  " --"
                                • 行星座標：給定時間及地球上的位置，計算行星，月球及太陽的座標。
                                " -+"coordinates and times
                                • Planets Coordinates: Coordinates for the " -+"planets, moon and sun at a given time and from a given position on Earth
                                " -+msgstr "" -+"與太陽系星體座標與時間資訊有關的演算法：
                                • 行星座標：給定時" -+"間及地球上的位置，計算行星，月球及太陽的座標。
                                " - - #: tools/jmoontool.cpp:34 - msgid "Jupiter Moons Tool" -@@ -31006,13 +31072,17 @@ - msgid "" - "Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to " - "generate light curves for the past 500 days." --msgstr "不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生過去五百天的光曲線。" -+msgstr "" -+"不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生過去五百天的光" -+"曲線。" - - #: tools/lcgenerator.cpp:287 - msgid "" - "Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to " - "generate light curves until today." --msgstr "不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生到今天為止的光曲線。" -+msgstr "" -+"不合法的日期格式。正確的格式為 mm/dd/yyyy 或 JD，「預設」則產生到今天為止的光" -+"曲線。" - - #: tools/lcgenerator.cpp:327 tools/lcgenerator.cpp:363 - #, c-format -@@ -31021,7 +31091,9 @@ - - #: tools/lcgenerator.cpp:400 - msgid "Light Curve produced by the American Amateur Variable Star Observers" --msgstr "由美國業餘觀星協會（American Amateur Variable Star Observers，AAVSO）繪製的光曲線" -+msgstr "" -+"由美國業餘觀星協會（American Amateur Variable Star Observers，AAVSO）繪製的光" -+"曲線" - - #: tools/lcgenerator.cpp:462 - msgid "AAVSO Star list downloaded successfully." -@@ -31065,7 +31137,7 @@ - - #: tools/modcalcplanets.cpp:400 - msgid "Incorrect number of fields in line %1: " --msgstr "在第 %1 行欄位數不正確：" -+msgstr "在第 %1 列欄位數不正確：" - - #: tools/modcalcplanets.cpp:401 - msgid "Present fields %1. " -@@ -31081,15 +31153,15 @@ - - #: tools/modcalcplanets.cpp:422 - msgid " in line %1: " --msgstr "於第 %1 行：" -+msgstr "於第 %1 列：" - - #: tools/modcalcplanets.cpp:444 - msgid "Line %1 contains an invalid time" --msgstr "第 %1 行包含不合法的時間" -+msgstr "第 %1 列包含不合法的時間" - - #: tools/modcalcplanets.cpp:464 - msgid "Line %1 contains an invalid date: " --msgstr "第 %1 行包含不合法的日期：" -+msgstr "第 %1 列包含不合法的日期：" - - #: tools/modcalcplanets.cpp:586 - msgid "Errors found while parsing some lines in the input file" -@@ -31223,22 +31295,22 @@ - - #: tools/planetviewer.cpp:45 - msgid "" --"_: axis label for x-coordinate of solar system viewer. AU means astronomical " --"unit.\n" -+"_: axis label for x-coordinate of solar system viewer. AU means " -+"astronomical unit.\n" - "X-position (AU)" - msgstr "X 位置（天文單位）" - - #: tools/planetviewer.cpp:46 - msgid "" --"_: axis label for y-coordinate of solar system viewer. AU means astronomical " --"unit.\n" -+"_: axis label for y-coordinate of solar system viewer. AU means " -+"astronomical unit.\n" - "Y-position (AU)" - msgstr "Y 位置（天文單位）" - - #: tools/scriptbuilder.cpp:120 - msgid "" --"Point the display at the specified location. %1 can be the name of an object, a " --"cardinal point on the compass, or 'zenith'." -+"Point the display at the specified location. %1 can be the name of an " -+"object, a cardinal point on the compass, or 'zenith'." - msgstr "根據指定的位置來指向。%1 可以是物件的名稱，羅盤上的基點，或是天頂。" - - #: tools/scriptbuilder.cpp:122 -@@ -31249,8 +31321,8 @@ - - #: tools/scriptbuilder.cpp:124 - msgid "" --"Point the display at the specified Alt/Az coordinates. %1 and %2 are expressed " --"in Degrees." -+"Point the display at the specified Alt/Az coordinates. %1 and %2 are " -+"expressed in Degrees." - msgstr "根據指定的高度/方位座標來指向。%1 跟 %2 以度為單位。" - - #: tools/scriptbuilder.cpp:126 -@@ -31279,8 +31351,8 @@ - - #: tools/scriptbuilder.cpp:133 - msgid "" --"Halt script execution until the key %1 is pressed. Only single-key strokes are " --"possible; use 'space' for the spacebar." -+"Halt script execution until the key %1 is pressed. Only single-key strokes " -+"are possible; use 'space' for the spacebar." - msgstr "暫停執行文稿直到按下 %1 鍵。只能有一個鍵，用 space 表示空白鍵。" - - #: tools/scriptbuilder.cpp:135 -@@ -31313,7 +31385,9 @@ - "Print the sky image to a printer or file. If %1 is true, it will show the " - "print dialog. If %2 is true, it will use the Star Chart color scheme for " - "printing." --msgstr "將天體影像列印到印表機或檔案。如果 %1 為真，則會顯示列印對話框。如果 %2 為真，則列印時會使用星體圖表顏色機制。" -+msgstr "" -+"將天體影像列印到印表機或檔案。如果 %1 為真，則會顯示列印對話框。如果 %2 為" -+"真，則列印時會使用星體圖表顏色機制。" - - #: tools/scriptbuilder.cpp:143 - msgid "Halt the simulation clock." -@@ -31327,7 +31401,8 @@ - msgid "" - "Set the timescale of the simulation clock to %1. 1.0 means real-time; 2.0 " - "means twice real-time; etc." --msgstr "設定模擬時鐘的時間刻度為 %1。1.0 表示實際時間，2.0 表示兩倍實際時間等等。" -+msgstr "" -+"設定模擬時鐘的時間刻度為 %1。1.0 表示實際時間，2.0 表示兩倍實際時間等等。" - - #: tools/scriptbuilder.cpp:150 - msgid "Establish an INDI device either in local mode or server mode." -@@ -31355,12 +31430,14 @@ - msgid "" - "Set the telescope target coordinates to the RA/Dec coordinates. RA is " - "expressed in Hours; DEC is expressed in Degrees." --msgstr "設定望遠鏡目標座標為赤經/赤緯座標。赤經以時（Hour）為單位，赤緯以度（Degree）為單位。" -+msgstr "" -+"設定望遠鏡目標座標為赤經/赤緯座標。赤經以時（Hour）為單位，赤緯以度（Degree）" -+"為單位。" - - #: tools/scriptbuilder.cpp:172 - msgid "" --"Set the telescope target coorinates to the RA/Dec coordinates of the selected " --"object." -+"Set the telescope target coorinates to the RA/Dec coordinates of the " -+"selected object." - msgstr "設定望遠鏡目標座標為所選物件的赤經/赤緯座標。" - - #: tools/scriptbuilder.cpp:176 -@@ -31379,9 +31456,11 @@ - - #: tools/scriptbuilder.cpp:187 - msgid "" --"Pause script execution until action returns with OK status. The action can be " --"the name of any INDI property supported by the device." --msgstr "暫停執行文稿，直到動作回覆狀態為 OK。這個動作可以是任何 INDI 裝置所支援的屬性名稱。" -+"Pause script execution until action returns with OK status. The action can " -+"be the name of any INDI property supported by the device." -+msgstr "" -+"暫停執行文稿，直到動作回覆狀態為 OK。這個動作可以是任何 INDI 裝置所支援的屬性" -+"名稱。" - - #: tools/scriptbuilder.cpp:190 - msgid "" -@@ -31391,15 +31470,16 @@ - - #: tools/scriptbuilder.cpp:194 - msgid "" --"Start moving the focuser in the direction Dir, and for the duration specified " --"by setINDIFocusTimeout." -+"Start moving the focuser in the direction Dir, and for the duration " -+"specified by setINDIFocusTimeout." - msgstr "開始以 Dir 方向移動焦距放大鏡，時間由 setINDIFocusTimeout 指定。" - - #: tools/scriptbuilder.cpp:198 - msgid "" - "Set the telescope focuser timer in seconds. This is the duration of any " - "focusing procedure performed by calling startINDIFocus." --msgstr "設定望遠鏡對焦時間（秒）。這是呼叫 startINDIFocus 時任何對焦程序要花的時間。" -+msgstr "" -+"設定望遠鏡對焦時間（秒）。這是呼叫 startINDIFocus 時任何對焦程序要花的時間。" - - #: tools/scriptbuilder.cpp:202 - msgid "Set the target CCD chip temperature." -@@ -31411,10 +31491,11 @@ - - #: tools/scriptbuilder.cpp:210 - msgid "" --"Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, " --"FRAME_DARK, and FRAME_FLAT." -+"Set the CCD camera frame type. Available options are FRAME_LIGHT, " -+"FRAME_BIAS, FRAME_DARK, and FRAME_FLAT." - msgstr "" --"設定 CCD 相機 frame 型態。選項包括 FRAME_LIGHT，FRAME_BIAS，FRAME_DARK 與 FRAME_FLAT。" -+"設定 CCD 相機 frame 型態。選項包括 FRAME_LIGHT，FRAME_BIAS，FRAME_DARK 與 " -+"FRAME_FLAT。" - - #: tools/scriptbuilder.cpp:214 - msgid "Start Camera/CCD exposure. The duration is in seconds." -@@ -31742,7 +31823,8 @@ - - #: tools/scriptbuilder.cpp:652 - msgid "" --"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" -+"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, " -+"4=Bullseye)" - msgstr "選擇視場符號的形狀（0：方形，1：圓形，2：十字型，4：Bullseye）" - - #: tools/scriptbuilder.cpp:652 -@@ -31831,14 +31913,14 @@ - - #: tools/scriptbuilder.cpp:860 - msgid "" --"The current script has unsaved changes. Would you like to save before closing " --"it?" -+"The current script has unsaved changes. Would you like to save before " -+"closing it?" - msgstr "目前的文稿有未儲存的改變。您關閉前要先儲存嗎？" - - #: tools/scriptbuilder.cpp:993 - #, c-format - msgid "Could not parse script. Line was: %1" --msgstr "無法剖析文稿。在第 %1 行" -+msgstr "無法剖析文稿。在第 %1 列" - - #: tools/scriptbuilder.cpp:1311 tools/scriptbuilder.cpp:1313 - #: tools/scriptbuilder.cpp:1349 tools/scriptbuilder.cpp:2050 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/ktouch.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/ktouch.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/ktouch.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/ktouch.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: ktouch\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2007-04-16 12:30+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -85,11 +84,11 @@ - - #: ktouch.cpp:686 - msgid "&Open lecture..." --msgstr "開啟課程(&O)..." -+msgstr "開啟課程(&O)…" - - #: ktouch.cpp:688 - msgid "&Edit lecture..." --msgstr "編輯課程(&E)..." -+msgstr "編輯課程(&E)…" - - #: ktouch.cpp:690 - msgid "&Edit color scheme..." -@@ -113,7 +112,7 @@ - - #: ktouch.cpp:714 - msgid "&Keyboard Layouts" --msgstr "鍵盤佈局(&K)" -+msgstr "鍵盤布局(&K)" - - #: ktouch.cpp:720 - msgid "&Color Schemes" -@@ -174,7 +173,7 @@ - #: ktouchkeyboard.cpp:186 ktouchkeyboard.cpp:238 ktouchkeyboardeditor.cpp:136 - #: ktouchkeyboardeditor.cpp:176 - msgid "untitled keyboard layout" --msgstr "未命名鍵盤佈局" -+msgstr "未命名鍵盤布局" - - #: ktouchkeyboard.cpp:289 - msgid "" -@@ -192,7 +191,7 @@ - - #: ktouchkeyboardeditor.cpp:93 - msgid "Save Keyboard Layout" --msgstr "儲存鍵盤佈局" -+msgstr "儲存鍵盤布局" - - #: ktouchkeyboardeditor.cpp:170 - msgid "Keyboard dimensions: %1 x %2" -@@ -200,7 +199,7 @@ - - #: ktouchkeyboardeditor.cpp:188 - msgid "Open keyboard file ..." --msgstr "開啟鍵盤檔案..." -+msgstr "開啟鍵盤檔案…" - - #: ktouchkeyboardeditor.cpp:189 - msgid "Which keyboard file would you like to edit?" -@@ -244,17 +243,19 @@ - - #: ktouchkeyboardwidget.cpp:54 - msgid "Could not read the keyboard layout file '%1'. " --msgstr "無法讀取鍵盤佈局檔案 %1。" -+msgstr "無法讀取鍵盤布局檔案 %1。" - - #: ktouchkeyboardwidget.cpp:59 - msgid "Could not download/open keyboard layout file from '%1'." --msgstr "無法從 %1 下載/開啟鍵盤佈局檔。" -+msgstr "無法從 %1 下載/開啟鍵盤布局檔。" - - #: ktouchkeyboardwidget.cpp:135 - msgid "" - "Error reading the keyboard layout; the default number keypad will be created " - "instead. You can choose another keyboard layout in the preferences dialog." --msgstr "讀取鍵盤佈局時發生錯誤；將會改建立預設的數字鍵。您可以在喜好設定中選擇其他的鍵盤佈局。" -+msgstr "" -+"讀取鍵盤布局時發生錯誤；將會改建立預設的數字鍵。您可以在喜好設定中選擇其他的" -+"鍵盤布局。" - - #: ktouchkeyboardwidget.cpp:368 - msgid "Could not open file." -@@ -262,11 +263,11 @@ - - #: ktouchkeyboardwidget.cpp:424 - msgid "Missing key type in line '%1'." --msgstr "在第 %1 行找不到鍵盤型態。" -+msgstr "在第 %1 列找不到鍵盤型態。" - - #: ktouchlecture.cpp:104 - msgid "A default lecture..." --msgstr "預設課程..." -+msgstr "預設課程…" - - #: ktouchlectureeditor.cpp:115 - msgid "Save Training Lecture" -@@ -292,7 +293,7 @@ - - #: ktouchlectureeditor.cpp:354 - msgid "Enter your lines here..." --msgstr "請在此輸入行數..." -+msgstr "請在此輸入列數…" - - #: ktouchlectureeditor.cpp:365 - msgid "Open Lecture File" -@@ -368,7 +369,7 @@ - - #: ktouchstatistics.cpp:75 - msgid "Default level..." --msgstr "預設等級..." -+msgstr "預設等級…" - - #: ktouchstatistics.cpp:78 - msgid "***current*** " -@@ -416,15 +417,15 @@ - - #: ktouchtrainer.cpp:271 - msgid "Starting training session: Waiting for first keypress..." --msgstr "開始訓練階段：等待按下第一個鍵..." -+msgstr "開始訓練階段：等待按下第一個鍵…" - - #: ktouchtrainer.cpp:290 - msgid "Training session paused. Training continues on next keypress..." --msgstr "暫停訓練階段。訓練將暫停到按下一個鍵後繼續..." -+msgstr "暫停訓練階段。訓練將暫停到按下一個鍵後繼續…" - - #: ktouchtrainer.cpp:303 - msgid "Training session! The time is running..." --msgstr "訓練階段。時間正在流失中..." -+msgstr "訓練階段。時間正在流失中…" - - #: ktouchtrainer.cpp:391 - msgid "You rock!" -@@ -608,19 +609,19 @@ - #: rc.cpp:93 - #, no-c-format - msgid "Keyboard Layout Editor" --msgstr "鍵盤佈局編輯器" -+msgstr "鍵盤布局編輯器" - - #. i18n: file ktouchkeyboardeditor_dlg.ui line 35 - #: rc.cpp:96 rc.cpp:183 - #, no-c-format - msgid "Change Font..." --msgstr "變更字型..." -+msgstr "變更字型…" - - #. i18n: file ktouchkeyboardeditor_dlg.ui line 105 - #: rc.cpp:111 - #, no-c-format - msgid "Keyboard Layout" --msgstr "鍵盤佈局" -+msgstr "鍵盤布局" - - #. i18n: file ktouchkeyboardeditor_dlg.ui line 116 - #: rc.cpp:114 -@@ -638,13 +639,13 @@ - #: rc.cpp:120 - #, no-c-format - msgid "Add..." --msgstr "新增..." -+msgstr "新增…" - - #. i18n: file ktouchkeyboardeditor_dlg.ui line 207 - #: rc.cpp:123 - #, no-c-format - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #. i18n: file ktouchkeyboardeditor_dlg.ui line 233 - #: rc.cpp:129 -@@ -758,7 +759,7 @@ - #: rc.cpp:192 - #, no-c-format - msgid "Save &As..." --msgstr "另存為(&A)..." -+msgstr "另存為(&A)…" - - #. i18n: file ktouchopenrequest_dlg.ui line 16 - #: rc.cpp:198 -@@ -824,14 +825,15 @@ - #: rc.cpp:252 - #, no-c-format - msgid "" --"You can choose here the color scheme for displaying the keyboard. " --"Black & White will display all keyboard letters black on white, " --"Classic will colorize the same color for each finger, Deep Blue " --"will display the keyboard in different deep blue colors and Stripy " --"will alternate blue and gray for letters corresponding to same finger." -+"You can choose here the color scheme for displaying the keyboard. Black & " -+"White will display all keyboard letters black on white, Classic " -+"will colorize the same color for each finger, Deep Blue will display " -+"the keyboard in different deep blue colors and Stripy will alternate " -+"blue and gray for letters corresponding to same finger." - msgstr "" --"您可以在此選擇顯示鍵盤的顏色機制。黑與白表示所有的鍵盤字母都是白底黑字。傳統會在用到同一根指頭的範圍內用同樣的顏色。" --"深藍會顯示深藍色，而條紋狀則用藍色與灰色交替顯示同一根指頭的範圍。" -+"您可以在此選擇顯示鍵盤的顏色機制。黑與白表示所有的鍵盤字母都是白底黑" -+"字。傳統會在用到同一根指頭的範圍內用同樣的顏色。深藍會顯示深藍" -+"色，而條紋狀則用藍色與灰色交替顯示同一根指頭的範圍。" - - #. i18n: file ktouchprefcolorslayout.ui line 107 - #: rc.cpp:255 -@@ -857,7 +859,7 @@ - msgid "" - "You can change here the background color for the teacher's line (the line of " - "letters you have to type.)" --msgstr "您可以在此改變教師行（也就是您要照著打字的那一行）的背景顏色" -+msgstr "您可以在此改變教師行（也就是您要照著打字的那一列）的背景顏色" - - #. i18n: file ktouchprefcolorslayout.ui line 154 - #: rc.cpp:267 -@@ -881,7 +883,7 @@ - #: rc.cpp:276 - #, no-c-format - msgid "Here you can change the color of the text you type in the student line." --msgstr "您可以在此改變學生行（也就是您打字的那一行）的文字顏色" -+msgstr "您可以在此改變學生行（也就是您打字的那一列）的文字顏色" - - #. i18n: file ktouchprefcolorslayout.ui line 241 - #: rc.cpp:279 rc.cpp:291 rc.cpp:309 -@@ -925,10 +927,12 @@ - #, no-c-format - msgid "" - "When you have checked 'Use different color on error in the typing line', you " --"can then choose a color for the text of errors. You make an error when you type " --"a wrong letter in the student line. This is a way to make your errors more " --"visible." --msgstr "若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的文字顏色。這會讓您知道您打錯字了。" -+"can then choose a color for the text of errors. You make an error when you " -+"type a wrong letter in the student line. This is a way to make your errors " -+"more visible." -+msgstr "" -+"若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的文字顏色。" -+"這會讓您知道您打錯字了。" - - #. i18n: file ktouchprefcolorslayout.ui line 466 - #: rc.cpp:312 -@@ -942,9 +946,11 @@ - msgid "" - "When you have checked 'Use different color on error in the typing line', you " - "can then choose a color for the background of errors. You make an error when " --"you type a wrong letter in the student line. This is a way to make your errors " --"more visible." --msgstr "若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的背景顏色。這會讓您知道您打錯字了。" -+"you type a wrong letter in the student line. This is a way to make your " -+"errors more visible." -+msgstr "" -+"若您勾選了「打字行中出現錯誤時用不同的顏色」，您可以選擇打錯字時的背景顏色。" -+"這會讓您知道您打錯字了。" - - #. i18n: file ktouchprefgenerallayout.ui line 36 - #: rc.cpp:321 -@@ -987,8 +993,8 @@ - #: rc.cpp:339 - #, no-c-format - msgid "" --"If this is checked (default) a sound will be played each time you automatically " --"change of level." -+"If this is checked (default) a sound will be played each time you " -+"automatically change of level." - msgstr "勾選此選項的話，在自動變更等級時會播放音效（預設是勾選）。" - - #. i18n: file ktouchprefgenerallayout.ui line 77 -@@ -1044,10 +1050,12 @@ - #, no-c-format - msgid "" - "This button will display a font dialog where you can change the font for the " --"student and the teacher lines. When you leave the font dialog, the new font is " --"previewed in the line below and only applied when you click the Apply button " --"below." --msgstr "這個按鍵會顯示字型對話框，讓您變更學生行與教師行的字型。要套用新的字型請按「套用」鍵。" -+"student and the teacher lines. When you leave the font dialog, the new font " -+"is previewed in the line below and only applied when you click the Apply " -+"button below." -+msgstr "" -+"這個按鍵會顯示字型對話框，讓您變更學生行與教師行的字型。要套用新的字型請按" -+"「套用」鍵。" - - #. i18n: file ktouchprefgenerallayout.ui line 303 - #: rc.cpp:369 -@@ -1059,8 +1067,8 @@ - #: rc.cpp:372 - #, no-c-format - msgid "" --"If you want to override the font of the training lecture check this box and set " --"your own font." -+"If you want to override the font of the training lecture check this box and " -+"set your own font." - msgstr "如果您要覆寫訓練課程的字型，請勾選此項並設定您自己的字型。" - - #. i18n: file ktouchprefgenerallayout.ui line 309 -@@ -1072,7 +1080,8 @@ - "sliding line. If you check this button you can choose your own font and " - "override the lecture font." - msgstr "" --"大部份的課程會有一個建議使用的字型。這對不是很常用的語言來說是有必要的，因為若用錯字型可能字元的顯示或有問題。如果勾選此選項您可以選用自己的字型。" -+"大部份的課程會有一個建議使用的字型。這對不是很常用的語言來說是有必要的，因為" -+"若用錯字型可能字元的顯示或有問題。如果勾選此選項您可以選用自己的字型。" - - #. i18n: file ktouchprefkeyboardlayout.ui line 41 - #: rc.cpp:381 -@@ -1090,8 +1099,8 @@ - #: rc.cpp:387 - #, no-c-format - msgid "" --"This highlights on the keyboard the key you have to type next. It is easier to " --"type when this is checked." -+"This highlights on the keyboard the key you have to type next. It is easier " -+"to type when this is checked." - msgstr "在鍵盤上標示您應該按的按鍵。" - - #. i18n: file ktouchprefkeyboardlayout.ui line 55 -@@ -1110,8 +1119,8 @@ - #: rc.cpp:396 - #, no-c-format - msgid "" --"If checked you can specify your own keyboard font instead of the predefined one " --"of the keyboard layout." -+"If checked you can specify your own keyboard font instead of the predefined " -+"one of the keyboard layout." - msgstr "勾選此選項的話，您可以指定您自己的鍵盤字型。" - - #. i18n: file ktouchprefkeyboardlayout.ui line 94 -@@ -1119,10 +1128,12 @@ - #, no-c-format - msgid "" - "Every keyboard layout may specify its own font. If the predefined font of a " --"certain keyboard layout does not work or you would like to have your own, check " --"this button. You may then choose your own font that will be used to draw the " --"characters on the keys." --msgstr "每個鍵盤佈局會指定自己的字型。如果鍵盤佈局定義的字型不能用，或是您想要用自己的字型，就勾選此選項並選取自己想要的字型。" -+"certain keyboard layout does not work or you would like to have your own, " -+"check this button. You may then choose your own font that will be used to " -+"draw the characters on the keys." -+msgstr "" -+"每個鍵盤布局會指定自己的字型。如果鍵盤布局定義的字型不能用，或是您想要用自己" -+"的字型，就勾選此選項並選取自己想要的字型。" - - #. i18n: file ktouchprefkeyboardlayout.ui line 102 - #: rc.cpp:402 -@@ -1298,10 +1309,13 @@ - #: rc.cpp:501 - #, no-c-format - msgid "" --"Here the characters are listed that you have missed during the typing test. The " --"percentage shows the ratio of how often a key was missed versus how often the " --"key was pressed in total. Large numbers indicate that the key was missed a lot." --msgstr "您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比例。數值越大表示這個鍵越容易被打錯。" -+"Here the characters are listed that you have missed during the typing test. " -+"The percentage shows the ratio of how often a key was missed versus how " -+"often the key was pressed in total. Large numbers indicate that the key was " -+"missed a lot." -+msgstr "" -+"您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比" -+"例。數值越大表示這個鍵越容易被打錯。" - - #. i18n: file ktouchstatistics_dlg.ui line 295 - #: rc.cpp:504 rc.cpp:588 -@@ -1423,11 +1437,13 @@ - #: rc.cpp:585 - #, no-c-format - msgid "" --"Here the characters are listed that you have missed during the typing test. The " --"percentage shows the ratio of how often a key was missed versus how often the " --"key was pressed correctly. Large numbers indicate that the key was missed a " --"lot." --msgstr "您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比例。數值越大表示這個鍵越容易被打錯。" -+"Here the characters are listed that you have missed during the typing test. " -+"The percentage shows the ratio of how often a key was missed versus how " -+"often the key was pressed correctly. Large numbers indicate that the key was " -+"missed a lot." -+msgstr "" -+"您在打字測驗時打錯的字元列在下面。百分比顯示這個鍵被打錯的次數與總共次數的比" -+"例。數值越大表示這個鍵越容易被打錯。" - - #. i18n: file ktouchstatistics_dlg.ui line 921 - #: rc.cpp:624 -@@ -1511,8 +1527,8 @@ - #: rc.cpp:675 - #, no-c-format - msgid "" --"Pressing this button will erase the whole training statistics for the current " --"user." -+"Pressing this button will erase the whole training statistics for the " -+"current user." - msgstr "按下此鍵會清除目前使用者的整個訓練統計。" - - #. i18n: file ktouchstatuslayout.ui line 32 -@@ -1561,8 +1577,8 @@ - #: rc.cpp:702 - #, no-c-format - msgid "" --"This shows how fast you are typing. It measures the typing speed in characters " --"per minute." -+"This shows how fast you are typing. It measures the typing speed in " -+"characters per minute." - msgstr "顯示您打字有多快。它是以每分鐘的字元數為單位。" - - #. i18n: file ktouchstatuslayout.ui line 248 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kturtle.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kturtle.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kturtle.po 2007-07-12 10:27:46.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kturtle.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kturtle\n" - "POT-Creation-Date: 2007-06-18 01:16+0200\n" - "PO-Revision-Date: 2007-01-09 12:44+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -52,9 +51,11 @@ - - #: dialogs.cpp:37 - msgid "" --"Click here for help regarding the error you selected in the list. This button " --"will not work when no error is selected." --msgstr "點選此數，您可以閱讀在清單中選取的錯誤的說明。這個按鍵在沒有選擇錯誤時不會有作用。" -+"Click here for help regarding the error you selected in the list. This " -+"button will not work when no error is selected." -+msgstr "" -+"點選此數，您可以閱讀在清單中選取的錯誤的說明。這個按鍵在沒有選擇錯誤時不會有" -+"作用。" - - #: dialogs.cpp:38 - msgid "Click here for help regarding the error you selected." -@@ -62,7 +63,8 @@ - - #: dialogs.cpp:45 - msgid "" --"In this list you find the error(s) that resulted from running your Logo code. \n" -+"In this list you find the error(s) that resulted from running your Logo " -+"code. \n" - "Good luck!" - msgstr "" - "在此清單中您可以找到您的 Logo 程式碼中的錯誤。\n" -@@ -214,11 +216,11 @@ - - #: kturtle.cpp:127 - msgid "Open Exa&mples..." --msgstr "開啟範例(&M)..." -+msgstr "開啟範例(&M)…" - - #: kturtle.cpp:132 - msgid "Save &Canvas..." --msgstr "儲存畫布(&C)..." -+msgstr "儲存畫布(&C)…" - - #: kturtle.cpp:133 - msgid "Execution Speed" -@@ -258,7 +260,7 @@ - - #: kturtle.cpp:161 - msgid "Show &Line Numbers" --msgstr "顯示行號(&L)" -+msgstr "顯示列號(&L)" - - #: kturtle.cpp:166 - msgid "&Color Picker" -@@ -286,19 +288,20 @@ - - #: kturtle.cpp:175 - msgid "&Configure Editor..." --msgstr "編輯器設定(&C)..." -+msgstr "編輯器設定(&C)…" - - #: kturtle.cpp:194 - msgid "" - "This is the code editor, here you type the Logo commands to instruct the " --"turtle. You can also open an existing Logo program with File->" --"Open Examples... or File->Open." -+"turtle. You can also open an existing Logo program with File->Open " -+"Examples... or File->Open." - msgstr "" --"這裡是程式碼編輯器，您可以在此輸入 Logo 的命令，指揮小烏龜行度。您也可以用「檔案＞開啟範例」或「檔案＞開啟」來開啟現有的 Logo 程式碼。" -+"這裡是程式碼編輯器，您可以在此輸入 Logo 的命令，指揮小烏龜行度。您也可以用" -+"「檔案＞開啟範例」或「檔案＞開啟」來開啟現有的 Logo 程式碼。" - - #: kturtle.cpp:223 - msgid "Welcome to KTurtle..." --msgstr "歡迎來到 KTurtle..." -+msgstr "歡迎來到 KTurtle…" - - #: kturtle.cpp:224 - msgid "Line: %1 Column: %2" -@@ -314,7 +317,7 @@ - - #: kturtle.cpp:259 - msgid " Line: %1 Column: %2 " --msgstr " 行：%1，位置：%2" -+msgstr " 列：%1，位置：%2" - - #: kturtle.cpp:275 kturtle.cpp:318 - msgid "" -@@ -332,7 +335,7 @@ - - #: kturtle.cpp:285 - msgid "New file... Happy coding!" --msgstr "新增檔案...祝愉快！" -+msgstr "新增檔案…祝愉快！" - - #: kturtle.cpp:295 kturtle.cpp:360 - msgid "Logo Files" -@@ -384,8 +387,8 @@ - - #: kturtle.cpp:369 - msgid "" --"A program named \"%1\" already exists in this folder. Do you want to overwrite " --"it?" -+"A program named \"%1\" already exists in this folder. Do you want to " -+"overwrite it?" - msgstr "程式 %1 已存在。您要覆寫它嗎？" - - #: kturtle.cpp:371 kturtle.cpp:409 -@@ -456,12 +459,12 @@ - - #: kturtle.cpp:471 - msgid "Quitting KTurtle..." --msgstr "離開 KTurtle..." -+msgstr "離開 KTurtle…" - - #: kturtle.cpp:474 - msgid "" --"The program you are currently working on is not saved. By quitting KTurtle you " --"may lose the changes you have made." -+"The program you are currently working on is not saved. By quitting KTurtle " -+"you may lose the changes you have made." - msgstr "目前的程式尚未儲存。離開 KTurtle 的話您可能會失去先前做的變更。" - - #: kturtle.cpp:476 -@@ -474,11 +477,11 @@ - - #: kturtle.cpp:521 - msgid "Parsing commands..." --msgstr "剖析命令中..." -+msgstr "剖析命令中…" - - #: kturtle.cpp:540 kturtle.cpp:602 - msgid "Executing commands..." --msgstr "執行命令中..." -+msgstr "執行命令中…" - - #: kturtle.cpp:583 - msgid "Done." -@@ -626,7 +629,8 @@ - - #: main.cpp:56 - msgid "" --"Author of \"wsbasic\" (wsbasic.sf.net) the base for the interpreter of KTurtle" -+"Author of \"wsbasic\" (wsbasic.sf.net) the base for the interpreter of " -+"KTurtle" - msgstr "wsbasic （wsbasic.sf.net）的作者，KTrutle 直譯器的基礎" - - #: main.cpp:59 main.cpp:62 -@@ -671,9 +675,9 @@ - - #: parser.cpp:97 - msgid "" --"Unexpected intruction after the '%1' command, please use only one instruction " --"per line" --msgstr "非預期的指令，在 %1 之後。一行內請只使用一個指令。" -+"Unexpected intruction after the '%1' command, please use only one " -+"instruction per line" -+msgstr "非預期的指令，在 %1 之後。一列內請只使用一個指令。" - - #: parser.cpp:101 - msgid "Expected '['" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kverbos.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kverbos.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kverbos.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kverbos.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kverbos\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-10-31 13:05+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -28,8 +27,8 @@ - "_: NAME OF TRANSLATORS\n" - "Your names" - msgstr "" --"簡體中文：Liu Songhe\n" --"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+"簡化字漢語：Liu Songhe\n" -+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" -@@ -82,19 +81,19 @@ - - #: kverbos.cpp:132 - msgid "E&nter New Verb..." --msgstr "輸入新動詞(&N)..." -+msgstr "輸入新動詞(&N)…" - - #: kverbos.cpp:133 - msgid "&Edit Verb List..." --msgstr "編輯動詞列表(&E)..." -+msgstr "編輯動詞列表(&E)…" - - #: kverbos.cpp:135 - msgid "&Configure KVerbos..." --msgstr "設定 KVerbos(&C)..." -+msgstr "設定 KVerbos(&C)…" - - #: kverbos.cpp:136 - msgid "&Username..." --msgstr "使用者名稱(&U)..." -+msgstr "使用者名稱(&U)…" - - #: kverbos.cpp:137 - msgid "&Results" -@@ -126,7 +125,7 @@ - - #: kverbos.cpp:145 - msgid "Saves the actual document as..." --msgstr "把實際文件另存為..." -+msgstr "把實際文件另存為…" - - #: kverbos.cpp:146 - msgid "Closes the actual document" -@@ -197,15 +196,15 @@ - - #: kverbos.cpp:207 kverbos.cpp:379 kverbos.cpp:404 kverbos.cpp:422 - msgid "Opening file..." --msgstr "正在開啟檔案..." -+msgstr "正在開啟檔案…" - - #: kverbos.cpp:351 - msgid "Opening a new application window..." --msgstr "正在開啟一個新的應用程式視窗..." -+msgstr "正在開啟一個新的應用程式視窗…" - - #: kverbos.cpp:361 - msgid "Creating new document..." --msgstr "正在建立新文件..." -+msgstr "正在建立新文件…" - - #: kverbos.cpp:389 kverbos.cpp:464 - msgid "*|All Files" -@@ -217,35 +216,35 @@ - - #: kverbos.cpp:446 - msgid "Saving file..." --msgstr "正在儲存檔案..." -+msgstr "正在儲存檔案…" - - #: kverbos.cpp:461 - msgid "Saving file with a new filename..." --msgstr "正在用新檔名儲存..." -+msgstr "正在用新檔名儲存…" - - #: kverbos.cpp:477 - msgid "Closing file..." --msgstr "正在關閉檔案..." -+msgstr "正在關閉檔案…" - - #: kverbos.cpp:486 - msgid "Printing..." --msgstr "正在列印..." -+msgstr "正在列印…" - - #: kverbos.cpp:499 - msgid "Exiting..." --msgstr "正在退出..." -+msgstr "正在退出…" - - #: kverbos.cpp:520 - msgid "Cutting selection..." --msgstr "正在剪下選取區..." -+msgstr "正在剪下選取區…" - - #: kverbos.cpp:527 - msgid "Copying selection to clipboard..." --msgstr "正在把選取區複製到剪貼簿..." -+msgstr "正在把選取區複製到剪貼簿…" - - #: kverbos.cpp:534 - msgid "Inserting clipboard contents..." --msgstr "正在插入剪貼簿內容..." -+msgstr "正在插入剪貼簿內容…" - - #: kverbos.cpp:552 - msgid "Number of verbs: " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kvoctrain.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kvoctrain.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kvoctrain.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kvoctrain.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,7 +10,7 @@ - "Project-Id-Version: kvoctrain\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2007-11-09 14:35+0800\n" --"Last-Translator: Chih-Wei Huang \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -122,16 +122,12 @@ - msgstr "12 個月" - - #: common-dialogs/blockoptions.cpp:252 --msgid "" --"Illogical blocking times.\n" --msgstr "" --"無意義的封存時間。\n" -+msgid "Illogical blocking times.\n" -+msgstr "無意義的封存時間。\n" - - #: common-dialogs/blockoptions.cpp:254 common-dialogs/blockoptions.cpp:273 --msgid "" --"The time for level %1 should be lower than the time for level %2.\n" --msgstr "" --"等級 %1 的時間不能低於等級 %2 的時間。\n" -+msgid "The time for level %1 should be lower than the time for level %2.\n" -+msgstr "等級 %1 的時間不能低於等級 %2 的時間。\n" - - #: common-dialogs/blockoptions.cpp:271 - msgid "" -@@ -152,8 +148,7 @@ - #: common-dialogs/blockoptions.cpp:293 - msgid "" - "The blocking time at level %1 should be lower than the expiration time.\n" --msgstr "" --"等級 %1 的封存時間不能低於過期時間。\n" -+msgstr "等級 %1 的封存時間不能低於過期時間。\n" - - #: common-dialogs/blockoptions.cpp:299 - msgid "Illogical Values" -@@ -223,7 +218,7 @@ - - #: common-dialogs/kvoctrainprefs.cpp:91 - msgid "&Profiles..." --msgstr "設定檔(&P)..." -+msgstr "設定檔(&P)…" - - #: common-dialogs/kvoctrainprefs.cpp:92 - msgid "Save or load specific Query settings which consist in a profile" -@@ -232,11 +227,12 @@ - #: common-dialogs/kvoctrainprefs.cpp:93 - msgid "" - "A Profile is a set of settings (settings related to queries) which you can " --"save/load in order to use again later. This button allows you to see existing " --"profiles, to load a new profile and to save your current settings in a new " --"profile." -+"save/load in order to use again later. This button allows you to see " -+"existing profiles, to load a new profile and to save your current settings " -+"in a new profile." - msgstr "" --"設定檔是將查詢相關的設定集合起來存放，您可以儲存或在需要使用時載入。這個按鈕讓您可以檢視現有的設定檔，載入設定檔或將現有的設定儲存在新的設定檔中。" -+"設定檔是將查詢相關的設定集合起來存放，您可以儲存或在需要使用時載入。這個按鈕" -+"讓您可以檢視現有的設定檔，載入設定檔或將現有的設定儲存在新的設定檔中。" - - #: common-dialogs/kvoctrainprefs.cpp:140 - msgid "Unapplied Changes" -@@ -922,7 +918,7 @@ - - #: common-dialogs/languageoptions.cpp:732 - msgid "No Picture Selected..." --msgstr "沒有選取圖片..." -+msgstr "沒有選取圖片…" - - #: common-dialogs/languageoptions.cpp:763 - msgid "No picture selected" -@@ -933,10 +929,8 @@ - msgstr "無效的圖片" - - #: common-dialogs/languageoptions.cpp:995 --msgid "" --"File does not contain a valid graphics format\n" --msgstr "" --"檔案中未含有有效的圖形格式\n" -+msgid "File does not contain a valid graphics format\n" -+msgstr "檔案中未含有有效的圖形格式\n" - - #: common-dialogs/languageoptions.cpp:1037 - #: common-dialogs/languageoptions.cpp:1050 -@@ -1247,11 +1241,11 @@ - - #: kva_clip.cpp:115 - msgid "Copying selection to clipboard..." --msgstr "正在把選取區域複製到剪貼簿..." -+msgstr "正在把選取區域複製到剪貼簿…" - - #: kva_clip.cpp:166 - msgid "Inserting clipboard contents..." --msgstr "正在插入剪貼簿內容..." -+msgstr "正在插入剪貼簿內容…" - - #: kva_header.cpp:42 - msgid "&Sort alphabetically" -@@ -1466,7 +1460,7 @@ - - #: kva_init.cpp:109 - msgid "Open &Example..." --msgstr "開啟範例(&E)..." -+msgstr "開啟範例(&E)…" - - #: kva_init.cpp:110 - msgid "Open a vocabulary document" -@@ -1474,7 +1468,7 @@ - - #: kva_init.cpp:113 - msgid "&Get New Vocabularies..." --msgstr "取得新字彙(&G)..." -+msgstr "取得新字彙(&G)…" - - #: kva_init.cpp:114 - msgid "Downloads new vocabularies" -@@ -1482,7 +1476,7 @@ - - #: kva_init.cpp:119 - msgid "&Merge..." --msgstr "合併(&M)..." -+msgstr "合併(&M)…" - - #: kva_init.cpp:120 - msgid "Merge an existing vocabulary document with the current one" -@@ -1526,7 +1520,7 @@ - - #: kva_init.cpp:163 - msgid "&Edit Selected Area..." --msgstr "編輯選取區域(&E)..." -+msgstr "編輯選取區域(&E)…" - - #: kva_init.cpp:164 - msgid "Edit the entries in the selected rows" -@@ -1534,7 +1528,7 @@ - - #: kva_init.cpp:167 - msgid "&Remove Selected Area" --msgstr "刪除選取區域(&R)..." -+msgstr "刪除選取區域(&R)…" - - #: kva_init.cpp:168 - msgid "Delete the selected rows" -@@ -1542,7 +1536,7 @@ - - #: kva_init.cpp:171 - msgid "Save E&ntries in Query As..." --msgstr "另存問答中的項目為(&N)..." -+msgstr "另存問答中的項目為(&N)…" - - #: kva_init.cpp:172 - msgid "Save the entries in the query as a new vocabulary" -@@ -1558,7 +1552,7 @@ - - #: kva_init.cpp:179 - msgid "Assign L&essons..." --msgstr "安排課程(&E)..." -+msgstr "安排課程(&E)…" - - #: kva_init.cpp:180 - msgid "Create random lessons with unassigned entries" -@@ -1623,52 +1617,36 @@ - msgstr "切換顯示工具列" - - #: kva_io.cpp:45 --msgid "" --"*|All Files (*)\n" --msgstr "" --"*|所有檔案 (*)\n" -+msgid "*|All Files (*)\n" -+msgstr "*|所有檔案 (*)\n" - - #: kva_io.cpp:46 --msgid "" --"*.kvtml|KVocTrain Markup (*.kvtml)\n" --msgstr "" --"*.kvtml|KVocTrain Markup (*.kvtml)\n" -+msgid "*.kvtml|KVocTrain Markup (*.kvtml)\n" -+msgstr "*.kvtml|KVocTrain Markup (*.kvtml)\n" - - #: kva_io.cpp:47 --msgid "" --"*.lex|Vocabulary Trainer 5.0 (*.lex)\n" --msgstr "" --"*.lex|Vocabulary Trainer 5.0 (*.lex)\n" -+msgid "*.lex|Vocabulary Trainer 5.0 (*.lex)\n" -+msgstr "*.lex|Vocabulary Trainer 5.0 (*.lex)\n" - - #: kva_io.cpp:48 --msgid "" --"*.vl|KVoclearn (*.vl)\n" --msgstr "" --"*.vl|KVoclearn (*.vl)\n" -+msgid "*.vl|KVoclearn (*.vl)\n" -+msgstr "*.vl|KVoclearn (*.vl)\n" - - #: kva_io.cpp:49 --msgid "" --"*.qvo|QVocab (*.qvo)\n" --msgstr "" --"*.qvo|QVocab (*.qvo)\n" -+msgid "*.qvo|QVocab (*.qvo)\n" -+msgstr "*.qvo|QVocab (*.qvo)\n" - - #: kva_io.cpp:50 --msgid "" --"*.voc|Vokabeltrainer (*.voc)\n" --msgstr "" --"*.voc|Vokabeltrainer (*.voc)\n" -+msgid "*.voc|Vokabeltrainer (*.voc)\n" -+msgstr "*.voc|Vokabeltrainer (*.voc)\n" - - #: kva_io.cpp:51 --msgid "" --"*.csv|Text (*.csv)\n" --msgstr "" --"*.csv|文字檔 (*.csv)\n" -+msgid "*.csv|Text (*.csv)\n" -+msgstr "*.csv|文字檔 (*.csv)\n" - - #: kva_io.cpp:52 --msgid "" --"*.vocab|Vocabbox (*.vocab)\n" --msgstr "" --"*.vocab|Vocabbox (*.vocab)\n" -+msgid "*.vocab|Vocabbox (*.vocab)\n" -+msgstr "*.vocab|Vocabbox (*.vocab)\n" - - #: kva_io.cpp:64 - msgid "Autobackup in progress" -@@ -1686,11 +1664,11 @@ - - #: kva_io.cpp:145 kva_io.cpp:181 - msgid "Opening file..." --msgstr "正在開啟檔案..." -+msgstr "正在開啟檔案…" - - #: kva_io.cpp:157 - msgid "Creating new file..." --msgstr "正在建立新檔案..." -+msgstr "正在建立新檔案…" - - #: kva_io.cpp:185 - msgid "Open Vocabulary File" -@@ -1703,7 +1681,7 @@ - - #: kva_io.cpp:220 - msgid "Opening example file..." --msgstr "正在開啟範例檔案..." -+msgstr "正在開啟範例檔案…" - - #: kva_io.cpp:225 - msgid "Open Example Vocabulary File" -@@ -1711,7 +1689,7 @@ - - #: kva_io.cpp:244 - msgid "Merging file..." --msgstr "正在合併檔案..." -+msgstr "正在合併檔案…" - - #: kva_io.cpp:247 - msgid "Merge Vocabulary File" -@@ -1729,7 +1707,7 @@ - - #: kva_io.cpp:590 - msgid "Saving file under new filename..." --msgstr "正在用新名字儲存檔案..." -+msgstr "正在用新名字儲存檔案…" - - #: kva_io.cpp:595 kva_io.cpp:647 - msgid "Save Vocabulary As" -@@ -1737,9 +1715,8 @@ - - #: kva_io.cpp:600 kva_io.cpp:653 - msgid "" --"The file" --"
                                %1" --"
                                already exists. Do you want to overwrite it?                                " -+"The file
                                %1
                                already exists. Do you want to overwrite it?" - msgstr "檔案
                                %1
                                已存在。您要覆寫它嗎？                                " - - #: kva_io.cpp:601 kva_io.cpp:654 kvtnewstuff.cpp:79 -@@ -1748,7 +1725,7 @@ - - #: kva_io.cpp:631 - msgid "Saving selected area under new filename..." --msgstr "將選取的區域用新檔案名儲存..." -+msgstr "將選取的區域用新檔案名儲存…" - - #: kva_io.cpp:670 - msgid "Part of: " -@@ -1779,7 +1756,7 @@ - - #: kva_query.cpp:126 - msgid "Starting property query..." --msgstr "正在開始特性問答..." -+msgstr "正在開始特性問答…" - - #: kva_query.cpp:161 kva_query.cpp:332 kva_query.cpp:609 - msgid "Starting Query" -@@ -1791,11 +1768,11 @@ - - #: kva_query.cpp:298 - msgid "Starting special query..." --msgstr "正在開始特殊問答..." -+msgstr "正在開始特殊問答…" - - #: kva_query.cpp:564 - msgid "Starting random query..." --msgstr "正在開始隨機問答..." -+msgstr "正在開始隨機問答…" - - #: kvoctrain.cpp:98 - #, c-format -@@ -1844,33 +1821,29 @@ - - #: kvoctrain.cpp:618 - msgid "Updating lesson indices..." --msgstr "正在更新課程索引..." -+msgstr "正在更新課程索引…" - - #: kvoctrain.cpp:631 - msgid "Updating type indices..." --msgstr "正在更新詞性索引..." -+msgstr "正在更新詞性索引…" - - #: kvoctrain.cpp:635 - msgid "Updating tense indices..." --msgstr "正在更新時態索引..." -+msgstr "正在更新時態索引…" - - #: kvoctrain.cpp:640 - msgid "" - "_: usage (area) of an expression\n" - "Updating usage label indices..." --msgstr "正在更新用法索引..." -+msgstr "正在更新用法索引…" - - #: kvoctrain.cpp:703 --msgid "" --"Do you really want to delete the selected entry?\n" --msgstr "" --"您真的要刪除所選取的項目嗎？\n" -+msgid "Do you really want to delete the selected entry?\n" -+msgstr "您真的要刪除所選取的項目嗎？\n" - - #: kvoctrain.cpp:714 --msgid "" --"Do you really want to delete the selected range?\n" --msgstr "" --"您真的要刪除所選取的範圍嗎？\n" -+msgid "Do you really want to delete the selected range?\n" -+msgstr "您真的要刪除所選取的範圍嗎？\n" - - #: kvoctrain.cpp:894 - #, c-format -@@ -1893,15 +1866,16 @@ - - #: kvoctrain.cpp:913 - msgid "Creating random lessons..." --msgstr "正在建立隨機課程..." -+msgstr "正在建立隨機課程…" - - #: kvoctrain.cpp:1002 - msgid "" --"To append a new language which is not listed in the submenu, you must first add " --"its data in the general options dialog.\n" -+"To append a new language which is not listed in the submenu, you must first " -+"add its data in the general options dialog.\n" - "Should this dialog be invoked now?" - msgstr "" --"要新增在子選單中未列出的新語言，您必須先在一般選項對話框中新增該語言的資料。\n" -+"要新增在子選單中未列出的新語言，您必須先在一般選項對話框中新增該語言的資" -+"料。\n" - "現在要叫出這個對話框嗎？" - - #: kvoctrain.cpp:1008 -@@ -1914,7 +1888,7 @@ - - #: kvoctrain.cpp:1050 - msgid "Searching expression..." --msgstr "正在搜尋詞語..." -+msgstr "正在搜尋詞語…" - - #: kvoctrain.cpp:1200 - msgid "Resume &Query" -@@ -1926,7 +1900,7 @@ - - #: kvoctrain.cpp:1232 - msgid "Another Language..." --msgstr "另一語言..." -+msgstr "另一語言…" - - #: kvoctrain.cpp:1270 - msgid "&Original" -@@ -1942,7 +1916,7 @@ - - #: kvoctrain.cpp:1324 - msgid "Printing..." --msgstr "列印中..." -+msgstr "列印中…" - - #: kvoctrain.cpp:1332 - msgid "Ready" -@@ -2626,7 +2600,7 @@ - "Line:\t%2\n" - msgstr "" - "檔案：\t%1\n" --"行號：\t%2\n" -+"列號：\t%2\n" - - #: kvt-core/kvd_rb_kvtml1.cpp:830 - msgid "" -@@ -2646,12 +2620,13 @@ - - #: kvt-core/kvd_rb_kvtml1.cpp:854 - msgid "" --"Your document contains an unknown tag <%1>. Maybe your version of KVocTrain is " --"too old, or the document is damaged.\n" -+"Your document contains an unknown tag <%1>. Maybe your version of KVocTrain " -+"is too old, or the document is damaged.\n" - "Loading is aborted because KVocTrain cannot read documents with unknown " - "elements.\n" - msgstr "" --"您的文件中含有未知的標記 <%1>。可能您的 KVocTrain 版本太舊，或者該文件已損壞。\n" -+"您的文件中含有未知的標記 <%1>。可能您的 KVocTrain 版本太舊，或者該文件已損" -+"壞。\n" - "載入已中止，因為 KVocTrain 無法讀取有未知元素的文件。\n" - - #: kvt-core/kvd_rb_kvtml1.cpp:862 -@@ -2905,7 +2880,7 @@ - - #: query-dialogs/QueryDlgBase.cpp:38 - msgid "&Edit Expression..." --msgstr "編輯詞語(&E)..." -+msgstr "編輯詞語(&E)…" - - #: query-dialogs/QueryDlgBase.cpp:308 - msgid "Well done, you knew the correct answer. %1% done." -@@ -3075,13 +3050,13 @@ - #: rc.cpp:18 rc.cpp:114 rc.cpp:141 rc.cpp:159 - #, no-c-format - msgid "&New..." --msgstr "新增(&N)..." -+msgstr "新增(&N)…" - - #. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91 - #: rc.cpp:21 rc.cpp:117 rc.cpp:144 rc.cpp:162 - #, no-c-format - msgid "&Modify..." --msgstr "修改(&M)..." -+msgstr "修改(&M)…" - - #. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33 - #: rc.cpp:33 -@@ -3507,8 +3482,8 @@ - #: rc.cpp:294 rc.cpp:297 - #, no-c-format - msgid "" --"If it is unchecked, you will just have black on white for the grades; if it is " --"checked, the colors below will be chosen." -+"If it is unchecked, you will just have black on white for the grades; if it " -+"is checked, the colors below will be chosen." - msgstr "如果沒勾選，等級只會以黑白顯示。勾選的話，您可以選擇顏色。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 30 -@@ -3529,7 +3504,8 @@ - msgid "" - "By checking this, you will use the Leitner method of learning which requires " - "you to answer correctly to each question 4 times in a row. " --msgstr "勾選此選項的話，將使用萊納（Leitner）學習法，會要求您每個問題連續答對四次。" -+msgstr "" -+"勾選此選項的話，將使用萊納（Leitner）學習法，會要求您每個問題連續答對四次。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 44 - #: rc.cpp:309 -@@ -3559,10 +3535,11 @@ - #: rc.cpp:321 - #, no-c-format - msgid "" --"When this options is enabled, you can enter part of an answer, then press F5 or " --"F6 to get a list of translations starting with or containing the text you " -+"When this options is enabled, you can enter part of an answer, then press F5 " -+"or F6 to get a list of translations starting with or containing the text you " - "typed." --msgstr "開啟此選項的話，您可以輸入答案的某一部份，然後按 F5 或 F6 來取得翻譯的列表。" -+msgstr "" -+"開啟此選項的話，您可以輸入答案的某一部份，然後按 F5 或 F6 來取得翻譯的列表。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 83 - #: rc.cpp:324 -@@ -3580,12 +3557,13 @@ - #: rc.cpp:330 - #, no-c-format - msgid "" --"When this options is enabled, the program will split translations into several " --"parts, show multiple answer fields, and you will need to answer each one of " --"them. This is useful for example when a word has several meanings that have " --"different translations in the other language." -+"When this options is enabled, the program will split translations into " -+"several parts, show multiple answer fields, and you will need to answer each " -+"one of them. This is useful for example when a word has several meanings " -+"that have different translations in the other language." - msgstr "" --"勾選此選項的話，程式會將翻譯分割成幾個部份，並顯示多個答案欄位，您必須每個都作答。這功能用在像是一個字有好幾種在其他語言中不同的意思的翻譯時。" -+"勾選此選項的話，程式會將翻譯分割成幾個部份，並顯示多個答案欄位，您必須每個都" -+"作答。這功能用在像是一個字有好幾種在其他語言中不同的意思的翻譯時。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 97 - #: rc.cpp:333 -@@ -3606,7 +3584,9 @@ - "Enter the maximum number of answer fields you want to have. When splitting " - "translations, the program will only split into this many parts, and the last " - "part will contain the rest of the translation." --msgstr "輸入您要回答的最大欄位數。分割翻譯時，程式最多只會分割成這麼多個部份，最後一部份會包含剩下的翻譯。" -+msgstr "" -+"輸入您要回答的最大欄位數。分割翻譯時，程式最多只會分割成這麼多個部份，最後一" -+"部份會包含剩下的翻譯。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 117 - #: rc.cpp:342 -@@ -3624,11 +3604,13 @@ - #: rc.cpp:348 - #, no-c-format - msgid "" --"If this is checked, the I Know button will be available. It allows you to tell " --"the query that you know the result without writing it or having it checked. " --"This is available by default. If you uncheck this, the I Know button will not " --"be available." --msgstr "勾選此選項的話，可以使用「我知道了」按鈕，讓您通知系統您已經知道這個問題的答案，而不必去做答。預設是使用。如果您取消勾選，則不能使用該按鈕。" -+"If this is checked, the I Know button will be available. It allows you to " -+"tell the query that you know the result without writing it or having it " -+"checked. This is available by default. If you uncheck this, the I Know " -+"button will not be available." -+msgstr "" -+"勾選此選項的話，可以使用「我知道了」按鈕，讓您通知系統您已經知道這個問題的答" -+"案，而不必去做答。預設是使用。如果您取消勾選，則不能使用該按鈕。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 139 - #: rc.cpp:351 -@@ -3672,8 +3654,8 @@ - #: rc.cpp:369 - #, no-c-format - msgid "" --"When this options is enabled, translations that have not been split at periods " --"or colons will be split at semicolons if they have any." -+"When this options is enabled, translations that have not been split at " -+"periods or colons will be split at semicolons if they have any." - msgstr "勾選此選項的話，翻譯會根據分號（;）分割。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 192 -@@ -3692,8 +3674,8 @@ - #: rc.cpp:378 - #, no-c-format - msgid "" --"When this options is enabled, translations that have not been split at periods, " --"colons or semicolons will be split at commas if they have any." -+"When this options is enabled, translations that have not been split at " -+"periods, colons or semicolons will be split at commas if they have any." - msgstr "勾選此選項的話，翻譯會根據逗號（,）分割。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 209 -@@ -3712,8 +3694,8 @@ - #: rc.cpp:387 - #, no-c-format - msgid "" --"When this options is enabled, translations that have not been split at periods " --"will be split at colons if they have any." -+"When this options is enabled, translations that have not been split at " -+"periods will be split at colons if they have any." - msgstr "勾選此選項的話，翻譯會根據冒號（:）分割。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 226 -@@ -3733,9 +3715,12 @@ - #, no-c-format - msgid "" - "When this is checked, you will be able to use a Show More button which allow " --"you to get the next letter in your answer in the query. If this is unchecked, " --"the Show More button will not be enabled, you will not be able to use it." --msgstr "勾選此選項的話，您可以在問答中使用「顯示更多」按鈕，讓您知道答案中的下一個字母。如果取消勾選的話，則不能使用此功能。" -+"you to get the next letter in your answer in the query. If this is " -+"unchecked, the Show More button will not be enabled, you will not be able to " -+"use it." -+msgstr "" -+"勾選此選項的話，您可以在問答中使用「顯示更多」按鈕，讓您知道答案中的下一個字" -+"母。如果取消勾選的話，則不能使用此功能。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 324 - #: rc.cpp:405 -@@ -3795,8 +3780,8 @@ - #: rc.cpp:432 - #, no-c-format - msgid "" --"Check this button if you want to activate a progress bar to show the remaining " --"time for each query." -+"Check this button if you want to activate a progress bar to show the " -+"remaining time for each query." - msgstr "勾選此選項的話，會在問答時顯示一進度列以提醒剩餘時間。" - - #. i18n: file ./common-dialogs/queryoptionsbase.ui line 460 -@@ -3809,8 +3794,8 @@ - #: rc.cpp:438 - #, no-c-format - msgid "" --"You may set a time limit KVocTrain grants you to remember the correct answer. " --"Set here the maximum time you want to allow per query." -+"You may set a time limit KVocTrain grants you to remember the correct " -+"answer. Set here the maximum time you want to allow per query." - msgstr "您可以在此設定 KVocTrain 中的時間限制。" - - #. i18n: file ./common-dialogs/groupoptionsbase.ui line 27 -@@ -3986,8 +3971,8 @@ - #: rc.cpp:561 rc.cpp:597 - #, no-c-format - msgid "" --"Each column can be assigned a language. This is internally done with the usual " --"international language codes." -+"Each column can be assigned a language. This is internally done with the " -+"usual international language codes." - msgstr "每個欄位可以指定一種語言。內部會使用常用的國際語言代碼。" - - #. i18n: file ./common-dialogs/languageoptionsbase.ui line 160 -@@ -4052,7 +4037,7 @@ - #: rc.cpp:591 - #, no-c-format - msgid "Keyboard layout:" --msgstr "鍵盤佈局：" -+msgstr "鍵盤布局：" - - #. i18n: file ./common-dialogs/languageoptionsbase.ui line 238 - #: rc.cpp:600 -@@ -4079,7 +4064,9 @@ - "Pressing this button opens a menu that contains all the countries that are " - "known in your KDE installation. Ordered by country you can add your desired " - "language properties to your personal list." --msgstr "按下此按鍵會開啟一個選單，包含所有在您 KDE 安裝中的國家。您可以新增您想要的語言。" -+msgstr "" -+"按下此按鍵會開啟一個選單，包含所有在您 KDE 安裝中的國家。您可以新增您想要的語" -+"言。" - - #. i18n: file ./common-dialogs/languageoptionsbase.ui line 269 - #: rc.cpp:612 -@@ -4097,8 +4084,8 @@ - #: rc.cpp:621 - #, no-c-format - msgid "" --"Pressing this button opens a menu that contains all the language codes that are " --"covered by \"ISO639-1\"" -+"Pressing this button opens a menu that contains all the language codes that " -+"are covered by \"ISO639-1\"" - msgstr "按下此按鍵會開啟一個選單，包含所有在 ISO639-1 中看到的語言代碼。" - - #. i18n: file ./common-dialogs/languageoptionsbase.ui line 286 -@@ -4196,8 +4183,8 @@ - #: rc.cpp:666 - #, no-c-format - msgid "" --"When checked, the items in the clipboard are assumed to be in the same language " --"order as the current document." -+"When checked, the items in the clipboard are assumed to be in the same " -+"language order as the current document." - msgstr "勾選此選項的話，在剪貼簿中的項目會被假設為與目前文件一樣的語言順序。" - - #. i18n: file ./common-dialogs/ProgressDlgForm.ui line 54 -@@ -4271,10 +4258,12 @@ - #, no-c-format - msgid "" - "If this feature is activated, you will repeatedly be prompted with the entry " --"dialog. After entering the first original you have to enter the corresponding " --"translations. Afterwards you proceed with the next original and its " --"translations until you stop by pressing the ESC key." --msgstr "勾選此選項的話，會重複跳出項目對話框。輸入第一個原文後，輸入相關的翻譯，然後不斷重複直到您按下 ESC 鍵為止。" -+"dialog. After entering the first original you have to enter the " -+"corresponding translations. Afterwards you proceed with the next original " -+"and its translations until you stop by pressing the ESC key." -+msgstr "" -+"勾選此選項的話，會重複跳出項目對話框。輸入第一個原文後，輸入相關的翻譯，然後" -+"不斷重複直到您按下 ESC 鍵為止。" - - #. i18n: file ./common-dialogs/generaloptionsbase.ui line 91 - #: rc.cpp:714 -@@ -4318,10 +4307,12 @@ - #: rc.cpp:732 - #, no-c-format - msgid "" --"KVocTrain makes each column the same width except the leftmost with the lesson " --"names, which is half the size of the others. The second column, which contains " --"the picture that describes the state of the row, has a fixed width." --msgstr "KVocTrain 會將每個欄位調成一樣大小，除了最左方的課程名稱為是其他欄位的一半，並且第二個欄位會固定寬度，用以表示該列的狀態。" -+"KVocTrain makes each column the same width except the leftmost with the " -+"lesson names, which is half the size of the others. The second column, which " -+"contains the picture that describes the state of the row, has a fixed width." -+msgstr "" -+"KVocTrain 會將每個欄位調成一樣大小，除了最左方的課程名稱為是其他欄位的一半，" -+"並且第二個欄位會固定寬度，用以表示該列的狀態。" - - #. i18n: file ./common-dialogs/generaloptionsbase.ui line 133 - #: rc.cpp:735 -@@ -4747,7 +4738,8 @@ - msgid "" - "_: NAME OF TRANSLATORS\n" - "Your names" --msgstr "簡體中文：KDE 簡體中文翻譯組 繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+msgstr "" -+"簡化字漢語：KDE 簡化字漢語翻譯組 傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kwordquiz.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/kwordquiz.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/kwordquiz.po 2008-08-19 20:43:13.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/kwordquiz.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kwordquiz\n" - "POT-Creation-Date: 2008-07-08 01:24+0200\n" - "PO-Revision-Date: 2006-10-14 16:28+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -124,16 +123,16 @@ - "_: NAME OF TRANSLATORS\n" - "Your names" - msgstr "" --"簡體中文：開源軟件國際化之 KDE 簡體中文組\n" --"繁體中文轉換與修改：Frank Weng (a.k.a. Franklin)" -+"簡化字漢語：開源軟件國際化之 KDE 簡化字漢語組\n" -+"傳統字漢語轉換與修改：Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"簡體中文：i18n-translation@lists.linux.net.cn\n" --"繁體中文轉換與修改：franklin at goodhorse dot idv dot tw" -+"簡化字漢語：i18n-translation@lists.linux.net.cn\n" -+"傳統字漢語轉換與修改：franklin at goodhorse dot idv dot tw" - - #: main.cpp:24 - msgid "A powerful flashcard and vocabulary learning program" -@@ -463,7 +462,8 @@ - #: rc.cpp:210 rc.cpp:219 - #, no-c-format - msgid "" --"The number of cards counted as correct (I know). May be shown as a percentage." -+"The number of cards counted as correct (I know). May be shown as a " -+"percentage." - msgstr "答對的卡片數。可以顯示為百分比。" - - #. i18n: file flashviewbase.ui line 398 -@@ -753,7 +753,7 @@ - msgid "" - "Note: Select Settings -> Configure Shortcuts... to change the shortcut " - "associated with each action." --msgstr "注意：選擇設定->設定捷徑... 可修改每個動作的捷徑。" -+msgstr "注意：選擇設定->設定捷徑… 可修改每個動作的捷徑。" - - #. i18n: file prefcharacterbase.ui line 62 - #: rc.cpp:546 -@@ -951,7 +951,7 @@ - #: rc.cpp:642 - #, no-c-format - msgid "C&haracter..." --msgstr "字元(&H)..." -+msgstr "字元(&H)…" - - #. i18n: file prefcharacterbase.ui line 342 - #: rc.cpp:645 -@@ -1108,8 +1108,8 @@ - #: rc.cpp:738 - #, no-c-format - msgid "" --"Select if questions where the hint function has been used should be counted as " --"errors" -+"Select if questions where the hint function has been used should be counted " -+"as errors" - msgstr "如果想要將使用過提示功能的問題計為錯誤，請選擇此項" - - #. i18n: file prefquizbase.ui line 96 -@@ -1208,8 +1208,8 @@ - #: rc.cpp:789 - #, no-c-format - msgid "" --"Select if the previous card should be counted as incorrect when moving to the " --"next card" -+"Select if the previous card should be counted as incorrect when moving to " -+"the next card" - msgstr "如果想要在自動翻到下一道題時將上一道題計為錯誤，請選擇此項。" - - #. i18n: file prefquizbase.ui line 257 -@@ -1228,8 +1228,8 @@ - #: rc.cpp:798 - #, no-c-format - msgid "" --"Select if you want a card to turn over automatically after the given amount of " --"time" -+"Select if you want a card to turn over automatically after the given amount " -+"of time" - msgstr "如果您想要在給定時間後自動翻過閃卡，請選擇此項。" - - #. i18n: file qaviewbase.ui line 619 -@@ -1422,7 +1422,7 @@ - - #: kwordquiz.cpp:118 - msgid "&Get New Vocabularies..." --msgstr "取得新字彙(&G)..." -+msgstr "取得新字彙(&G)…" - - #: kwordquiz.cpp:119 - msgid "Downloads new vocabularies" -@@ -1462,7 +1462,8 @@ - - #: kwordquiz.cpp:155 - msgid "" --"Pastes previously cut or copied text from the clipboard into the selected cells" -+"Pastes previously cut or copied text from the clipboard into the selected " -+"cells" - msgstr "將剪貼簿中的文字貼到已選取的格子中" - - #: kwordquiz.cpp:159 -@@ -1503,7 +1504,7 @@ - - #: kwordquiz.cpp:180 - msgid "&Column Titles..." --msgstr "自訂標題(&C)..." -+msgstr "自訂標題(&C)…" - - #: kwordquiz.cpp:181 - msgid "Defines the column titles for the active vocabulary" -@@ -1511,7 +1512,7 @@ - - #: kwordquiz.cpp:184 - msgid "&Font..." --msgstr "字型(&F)..." -+msgstr "字型(&F)…" - - #: kwordquiz.cpp:185 - msgid "Defines the font used by the editor" -@@ -1519,17 +1520,17 @@ - - #: kwordquiz.cpp:190 - msgid "&Rows/Columns..." --msgstr "行/欄(&R)..." -+msgstr "行/欄(&R)…" - - #: kwordquiz.cpp:191 - msgid "" - "Defines the number of rows, row heights, and column widths for the active " - "vocabulary" --msgstr "定義當繆字彙的行數、行高和欄寬" -+msgstr "定義當繆字彙的列數、行高和欄寬" - - #: kwordquiz.cpp:194 - msgid "&Sort..." --msgstr "排序(&S)..." -+msgstr "排序(&S)…" - - #: kwordquiz.cpp:195 - msgid "" -@@ -1652,7 +1653,7 @@ - - #: kwordquiz.cpp:380 kwordquiz.cpp:494 kwordquiz.cpp:548 - msgid "Opening file..." --msgstr "開啟檔案..." -+msgstr "開啟檔案…" - - #: kwordquiz.cpp:388 kwordquiz.cpp:489 kwordquiz.cpp:543 kwordquiz.cpp:551 - #: kwordquiz.cpp:565 kwordquiz.cpp:579 kwordquiz.cpp:657 kwordquiz.cpp:672 -@@ -1668,7 +1669,7 @@ - - #: kwordquiz.cpp:480 - msgid "Opening a new document window..." --msgstr "開啟新的文件窗口..." -+msgstr "開啟新的文件窗口…" - - #: kwordquiz.cpp:496 - msgid "&Join selected files into one list" -@@ -1694,11 +1695,11 @@ - - #: kwordquiz.cpp:556 - msgid "Saving file..." --msgstr "儲存檔案..." -+msgstr "儲存檔案…" - - #: kwordquiz.cpp:577 - msgid "Saving file with a new filename..." --msgstr "以新檔案名儲存檔案..." -+msgstr "以新檔案名儲存檔案…" - - #: kwordquiz.cpp:587 - msgid "" -@@ -1718,62 +1719,61 @@ - - #: kwordquiz.cpp:612 - msgid "" --"The file" --"
                                %1" --"
                                already exists. Do you want to overwrite it?                                " -+"The file
                                %1
                                already exists. Do you want to overwrite it?" - msgstr "檔案
                                %1
                                已存在。您想要覆蓋嗎？                                " - - #: kwordquiz.cpp:635 - msgid "Closing file..." --msgstr "關閉檔案..." -+msgstr "關閉檔案…" - - #: kwordquiz.cpp:662 - msgid "Printing..." --msgstr "列印..." -+msgstr "列印…" - - #: kwordquiz.cpp:677 - msgid "Exiting..." --msgstr "離開..." -+msgstr "離開…" - - #: kwordquiz.cpp:702 - msgid "Undoing previous command..." --msgstr "復原上個命令..." -+msgstr "復原上個命令…" - - #: kwordquiz.cpp:709 - msgid "Cutting selection..." --msgstr "剪下已選取內容..." -+msgstr "剪下已選取內容…" - - #: kwordquiz.cpp:716 - msgid "Copying selection to clipboard..." --msgstr "將已選取內容複製到剪貼簿..." -+msgstr "將已選取內容複製到剪貼簿…" - - #: kwordquiz.cpp:723 - msgid "Inserting clipboard contents..." --msgstr "插入剪貼簿內容..." -+msgstr "插入剪貼簿內容…" - - #: kwordquiz.cpp:730 - msgid "Clearing the selected cells..." --msgstr "清除已選取單元格..." -+msgstr "清除已選取單元格…" - - #: kwordquiz.cpp:737 - msgid "Inserting rows..." --msgstr "插入列..." -+msgstr "插入列…" - - #: kwordquiz.cpp:744 - msgid "Deleting selected rows..." --msgstr "刪除選取列..." -+msgstr "刪除選取列…" - - #: kwordquiz.cpp:751 - msgid "Marking selected text as a blank..." --msgstr "將選取的文字標示為空白..." -+msgstr "將選取的文字標示為空白…" - - #: kwordquiz.cpp:758 - msgid "Removing blank markings..." --msgstr "移除空白標記..." -+msgstr "移除空白標記…" - - #: kwordquiz.cpp:765 - msgid "Searching for indicated text..." --msgstr "搜尋辨識的文字..." -+msgstr "搜尋辨識的文字…" - - #: kwordquiz.cpp:766 kwordquiz.cpp:805 - msgid "Not implemented yet" -@@ -1781,52 +1781,52 @@ - - #: kwordquiz.cpp:772 - msgid "Setting the column titles of the vocabulary..." --msgstr "設定字彙的欄標題..." -+msgstr "設定字彙的欄標題…" - - #: kwordquiz.cpp:789 - msgid "Setting the font of the vocabulary..." --msgstr "設定字彙的字型..." -+msgstr "設定字彙的字型…" - - #: kwordquiz.cpp:804 - msgid "Changing the keyboard layout..." --msgstr "更改鍵盤佈局..." -+msgstr "更改鍵盤布局…" - - #: kwordquiz.cpp:811 - msgid "Inserting special character..." --msgstr "插入特殊字元..." -+msgstr "插入特殊字元…" - - #: kwordquiz.cpp:818 - msgid "Changing row and column properties..." --msgstr "更改列與欄屬性..." -+msgstr "更改列與欄屬性…" - - #: kwordquiz.cpp:825 - msgid "Sorting the vocabulary..." --msgstr "排序字彙..." -+msgstr "排序字彙…" - - #: kwordquiz.cpp:832 - msgid "Randomizing the vocabulary..." --msgstr "打亂字彙..." -+msgstr "打亂字彙…" - - #: kwordquiz.cpp:839 kwordquiz.cpp:852 kwordquiz.cpp:859 kwordquiz.cpp:866 - #: kwordquiz.cpp:873 kwordquiz.cpp:880 - msgid "Updating mode..." --msgstr "更新模式..." -+msgstr "更新模式…" - - #: kwordquiz.cpp:887 - msgid "Starting editor session..." --msgstr "開啟編輯器階段..." -+msgstr "開啟編輯器階段…" - - #: kwordquiz.cpp:894 - msgid "Starting flashcard session..." --msgstr "開始閃卡階段..." -+msgstr "開始閃卡階段…" - - #: kwordquiz.cpp:901 - msgid "Starting multiple choice session..." --msgstr "開始多重選擇題階段..." -+msgstr "開始多重選擇題階段…" - - #: kwordquiz.cpp:908 - msgid "Starting question & answer session..." --msgstr "開始問答題階段..." -+msgstr "開始問答題階段…" - - #: kwordquiz.cpp:1077 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/libkdeedu.po kde-i18n-zh_TW-3.5.10/messages/kdeedu/libkdeedu.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdeedu/libkdeedu.po 2007-05-14 12:22:57.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdeedu/libkdeedu.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libkdeedu\n" - "POT-Creation-Date: 2007-02-14 02:46+0100\n" - "PO-Revision-Date: 2006-06-30 14:26+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/atlantik.po kde-i18n-zh_TW-3.5.10/messages/kdegames/atlantik.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/atlantik.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/atlantik.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: atlantik\n" - "POT-Creation-Date: 2005-07-24 01:33+0200\n" - "PO-Revision-Date: 2006-01-17 14:57+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -22,11 +21,11 @@ - - #: libatlantikclient/atlantik_network.cpp:909 - msgid "Connecting to %1:%2..." --msgstr "連線至 %1:%2..." -+msgstr "連線至 %1:%2…" - - #: libatlantikclient/atlantik_network.cpp:915 - msgid "Server host name lookup finished..." --msgstr "伺服器主機名稱搜尋已經完成..." -+msgstr "伺服器主機名稱搜尋已經完成…" - - #: libatlantikclient/atlantik_network.cpp:920 - msgid "Connected to %1:%2." -@@ -138,11 +137,11 @@ - - #: libatlantikui/auction_widget.cpp:94 - msgid "Going once..." --msgstr "一次..." -+msgstr "一次…" - - #: libatlantikui/auction_widget.cpp:98 - msgid "Going twice..." --msgstr "二次..." -+msgstr "二次…" - - #: libatlantikui/auction_widget.cpp:102 - msgid "Sold!" -@@ -293,7 +292,8 @@ - msgid "" - "You are currently part of an active game. Are you sure you want to close " - "Atlantik? If you do, you forfeit the game." --msgstr "您目前正在進行遊戲中。您確定要關閉 Atlantik 嗎？如此您將會失去進行中的遊戲。" -+msgstr "" -+"您目前正在進行遊戲中。您確定要關閉 Atlantik 嗎？如此您將會失去進行中的遊戲。" - - #: client/atlantik.cpp:843 - msgid "Close & Forfeit?" -@@ -317,15 +317,15 @@ - - #: client/selectconfiguration_widget.cpp:78 - msgid "Retrieving configuration list..." --msgstr "取回設定列表中..." -+msgstr "取回設定列表中…" - - #: client/selectconfiguration_widget.cpp:83 - msgid "Game started. Retrieving full game data..." --msgstr "遊戲已開始：取回完整的遊戲資料..." -+msgstr "遊戲已開始：取回完整的遊戲資料…" - - #: client/selectconfiguration_widget.cpp:162 - msgid "Retrieved configuration list." --msgstr "取回設定列表中..." -+msgstr "取回設定列表中…" - - #: client/main.cpp:29 - msgid "Connect to this host" -@@ -530,7 +530,8 @@ - "If checked, the colored headers of street estates on the board will have a " - "Quartz effect similar to the Quartz KWin style.\n" - msgstr "" --"如果選定此項，棋盤上街道財產的色彩頁眉將會有近似於 石英KWin 風格的石英效果。\n" -+"如果選定此項，棋盤上街道財產的色彩頁眉將會有近似於 石英KWin 風格的石英效" -+"果。\n" - - #: client/selectserver_widget.cpp:39 - msgid "Enter Custom monopd Server" -@@ -578,7 +579,7 @@ - - #: client/selectserver_widget.cpp:116 - msgid "Retrieving server list..." --msgstr "取回伺服器列表中..." -+msgstr "取回伺服器列表中…" - - #: client/selectserver_widget.cpp:124 - msgid "unknown" -@@ -590,7 +591,7 @@ - - #: client/selectserver_widget.cpp:144 - msgid "Error while retrieving the server list." --msgstr "取回伺服器列表時發生錯誤..." -+msgstr "取回伺服器列表時發生錯誤…" - - #: client/selectgame_widget.cpp:43 - msgid "Create or Select monopd Game" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kasteroids.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kasteroids.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kasteroids.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kasteroids.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: kasteroids\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-09 16:36+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -120,7 +120,7 @@ - - #: toplevel.cpp:596 - msgid "Start new game with" --msgstr "以...開始新遊戲" -+msgstr "以…開始新遊戲" - - #: toplevel.cpp:599 - msgid " ships." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/katomic.po kde-i18n-zh_TW-3.5.10/messages/kdegames/katomic.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/katomic.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/katomic.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: katomic\n" - "POT-Creation-Date: 2008-06-25 01:36+0200\n" - "PO-Revision-Date: 2003-12-05 20:57+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbackgammon.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbackgammon.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbackgammon.po 2007-05-14 12:22:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbackgammon.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kbackgammon\n" - "POT-Creation-Date: 2007-03-09 02:17+0100\n" - "PO-Revision-Date: 2006-01-20 10:58+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -56,26 +55,31 @@ - - #: kbg.cpp:182 - msgid "" --"This area contains the status messages for the game. Most of these messages are " --"sent to you from the current engine." -+"This area contains the status messages for the game. Most of these messages " -+"are sent to you from the current engine." - msgstr "這個地方顯示遊戲的訊息。大部份的訊息都是目前的遊戲引擎送過來的。" - - #: kbg.cpp:186 - msgid "" --"This is the command line. You can type special commands related to the current " --"engine in here. Most relevant commands are also available through the menus." --msgstr "這裡是命令列。您可以輸入目前的遊戲引擎使用的特殊命令。不過大部份常用的命令也都可以從目錄選單中選取。" -+"This is the command line. You can type special commands related to the " -+"current engine in here. Most relevant commands are also available through " -+"the menus." -+msgstr "" -+"這裡是命令列。您可以輸入目前的遊戲引擎使用的特殊命令。不過大部份常用的命令也" -+"都可以從目錄選單中選取。" - - #: kbg.cpp:191 - msgid "" - "This is the button bar tool bar. It gives you easy access to game related " - "commands. You can drag the bar to a different location within the window." --msgstr "這裡是按鈕工具列，讓您方便直接下遊戲的命令。您可以將此工具列拖曳到視窗中的其他地方。" -+msgstr "" -+"這裡是按鈕工具列，讓您方便直接下遊戲的命令。您可以將此工具列拖曳到視窗中的其" -+"他地方。" - - #: kbg.cpp:196 - msgid "" --"This is the status bar. It shows you the currently selected engine in the left " --"corner." -+"This is the status bar. It shows you the currently selected engine in the " -+"left corner." - msgstr "這裡是狀態列。它會在左邊顯示您目前選取的遊戲引擎模式。" - - #: kbg.cpp:509 -@@ -106,14 +110,16 @@ - #: kbg.cpp:524 - msgid "" - "After you finished your moves, they have to be sent to the engine. You can " --"either do that manually (in which case you should not enable this feature), or " --"you can specify an amount of time that has to pass before the move is " --"committed. If you undo a move during the timeout, the timeout will be reset and " --"restarted once you finish the move. This is very useful if you would like to " --"review the result of your move." -+"either do that manually (in which case you should not enable this feature), " -+"or you can specify an amount of time that has to pass before the move is " -+"committed. If you undo a move during the timeout, the timeout will be reset " -+"and restarted once you finish the move. This is very useful if you would " -+"like to review the result of your move." - msgstr "" --"您移動您的棋子之後，這個動作會被送到遊戲引擎。如果您不打開此選項，您可以手動決定何時要把您下的這步棋送到遊戲引擎內。您也可以決定一個時間，在時間到之前都有機會反" --"悔。如果時間到之前您決定反悔，計時器會重置。如果您希望先看看移動棋子之後的結果，您可以關掉此選項。" -+"您移動您的棋子之後，這個動作會被送到遊戲引擎。如果您不打開此選項，您可以手動" -+"決定何時要把您下的這步棋送到遊戲引擎內。您也可以決定一個時間，在時間到之前都" -+"有機會反悔。如果時間到之前您決定反悔，計時器會重置。如果您希望先看看移動棋子" -+"之後的結果，您可以關掉此選項。" - - #: kbg.cpp:531 - msgid "Enable timeout" -@@ -125,8 +131,8 @@ - - #: kbg.cpp:549 - msgid "" --"Check the box to enable all the messages that you have previously disabled by " --"choosing the \"Don't show this message again\" option." -+"Check the box to enable all the messages that you have previously disabled " -+"by choosing the \"Don't show this message again\" option." - msgstr "勾選這個選項，可以將您之前選擇不要顯示的訊息通通讓它們重新顯示出來。" - - #: kbg.cpp:553 -@@ -135,9 +141,11 @@ - - #: kbg.cpp:559 - msgid "" --"Check the box to automatically save all window positions on program exit. They " --"will be restored at next start." --msgstr "勾選這個選項的話，會在遊戲離開的時候自動儲存目前視窗的狀態。下次開啟程式時會回到此狀態。" -+"Check the box to automatically save all window positions on program exit. " -+"They will be restored at next start." -+msgstr "" -+"勾選這個選項的話，會在遊戲離開的時候自動儲存目前視窗的狀態。下次開啟程式時會" -+"回到此狀態。" - - #: kbg.cpp:563 - msgid "Save settings on exit" -@@ -145,9 +153,12 @@ - - #: kbg.cpp:570 - msgid "" --"Event notification of %1 is configured as part of the system-wide notification " --"process. Click here, and you will be able to configure system sounds, etc." --msgstr "%1 的事件通知被設定為 KDE 的系統通知程序的一部份。點選這裡您就可以設定系統聲音之類的系統設定。" -+"Event notification of %1 is configured as part of the system-wide " -+"notification process. Click here, and you will be able to configure system " -+"sounds, etc." -+msgstr "" -+"%1 的事件通知被設定為 KDE 的系統通知程序的一部份。點選這裡您就可以設定系統聲" -+"音之類的系統設定。" - - #: kbg.cpp:577 - msgid "Klick here to configure the event notification" -@@ -160,7 +171,8 @@ - - #: kbg.cpp:671 - msgid "" --"You can enable the menubar again with the right mouse button menu of the board." -+"You can enable the menubar again with the right mouse button menu of the " -+"board." - msgstr "您在棋盤上點選滑鼠右鍵就可以把目錄選單再叫出來。" - - #: kbgboard.cpp:131 -@@ -267,16 +279,17 @@ - msgstr "" - "這裡是雙陸棋盤的「楚河漢界」。\n" - "\n" --"被「吃掉」的棋子會被擺在這條楚河漢界的長條框中，在下一步棋時必須先讓它們回到棋盤之中。\n" -+"被「吃掉」的棋子會被擺在這條楚河漢界的長條框中，在下一步棋時必須先讓它們回到" -+"棋盤之中。\n" - "如果您有開啟「簡化移動」功能，您可以利用該功能來擺放棋子。" - - #: kbgboard.cpp:1633 - msgid "" - "This is a regular field of the backgammon board.\n" - "\n" --"Checkers can be placed on this field and if the current state of the game and " --"the dice permit this, they can be moved by dragging them to their destination " --"or by using the 'short move' feature." -+"Checkers can be placed on this field and if the current state of the game " -+"and the dice permit this, they can be moved by dragging them to their " -+"destination or by using the 'short move' feature." - msgstr "" - "這裡是雙陸棋盤。\n" - "\n" -@@ -286,17 +299,18 @@ - msgid "" - "This part of the backgammon board is the home.\n" - "\n" --"Depending on the direction of the game, one of the homes contains the dice and " --"the other one contains checkers that have been moved off the board. Checkers " --"can never be moved away from the home. If this home contains the dice and the " --"current state of the game permits this, double clicking on the dice will roll " --"them. Moreover, the cube might be placed on the home bar and if it can be " --"doubled, double clicking it will do so." -+"Depending on the direction of the game, one of the homes contains the dice " -+"and the other one contains checkers that have been moved off the board. " -+"Checkers can never be moved away from the home. If this home contains the " -+"dice and the current state of the game permits this, double clicking on the " -+"dice will roll them. Moreover, the cube might be placed on the home bar and " -+"if it can be doubled, double clicking it will do so." - msgstr "" - "最旁邊的兩個區域是雙陸棋的「家區域」。\n" - "\n" --"這兩邊一邊是放置走出棋盤的棋子，另一邊則放骰子。一但棋子脫離了棋盤，就不能再移動。另外在遊戲進行中需要擲骰子的時候，可以用滑鼠雙擊骰子。此外，賭倍骰也有可能放在" --"這裡，如果可以賭倍的時候也可以雙擊賭倍骰。" -+"這兩邊一邊是放置走出棋盤的棋子，另一邊則放骰子。一但棋子脫離了棋盤，就不能再" -+"移動。另外在遊戲進行中需要擲骰子的時候，可以用滑鼠雙擊骰子。此外，賭倍骰也有" -+"可能放在這裡，如果可以賭倍的時候也可以雙擊賭倍骰。" - - #: engines/fibs/kbgfibschat.cpp:203 - msgid "%1 user" -@@ -318,14 +332,15 @@ - msgid "" - "This is the chat window.\n" - "\n" --"The text in this window is colored depending on whether it is directed at you " --"personally, shouted to the general FIBS population, has been said by you, or is " --"of general interest. If you select the name of a player, the context contains " --"entries specifically geared towards that player." -+"The text in this window is colored depending on whether it is directed at " -+"you personally, shouted to the general FIBS population, has been said by " -+"you, or is of general interest. If you select the name of a player, the " -+"context contains entries specifically geared towards that player." - msgstr "" - "這是聊天視窗。\n" - "\n" --"視窗內的文字會依據屬性呈現不同的顏色，像是對您說的悄悄話，或是對整個 FIBS 玩家喊的話，或是您說的話等等。如果您選擇某個玩家，說的話會直接傳達給他。" -+"視窗內的文字會依據屬性呈現不同的顏色，像是對您說的悄悄話，或是對整個 FIBS 玩" -+"家喊的話，或是您說的話等等。如果您選擇某個玩家，說的話會直接傳達給他。" - - #: engines/fibs/kbgfibschat.cpp:233 - msgid "Info On" -@@ -399,7 +414,8 @@ - msgid "" - "Select all the users you want to remove from the gag list and then click OK. " - "Afterwards you will again hear what they shout." --msgstr "選擇好要移出清單的使用者，並按下「確定」。然後您就可以再聽到他們亂喊亂叫了。" -+msgstr "" -+"選擇好要移出清單的使用者，並按下「確定」。然後您就可以再聽到他們亂喊亂叫了。" - - #: engines/fibs/kbgfibschat.cpp:381 - msgid "&Gag List" -@@ -524,15 +540,17 @@ - - #: engines/fibs/kbgfibs.cpp:239 - msgid "" --"Usually, all messages sent directly to you by other players are displayed only " --"in the chat window. Check this box if you would like to get a copy of these " --"messages in the main window." --msgstr "通常，直接送給您的訊息只會顯示在聊天視窗中。勾選這個選項的話，在主視窗中也會顯示出來。" -+"Usually, all messages sent directly to you by other players are displayed " -+"only in the chat window. Check this box if you would like to get a copy of " -+"these messages in the main window." -+msgstr "" -+"通常，直接送給您的訊息只會顯示在聊天視窗中。勾選這個選項的話，在主視窗中也會" -+"顯示出來。" - - #: engines/fibs/kbgfibs.cpp:242 - msgid "" --"Check this box if you would like to receive information on players that invite " --"you to games." -+"Check this box if you would like to receive information on players that " -+"invite you to games." - msgstr "勾選這個選項的話，您在接受邀請時會顯示邀請您的玩家的個人資訊。" - - #: engines/fibs/kbgfibs.cpp:257 -@@ -549,8 +567,8 @@ - - #: engines/fibs/kbgfibs.cpp:261 - msgid "" --"If you want to send a standard greeting to your opponent whenever you start a " --"new match, check this box and write the message into the entry field." -+"If you want to send a standard greeting to your opponent whenever you start " -+"a new match, check this box and write the message into the entry field." - msgstr "勾選這個選項，並寫上打招呼的話，您在開始比賽時就會自動向對手打招呼。" - - #: engines/fibs/kbgfibs.cpp:265 -@@ -595,33 +613,40 @@ - - #: engines/fibs/kbgfibs.cpp:320 - msgid "" --"Enter here the host name of FIBS. With almost absolute certainty this should be " --"\"fibs.com\". If you leave this blank, you will be asked again at connection " --"time." --msgstr "輸入 FIBS 主機名稱。通常都是 fibs.com。如果空白的話，連線時會詢問您要連到哪裡。" -+"Enter here the host name of FIBS. With almost absolute certainty this should " -+"be \"fibs.com\". If you leave this blank, you will be asked again at " -+"connection time." -+msgstr "" -+"輸入 FIBS 主機名稱。通常都是 fibs.com。如果空白的話，連線時會詢問您要連到哪" -+"裡。" - - #: engines/fibs/kbgfibs.cpp:324 - msgid "" --"Enter here the port number of FIBS. With almost absolute certainty this should " --"be \"4321\". If you leave this blank, you will be asked again at connection " --"time." --msgstr "輸入 FIBS 主機連接埠。通常都是 4321。如果空白的話，連線時會詢問您要連到哪個連接埠。" -+"Enter here the port number of FIBS. With almost absolute certainty this " -+"should be \"4321\". If you leave this blank, you will be asked again at " -+"connection time." -+msgstr "" -+"輸入 FIBS 主機連接埠。通常都是 4321。如果空白的話，連線時會詢問您要連到哪個連" -+"接埠。" - - #: engines/fibs/kbgfibs.cpp:328 - msgid "" --"Enter your login on FIBS here. If you do not have a login yet, you should first " --"create an account using the corresponding menu entry. If you leave this blank, " --"you will be asked again at connection time." --msgstr "輸入您在 FIBS 主機上的使用者名稱。如果沒有的話，您可以從選單中選擇註冊使用者。如果空白的話，連線時會請您輸入。" -+"Enter your login on FIBS here. If you do not have a login yet, you should " -+"first create an account using the corresponding menu entry. If you leave " -+"this blank, you will be asked again at connection time." -+msgstr "" -+"輸入您在 FIBS 主機上的使用者名稱。如果沒有的話，您可以從選單中選擇註冊使用" -+"者。如果空白的話，連線時會請您輸入。" - - #: engines/fibs/kbgfibs.cpp:332 - msgid "" - "Enter your password on FIBS here. If you do not have a login yet, you should " --"first create an account using the corresponding menu entry. If you leave this " --"blank, you will be asked again at connection time. The password will not be " --"visible." -+"first create an account using the corresponding menu entry. If you leave " -+"this blank, you will be asked again at connection time. The password will " -+"not be visible." - msgstr "" --"輸入您在 FIBS 主機上的使用者密碼。如果還沒有註冊使用者的話，您可以從選單中選擇註冊使用者。如果空白的話，連線時會請您輸入密碼。輸入時螢幕上不會顯示。" -+"輸入您在 FIBS 主機上的使用者密碼。如果還沒有註冊使用者的話，您可以從選單中選" -+"擇註冊使用者。如果空白的話，連線時會請您輸入密碼。輸入時螢幕上不會顯示。" - - #: engines/fibs/kbgfibs.cpp:341 - msgid "Keep connections alive" -@@ -629,13 +654,14 @@ - - #: engines/fibs/kbgfibs.cpp:343 - msgid "" --"Usually, FIBS drops the connection after one hour of inactivity. When you check " --"this box, %1 will try to keep the connection alive, even if you are not " --"actually playing or chatting. Use this with caution if you do not have " -+"Usually, FIBS drops the connection after one hour of inactivity. When you " -+"check this box, %1 will try to keep the connection alive, even if you are " -+"not actually playing or chatting. Use this with caution if you do not have " - "flat-rate Internet access." - msgstr "" --"通常 FIBS 主機在連線超過一個小時沒有任何動作的話，會主動斷線。如果您勾選此選項，%1 " --"會試著保持連線，即使您並沒有真的在玩或在聊天。不過請小心使用，因為可能影響您的網路。" -+"通常 FIBS 主機在連線超過一個小時沒有任何動作的話，會主動斷線。如果您勾選此選" -+"項，%1 會試著保持連線，即使您並沒有真的在玩或在聊天。不過請小心使用，因為可能" -+"影響您的網路。" - - #: engines/fibs/kbgfibs.cpp:357 - msgid "&Connection" -@@ -656,7 +682,8 @@ - "%1 (experience %2, rating %3) wants to resume a saved match with you. If you " - "want to play, use the corresponding menu entry to join (or type 'join %4')." - msgstr "" --"%1 (經驗值 %2 等級 %3)想要回復已經儲存的與您的比賽。如果您要繼續跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %4）。" -+"%1 (經驗值 %2 等級 %3)想要回復已經儲存的與您的比賽。如果您要繼續跟他玩，請在" -+"目錄選單中選取「加入」（或是在命令列中輸入 join %4）。" - - #: engines/fibs/kbgfibs.cpp:438 - msgid "%1 wants to resume a saved match with you" -@@ -670,10 +697,12 @@ - - #: engines/fibs/kbgfibs.cpp:442 - msgid "" --"%1 (experience %2, rating %3) wants to play an unlimited match with you. If you " --"want to play, use the corresponding menu entry to join (or type 'join %4')." -+"%1 (experience %2, rating %3) wants to play an unlimited match with you. If " -+"you want to play, use the corresponding menu entry to join (or type 'join %" -+"4')." - msgstr "" --"%1 (經驗值 %2 等級 %3)想要與您玩一場未限制賭注的比賽。如果您要跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %4）。" -+"%1 (經驗值 %2 等級 %3)想要與您玩一場未限制賭注的比賽。如果您要跟他玩，請在目" -+"錄選單中選取「加入」（或是在命令列中輸入 join %4）。" - - #: engines/fibs/kbgfibs.cpp:445 - msgid "%1 has invited you to an unlimited match" -@@ -688,10 +717,12 @@ - - #: engines/fibs/kbgfibs.cpp:451 - msgid "" --"%1 (experience %2, rating %3) wants to play a %4 point match with you. If you " --"want to play, use the corresponding menu entry to join (or type 'join %5')." -+"%1 (experience %2, rating %3) wants to play a %4 point match with you. If " -+"you want to play, use the corresponding menu entry to join (or type 'join %" -+"5')." - msgstr "" --"%1 (經驗值 %2 等級 %3)想要與您玩一場賭 %4 點的比賽。如果您要跟他玩，請在目錄選單中選取「加入」（或是在命令列中輸入 join %5）。" -+"%1 (經驗值 %2 等級 %3)想要與您玩一場賭 %4 點的比賽。如果您要跟他玩，請在目錄" -+"選單中選取「加入」（或是在命令列中輸入 join %5）。" - - #: engines/fibs/kbgfibs.cpp:454 - msgid "%1 has invited you for a %2 point match" -@@ -849,10 +880,12 @@ - - #: engines/fibs/kbgfibs.cpp:1611 - msgid "" --"Your account has been created. Your new login is %1" --". To fully activate this account, I will now close the connection. Once you " --"reconnect, you can start playing backgammon on FIBS." --msgstr "您的使用者帳號已建立。使用者名稱為 %1。請您重新連線，並使用新的使用者帳號登入。" -+"Your account has been created. Your new login is %1. To fully " -+"activate this account, I will now close the connection. Once you reconnect, " -+"you can start playing backgammon on FIBS." -+msgstr "" -+"您的使用者帳號已建立。使用者名稱為 %1。請您重新連線，並使用新的使用者" -+"帳號登入。" - - #: engines/fibs/kbgfibs.cpp:1739 - msgid "%1 (%2) vs. %3 (%4) - game over" -@@ -896,10 +929,11 @@ - - #: engines/fibs/kbgfibs.cpp:2062 - msgid "" --"You should never set the 'boardstyle' variable by hand! It is vital for proper " --"functioning of this program that it remains set to 3. It has been reset for " --"you." --msgstr "請不要手動設定「boardstyle」。這對此程式的某些功能很重要，此值將重設為 3。" -+"You should never set the 'boardstyle' variable by hand! It is vital for " -+"proper functioning of this program that it remains set to 3. It has been " -+"reset for you." -+msgstr "" -+"請不要手動設定「boardstyle」。這對此程式的某些功能很重要，此值將重設為 3。" - - #: engines/fibs/kbgfibs.cpp:2162 - msgid "&Connect" -@@ -915,7 +949,7 @@ - - #: engines/fibs/kbgfibs.cpp:2172 - msgid "&Invite..." --msgstr "邀請...(&I)" -+msgstr "邀請…(&I)" - - #: engines/fibs/kbgfibs.cpp:2178 - msgid "&Commands" -@@ -1041,10 +1075,12 @@ - - #: engines/fibs/kplayerlist.cpp:259 - msgid "" --"This window contains the player list. It shows all players that are currently " --"logged into FIBS.Use the right mouse button to get a context menu with helpful " --"information and commands." --msgstr "這個視窗是玩家清單。它顯示所有目前登入在 FIBS 的玩家。用滑鼠右鍵可以取得資訊與命令清單。" -+"This window contains the player list. It shows all players that are " -+"currently logged into FIBS.Use the right mouse button to get a context menu " -+"with helpful information and commands." -+msgstr "" -+"這個視窗是玩家清單。它顯示所有目前登入在 FIBS 的玩家。用滑鼠右鍵可以取得資訊" -+"與命令清單。" - - #: engines/fibs/kplayerlist.cpp:289 - msgid "Info" -@@ -1228,14 +1264,12 @@ - - #: engines/gnubg/kbggnubg.cpp:442 - msgid "&Restart GNU Backgammon" --msgstr "重新啟動 GNUBG (&R)" -+msgstr "重新啟動 GNUBG(&R)" - - #: engines/gnubg/kbggnubg.cpp:474 - msgid "" --"This is experimental code which currently requires a specially patched version " --"of GNU Backgammon." --"
                                " --"
                                " -+"This is experimental code which currently requires a specially patched " -+"version of GNU Backgammon.

                                " - msgstr "這個功能目前還在實驗中，而且需要特殊的 GNUBG 更新。

                                " - - #: engines/gnubg/kbggnubg.cpp:507 -@@ -1487,7 +1521,9 @@ - "This is a graphical backgammon program. It supports backgammon games\n" - "with other players, games against computer engines like GNU bg and even\n" - "on-line games on the 'First Internet Backgammon Server'." --msgstr "這是個圖形介面的西洋雙陸棋遊戲程式。它支援兩人對戰，與電腦對戰，還有網路對戰等模式。" -+msgstr "" -+"這是個圖形介面的西洋雙陸棋遊戲程式。它支援兩人對戰，與電腦對戰，還有網路對戰" -+"等模式。" - - #: main.cpp:43 - msgid "KBackgammon" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbattleship.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbattleship.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbattleship.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbattleship.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kbattleship\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-01-17 15:48+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -73,11 +72,11 @@ - - #: kbattleship.cpp:187 - msgid "Sending Message..." --msgstr "傳送訊息..." -+msgstr "傳送訊息…" - - #: kbattleship.cpp:311 kbattleship.cpp:1231 kbattleship.cpp:1313 - msgid "S&ingle Player" --msgstr "單一玩家(&i)" -+msgstr "單一玩家(&I)" - - #: kbattleship.cpp:314 kbattleship.cpp:406 - msgid "You won the game :)" -@@ -97,7 +96,7 @@ - - #: kbattleship.cpp:401 - msgid "Waiting for enemy to shoot.." --msgstr "等待敵方射擊..." -+msgstr "等待敵方射擊…" - - #: kbattleship.cpp:419 kbattleship.cpp:425 - msgid "Enemy disconnected." -@@ -109,23 +108,23 @@ - - #: kbattleship.cpp:435 - msgid "&Start server" --msgstr "起始伺服器 (&S)" -+msgstr "起始伺服器(&S)" - - #: kbattleship.cpp:436 - msgid "S&ingle game" --msgstr "單一玩家遊戲(&i)" -+msgstr "單一玩家遊戲(&I)" - - #: kbattleship.cpp:557 - msgid "Waiting for computer player to start the match..." --msgstr "等待電腦玩家開始競賽..." -+msgstr "等待電腦玩家開始競賽…" - - #: kbattleship.cpp:567 konnectionhandling.cpp:112 konnectionhandling.cpp:136 - msgid "Waiting for other player to place their ships..." --msgstr "等待其他玩家放置船艦..." -+msgstr "等待其他玩家放置船艦…" - - #: kbattleship.cpp:569 - msgid "Waiting for other player to start the match..." --msgstr "等待其他玩家開始競賽..." -+msgstr "等待其他玩家開始競賽…" - - #. i18n: file dialogs/statDlg.ui line 172 - #: kbattleship.cpp:639 kbattleship.cpp:670 rc.cpp:105 -@@ -147,7 +146,7 @@ - - #: kbattleship.cpp:697 - msgid "Loading Connect-Server dialog..." --msgstr "載入連接伺服器對話視窗..." -+msgstr "載入連接伺服器對話視窗…" - - #: kbattleship.cpp:718 - msgid "The client is asking to restart the game. Do you accept?" -@@ -181,11 +180,11 @@ - - #: kbattleship.cpp:770 - msgid "Waiting for an answer..." --msgstr "等待回應..." -+msgstr "等待回應…" - - #: kbattleship.cpp:806 - msgid "Loading Start-Server dialog..." --msgstr "載入開始伺服器對話視窗..." -+msgstr "載入開始伺服器對話視窗…" - - #: kbattleship.cpp:846 - msgid "&Stop server" -@@ -193,7 +192,7 @@ - - #: kbattleship.cpp:849 - msgid "Waiting for a player..." --msgstr "等待玩家加入..." -+msgstr "等待玩家加入…" - - #: kbattleship.cpp:1077 - msgid "The URL passed to KDE Battleship '%1' is not a valid url" -@@ -206,7 +205,7 @@ - - #: kbattleship.cpp:1116 - msgid "Dis&connect from server" --msgstr "從伺服器斷線(&c)" -+msgstr "從伺服器斷線(&C)" - - #: kbattleship.cpp:1216 - msgid "Start Game" -@@ -222,7 +221,7 @@ - - #: kbattleship.cpp:1253 - msgid "Waiting for the AI player to place the ships..." --msgstr "等在電腦玩家放置船艦..." -+msgstr "等在電腦玩家放置船艦…" - - #: kbattleship.cpp:1304 konnectionhandling.cpp:124 konnectionhandling.cpp:192 - msgid "Enemy has shot. Shoot now." -@@ -272,8 +271,8 @@ - - #: konnectionhandling.cpp:97 - msgid "" --"Connection dropped by enemy. The client's protocol implementation (%1) is not " --"compatible with our (%2) version." -+"Connection dropped by enemy. The client's protocol implementation (%1) is " -+"not compatible with our (%2) version." - msgstr "連線被敵方中斷。客戶端之通訊協定(%1)不符合我們的版本(%2)。" - - #: konnectionhandling.cpp:142 konnectionhandling.cpp:203 -@@ -282,13 +281,13 @@ - - #: konnectionhandling.cpp:162 - msgid "" --"Connection to client dropped. The client's protocol implementation (%1) is not " --"compatible with our (%2) version." -+"Connection to client dropped. The client's protocol implementation (%1) is " -+"not compatible with our (%2) version." - msgstr "客戶端連線中斷，客戶端之通訊協定(%1)不符合我們的版本(%2)" - - #: konnectionhandling.cpp:170 - msgid "We have a player. Let's start..." --msgstr "玩家加入，咱們開始遊戲吧..." -+msgstr "玩家加入，咱們開始遊戲吧…" - - #: konnectionhandling.cpp:180 - msgid "You can shoot now." -@@ -327,7 +326,8 @@ - - #: main.cpp:28 - msgid "" --"URL of server to attach to. In the form kbattleship://host:port/ or host:port" -+"URL of server to attach to. In the form kbattleship://host:port/ or host:" -+"port" - msgstr "伺服器連結的 URL。格式為 kbattleship://主機:埠號/ 或是 主機:埠號" - - #: main.cpp:36 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kblackbox.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kblackbox.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kblackbox.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kblackbox.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: kblackbox\n" - "POT-Creation-Date: 2005-07-24 01:33+0200\n" - "PO-Revision-Date: 2003-12-23 02:10+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -99,7 +99,7 @@ - - #: kbbgame.cpp:702 - msgid "&Give Up" --msgstr "放棄 (&G)" -+msgstr "放棄(&G)" - - #: kbbgame.cpp:703 - msgid "&Done" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbounce.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kbounce.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kbounce.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kbounce.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kbounce\n" - "POT-Creation-Date: 2005-07-01 01:32+0200\n" - "PO-Revision-Date: 2003-12-06 11:37+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -56,15 +56,15 @@ - - #: kbounce.cpp:135 - msgid "&Select Background Folder..." --msgstr "選擇背景圖案所在的目錄...(&S)" -+msgstr "選擇背景圖案所在的目錄…(&S)" - - #: kbounce.cpp:138 - msgid "Show &Backgrounds" --msgstr "顯示背景 (&B)" -+msgstr "顯示背景(&B)" - - #: kbounce.cpp:140 - msgid "Hide &Backgrounds" --msgstr "隱藏背景 (&B)" -+msgstr "隱藏背景(&B)" - - #: kbounce.cpp:144 - msgid "&Play Sounds" -@@ -101,28 +101,20 @@ - - #: kbounce.cpp:463 - #, c-format --msgid "" --"You have successfully cleared more than 75% of the board.\n" --msgstr "" --"您已經成功清除了75%的區域。\n" -+msgid "You have successfully cleared more than 75% of the board.\n" -+msgstr "您已經成功清除了 75% 的區域。\n" - - #: kbounce.cpp:464 --msgid "" --"%1 points: 15 points per remaining life\n" --msgstr "" --"%1 分: 每條剩下的命可得15分\n" -+msgid "%1 points: 15 points per remaining life\n" -+msgstr "%1 分: 每條剩下的命可得15分\n" - - #: kbounce.cpp:465 --msgid "" --"%1 points: Bonus\n" --msgstr "" --"%1 分: 額外紅利\n" -+msgid "%1 points: Bonus\n" -+msgstr "%1 分: 額外紅利\n" - - #: kbounce.cpp:466 --msgid "" --"%1 points: Total score for this level\n" --msgstr "" --"%1 分: 本關卡的總分數\n" -+msgid "%1 points: Total score for this level\n" -+msgstr "%1 分: 本關卡的總分數\n" - - #: kbounce.cpp:467 - msgid "On to level %1. Remember you get %2 lives this time!" -@@ -148,7 +140,7 @@ - #~ msgstr "選擇圖案目錄(&S)" - - #~ msgid "Show &Images" --#~ msgstr "顯示圖案 (&I)" -+#~ msgstr "顯示圖案(&I)" - - #, fuzzy - #~ msgid "&Select Image Directory..." -@@ -168,13 +160,13 @@ - #~ "準備再闖下一關吧！" - - #~ msgid "S&how Highscore" --#~ msgstr "顯示排行榜 (&H)" -+#~ msgstr "顯示排行榜(&H)" - - #~ msgid "&Pause" --#~ msgstr "暫停 (&P)" -+#~ msgstr "暫停(&P)" - - #~ msgid "&Stop" --#~ msgstr "停止 (&S)" -+#~ msgstr "停止(&S)" - - #~ msgid "New High Score" - #~ msgstr "新排行榜" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kenolaba.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kenolaba.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kenolaba.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kenolaba.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: kenolaba\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2004-01-09 11:45+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -122,7 +122,7 @@ - - #: AbTop.cpp:501 - msgid "I am thinking..." --msgstr "我在思考中..." -+msgstr "我在思考中…" - - #: AbTop.cpp:501 - msgid "It is your turn!" -@@ -283,47 +283,49 @@ - #: rc.cpp:69 - #, no-c-format - msgid "" --"For every ball, the given points are added to the evaluation depending on the " --"balls position. The bonus for a given position is changed randomly in the +/- " --"range." --msgstr "對每一個球，給定點的評估會依據其位置而加入。每個點的分數可以在 +/- 的範圍內隨機改變。" -+"For every ball, the given points are added to the evaluation depending on " -+"the balls position. The bonus for a given position is changed randomly in " -+"the +/- range." -+msgstr "" -+"對每一個球，給定點的評估會依據其位置而加入。每個點的分數可以在 +/- 的範圍內隨" -+"機改變。" - - #. i18n: file EvalDlg.ui line 1175 - #: rc.cpp:72 - #, no-c-format - msgid "In-A-Row" --msgstr "在一行" -+msgstr "在一列" - - #. i18n: file EvalDlg.ui line 1295 - #: rc.cpp:75 - #, no-c-format - msgid "Three in-a-row:" --msgstr "三個一行：" -+msgstr "三個一列：" - - #. i18n: file EvalDlg.ui line 1303 - #: rc.cpp:78 - #, no-c-format - msgid "Two in-a-row:" --msgstr "二個一行：" -+msgstr "二個一列：" - - #. i18n: file EvalDlg.ui line 1311 - #: rc.cpp:81 - #, no-c-format - msgid "Four in-a-row:" --msgstr "四個一行：" -+msgstr "四個一列：" - - #. i18n: file EvalDlg.ui line 1319 - #: rc.cpp:84 - #, no-c-format - msgid "Five in-a-row:" --msgstr "五個一行：" -+msgstr "五個一列：" - - #. i18n: file EvalDlg.ui line 1342 - #: rc.cpp:87 - #, no-c-format - msgid "" - "For a number of balls In-a-Row, the given points are added to the evaluation" --msgstr "對於每一行的球數，給定的點會增加到評估中。" -+msgstr "對於每一列的球數，給定的點會增加到評估中。" - - #. i18n: file EvalDlg.ui line 1370 - #: rc.cpp:90 -@@ -379,8 +381,8 @@ - #: rc.cpp:120 - #, no-c-format - msgid "" --"Your evaluation scheme, defined in all other tabs of this dialog, can be stored " --"here." -+"Your evaluation scheme, defined in all other tabs of this dialog, can be " -+"stored here." - msgstr "這邊是您的評估架構，被所有這個對話窗中的標籤頁所定義，可以被儲存。" - - #. i18n: file EvalDlg.ui line 1686 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kfouleggs.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kfouleggs.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kfouleggs.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kfouleggs.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfouleggs\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-16 22:12+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,7 +16,7 @@ - - #: ai.cpp:10 - msgid "Occupied lines:" --msgstr "佔用的行數:" -+msgstr "佔用的列數:" - - #: ai.cpp:12 - msgid "Number of spaces:" -@@ -98,7 +98,7 @@ - #: rc.cpp:6 - #, no-c-format - msgid "Occupied lines" --msgstr "佔用行數" -+msgstr "佔用列數" - - #. i18n: file kfouleggs.kcfg line 14 - #: rc.cpp:9 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kgoldrunner.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kgoldrunner.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kgoldrunner.po 2007-01-15 10:56:21.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kgoldrunner.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,8 +13,7 @@ - "Project-Id-Version: kgoldrunner\n" - "POT-Creation-Date: 2006-10-10 02:33+0200\n" - "PO-Revision-Date: 2006-01-18 11:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -43,18 +42,20 @@ - - #: data_messages.cpp:30 - msgid "" --"Hi ! Welcome to KGoldrunner ! The idea of the game is to pick up all the gold " --"nuggets, then climb to the top of the playing area and move up to the next " --"level. A hidden ladder will appear as you collect the last nugget.\n" --"\n" --"The hero (the green figure) is your deputy. To collect the nuggets, just point " --"the mouse where you want him to go. At first gravity takes over and he falls " --"..." --msgstr "" --"Hi ! 歡迎來到KGoldrunner ! 這個遊戲的目標是要撿到所有的金塊，爬 到遊戲畫面的最上端然後進入下一關。當你撿到所有的金塊時，隱藏 " --"的樓梯會出現，帶你進入下一關。\n" -+"Hi ! Welcome to KGoldrunner ! The idea of the game is to pick up all the " -+"gold nuggets, then climb to the top of the playing area and move up to the " -+"next level. A hidden ladder will appear as you collect the last nugget.\n" -+"\n" -+"The hero (the green figure) is your deputy. To collect the nuggets, just " -+"point the mouse where you want him to go. At first gravity takes over and " -+"he falls ..." -+msgstr "" -+"Hi ! 歡迎來到KGoldrunner ! 這個遊戲的目標是要撿到所有的金塊，爬 到遊戲畫面的" -+"最上端然後進入下一關。當你撿到所有的金塊時，隱藏 的樓梯會出現，帶你進入下一" -+"關。\n" - "\n" --"你扮演男主角(綠色小人)。要撿到金塊，只要用滑鼠點一下你要他去的 地方，他就會跑過去。重力會讓他往下掉..." -+"你扮演男主角(綠色小人)。要撿到金塊，只要用滑鼠點一下你要他去的 地方，他就會跑" -+"過去。重力會讓他往下掉..." - - #: data_messages.cpp:36 - msgid "Navigation" -@@ -62,18 +63,20 @@ - - #: data_messages.cpp:37 - msgid "" --"This is an exercise in moving around. Follow the track of gold nuggets until " --"the ladder pops up at the right. The hero can only follow the mouse along " --"simple paths (like _ | L or U), so be careful not to get too far ahead of him.\n" -+"This is an exercise in moving around. Follow the track of gold nuggets " -+"until the ladder pops up at the right. The hero can only follow the mouse " -+"along simple paths (like _ | L or U), so be careful not to get too far ahead " -+"of him.\n" - "\n" - "DANGER: Try not to fall off the ladder or bar into the concrete pit at the " - "bottom right. If you do get trapped there, the only way out is to kill the " - "hero (press key Q for quit) and start the level again." - msgstr "" --"在此練習操控移動。順著著金塊分佈的路徑直到右方有梯子浮現。 主角能隨著你滑鼠移動，不過限於簡單的路徑(像是like _ | L or U)， " --"因此滑鼠別領先他太多。\n" -+"在此練習操控移動。順著著金塊分布的路徑直到右方有梯子浮現。 主角能隨著你滑鼠移" -+"動，不過限於簡單的路徑(像是like _ | L or U)， 因此滑鼠別領先他太多。\n" - "\n" --"警告：別從梯子或橫木上掉到右下方的水泥凹窩之中。如果你真的 掉下去了，唯一的辦法是讓主角死掉(按Q)然後重新開始本關卡。" -+"警告：別從梯子或橫木上掉到右下方的水泥凹窩之中。如果你真的 掉下去了，唯一的辦" -+"法是讓主角死掉(按Q)然後重新開始本關卡。" - - #: data_messages.cpp:43 - msgid "Digging" -@@ -81,24 +84,26 @@ - - #: data_messages.cpp:44 - msgid "" --"Now you have to dig to get the gold! Just use the left and right mouse buttons " --"to dig left or right of the hero's position. The hero can then jump into and " --"through the hole he has dug. He can also dig several holes in a row and run " --"sideways through the dug holes. Be careful though. After a while the holes " --"close up and you can get trapped and killed.\n" --"\n" --"In the third box down, you have to dig two holes, jump in and quickly dig one " --"more, to get through two layers. On the right, you have to dig three, then two " --"then one to get through. There are also two little puzzles to work out along " --"the way. Good luck!\n" -+"Now you have to dig to get the gold! Just use the left and right mouse " -+"buttons to dig left or right of the hero's position. The hero can then jump " -+"into and through the hole he has dug. He can also dig several holes in a " -+"row and run sideways through the dug holes. Be careful though. After a " -+"while the holes close up and you can get trapped and killed.\n" -+"\n" -+"In the third box down, you have to dig two holes, jump in and quickly dig " -+"one more, to get through two layers. On the right, you have to dig three, " -+"then two then one to get through. There are also two little puzzles to work " -+"out along the way. Good luck!\n" - "\n" - "By the way, you can dig through brick, but not concrete." - msgstr "" --"現在你必須挖洞才能撿到金塊！使用滑鼠的左右鍵，分別在主角所 在位置的左右挖洞。這樣主角就能跳到他自己挖的洞裡，他也可以 " --"挖成一排，開一條小路。請小心，過一會兒所挖的洞就會自動補回 你如果還在那個位置，就會身陷其中而死。\n" --"\n" --"在下方的第三個框框裡，你必須挖兩個洞，跳進去然後迅速地挖一 個新的洞，這樣才可以通過兩層。在右邊，你需要挖三個洞，然後 " --"兩個，再加一個才能通過。過程中有兩個小難題需要克服，祝你好 運！\n" -+"現在你必須挖洞才能撿到金塊！使用滑鼠的左右鍵，分別在主角所 在位置的左右挖洞。" -+"這樣主角就能跳到他自己挖的洞裡，他也可以 挖成一排，開一條小路。請小心，過一會" -+"兒所挖的洞就會自動補回 你如果還在那個位置，就會身陷其中而死。\n" -+"\n" -+"在下方的第三個框框裡，你必須挖兩個洞，跳進去然後迅速地挖一 個新的洞，這樣才可" -+"以通過兩層。在右邊，你需要挖三個洞，然後 兩個，再加一個才能通過。過程中有兩個" -+"小難題需要克服，祝你好 運！\n" - "\n" - "另外，你只能在磚牆上挖洞，水泥牆你是挖不動的。" - -@@ -108,31 +113,35 @@ - - #: data_messages.cpp:53 - msgid "" --"Well, it's been nice and easy up to now, but the game would be no fun without " --"enemies. They are after the gold too: worse still they are after you! You die " --"if they catch you, but maybe you will have a few lives left and can start " --"again.\n" --"\n" --"You can handle enemies by running away, digging a hole or luring them into part " --"of the playing area where they get stranded.\n" --"\n" --"If an enemy falls into a hole, he gives up any gold he is carrying, then gets " --"stuck in the hole for a time and climbs out. If the hole closes while he is in " --"it, he dies and reappears somewhere else on the screen. You can deliberately " --"kill enemies by digging several holes in a row.\n" --"\n" --"More importantly, you can run over an enemy's head. You must do that right at " --"the start of this level. Dig a hole, trap the enemy, wait for him to fall all " --"the way in, then run over him, with the other enemy in hot pursuit..." -+"Well, it's been nice and easy up to now, but the game would be no fun " -+"without enemies. They are after the gold too: worse still they are after " -+"you! You die if they catch you, but maybe you will have a few lives left " -+"and can start again.\n" -+"\n" -+"You can handle enemies by running away, digging a hole or luring them into " -+"part of the playing area where they get stranded.\n" -+"\n" -+"If an enemy falls into a hole, he gives up any gold he is carrying, then " -+"gets stuck in the hole for a time and climbs out. If the hole closes while " -+"he is in it, he dies and reappears somewhere else on the screen. You can " -+"deliberately kill enemies by digging several holes in a row.\n" -+"\n" -+"More importantly, you can run over an enemy's head. You must do that right " -+"at the start of this level. Dig a hole, trap the enemy, wait for him to " -+"fall all the way in, then run over him, with the other enemy in hot " -+"pursuit..." - msgstr "" --"到目前為止都還算簡單，不過遊戲沒有敵人就不好玩。他們也會偷拿金子，而且還會追著你跑！如果他們抓到你，你就死了，如果還有生命數就可以再開始玩。\n" -+"到目前為止都還算簡單，不過遊戲沒有敵人就不好玩。他們也會偷拿金子，而且還會追" -+"著你跑！如果他們抓到你，你就死了，如果還有生命數就可以再開始玩。\n" - "\n" - "您可以逃避他們的追殺，也可以挖洞並引誘他們掉下去。\n" - "\n" --"當敵人掉進洞時，他們偷拿的金子會跑出來。不過他們一陣子就會從洞裡爬出來。如果沒來得及在洞填上之前爬出來，他就會被埋死在裡面，然後又從某處再跑出來。您可以連續挖幾" --"個洞，讓他們連續掉進去後最後會被埋起來。\n" -+"當敵人掉進洞時，他們偷拿的金子會跑出來。不過他們一陣子就會從洞裡爬出來。如果" -+"沒來得及在洞填上之前爬出來，他就會被埋死在裡面，然後又從某處再跑出來。您可以" -+"連續挖幾個洞，讓他們連續掉進去後最後會被埋起來。\n" - "\n" --"更重要的是，他們掉在洞裡時您可以從他們頭上走過去。像在這一關開始您就要這樣做：挖一個洞，引誘敵人掉下去，然後從他頭上踏過去，以免其他敵人追過來..." -+"更重要的是，他們掉在洞裡時您可以從他們頭上走過去。像在這一關開始您就要這樣" -+"做：挖一個洞，引誘敵人掉下去，然後從他頭上踏過去，以免其他敵人追過來..." - - #: data_messages.cpp:63 - msgid "Bars" -@@ -140,9 +149,12 @@ - - #: data_messages.cpp:64 - msgid "" --"You can move horizontally along bars (or poles), but if you move down you will " --"let go and fall .... Also, note that you can collect gold by falling onto it." --msgstr "你可以吊在橫木上作水平移動，但如果你往下移動，你就會鬆手然後 掉落... 提醒一下，你可以藉著落下的過程取得路徑上的金塊。" -+"You can move horizontally along bars (or poles), but if you move down you " -+"will let go and fall .... Also, note that you can collect gold by falling " -+"onto it." -+msgstr "" -+"你可以吊在橫木上作水平移動，但如果你往下移動，你就會鬆手然後 掉落... 提醒一" -+"下，你可以藉著落下的過程取得路徑上的金塊。" - - #: data_messages.cpp:68 - msgid "False Bricks" -@@ -150,13 +162,15 @@ - - #: data_messages.cpp:69 - msgid "" --"Some of the bricks in this level are not what they seem. If you walk onto them " --"you fall through. The enemies fall through them too." --msgstr "這關裡有些看似磚牆的部份不是真的磚牆。如果你走過這些磚牆上 面，你就會往下掉。你的敵人一樣會從這些地方往下掉。" -+"Some of the bricks in this level are not what they seem. If you walk onto " -+"them you fall through. The enemies fall through them too." -+msgstr "" -+"這關裡有些看似磚牆的部份不是真的磚牆。如果你走過這些磚牆上 面，你就會往下掉。" -+"你的敵人一樣會從這些地方往下掉。" - - #: data_messages.cpp:73 data_messages.cpp:110 - msgid "Bye ......." --msgstr "再會 ......" -+msgstr "再會……" - - #: data_messages.cpp:74 data_messages.cpp:111 - msgid "" -@@ -164,15 +178,16 @@ - "games in KGoldrunner.\n" - "\n" - "Note that there is a game Editor in which you and your friends can make up " --"levels and challenge each other. There is also a KGoldrunner Handbook in the " --"Help Menu, which contains more detail than this Tutorial.\n" -+"levels and challenge each other. There is also a KGoldrunner Handbook in " -+"the Help Menu, which contains more detail than this Tutorial.\n" - "\n" - "It's been a pleasure showing you around. Bye !!!" - msgstr "" - "這只是一個可以簡單完成的關卡，希望你在其他KGoldrunner的關卡 中能玩得愉快。\n" - "\n" --"注意一下，這個遊戲包含了遊戲編輯器，你可以和你的朋友製造關 卡、挑戰對方。在說明選單中也有KGoldrunner的使用手冊，在那裡 " --"可以找到比這個體驗教學詳細的說明。\n" -+"注意一下，這個遊戲包含了遊戲編輯器，你可以和你的朋友製造關 卡、挑戰對方。在說" -+"明選單中也有KGoldrunner的使用手冊，在那裡 可以找到比這個體驗教學詳細的說" -+"明。\n" - "\n" - "很高興能夠帶你體驗一下，再會!!!" - -@@ -182,32 +197,35 @@ - - #: data_messages.cpp:83 - msgid "" --"There's nowhere to dig, so you must dodge the enemies and avoid falling to the " --"concrete at the wrong time. Try to keep the enemies together.\n" -+"There's nowhere to dig, so you must dodge the enemies and avoid falling to " -+"the concrete at the wrong time. Try to keep the enemies together.\n" - "\n" --"If an enemy has a gold outline, he is holding a nugget. He might drop it as he " --"runs over the concrete or maybe at the top of a ladder ...... patience, " -+"If an enemy has a gold outline, he is holding a nugget. He might drop it as " -+"he runs over the concrete or maybe at the top of a ladder ...... patience, " - "patience !!" - msgstr "" --"這裡沒有地方可以挖洞，所以您只能閃躲敵人並避免在錯誤的時間掉進水泥裡。試著讓敵人集中在一起。\n" -+"這裡沒有地方可以挖洞，所以您只能閃躲敵人並避免在錯誤的時間掉進水泥裡。試著讓" -+"敵人集中在一起。\n" - "\n" --"如果敵人有金色的輪廓，那他可能有偷拿金子。他也許會在水泥上面跑的時候把金子丟下來，也或者會放在梯子的最上方。保持耐心！" -+"如果敵人有金色的輪廓，那他可能有偷拿金子。他也許會在水泥上面跑的時候把金子丟" -+"下來，也或者會放在梯子的最上方。保持耐心！" - - #: data_messages.cpp:89 - msgid "To kill ....." --msgstr "殺掉他們..." -+msgstr "殺掉他們…" - - #: data_messages.cpp:90 - msgid "" --"You cannot get up to the gold, so you must get the enemies to bring it down to " --"you. But how do you get them to keep going back?\n" -+"You cannot get up to the gold, so you must get the enemies to bring it down " -+"to you. But how do you get them to keep going back?\n" - "\n" - "If you are feeling stressed, you can hit the P or Esc key and take a break. " - "Also, you can use the Settings menu to slow down the action." - msgstr "" - "您無法拿到那些金子，所以得讓敵人幫你帶下來。不過您要怎麼讓他帶下來？\n" - "\n" --"如果您覺得壓力很大，您可以按 P 或 ESC 鍵休息一下。您也可以在設定目錄中設定讓動作變慢一點。" -+"如果您覺得壓力很大，您可以按 P 或 ESC 鍵休息一下。您也可以在設定目錄中設定讓" -+"動作變慢一點。" - - #: data_messages.cpp:96 - msgid "... Or not to kill?" -@@ -218,13 +236,14 @@ - "It is best not to kill the enemy. Try it and you will find out why ... Heh, " - "heh, heh !! ... ;-)\n" - "\n" --"If you do kill him unintentionally, before you have collected the gold at the " --"top left, you can still finish the level by digging away the side of the pit he " --"is in." -+"If you do kill him unintentionally, before you have collected the gold at " -+"the top left, you can still finish the level by digging away the side of the " -+"pit he is in." - msgstr "" - "最好不要殺掉敵人。試著自己找出為什麼，嘿，嘿，嘿～\n" - "\n" --"如果在您拿到最左上方的金子前，您不小心殺掉敵人，您還是可以在他掉進去的洞附近挖洞來完成關卡。" -+"如果在您拿到最左上方的金子前，您不小心殺掉敵人，您還是可以在他掉進去的洞附近" -+"挖洞來完成關卡。" - - #: data_messages.cpp:103 - msgid "Traps" -@@ -234,15 +253,17 @@ - msgid "" - "Some of the bricks here are not what they seem. They are known as false " - "bricks, fall-through bricks or traps. If you try to walk on them, you fall " --"through. If the enemies walk on them, they can descend on you without warning. " --" Sometimes you have to fall through a brick to get some gold.\n" -+"through. If the enemies walk on them, they can descend on you without " -+"warning. Sometimes you have to fall through a brick to get some gold.\n" - "\n" --"At the start, jump into the concrete pit, dig and drop through. That will get " --"one enemy tied up for a while .... :-)" -+"At the start, jump into the concrete pit, dig and drop through. That will " -+"get one enemy tied up for a while .... :-)" - msgstr "" --"有些磚塊實際上不是磚塊，只是看起來像磚塊的陷阱。如果您走在那上面，您就會掉下去。有時您會需要掉下某些陷阱才能拿到一些金子。\n" -+"有些磚塊實際上不是磚塊，只是看起來像磚塊的陷阱。如果您走在那上面，您就會掉下" -+"去。有時您會需要掉下某些陷阱才能拿到一些金子。\n" - "\n" --"在關卡開始時，跳進水泥洞中，挖洞，然後跳下去。這樣會有一個敵人被「卡」在那裡一段時間。" -+"在關卡開始時，跳進水泥洞中，挖洞，然後跳下去。這樣會有一個敵人被「卡」在那裡" -+"一段時間。" - - #: data_messages.cpp:157 - msgid "Don't Panic" -@@ -636,13 +657,14 @@ - - #: data_messages.cpp:448 - msgid "" --"This level is named after the famous German submarine war film and dedicated to " --"Marco Krüger of Berlin, the original author of KGoldrunner.\n" -+"This level is named after the famous German submarine war film and dedicated " -+"to Marco Krüger of Berlin, the original author of KGoldrunner.\n" - "\n" --"Just one small hint .... if you stand on the right hand end of the boat you can " --"get the enemy to fall towards you .... the rest is up to you !!!!" -+"Just one small hint .... if you stand on the right hand end of the boat you " -+"can get the enemy to fall towards you .... the rest is up to you !!!!" - msgstr "" --"這個關卡是根據著名的德國潛艇戰爭電影命名，要獻給 KGoldrunner 的作者，柏林的 Marco Krüger。\n" -+"這個關卡是根據著名的德國潛艇戰爭電影命名，要獻給 KGoldrunner 的作者，柏林的 " -+"Marco Krüger。\n" - "\n" - "只給一個小提示...站在船的右手邊，敵人會開始往你這兒掉下來。接下來就看你的了！" - -@@ -829,13 +851,14 @@ - #: data_messages.cpp:592 - msgid "" - "These 100 levels make an excellent introductory game, as well as a good " --"opportunity for experts to build up high scores. They were composed by Peter " --"Wadham and use traditional playing rules.\n" -+"opportunity for experts to build up high scores. They were composed by " -+"Peter Wadham and use traditional playing rules.\n" - "\n" - "The last few levels are very hard, but if you are looking for even more of a " - "challenge, have a go at 'Vengeance of Peter W' .... ;-) ...." - msgstr "" --"這一百個關卡是個很好的開始，也可以讓行家得到很高的分數。這些都是 Peter Wadham 創作的，使用傳統的規則。\n" -+"這一百個關卡是個很好的開始，也可以讓行家得到很高的分數。這些都是 Peter " -+"Wadham 創作的，使用傳統的規則。\n" - "\n" - "最後幾關非常困難，不過如果您還要更多挑戰，請到「Peter W 的復仇」。" - -@@ -845,10 +868,12 @@ - - #: data_messages.cpp:595 - msgid "" --"These tricky little levels were composed by Peter, Simon, Genevieve and their " --"father Ian Wadham. They use traditional playing rules. Enjoy! .... ;-) ...." -+"These tricky little levels were composed by Peter, Simon, Genevieve and " -+"their father Ian Wadham. They use traditional playing rules. " -+"Enjoy! .... ;-) ...." - msgstr "" --"這些麻煩的小關卡是由 Peter，Simon，Genevieve 及他們的父親 Ian Wadham 創作的。他們使用傳統的規則。好好享受吧！" -+"這些麻煩的小關卡是由 Peter，Simon，Genevieve 及他們的父親 Ian Wadham 創作的。" -+"他們使用傳統的規則。好好享受吧！" - - #: data_messages.cpp:597 - msgid "Vengeance of Peter W" -@@ -871,8 +896,9 @@ - "KGoldrunner rules. The enemies run fast and have an aggressive search " - "strategy. Enjoy! .... :-) ...." - msgstr "" --"這些關卡由 Marco Krüger，KGoldrunner 的原始作者及他的一些朋友，還有其他貢獻者創作的。他們使用 KGoldrunner " --"的規則。敵人會跑得比較快，而且更具侵略性。好好享受！" -+"這些關卡由 Marco Krüger，KGoldrunner 的原始作者及他的一些朋友，還有其他貢獻者" -+"創作的。他們使用 KGoldrunner 的規則。敵人會跑得比較快，而且更具侵略性。好好享" -+"受！" - - #: data_messages.cpp:603 - msgid "Tutorial" -@@ -884,12 +910,14 @@ - "KGoldrunner and helps you develop the skills you need to get started. Each " - "level has a brief explanation, then you play .....\n" - "\n" --"When you move on to play more advanced levels, you will find that KGoldrunner " --"combines action, strategy and puzzle solving --- all in one game." -+"When you move on to play more advanced levels, you will find that " -+"KGoldrunner combines action, strategy and puzzle solving --- all in one game." - msgstr "" --"這些教學文件是用一些簡單的關卡來教導 KGoldrunner 的規則，並協助您熟練一些技巧。每個關卡都有簡單的解釋。\n" -+"這些教學文件是用一些簡單的關卡來教導 KGoldrunner 的規則，並協助您熟練一些技" -+"巧。每個關卡都有簡單的解釋。\n" - "\n" --"當您玩到更進階的關卡時，您就會發現 KGoldrunner 包含了動作、戰略及解謎...集於一身。" -+"當您玩到更進階的關卡時，您就會發現 KGoldrunner 包含了動作、戰略及解謎...集於" -+"一身。" - - #: data_messages.cpp:606 - msgid "Advanced Tutorial" -@@ -943,11 +971,11 @@ - - #: kgoldrunner.cpp:250 kgoldrunner.cpp:1007 kgrgame.cpp:772 - msgid "&Save Edits..." --msgstr "儲存編輯(&S)..." -+msgstr "儲存編輯(&S)…" - - #: kgoldrunner.cpp:257 - msgid "&Move Level..." --msgstr "更多關卡(&M)..." -+msgstr "更多關卡(&M)…" - - #: kgoldrunner.cpp:262 - msgid "&Delete Level..." -@@ -1007,7 +1035,7 @@ - - #: kgoldrunner.cpp:396 - msgid "K&Goldrunner Rules" --msgstr "KGoldrunner 規則 (&G)" -+msgstr "KGoldrunner 規則(&G)" - - #: kgoldrunner.cpp:410 - msgid "Larger Playing Area" -@@ -1116,21 +1144,23 @@ - - #: kgoldrunner.cpp:862 - msgid "" --"Cannot find system games sub-folder '%1/system/' in area '%2' of the KDE folder " --"($KDEDIRS)." -+"Cannot find system games sub-folder '%1/system/' in area '%2' of the KDE " -+"folder ($KDEDIRS)." - msgstr "無法在KDE資料夾($KDEDIRS)的'%2'區內找到遊戲子目錄'en/%1/'。" - - #: kgoldrunner.cpp:875 - msgid "" --"Cannot find or create user games sub-folder '%1/user/' in area '%2' of the KDE " --"user area ($KDEHOME)." -+"Cannot find or create user games sub-folder '%1/user/' in area '%2' of the " -+"KDE user area ($KDEHOME)." - msgstr "無法在KDE使用者區($KDEHOME)的'%2'區內找到遊戲 子目錄'en/%1/'。" - - #: kgoldrunner.cpp:884 - msgid "" --"Cannot find or create 'levels/' folder in sub-folder '%1/user/' in the KDE user " --"area ($KDEHOME)." --msgstr "在 KDE 使用者資料區 ($KDEHOME) 中的子資料夾 %1/user/ 中找不到或無法產生 levels 資料夾。" -+"Cannot find or create 'levels/' folder in sub-folder '%1/user/' in the KDE " -+"user area ($KDEHOME)." -+msgstr "" -+"在 KDE 使用者資料區 ($KDEHOME) 中的子資料夾 %1/user/ 中找不到或無法產生 " -+"levels 資料夾。" - - #: kgoldrunner.cpp:913 - msgid "Switch to Keyboard Mode" -@@ -1138,10 +1168,12 @@ - - #: kgoldrunner.cpp:914 - msgid "" --"You have pressed a key that can be used to move the Hero. Do you want to switch " --"automatically to keyboard control? Mouse control is easier to use in the long " --"term - like riding a bike rather than walking!" --msgstr "您在鍵盤中按下了移動我們的主角的按鍵。您要自動切換成鍵盤控制嗎？滑鼠控制適用於長途行動，像是騎機車之類。" -+"You have pressed a key that can be used to move the Hero. Do you want to " -+"switch automatically to keyboard control? Mouse control is easier to use in " -+"the long term - like riding a bike rather than walking!" -+msgstr "" -+"您在鍵盤中按下了移動我們的主角的按鍵。您要自動切換成鍵盤控制嗎？滑鼠控制適用" -+"於長途行動，像是騎機車之類。" - - #: kgoldrunner.cpp:918 - msgid "Switch to &Keyboard Mode" -@@ -1213,9 +1245,10 @@ - - #: kgrcanvas.cpp:147 - msgid "" --"Sorry, you cannot change the size of the playing area. That function requires " --"Qt Library version 3 or later." --msgstr "抱歉，您不能改變遊戲區的大小。該功能需要 Qt 函式庫 version 3 或是更新的版本。" -+"Sorry, you cannot change the size of the playing area. That function " -+"requires Qt Library version 3 or later." -+msgstr "" -+"抱歉，您不能改變遊戲區的大小。該功能需要 Qt 函式庫 version 3 或是更新的版本。" - - #: kgrdialog.cpp:39 kgrdialog.cpp:86 - msgid "Select Game" -@@ -1275,7 +1308,7 @@ - - #: kgrdialog.cpp:179 - msgid "Move To..." --msgstr "移到..." -+msgstr "移到…" - - #: kgrdialog.cpp:182 kgrdialog.cpp:583 kgrdialog.cpp:655 kgrgame.cpp:2167 - msgid "Edit Game Info" -@@ -1323,7 +1356,9 @@ - msgid "" - "The main button at the bottom echoes the menu action you selected. Click it " - "after choosing a game and level - or use \"Cancel\"." --msgstr "底部的主要按鍵會回應您所選擇的選單的動作。選好遊戲與關卡後按下按鍵，或是按下「取消」。" -+msgstr "" -+"底部的主要按鍵會回應您所選擇的選單的動作。選好遊戲與關卡後按下按鍵，或是按下" -+"「取消」。" - - #: kgrdialog.cpp:419 - msgid "" -@@ -1333,53 +1368,59 @@ - "\"Cancel\" and click that item in the Game or Help menu. The tutorial game " - "gives you hints as you go.\n" - "\n" --"Otherwise, just click on the name of a game (in the list box), then, to start " --"at level 001, click on the main button at the bottom. Play begins when you move " --"the mouse or press a key." -+"Otherwise, just click on the name of a game (in the list box), then, to " -+"start at level 001, click on the main button at the bottom. Play begins when " -+"you move the mouse or press a key." - msgstr "" - "\n" - "\n" --"如果您是第一次玩 KGoldrunner，請選擇教學遊戲，或按下「取消」並按下遊戲或說明選單中的項目。教學遊戲會給您一些提示。\n" -+"如果您是第一次玩 KGoldrunner，請選擇教學遊戲，或按下「取消」並按下遊戲或說明" -+"選單中的項目。教學遊戲會給您一些提示。\n" - "\n" --"不然也可以在列表中按下遊戲的名稱，然後按下底部的主要按鍵從第一關開始玩。關卡會在您移動滑鼠或按下任何鍵之後開始。" -+"不然也可以在列表中按下遊戲的名稱，然後按下底部的主要按鍵從第一關開始玩。關卡" -+"會在您移動滑鼠或按下任何鍵之後開始。" - - #: kgrdialog.cpp:430 - msgid "" - "\n" - "\n" - "You can select System levels for editing (or copying), but you must save the " --"result in a game you have created. Use the mouse as a paintbrush and the editor " --"toolbar buttons as a palette. Use the 'Empty Space' button to erase." -+"result in a game you have created. Use the mouse as a paintbrush and the " -+"editor toolbar buttons as a palette. Use the 'Empty Space' button to erase." - msgstr "" - "\n" - "\n" --"您可以選擇系統關卡來編輯，但您必須儲存您創作的關卡。從工具列選擇要填上空間的物品，移動滑鼠來填上空間。「清除空間」則可以把物品清除。" -+"您可以選擇系統關卡來編輯，但您必須儲存您創作的關卡。從工具列選擇要填上空間的" -+"物品，移動滑鼠來填上空間。「清除空間」則可以把物品清除。" - - #: kgrdialog.cpp:437 - msgid "" - "\n" - "\n" --"You can add a name and hint to your new level here, but you must save the level " --"you have created into one of your own games. By default your new level will go " --"at the end of your game, but you can also select a level number and save into " --"the middle of your game." -+"You can add a name and hint to your new level here, but you must save the " -+"level you have created into one of your own games. By default your new level " -+"will go at the end of your game, but you can also select a level number and " -+"save into the middle of your game." - msgstr "" - "\n" - "\n" --"您可以在新關卡加入一個名稱或提示，但是要記得儲存。您的新關卡預設會加到最後面，但是您也可以選擇插入中間的關卡編號。" -+"您可以在新關卡加入一個名稱或提示，但是要記得儲存。您的新關卡預設會加到最後" -+"面，但是您也可以選擇插入中間的關卡編號。" - - #: kgrdialog.cpp:444 - msgid "" - "\n" - "\n" --"You can create or edit a name and hint here, before saving. If you change the " --"game or level, you can do a copy or \"Save As\", but you must always save into " --"one of your own games. If you save a level into the middle of a series, the " --"other levels are automatically re-numbered." -+"You can create or edit a name and hint here, before saving. If you change " -+"the game or level, you can do a copy or \"Save As\", but you must always " -+"save into one of your own games. If you save a level into the middle of a " -+"series, the other levels are automatically re-numbered." - msgstr "" - "\n" - "\n" --"您可以在此產生或編輯名稱與提示。如果您修改了遊戲或關卡，您可以選擇「另存新檔」，但要記得至少儲存到一個地方。如果您將關卡插到中間，其他的關卡會自動重新編號。" -+"您可以在此產生或編輯名稱與提示。如果您修改了遊戲或關卡，您可以選擇「另存新" -+"檔」，但要記得至少儲存到一個地方。如果您將關卡插到中間，其他的關卡會自動重新" -+"編號。" - - #: kgrdialog.cpp:451 - msgid "" -@@ -1398,12 +1439,13 @@ - "\n" - "To move (re-number) a level, you must first select it by using \"Edit Any " - "Level...\", then you can use \"Move Level...\" to assign it a new number or " --"even a different game. Other levels are automatically re-numbered as required. " --"You can only move levels within your own games." -+"even a different game. Other levels are automatically re-numbered as " -+"required. You can only move levels within your own games." - msgstr "" - "\n" - "\n" --"要移動關卡，您要先選擇「編輯任一關卡」，然後選擇「移動關卡」來重新指定關卡編號。其他的關卡會自動重新編號。" -+"要移動關卡，您要先選擇「編輯任一關卡」，然後選擇「移動關卡」來重新指定關卡編" -+"號。其他的關卡會自動重新編號。" - - #: kgrdialog.cpp:463 - msgid "" -@@ -1420,16 +1462,17 @@ - msgid "" - "\n" - "\n" --"Click on the list box to choose a game. Below the list box you can see \"More " --"Info\" about the selected game, how many levels there are and what rules the " --"enemies follow (see the Settings menu).\n" -+"Click on the list box to choose a game. Below the list box you can see " -+"\"More Info\" about the selected game, how many levels there are and what " -+"rules the enemies follow (see the Settings menu).\n" - "\n" - "You select a level number by typing it or using the scroll bar. As you vary " - "the game or level, the thumbnail area shows a preview of your choice." - msgstr "" - "\n" - "\n" --"在清單中選擇一個遊戲。清單底下您可以用「更多資訊」來查看關於該遊戲的資訊，遊戲中有多少關卡，使用哪種規則等等（並請參考「設定」選單）。\n" -+"在清單中選擇一個遊戲。清單底下您可以用「更多資訊」來查看關於該遊戲的資訊，遊" -+"戲中有多少關卡，使用哪種規則等等（並請參考「設定」選單）。\n" - "\n" - "您可以用鍵盤輸入或用捲軸選擇關卡編號，然後可以看到關於該遊戲或關卡的預覽。" - -@@ -1506,8 +1549,8 @@ - - #: kgrgame.cpp:191 - msgid "" --"CONGRATULATIONS !!!!" --"

                                You have conquered the last level in the %1 game !!

                                " -+"CONGRATULATIONS !!!!

                                You have conquered the last level in the %1 " -+"game !!

                                " - msgstr "恭喜！！

                                您征服了遊戲 %1 的最後一個關卡！

                                " - - #: kgrgame.cpp:384 -@@ -1558,9 +1601,11 @@ - - #: kgrgame.cpp:776 - msgid "" --"Please note: for reasons of simplicity, your saved game position and score will " --"be as they were at the start of this level, not as they are now." --msgstr "請注意：為了簡化，您儲存遊戲的位址與分數會被視為關卡開始時的位址與分數，而不是現在的位址與分數。" -+"Please note: for reasons of simplicity, your saved game position and score " -+"will be as they were at the start of this level, not as they are now." -+msgstr "" -+"請注意：為了簡化，您儲存遊戲的位址與分數會被視為關卡開始時的位址與分數，而不" -+"是現在的位址與分數。" - - #: kgrgame.cpp:802 kgrgame.cpp:989 kgrgame.cpp:1587 kgrgame.cpp:2545 - msgid "Cannot open file '%1' for output." -@@ -1593,9 +1638,11 @@ - #: kgrgame.cpp:1003 - msgid "" - "Congratulations !!! You have achieved a high score in this game. " --"Please enter your name so that it may be enshrined in the KGoldrunner Hall of " --"Fame." --msgstr "恭喜！您刷新了此遊戲的最高分。請輸入您的姓名，讓您的姓名可以在 KGoldrunner 名人堂中閃耀。" -+"Please enter your name so that it may be enshrined in the KGoldrunner Hall " -+"of Fame." -+msgstr "" -+"恭喜！您刷新了此遊戲的最高分。請輸入您的姓名，讓您的姓名可以在 " -+"KGoldrunner 名人堂中閃耀。" - - #: kgrgame.cpp:1015 kgrgame.cpp:1031 kgrgame.cpp:1106 - msgid "Save High Score" -@@ -1623,17 +1670,11 @@ - - #: kgrgame.cpp:1155 - msgid "" --"
                                " --"

                                KGoldrunner Hall of Fame

                                " --"
                                " --"
                                " --"

                                \"%1\" Game

                                " --msgstr "" --"
                                " --"

                                KGoldrunner 名人堂

                                " --"
                                " --"
                                " --"

                                遊戲 %1

                                " -+"

                                KGoldrunner Hall of Fame


                                \"%1\" " -+"Game

                                " -+msgstr "" -+"

                                KGoldrunner 名人堂


                                遊戲 %1

                                " - - #: kgrgame.cpp:1160 - msgid " Name Level Score Date" -@@ -1651,20 +1692,24 @@ - msgid "" - "You cannot create and save a level until you have created a game to hold it. " - "Try menu item \"Create Game\"." --msgstr "您建立與儲存新關卡之前必須先產生新的遊戲來儲存。請試試選單中的「創造遊戲」。" -+msgstr "" -+"您建立與儲存新關卡之前必須先產生新的遊戲來儲存。請試試選單中的「創造遊戲」。" - - #: kgrgame.cpp:1409 - msgid "" --"You cannot edit and save a level until you have created a game and a level. Try " --"menu item \"Create Game\"." --msgstr "您編輯與儲存關卡之前必須先產生新的遊戲與關卡。請試試選單中的「創造遊戲」。" -+"You cannot edit and save a level until you have created a game and a level. " -+"Try menu item \"Create Game\"." -+msgstr "" -+"您編輯與儲存關卡之前必須先產生新的遊戲與關卡。請試試選單中的「創造遊戲」。" - - #: kgrgame.cpp:1421 - msgid "" --"It is OK to edit a system level, but you MUST save the level in one of your own " --"games. You're not just taking a peek at the hidden ladders and fall-through " --"bricks, are you? :-)" --msgstr "您可以編輯系統關卡，但是您必須將它儲存在自己的遊戲中。我想您編輯系統關卡應該不會只是要偷看隱藏的梯子跟陷阱，是吧？" -+"It is OK to edit a system level, but you MUST save the level in one of your " -+"own games. You're not just taking a peek at the hidden ladders and fall-" -+"through bricks, are you? :-)" -+msgstr "" -+"您可以編輯系統關卡，但是您必須將它儲存在自己的遊戲中。我想您編輯系統關卡應該" -+"不會只是要偷看隱藏的梯子跟陷阱，是吧？" - - #: kgrgame.cpp:1531 kgrgame.cpp:1568 kgrgame.cpp:1586 kgrgame.cpp:2062 - msgid "Save Level" -@@ -1700,9 +1745,11 @@ - - #: kgrgame.cpp:1659 - msgid "" --"You cannot move a level until you have created a game and at least two levels. " --"Try menu item \"Create Game\"." --msgstr "除非您先產生新的遊戲以及至少兩個關卡，才能做移動關卡的動作。請試試選單中的「創造遊戲」。" -+"You cannot move a level until you have created a game and at least two " -+"levels. Try menu item \"Create Game\"." -+msgstr "" -+"除非您先產生新的遊戲以及至少兩個關卡，才能做移動關卡的動作。請試試選單中的" -+"「創造遊戲」。" - - #: kgrgame.cpp:1667 - msgid "Sorry, you cannot move a system level." -@@ -1714,8 +1761,8 @@ - - #: kgrgame.cpp:1744 - msgid "" --"You cannot delete a level until you have created a game and a level. Try menu " --"item \"Create Game\"." -+"You cannot delete a level until you have created a game and a level. Try " -+"menu item \"Create Game\"." - msgstr "您要刪除" - - #: kgrgame.cpp:1766 -@@ -1794,8 +1841,8 @@ - - #: kgrgame.cpp:2372 - msgid "" --"There is no folder '%1' to hold levels for the '%2' game. Please make sure '%3' " --"has been run in the '%4' folder." -+"There is no folder '%1' to hold levels for the '%2' game. Please make sure '%" -+"3' has been run in the '%4' folder." - msgstr "沒有資料夾 %1，無法保存遊戲 %2。請確定 %3 已經在資料夾 %4 中執行。" - - #: kgrgame.cpp:2390 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kjumpingcube.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kjumpingcube.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kjumpingcube.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kjumpingcube.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kjumpingcube\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2003-12-23 02:06+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -32,7 +32,7 @@ - - #: kjumpingcube.cpp:86 - msgid "Stop &Thinking" --msgstr "停止思考 (&T)" -+msgstr "停止思考(&T)" - - #: kjumpingcube.cpp:125 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klickety.po kde-i18n-zh_TW-3.5.10/messages/kdegames/klickety.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klickety.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/klickety.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: klickety\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-09 16:24+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -25,13 +25,13 @@ - - #: field.cpp:20 - msgid "" --"Display the number of remaining blocks." --"
                                It turns blue if it is a highscore and red if it is the best local score.                                " -+"Display the number of remaining blocks.
                                It turns blue if it is a highscore and red if it " -+"is the best local score.                                " - msgstr "" --"顯示剩下方塊的數目。" --"
                                當高分得入排行榜時，它會變成藍色，成為本地最高分時，它就變成紅色                                " -+"顯示剩下方塊的數目。
                                當高分得入排行榜時，它會變成藍色，成為本地最高分時，它就變成紅色" - - #: field.cpp:29 - msgid "Elapsed time" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klines.po kde-i18n-zh_TW-3.5.10/messages/kdegames/klines.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/klines.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/klines.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: klines\n" - "POT-Creation-Date: 2005-07-03 01:31+0200\n" - "PO-Revision-Date: 2003-12-09 16:16+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -189,7 +189,7 @@ - - #: klines.cpp:364 - msgid "Whenever you complete a line you get an extra turn." --msgstr "當您消去一行時，您得到額外沒有新球的回合。" -+msgstr "當您消去一列時，您得到額外沒有新球的回合。" - - #: klines.cpp:368 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmahjongg.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kmahjongg.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmahjongg.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kmahjongg.po 2011-11-11 15:45:17.000000000 +0100 -@@ -13,8 +13,7 @@ - "Project-Id-Version: kmahjongg\n" - "POT-Creation-Date: 2006-06-18 03:58+0200\n" - "PO-Revision-Date: 2006-01-17 16:18+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -139,8 +138,8 @@ - - #: HighScore.cpp:498 - msgid "" --"Resetting the high scores will remove all high score entries both in memory and " --"on disk. Do you wish to proceed?" -+"Resetting the high scores will remove all high score entries both in memory " -+"and on disk. Do you wish to proceed?" - msgstr "" - "重設高分榜將會移除所有在記憶體與磁碟中的分數紀錄\n" - "是否要繼續執行?" -@@ -155,47 +154,39 @@ - - #: Preview.cpp:35 - msgid "Load..." --msgstr "載入..." -+msgstr "載入…" - - #: Preview.cpp:86 - msgid "Change Background Image" - msgstr "改變背景影像" - - #: Preview.cpp:88 --msgid "" --"*.bgnd|Background Image (*.bgnd)\n" --msgstr "" --"*.bgnd|背景影像 (*.bgnd)\n" -+msgid "*.bgnd|Background Image (*.bgnd)\n" -+msgstr "*.bgnd|背景影像 (*.bgnd)\n" - - #: Preview.cpp:94 - msgid "Change Tile Set" - msgstr "改變麻將牌樣式" - - #: Preview.cpp:95 --msgid "" --"*.tileset|Tile Set File (*.tileset)\n" --msgstr "" --"*.tileset|牌樣式設定檔 (*.tileset)\n" -+msgid "*.tileset|Tile Set File (*.tileset)\n" -+msgstr "*.tileset|牌樣式設定檔 (*.tileset)\n" - - #: Preview.cpp:101 --msgid "" --"*.layout|Board Layout File (*.layout)\n" --msgstr "" --"*.layout|版面布局檔 (*.layout)\n" -+msgid "*.layout|Board Layout File (*.layout)\n" -+msgstr "*.layout|版面布局檔 (*.layout)\n" - - #: Preview.cpp:102 - msgid "Change Board Layout" - msgstr "改變版面布局" - - #: Preview.cpp:108 --msgid "" --"*.theme|KMahjongg Theme File (*.theme)\n" --msgstr "" --"*.theme|Kmahjongg 佈景主題 (*.theme)\n" -+msgid "*.theme|KMahjongg Theme File (*.theme)\n" -+msgstr "*.theme|Kmahjongg 布景主題 (*.theme)\n" - - #: Preview.cpp:109 - msgid "Choose Theme" --msgstr "選擇佈景主題" -+msgstr "選擇布景主題" - - #: Preview.cpp:121 - msgid "*|All Files" -@@ -203,11 +194,11 @@ - - #: Preview.cpp:210 - msgid "That is not a valid theme file." --msgstr "這不是有效的佈景主題檔。" -+msgstr "這不是有效的布景主題檔。" - - #: Preview.cpp:386 - msgid "Save Theme" --msgstr "儲存佈景主題" -+msgstr "儲存布景主題" - - #: Preview.cpp:405 - msgid "Overwrite" -@@ -296,7 +287,7 @@ - - #: boardwidget.cpp:726 - msgid "Calculating new game..." --msgstr "計算新版面中..." -+msgstr "計算新版面中…" - - #: boardwidget.cpp:731 - msgid "Error converting board information!" -@@ -325,27 +316,27 @@ - - #: kmahjongg.cpp:136 - msgid "New Numbered Game..." --msgstr "新編號的遊戲..." -+msgstr "新編號的遊戲…" - - #: kmahjongg.cpp:137 - msgid "Open Th&eme..." --msgstr "開啟佈景主題...(&E)" -+msgstr "開啟布景主題…(&E)" - - #: kmahjongg.cpp:138 - msgid "Open &Tileset..." --msgstr "開啟牌樣式...(&T)" -+msgstr "開啟牌樣式…(&T)" - - #: kmahjongg.cpp:139 - msgid "Open &Background..." --msgstr "開啟背景圖...(&B)" -+msgstr "開啟背景圖…(&B)" - - #: kmahjongg.cpp:140 - msgid "Open La&yout..." --msgstr "開啟版面樣式...(&Y)" -+msgstr "開啟版面樣式…(&Y)" - - #: kmahjongg.cpp:141 - msgid "Sa&ve Theme..." --msgstr "儲存佈景主題...(&V)" -+msgstr "儲存布景主題…(&V)" - - #: kmahjongg.cpp:144 - msgid "Shu&ffle" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmines.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kmines.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kmines.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kmines.po 2011-11-11 15:45:17.000000000 +0100 -@@ -16,8 +16,7 @@ - "Project-Id-Version: kmines\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-17 16:20+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -210,7 +209,8 @@ - - #: dialogs.cpp:252 - msgid "" --"When the \"magic\" reveal is on, you lose the ability to enter the highscores." -+"When the \"magic\" reveal is on, you lose the ability to enter the " -+"highscores." - msgstr "當\"神奇\"開挖被啟動時，您就不能進入排行榜" - - #: dialogs.cpp:257 -@@ -230,7 +230,7 @@ - msgid "" - "_n: %n mine color:\n" - "%n mines color:" --msgstr "%n地雷顏色:" -+msgstr "%n 地雷顏色:" - - #: field.cpp:39 - msgid "Case revealed" -@@ -310,7 +310,7 @@ - - #: main.cpp:106 - msgid "Solving Rate..." --msgstr "解決速度..." -+msgstr "解決速度…" - - #: main.cpp:110 - msgid "View Log" -@@ -366,10 +366,11 @@ - - #: status.cpp:68 - msgid "" --"Mines left." --"
                                It turns red when you have flagged more cases " --"than present mines.                                " --msgstr "剩餘地雷
                                當您標記超過現有的地雷數目時， 會變成紅色                                " -+"Mines left.
                                It turns red when you have " -+"flagged more cases than present mines.                                " -+msgstr "" -+"剩餘地雷
                                當您標記超過現有的地雷數目時， 會變成紅" -+"色                                " - - #: status.cpp:78 - msgid "Press to start a new game" -@@ -377,13 +378,11 @@ - - #: status.cpp:83 - msgid "" --"Time elapsed." --"
                                It turns blue if it is a highscore and red if it is the best time.                                " -+"Time elapsed.
                                It turns blue if it is a " -+"highscore and red if it is the best time.                                " - msgstr "" --"剩餘時間" --"
                                當產生新的最高分時，會變成藍色 當產生新的最佳時間時，會變成紅色.                                " -+"剩餘時間
                                當產生新的最高分時，會變成藍色 " -+"當產生新的最佳時間時，會變成紅色.                                " - - #: status.cpp:103 - msgid "Mines field." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/knetwalk.po kde-i18n-zh_TW-3.5.10/messages/kdegames/knetwalk.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/knetwalk.po 2007-01-15 10:56:21.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/knetwalk.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: knetwalk\n" - "POT-Creation-Date: 2006-12-21 02:39+0100\n" - "PO-Revision-Date: 2006-01-18 08:57+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -88,17 +87,15 @@ - - #: mainwindow.cpp:89 - msgid "" --"

                                Rules of the Game

                                " --"

                                You are the system administrator and your goal is to connect each computer " --"to the central server." --"

                                Click the right mouse button to turn the cable in a clockwise direction, and " --"the left mouse button to turn it in a counter-clockwise direction." --"

                                Start the LAN with as few turns as possible!" -+"

                                Rules of the Game

                                You are the system administrator and your goal " -+"is to connect each computer to the central server.

                                Click the right mouse " -+"button to turn the cable in a clockwise direction, and the left mouse button " -+"to turn it in a counter-clockwise direction.

                                Start the LAN with as few " -+"turns as possible!" - msgstr "" --"

                                遊戲規則

                                " --"

                                您是個系統管理員，您的目標是將每一台電腦都連接到中央伺服器上。" --"

                                按滑鼠右鍵可以將 cable 線轉順時鐘方向，滑鼠左鍵則轉逆時鐘方向。" --"

                                開始 LAN 連線之前，盡量讓線轉越少次越好！" -+"

                                遊戲規則

                                您是個系統管理員，您的目標是將每一臺電腦都連接到中央伺服" -+"器上。

                                按滑鼠右鍵可以將 cable 線轉順時鐘方向，滑鼠左鍵則轉逆時鐘方向。

                                開" -+"始 LAN 連線之前，盡量讓線轉越少次越好！" - - #: mainwindow.cpp:151 mainwindow.cpp:372 - #, c-format -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kolf.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kolf.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kolf.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kolf.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kolf\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-19 19:33+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -212,7 +212,7 @@ - - #: kolf.cpp:92 - msgid "Save &Course As..." --msgstr "將路線存為...(&C)" -+msgstr "將路線存為…(&C)" - - #: kolf.cpp:94 - msgid "&Save Game" -@@ -220,11 +220,11 @@ - - #: kolf.cpp:95 - msgid "&Save Game As..." --msgstr "將遊戲存為...(&S)" -+msgstr "將遊戲存為…(&S)" - - #: kolf.cpp:98 - msgid "Load Saved Game..." --msgstr "載入儲存的檔案..." -+msgstr "載入儲存的檔案…" - - #: kolf.cpp:103 - msgid "&New" -@@ -320,7 +320,7 @@ - - #: kolf.cpp:150 - msgid "&Tutorial" --msgstr "體驗教學...(&T)" -+msgstr "體驗教學…(&T)" - - #: kolf.cpp:403 kolf.cpp:446 kolf.cpp:472 newgame.cpp:225 scoreboard.cpp:17 - msgid "Par" -@@ -464,7 +464,7 @@ - - #: newgame.cpp:159 - msgid "Add..." --msgstr "增加..." -+msgstr "增加…" - - #: newgame.cpp:172 - msgid "Game Options" -@@ -552,7 +552,7 @@ - - #: slope.cpp:555 - msgid "Whether or not this slope can be moved by other objects, like floaters." --msgstr "這個斜坡是否能夠被其他物(像是浮台)件所推動" -+msgstr "這個斜坡是否能夠被其他物(像是浮臺)件所推動" - - #: game.h:231 - msgid "Puddle" -@@ -614,7 +614,9 @@ - #~ msgid "Steep" - #~ msgstr "陡峭的" - --#~ msgid "Since it's your first time playing Kolf, would you like to play on the tutorial course once?" -+#~ msgid "" -+#~ "Since it's your first time playing Kolf, would you like to play on the " -+#~ "tutorial course once?" - #~ msgstr "這是您第一次玩 Kolf ，您願意玩一次入門路線嗎？" - - #~ msgid "New %1" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/konquest.po kde-i18n-zh_TW-3.5.10/messages/kdegames/konquest.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/konquest.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/konquest.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: konquest\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-01-17 16:32+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -36,7 +35,7 @@ - #: rc.cpp:15 - #, no-c-format - msgid "New Column" --msgstr "新的一行" -+msgstr "新的一列" - - #. i18n: file newGameDlg_ui.ui line 111 - #: rc.cpp:18 -@@ -104,11 +103,11 @@ - - #: gameboard.cc:237 - msgid "Select source planet..." --msgstr "選擇起始的行星..." -+msgstr "選擇起始的行星…" - - #: gameboard.cc:255 - msgid "Select destination planet..." --msgstr "選擇目標的行星..." -+msgstr "選擇目標的行星…" - - #: gameboard.cc:277 - msgid ": How many ships?" -@@ -136,7 +135,7 @@ - - #: gameboard.cc:339 - msgid "Computer Player thinking..." --msgstr "電腦玩家考慮中..." -+msgstr "電腦玩家考慮中…" - - #: gameboard.cc:434 - msgid "Turn #: %1 of %2" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpat.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kpat.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpat.po 2007-01-15 10:56:21.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kpat.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kpat\n" - "POT-Creation-Date: 2006-10-12 02:36+0200\n" - "PO-Revision-Date: 2006-01-17 16:27+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,7 +28,7 @@ - - #: cardmaps.cpp:99 - msgid "please wait, loading cards..." --msgstr "請稍候, 載入卡片中..." -+msgstr "請稍候, 載入卡片中…" - - #: cardmaps.cpp:100 - msgid "KPatience - a Solitaire game" -@@ -41,19 +40,19 @@ - - #: computation.cpp:116 - msgid "&Calculation" --msgstr "計算 (&C)" -+msgstr "計算(&C)" - - #: dealer.cpp:117 - msgid "&Hint" --msgstr "提示 (&H)" -+msgstr "提示(&H)" - - #: dealer.cpp:125 - msgid "&Demo" --msgstr "示範 (&D)" -+msgstr "示範(&D)" - - #: dealer.cpp:133 - msgid "&Redeal" --msgstr "重新發牌 (&R)" -+msgstr "重新發牌(&R)" - - #: fortyeight.cpp:196 - msgid "Forty && &Eight" -@@ -77,7 +76,7 @@ - - #: freecell.cpp:848 - msgid "&Freecell" --msgstr "新接龍 (&F)" -+msgstr "新接龍(&F)" - - #: golf.cpp:160 - msgid "Go&lf" -@@ -85,7 +84,7 @@ - - #: grandf.cpp:223 - msgid "&Grandfather" --msgstr "老祖宗 (&G)" -+msgstr "老祖宗(&G)" - - #: gypsy.cpp:113 - msgid "Gy&psy" -@@ -93,15 +92,15 @@ - - #: idiot.cpp:229 - msgid "&Aces Up" --msgstr "Aces Up (&A)" -+msgstr "Aces Up(&A)" - - #: kings.cpp:127 - msgid "&The Kings" --msgstr "國王 (&T)" -+msgstr "國王(&T)" - - #: klondike.cpp:483 - msgid "&Klondike" --msgstr "Klondike (&K)" -+msgstr "Klondike(&K)" - - #: klondike.cpp:490 - msgid "Klondike (&draw 3)" -@@ -153,43 +152,43 @@ - - #: mod3.cpp:303 - msgid "M&od3" --msgstr "Mod3 (&O)" -+msgstr "Mod3(&O)" - - #: napoleon.cpp:200 - msgid "&Napoleon's Tomb" --msgstr "拿破崙之墓 (&N)" -+msgstr "拿破崙之墓(&N)" - - #: pwidget.cpp:76 - msgid "&Choose Game..." --msgstr "選擇遊戲 (&C)" -+msgstr "選擇遊戲(&C)" - - #: pwidget.cpp:78 - msgid "Restart &Game" --msgstr "重新開始遊戲 (&G)" -+msgstr "重新開始遊戲(&G)" - - #: pwidget.cpp:83 - msgid "&Game Type" --msgstr "遊戲類別 (&G)" -+msgstr "遊戲類別(&G)" - - #: pwidget.cpp:107 - msgid "&Change Background" --msgstr "改變背景 (&C)" -+msgstr "改變背景(&C)" - - #: pwidget.cpp:134 - msgid "&Switch Cards..." --msgstr "切換卡片 (&S)" -+msgstr "切換卡片(&S)" - - #: pwidget.cpp:137 - msgid "&Statistics" --msgstr "統計 (&S)" -+msgstr "統計(&S)" - - #: pwidget.cpp:140 - msgid "&Animation on Startup" --msgstr "啟動時的動畫 (&A)" -+msgstr "啟動時的動畫(&A)" - - #: pwidget.cpp:143 - msgid "&Enable Autodrop" --msgstr "使用自動落下 (&E)" -+msgstr "使用自動落下(&E)" - - #: pwidget.cpp:146 - msgid "Disable Autodrop" -@@ -197,8 +196,8 @@ - - #: pwidget.cpp:221 - msgid "" --"The cards you have chosen have a different size than the ones you are currently " --"using. This requires the current game to be restarted." -+"The cards you have chosen have a different size than the ones you are " -+"currently using. This requires the current game to be restarted." - msgstr "您選擇的牌和目前使用的牌大小不合。您必須重新啟動本遊戲。" - - #: pwidget.cpp:242 -@@ -207,11 +206,13 @@ - - #: pwidget.cpp:301 - msgid "" --"You are already running an unfinished game. If you abort the old game to start " --"a new one, the old game will be registered as a loss in the statistics file.\n" -+"You are already running an unfinished game. If you abort the old game to " -+"start a new one, the old game will be registered as a loss in the statistics " -+"file.\n" - "What do you want to do?" - msgstr "" --"您目前有一局正在進行中。如果您直接重起新的一局，舊的這一局將會被標記為失敗。\n" -+"您目前有一局正在進行中。如果您直接重起新的一局，舊的這一局將會被標記為失" -+"敗。\n" - "您確定要重起牌局嗎？" - - #: pwidget.cpp:306 -@@ -320,7 +321,7 @@ - - #: simon.cpp:152 - msgid "&Simple Simon" --msgstr "簡單 Simon (&S)" -+msgstr "簡單 Simon(&S)" - - #: spider.cpp:461 - msgid "S&pider (Easy)" -@@ -336,4 +337,4 @@ - - #: yukon.cpp:126 - msgid "&Yukon" --msgstr "育空 (&Y)" -+msgstr "育空(&Y)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpoker.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kpoker.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kpoker.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kpoker.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: kpoker\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-17 21:08+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kreversi.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kreversi.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kreversi.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kreversi.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kreversi\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-07-04 11:22+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -25,8 +24,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"shyue@sonoma.com.tw, hydonsingore@mail.educities.edu.tw, franklin at goodhorse " --"dot idv dot tw" -+"shyue@sonoma.com.tw, hydonsingore@mail.educities.edu.tw, franklin at " -+"goodhorse dot idv dot tw" - - #: board.cpp:268 - msgid "Click" -@@ -86,8 +85,9 @@ - - #: kreversi.cpp:224 - msgid "" --"You are already running an unfinished game. If you abort the old game to start " --"a new one, the old game will be registered as a loss in the highscore file.\n" -+"You are already running an unfinished game. If you abort the old game to " -+"start a new one, the old game will be registered as a loss in the highscore " -+"file.\n" - "What do you want to do?" - msgstr "" - "您正在進行一局遊戲。如果您要重起新的一局，舊的一局將會被標記為失敗。\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksame.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksame.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksame.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksame.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: ksame\n" - "POT-Creation-Date: 2005-07-24 01:33+0200\n" - "PO-Revision-Date: 2004-02-08 19:56+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: traditional chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kshisen.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kshisen.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kshisen.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kshisen.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: kshisen\n" - "POT-Creation-Date: 2006-06-12 04:03+0200\n" - "PO-Revision-Date: 2003-01-08 15:32+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksirtet.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksirtet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksirtet.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksirtet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: ksirtet\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-19 13:28+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +31,7 @@ - #: rc.cpp:9 - #, no-c-format - msgid "Occupied lines" --msgstr "佔用的行數" -+msgstr "佔用的列數" - - #. i18n: file ksirtet.kcfg line 20 - #: rc.cpp:12 -@@ -61,7 +61,7 @@ - #: rc.cpp:24 - #, no-c-format - msgid "Number of full lines" --msgstr "整行數目" -+msgstr "整列數目" - - #: piece.cpp:46 - msgid "Z piece color:" -@@ -97,7 +97,7 @@ - - #: ai.cpp:8 - msgid "Occupied lines:" --msgstr "佔用行數:" -+msgstr "佔用列數:" - - #: ai.cpp:10 - msgid "Number of holes:" -@@ -125,7 +125,7 @@ - - #: field.cpp:18 - msgid "Indicate the number of garbage lines you received from your opponent." --msgstr "顯示對手送來的行數。" -+msgstr "顯示對手送來的列數。" - - #: field.cpp:46 - msgid "Total:" -@@ -136,7 +136,7 @@ - msgid "" - "_n: 1 Line:\n" - "%n Lines:" --msgstr "%n 行：" -+msgstr "%n 列：" - - #: settings.cpp:15 - msgid "Old rotation style" -@@ -152,10 +152,10 @@ - - #: main.cpp:28 - msgid "Removed Lines" --msgstr "消掉的行數" -+msgstr "消掉的列數" - - #~ msgid "Display the number of lines removed simultaneously." --#~ msgstr "即時顯示消掉的行數" -+#~ msgstr "即時顯示消掉的列數" - - #, fuzzy - #~ msgid "Show next piece" -@@ -201,7 +201,7 @@ - #~ msgstr "右移" - - #~ msgid "One line down" --#~ msgstr "往下一行" -+#~ msgstr "往下一列" - - #~ msgid "Rotate left" - #~ msgstr "左旋" -@@ -296,7 +296,7 @@ - - #, fuzzy - #~ msgid "Configure Keys" --#~ msgstr "連接中 ..." -+#~ msgstr "連接中…" - - #, fuzzy - #~ msgid "Hostname" -@@ -328,7 +328,7 @@ - - #, fuzzy - #~ msgid "Configure AI..." --#~ msgstr "連接中 ..." -+#~ msgstr "連接中…" - - #, fuzzy - #~ msgid "Network meeting" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksmiletris.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksmiletris.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksmiletris.po 2005-09-10 13:14:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksmiletris.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,7 +5,7 @@ - "Project-Id-Version: ksmiletris\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-23 01:51+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksnake.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksnake.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksnake.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksnake.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: ksnake\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-01-17 16:47+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -30,8 +29,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"shyue@sonoma.com.tw,kenduest@i18n.linux.org.tw," --"hydonsingore@mail.educities.edu.tw" -+"shyue@sonoma.com.tw,kenduest@i18n.linux.org.tw,hydonsingore@mail.educities." -+"edu.tw" - - #: game.cpp:60 - msgid "Score: 0" -@@ -100,10 +99,8 @@ - msgstr "改進" - - #: pixServer.cpp:184 --msgid "" --"error loading %1, aborting\n" --msgstr "" --"%1 載入錯誤, 放棄!\n" -+msgid "error loading %1, aborting\n" -+msgstr "%1 載入錯誤, 放棄!\n" - - #: rattler.cpp:315 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksokoban.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ksokoban.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ksokoban.po 2005-09-10 13:14:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ksokoban.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: ksokoban\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-23 01:49+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -36,7 +36,7 @@ - - #: MainWindow.cpp:93 - msgid "&Load Levels..." --msgstr "載入關卡(&L)..." -+msgstr "載入關卡(&L)…" - - #: MainWindow.cpp:95 - msgid "&Next Level" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kspaceduel.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kspaceduel.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kspaceduel.po 2005-09-10 13:14:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kspaceduel.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kspaceduel\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2003-12-05 00:43+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -288,7 +288,7 @@ - - #: topwidget.cpp:67 - msgid "&New Round" --msgstr "新比賽 (&N)" -+msgstr "新比賽(&N)" - - #: topwidget.cpp:84 - msgid "Player 1 Rotate Left" -@@ -308,7 +308,7 @@ - - #: topwidget.cpp:96 - msgid "Player 1 Mine" --msgstr "佈雷" -+msgstr "布雷" - - #: topwidget.cpp:100 - msgid "Player 2 Rotate Left" -@@ -328,7 +328,7 @@ - - #: topwidget.cpp:112 - msgid "Player 2 Mine" --msgstr "佈雷" -+msgstr "布雷" - - #~ msgid "Key Setup" - #~ msgstr "按鍵設定" -@@ -364,14 +364,14 @@ - #~ msgstr "選手按鍵 [&K]" - - #~ msgid "&Handicap..." --#~ msgstr "殘障...[&H]" -+#~ msgstr "殘障…[&H]" - - #~ msgid "Gra&phics..." - #~ msgstr "畫面 [&P]" - - #, fuzzy - #~ msgid "&AI..." --#~ msgstr "人工智慧...[&A]" -+#~ msgstr "人工智慧…[&A]" - - #~ msgid "New &Game" - #~ msgstr "新遊戲 [&G]" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktron.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ktron.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktron.po 2008-08-19 20:43:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ktron.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: ktron\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2003-12-16 20:43+0800\n" --"Last-Translator: Hydonsingore Sie \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traitional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -120,7 +120,8 @@ - msgstr "" - "(c) 1998-2000, Matthias Kiefer\n" - "\n" --"部份電腦玩家的計算能力，是 Rhett D. Jacobs 從xtron取得的。" -+"部份電腦玩家的計算能力，是 Rhett D. Jacobs 從" -+"xtron取得的。" - - #: main.cpp:39 - msgid "Original author" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktuberling.po kde-i18n-zh_TW-3.5.10/messages/kdegames/ktuberling.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/ktuberling.po 2006-10-01 18:34:10.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/ktuberling.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: ktuberling\n" - "POT-Creation-Date: 2006-08-13 04:05+0200\n" - "PO-Revision-Date: 2006-08-14 13:15+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -70,11 +69,11 @@ - - #: toplevel.cpp:262 - msgid "Save &as Picture..." --msgstr "存成圖檔 (&A)" -+msgstr "存成圖檔(&A)" - - #: toplevel.cpp:272 - msgid "&No Sound" --msgstr "關掉聲音 (&S)" -+msgstr "關掉聲音(&S)" - - #: toplevel.cpp:312 - msgid "Could not load file." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kwin4.po kde-i18n-zh_TW-3.5.10/messages/kdegames/kwin4.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/kwin4.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/kwin4.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,8 +12,7 @@ - "Project-Id-Version: kwin4\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-17 16:50+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -42,7 +41,7 @@ - - #: kwin4.cpp:79 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: kwin4.cpp:192 - msgid "Start a new game" -@@ -50,15 +49,15 @@ - - #: kwin4.cpp:195 - msgid "Open a saved game..." --msgstr "開啟舊遊戲..." -+msgstr "開啟舊遊戲…" - - #: kwin4.cpp:198 - msgid "Save a game..." --msgstr "儲存遊戲..." -+msgstr "儲存遊戲…" - - #: kwin4.cpp:201 - msgid "Ending the current game..." --msgstr "中止進行中的遊戲..." -+msgstr "中止進行中的遊戲…" - - #: kwin4.cpp:202 - msgid "Aborts a currently played game. No winner will be declared." -@@ -70,7 +69,7 @@ - - #: kwin4.cpp:207 - msgid "Network Chat..." --msgstr "網路聊天..." -+msgstr "網路聊天…" - - #: kwin4.cpp:211 - msgid "Debug KGame" -@@ -78,7 +77,7 @@ - - #: kwin4.cpp:214 - msgid "&Show Statistics" --msgstr "顯示統計資料 (&S)" -+msgstr "顯示統計資料(&S)" - - #: kwin4.cpp:216 - msgid "Show statistics." -@@ -133,14 +132,12 @@ - msgstr "沒人 " - - #: kwin4.cpp:482 --msgid "" --"The network game ended!\n" --msgstr "" --"連線遊戲終止!\n" -+msgid "The network game ended!\n" -+msgstr "連線遊戲終止!\n" - - #: kwin4.cpp:493 - msgid "Game running..." --msgstr "遊戲執行中..." -+msgstr "遊戲執行中…" - - #: kwin4.cpp:504 - msgid "The game is drawn. Please restart next round." -@@ -190,15 +187,15 @@ - - #: kwin4view.cpp:606 - msgid "Hold on... the other player has not been yet..." --msgstr "請稍候，人家還沒下呢..." -+msgstr "請稍候，人家還沒下呢…" - - #: kwin4view.cpp:607 - msgid "Hold your horses..." --msgstr "請稍候，別猴急..." -+msgstr "請稍候，別猴急…" - - #: kwin4view.cpp:608 - msgid "Ah ah ah... only one go at a time..." --msgstr "請稍候，一次只能一個人下..." -+msgstr "請稍候，一次只能一個人下…" - - #: kwin4view.cpp:609 - msgid "Please wait... it is not your turn." -@@ -222,7 +219,7 @@ - - #: main.cpp:46 - msgid "Code Improvements" --msgstr "源碼改進" -+msgstr "原始碼改進" - - #. i18n: file settings.ui line 24 - #: rc.cpp:9 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libkdegames.po kde-i18n-zh_TW-3.5.10/messages/kdegames/libkdegames.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libkdegames.po 2007-01-15 10:56:21.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/libkdegames.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: libkdegames\n" - "POT-Creation-Date: 2006-12-21 02:39+0100\n" - "PO-Revision-Date: 2006-01-18 09:29+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -46,7 +45,7 @@ - - #: kgame/dialogs/kgamedebugdialog.cpp:143 - msgid "Debug &KGame" --msgstr "Debug KGame (&K)" -+msgstr "Debug KGame(&K)" - - #: kgame/dialogs/kgamedebugdialog.cpp:148 - #: kgame/dialogs/kgamedebugdialog.cpp:193 -@@ -553,13 +552,13 @@ - #: kgamemisc.cpp:55 - msgid "" - "_: A list of language typical names ( for games ), separated by spaces\n" --"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed " --"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil " --"Paul Rik Robert Sam Sean Thomas Tim Walter" -+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan " -+"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike " -+"Neil Paul Rik Robert Sam Sean Thomas Tim Walter" - msgstr "" --"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed " --"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil " --"Paul Rik Robert Sam Sean Thomas Tim Walter" -+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan " -+"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike " -+"Neil Paul Rik Robert Sam Sean Thomas Tim Walter" - - #: kstdgameaction.cpp:60 - msgid "" -@@ -581,7 +580,7 @@ - - #: kstdgameaction.cpp:65 - msgid "Save &As..." --msgstr "另存新檔...(&A)" -+msgstr "另存新檔…(&A)" - - #: kstdgameaction.cpp:66 - msgid "&End Game" -@@ -637,7 +636,7 @@ - - #: kstdgameaction.cpp:83 - msgid "Configure &Highscores..." --msgstr "設定高分榜(&H)..." -+msgstr "設定高分榜(&H)…" - - #: highscore/khighscore.cpp:134 - msgid "Retry" -@@ -645,8 +644,8 @@ - - #: highscore/khighscore.cpp:135 - msgid "" --"Cannot access the highscore file. Another user is probably currently writing to " --"it." -+"Cannot access the highscore file. Another user is probably currently writing " -+"to it." - msgstr "無法存取高分榜的檔案。可能另一個玩家正在改寫它。" - - #: highscore/kscoredialog.cpp:68 -@@ -720,11 +719,11 @@ - - #: highscore/kexthighscore_gui.cpp:204 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: highscore/kexthighscore_gui.cpp:205 - msgid "Export..." --msgstr "匯出..." -+msgstr "匯出…" - - #: highscore/kexthighscore_gui.cpp:258 - msgid "Overwrite" -@@ -776,8 +775,8 @@ - - #: highscore/kexthighscore_gui.cpp:456 - msgid "" --"This will permanently remove your registration key. You will not be able to use " --"the currently registered nickname anymore." -+"This will permanently remove your registration key. You will not be able to " -+"use the currently registered nickname anymore." - msgstr "這樣會永遠移除您的註冊金鑰。您將無法再使用目前註冊的暱稱。" - - #: highscore/kexthighscore_gui.cpp:499 -@@ -1060,11 +1059,11 @@ - - #: kchatdialog.cpp:86 kchatdialog.cpp:108 - msgid "Name Font..." --msgstr "名稱字型..." -+msgstr "名稱字型…" - - #: kchatdialog.cpp:89 kchatdialog.cpp:111 - msgid "Text Font..." --msgstr "文字字型..." -+msgstr "文字字型…" - - #: kchatdialog.cpp:98 - msgid "Player: " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libksirtet.po kde-i18n-zh_TW-3.5.10/messages/kdegames/libksirtet.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/libksirtet.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/libksirtet.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: libksirtet\n" - "POT-Creation-Date: 2005-11-30 03:21+0100\n" - "PO-Revision-Date: 2006-01-17 15:30+0800\n" --"Last-Translator: Frank Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese(traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -388,13 +388,12 @@ - - #: common/field.cpp:183 - msgid "" --"Display the current score." --"
                                It turns blue if it is a highscore and red if it is the best local score.                                " -+"Display the current score.
                                It turns blue " -+"if it is a highscore and red if it is the best " -+"local score.                                " - msgstr "" --"顯示目前的分數 " --"
                                當分數高時，會變成藍色 ；當分數成為本地最高分時，會變成紅色。                                " -+"顯示目前的分數
                                當分數高時，會變成藍色 ；" -+"當分數成為本地最高分時，會變成紅色。                                " - - #: common/field.cpp:184 common/highscores.cpp:14 - msgid "Level" -@@ -418,7 +417,7 @@ - - #: common/inter.cpp:19 - msgid "One Line Down" --msgstr "落下一行" -+msgstr "落下一列" - - #: common/inter.cpp:20 - msgid "Rotate Left" -@@ -474,7 +473,7 @@ - - #: common/settings.cpp:27 - msgid "Show detailed \"removed lines\" field" --msgstr "顯示詳細的\"消掉行數\"欄區" -+msgstr "顯示詳細的\"消掉列數\"欄區" - - #: common/settings.cpp:40 - msgid "Initial level:" -@@ -510,7 +509,7 @@ - #~ msgstr "送給下一位玩家\"禮物\"時發亮。" - - #~ msgid "Configure Keys..." --#~ msgstr "設定按鍵..." -+#~ msgstr "設定按鍵…" - - #~ msgid "Fade strength:" - #~ msgstr "淡出強度:" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/lskat.po kde-i18n-zh_TW-3.5.10/messages/kdegames/lskat.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegames/lskat.po 2006-07-22 10:03:52.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegames/lskat.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: lskat\n" - "POT-Creation-Date: 2005-05-18 21:24+0200\n" - "PO-Revision-Date: 2006-01-17 15:31+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +30,7 @@ - - #: lskat.cpp:162 lskat.cpp:163 - msgid "Starting a new game..." --msgstr "開啟新遊戲中..." -+msgstr "開啟新遊戲中…" - - #: lskat.cpp:164 - msgid "&End Game" -@@ -71,7 +70,7 @@ - - #: lskat.cpp:177 - msgid "Exiting..." --msgstr "離開中..." -+msgstr "離開中…" - - #: lskat.cpp:178 - msgid "Quits the program." -@@ -155,7 +154,7 @@ - - #: lskat.cpp:216 - msgid "Configure card decks..." --msgstr "設定牌面樣式..." -+msgstr "設定牌面樣式…" - - #: lskat.cpp:217 - msgid "Choose how the cards should look." -@@ -163,11 +162,11 @@ - - #: lskat.cpp:219 - msgid "Change &Names..." --msgstr "更改名稱...(&N)" -+msgstr "更改名稱…(&N)" - - #: lskat.cpp:221 lskat.cpp:222 - msgid "Configure player names..." --msgstr "設定玩家名稱..." -+msgstr "設定玩家名稱…" - - #: lskat.cpp:238 - msgid "This leaves space for the mover" -@@ -195,7 +194,7 @@ - - #: lskat.cpp:403 - msgid "Game ended...start a new one..." --msgstr "遊戲已結束...請開新遊戲..." -+msgstr "遊戲已結束…請開新遊戲..." - - #: lskat.cpp:587 - msgid "No game running" -@@ -203,7 +202,7 @@ - - #: lskat.cpp:590 - msgid "%1 to move..." --msgstr "%1 出牌..." -+msgstr "%1 出牌…" - - #: lskat.cpp:605 - msgid "" -@@ -219,11 +218,11 @@ - - #: lskat.cpp:680 - msgid "Remote connection to %1:%2..." --msgstr "遠端連線至 %1:%2..." -+msgstr "遠端連線至 %1:%2…" - - #: lskat.cpp:684 - msgid "Offering remote connection on port %1..." --msgstr "允許遠端連線於連接埠 %1..." -+msgstr "允許遠端連線於連接埠 %1…" - - #: lskat.cpp:686 - msgid "Abort" -@@ -231,41 +230,39 @@ - - #: lskat.cpp:769 - msgid "Waiting for the computer to move..." --msgstr "等待電腦玩家出牌..." -+msgstr "等待電腦玩家出牌…" - - #: lskat.cpp:785 - msgid "Waiting for remote player..." --msgstr "等待遠端玩家..." -+msgstr "等待遠端玩家…" - - #: lskat.cpp:792 - msgid "Please make your move..." --msgstr "請您出牌..." -+msgstr "請您出牌…" - - #: lskat.cpp:827 - msgid "Remote connection lost for player 1..." --msgstr "失去與玩家 1 的遠端連線..." -+msgstr "失去與玩家 1 的遠端連線…" - - #: lskat.cpp:834 - msgid "Remote connection lost for player 2..." --msgstr "失去與玩家 2 的遠端連線..." -+msgstr "失去與玩家 2 的遠端連線…" - - #: lskat.cpp:846 --msgid "" --"Message from remote player:\n" --msgstr "" --"遠端玩家傳過來的訊息：\n" -+msgid "Message from remote player:\n" -+msgstr "遠端玩家傳過來的訊息：\n" - - #: lskat.cpp:864 - msgid "Remote player ended game..." --msgstr "遠端玩家結束遊戲..." -+msgstr "遠端玩家結束遊戲…" - - #: lskat.cpp:889 - msgid "You are network client...loading remote game..." --msgstr "你是連線客戶端...載入遠端遊戲中..." -+msgstr "你是連線客戶端…載入遠端遊戲中..." - - #: lskat.cpp:902 - msgid "You are network server..." --msgstr "你是連線伺服器..." -+msgstr "你是連線伺服器…" - - #: lskat.cpp:960 - msgid "" -@@ -284,16 +281,12 @@ - "請再考慮！\n" - - #: lskat.cpp:992 --msgid "" --"It is not your turn.\n" --msgstr "" --"不是換你。\n" -+msgid "It is not your turn.\n" -+msgstr "不是換你。\n" - - #: lskat.cpp:997 --msgid "" --"This move is not possible.\n" --msgstr "" --"這步是不可能的。\n" -+msgid "This move is not possible.\n" -+msgstr "這步是不可能的。\n" - - #: lskatdoc.cpp:749 - msgid "Alice" -@@ -321,7 +314,7 @@ - - #: lskatview.cpp:428 - msgid " Game is drawn" --msgstr ".......本局平手" -+msgstr "…....本局平手" - - #: lskatview.cpp:432 - msgid "Player 1 - %1 won " -@@ -369,19 +362,19 @@ - - #: lskatview.cpp:838 - msgid "Hold on... the other player hasn't been yet..." --msgstr "等等...對方還沒出牌..." -+msgstr "等等…對方還沒出牌..." - - #: lskatview.cpp:841 - msgid "Hold your horses..." --msgstr "別急阿..." -+msgstr "別急阿…" - - #: lskatview.cpp:844 - msgid "Ah ah ah... only one go at a time..." --msgstr "誒....一次一個人出牌..." -+msgstr "誒….一次一個人出牌..." - - #: lskatview.cpp:847 - msgid "Please wait... it is not your turn." --msgstr "再等一下...還沒該你" -+msgstr "再等一下…還沒該你" - - #: main.cpp:23 - msgid "Enter debug level" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcmkamera.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcmkamera.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcmkamera.po 2007-07-12 10:27:44.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcmkamera.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kcmkamera\n" - "POT-Creation-Date: 2007-05-28 02:15+0200\n" - "PO-Revision-Date: 2006-06-08 14:47+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,24 +32,25 @@ - - #: kamera.cpp:131 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: kamera.cpp:132 - msgid "" - "Click this button to change the configuration of the selected camera." --"
                                " --"
                                The availability of this feature and the contents of the Configuration " --"dialog depend on the camera model." --msgstr "點選這個按鈕來變更所選取照相機的設定。

                                設定方塊內所顯示該照相機的功能以及內容項目，會依照不同照相機型式而有所不同。" -+"

                                The availability of this feature and the contents of the " -+"Configuration dialog depend on the camera model." -+msgstr "" -+"點選這個按鈕來變更所選取照相機的設定。

                                設定方塊內所顯示該照相機的功能" -+"以及內容項目，會依照不同照相機型式而有所不同。" - - #: kamera.cpp:135 - msgid "" - "Click this button to view a summary of the current status of the selected " --"camera." --"
                                " --"
                                The availability of this feature and the contents of the Configuration " --"dialog depend on the camera model." --msgstr "點選這個按鈕來檢視所選取照相機目前的狀態。

                                設定方塊內所顯示該照相機的功能以及內容項目，會依照不同照相機型式而有所不同。" -+"camera.

                                The availability of this feature and the contents of the " -+"Configuration dialog depend on the camera model." -+msgstr "" -+"點選這個按鈕來檢視所選取照相機目前的狀態。

                                設定方塊內所顯示該照相機的" -+"功能以及內容項目，會依照不同照相機型式而有所不同。" - - #: kamera.cpp:139 - msgid "Click this button to cancel the current camera operation." -@@ -68,17 +68,16 @@ - "to on your computer (e.g. USB, Serial, Firewire). If your camera doesn't\n" - "appear in the list of Supported Cameras, go to the\n" - "GPhoto web site for a possible update." --"
                                " --"
                                \n" -+"

                                \n" - "To view and download images from the digital camera, go to address\n" - "camera:/ in Konqueror and other KDE applications." - msgstr "" - "

                                數位相機

                                \n" - "這個模組能夠讓您設定使用數位相機。\n" --"設定過程您需要指定您的相機型號與所連結的位置 (比方 USB，序列埠等位置)。若是您的相機型號沒有列在支援的照相機的話，請連線到\n" -+"設定過程您需要指定您的相機型號與所連結的位置 (比方 USB，序列埠等位置)。若是您" -+"的相機型號沒有列在支援的照相機的話，請連線到\n" - "GPhoto 網站 來取得相關更新資訊" --"
                                " --"
                                \n" -+"

                                \n" - "要檢視與下載數位相機圖片，請在 Konqueror 或者是 KDE 程式上連結\n" - "camera:/ 即可" - -@@ -92,25 +91,26 @@ - - #: kameradevice.cpp:88 kameradevice.cpp:434 kameradevice.cpp:454 - msgid "" --"Description of abilities for camera %1 is not available. Configuration options " --"may be incorrect." -+"Description of abilities for camera %1 is not available. Configuration " -+"options may be incorrect." - msgstr "關於 %1 照相機的功能描述無法使用。設定參數可能不正確。" - - #: kameradevice.cpp:111 - msgid "Could not access driver. Check your gPhoto2 installation." --msgstr "無法取用驅動程式。請檢查您的 gPhoto2。檢查 gPhoto2 程式庫是否安裝妥當。" -+msgstr "" -+"無法取用驅動程式。請檢查您的 gPhoto2。檢查 gPhoto2 程式庫是否安裝妥當。" - - #: kameradevice.cpp:131 - msgid "" --"Unable to initialize camera. Check your port settings and camera connectivity " --"and try again." --msgstr "無法對照相機進行初始化的動作。請檢查您的通訊埠設定，以及照相機是否已連接妥當，然後再行嚐試。" -+"Unable to initialize camera. Check your port settings and camera " -+"connectivity and try again." -+msgstr "" -+"無法對照相機進行初始化的動作。請檢查您的通訊埠設定，以及照相機是否已連接妥" -+"當，然後再行嚐試。" - - #: kameradevice.cpp:155 --msgid "" --"No camera summary information is available.\n" --msgstr "" --"沒有相機的摘要資訊。\n" -+msgid "No camera summary information is available.\n" -+msgstr "沒有相機的摘要資訊。\n" - - #: kameradevice.cpp:168 kameradevice.cpp:178 - msgid "Camera configuration failed." -@@ -148,12 +148,14 @@ - msgid "" - "If this option is checked, the camera would have to be connected one of the " - "serial ports (known as COM in Microsoft Windows) in your computer." --msgstr "若是這個項目開啟了，那照相機應該連結到您主機的序列埠上 ((Windows 說法就是 COM 位置上)。" -+msgstr "" -+"若是這個項目開啟了，那照相機應該連結到您主機的序列埠上 ((Windows 說法就是 " -+"COM 位置上)。" - - #: kameradevice.cpp:313 - msgid "" --"If this option is checked, the camera would have to be connected to one of the " --"USB slots in your computer or USB hub." -+"If this option is checked, the camera would have to be connected to one of " -+"the USB slots in your computer or USB hub." - msgstr "若是這個項目開啟了，那照相機應該連結到您主機的 USB 位置上。" - - #: kameradevice.cpp:320 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewcanvasconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewcanvasconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewcanvasconfig.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewcanvasconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcm_kviewcanvasconfig\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-08 15:06+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -26,8 +25,8 @@ - msgid "" - "The height of the image shown will not get smaller than the size you enter " - "here.\n" --"A value of 10 would cause a 1x1 image to be stretched vertically by a factor of " --"10." -+"A value of 10 would cause a 1x1 image to be stretched vertically by a factor " -+"of 10." - msgstr "" - "所顯示的影像高度不會小於您在這裡所輸入的值。\n" - "輸入 10 的話會讓 1x1 的圖片高度放大十倍。" -@@ -44,8 +43,8 @@ - msgid "" - "The height of the image shown will not get bigger than the size you enter " - "here.\n" --"A value of 100 would cause a 1000x1000 image to be compressed vertically by a " --"factor of 0.1." -+"A value of 100 would cause a 1000x1000 image to be compressed vertically by " -+"a factor of 0.1." - msgstr "" - "所顯示的影像高度不會大於您在這裡所輸入的值。\n" - "輸入 100 的話會讓 1000x1000 的圖片高度縮小為 0.1 倍。" -@@ -62,8 +61,8 @@ - msgid "" - "The width of the image shown will not get smaller than the size you enter " - "here.\n" --"A value of 10 would cause a 1x1 image to be stretched horizontally by a factor " --"of 10." -+"A value of 10 would cause a 1x1 image to be stretched horizontally by a " -+"factor of 10." - msgstr "" - "所顯示的影像寬度不會小於您在這裡所輸入的值。\n" - "輸入 10 的話會讓 1x1 的圖片寬度放大十倍。" -@@ -78,9 +77,10 @@ - #: rc.cpp:27 - #, no-c-format - msgid "" --"The width of the image shown will not get bigger than the size you enter here.\n" --"A value of 100 would cause a 1000x1000 image to be compressed horizontally by a " --"factor of 0.1." -+"The width of the image shown will not get bigger than the size you enter " -+"here.\n" -+"A value of 100 would cause a 1000x1000 image to be compressed horizontally " -+"by a factor of 0.1." - msgstr "" - "所顯示的影像寬度不會大於您在這裡所輸入的值。\n" - "輸入 100 的話會讓 1000x1000 的圖片寬度縮小為 0.1 倍。" -@@ -103,7 +103,8 @@ - msgid "" - "Every effect selected may be used to create a transition effect between the " - "images. If you select multiple effects they will be chosen randomly." --msgstr "每一個所選取的效果都可能用在圖片間的轉換。如果您選擇多個效果，則會隨機選取。" -+msgstr "" -+"每一個所選取的效果都可能用在圖片間的轉換。如果您選擇多個效果，則會隨機選取。" - - #. i18n: file generalconfigwidget.ui line 195 - #: rc.cpp:40 -@@ -121,10 +122,12 @@ - #: rc.cpp:46 - #, no-c-format - msgid "" --"If this is checked KView will always try to keep the aspect ratio. That means " --"if the width is scaled with a factor x, the height is scaled with the same " --"factor." --msgstr "勾選此選項的話，KView 會試著保留長跟寬的比例。這表示如果寬度調整係數為 x，則高度也會用同樣的係數來調整。" -+"If this is checked KView will always try to keep the aspect ratio. That " -+"means if the width is scaled with a factor x, the height is scaled with the " -+"same factor." -+msgstr "" -+"勾選此選項的話，KView 會試著保留長跟寬的比例。這表示如果寬度調整係數為 x，則" -+"高度也會用同樣的係數來調整。" - - #. i18n: file generalconfigwidget.ui line 214 - #: rc.cpp:49 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewgeneralconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewgeneralconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewgeneralconfig.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewgeneralconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcm_kviewgeneralconfig\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-08 15:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -39,4 +38,6 @@ - "

                                KView will resize the window to fit the image. The image will never be " - "scaled up but if it is too large for the screen the image will be scaled " - "down.

                                " --msgstr "

                                KView 會調整視窗以符合圖片大小。這個圖片將不會被調整，但是若圖片大到超過螢幕，則會縮小。

                                " -+msgstr "" -+"

                                KView 會調整視窗以符合圖片大小。這個圖片將不會被調整，但是若圖片大到超過螢" -+"幕，則會縮小。

                                " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewpluginsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewpluginsconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewpluginsconfig.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewpluginsconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcm_kviewpluginsconfig\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-08 15:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcm_kviewviewerpluginsconfig.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcm_kviewviewerpluginsconfig\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-08 15:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcoloredit.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcoloredit.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kcoloredit.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kcoloredit.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kcoloredit\n" - "POT-Creation-Date: 2006-06-05 03:59+0200\n" - "PO-Revision-Date: 2006-06-19 10:25+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -103,7 +102,7 @@ - - #: kcoloredit.cpp:77 - msgid "New &Window" --msgstr "新視窗 (&W)" -+msgstr "新視窗(&W)" - - #: kcoloredit.cpp:92 - msgid "Show &Color Names" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdjview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdjview.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdjview.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdjview.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kdjview\n" - "POT-Creation-Date: 2006-02-10 04:00+0100\n" - "PO-Revision-Date: 2006-06-09 11:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -48,7 +47,7 @@ - - #: djvumultipage.cpp:70 - msgid "Delete Pages..." --msgstr "刪除頁面..." -+msgstr "刪除頁面…" - - #: djvumultipage.cpp:95 - msgid "KDjView" -@@ -116,21 +115,21 @@ - - #: djvurenderer.cpp:296 - msgid "" --"File error. The specified file '%1' could not be " --"loaded." -+"File error. The specified file '%1' could not be loaded." -+"" - msgstr "檔案錯誤。指定的檔案 %1 無法載入。" - - #: djvurenderer.cpp:402 - msgid "Loading file. Computing page sizes..." --msgstr "載入檔案中。計算頁面大小..." -+msgstr "載入檔案中。計算頁面大小…" - - #: djvurenderer.cpp:580 - msgid "Printing..." --msgstr "列印中..." -+msgstr "列印中…" - - #: djvurenderer.cpp:580 - msgid "Preparing pages for printing..." --msgstr "準備列印頁面中..." -+msgstr "準備列印頁面中…" - - #: djvurenderer.cpp:581 - msgid "Abort" -@@ -138,11 +137,11 @@ - - #: djvurenderer.cpp:637 - msgid "Deleting pages..." --msgstr "刪除頁面中..." -+msgstr "刪除頁面中…" - - #: djvurenderer.cpp:637 - msgid "Please wait while pages are removed..." --msgstr "請稍候，正在移除頁面..." -+msgstr "請稍候，正在移除頁面…" - - #: djvurenderer.cpp:660 - #, c-format -@@ -168,24 +167,23 @@ - - #: kprintDialogPage_DJVUpageoptions.cpp:50 - msgid "" --"If this option is enabled, some pages might be rotated to better fit the paper " --"size." -+"If this option is enabled, some pages might be rotated to better fit the " -+"paper size." - msgstr "如果開啟此選項，有些頁面會改變方向，以符合紙張大小。" - - #: kprintDialogPage_DJVUpageoptions.cpp:51 - msgid "" --"" --"

                                If this option is enabled, landscape or portrait orientation are " -+"

                                If this option is enabled, landscape or portrait orientation are " - "automatically chosen on a page-by-page basis. This makes better use of the " --"paper and gives more visually-appealing printouts.

                                " --"

                                Note: This option overrides the Portrait/Landscape option chosen in " --"the printer properties. If this option is enabled, and if the pages in your " --"document have different sizes, then some pages might be rotated while others " --"are not.

                                " -+"paper and gives more visually-appealing printouts.

                                Note: This " -+"option overrides the Portrait/Landscape option chosen in the printer " -+"properties. If this option is enabled, and if the pages in your document " -+"have different sizes, then some pages might be rotated while others are not." -+"

                                " - msgstr "" --"" --"

                                如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不會有問題。

                                " --"

                                注意：這個選項會覆蓋印表機內容所設定的方向。如果開啟此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。

                                " -+"

                                如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不" -+"會有問題。

                                注意：這個選項會覆蓋印表機內容所設定的方向。如果開啟" -+"此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。

                                " - - #: kprintDialogPage_DJVUpageoptions.cpp:62 - msgid "Scale pages to fit paper size" -@@ -199,16 +197,14 @@ - - #: kprintDialogPage_DJVUpageoptions.cpp:64 - msgid "" --"" --"

                                If this option is enabled, all pages will be scaled to optimally fit the " --"printer's paper size.

                                " --"

                                Note: If this option is enabled, and if the pages in your document " --"have different sizes, then different pages might be scaled by different scaling " --"factors.

                                " -+"

                                If this option is enabled, all pages will be scaled to optimally fit " -+"the printer's paper size.

                                Note: If this option is enabled, and " -+"if the pages in your document have different sizes, then different pages " -+"might be scaled by different scaling factors.

                                " - msgstr "" --"" --"

                                如果開啟此選項，所有的頁面大小會調整，以符合紙張大小。

                                " --"

                                注意：若開啟此選項，而且您的文件大小不同，則不同的頁面調整的比例也有可能不同。

                                " -+"

                                如果開啟此選項，所有的頁面大小會調整，以符合紙張大小。

                                注意：" -+"若開啟此選項，而且您的文件大小不同，則不同的頁面調整的比例也有可能不同。" -+"

                                " - - #. i18n: file kprintDialogPage_DJVUconversionoptions_basewidget.ui line 32 - #: rc.cpp:9 -@@ -248,8 +244,8 @@ - "KViewShell. The choice of a language level can dramatically affect printing " - "speed, but has no impact on the quality of the printout.

                                \n" - "

                                Level 1: This is the most conservative option, because PostScript " --"Level 1 files can be printed on all printers. The files produced are, however, " --"extremely long, and printing can be very slow.

                                \n" -+"Level 1 files can be printed on all printers. The files produced are, " -+"however, extremely long, and printing can be very slow.

                                \n" - "

                                Level 2: Level 2 PostScript files are much smaller and print much " - "faster than Level 1 files. Level 2 files are supported by almost all " - "printers.

                                \n" -@@ -257,12 +253,15 @@ - "faster than Level 2 files. However, Level 3 files are supported only by some " - "modern printers. If Level 3 works for you, this is the best option.

                                " - msgstr "" --"

                                此對話框讓您選擇 KViewShell 所使用的 PostScript 語言等級。所選擇的語言等級會明顯地影響列印速度，但是不會影響品質。

                                \n" --"

                                等級 1最保守的選項，可以在所有印表機上列印。但是所產生的檔案會非常長，印得非常慢。

                                \n" --"

                                等級 2等級 2 的 PostScript 檔比等級 1 小得多，列印速度也快得多。等級 2 的檔案也能被差不多全部的印表機接受。

                                " --"\n" --"

                                等級 3等級 3 的 PostScript 檔又比等級 2 的小得多，列印速度也快得多。但是等級 3 " --"的檔案只有一些新型的印表機才有支援。如果您的印表機有支援，使用等級 3 最好。

                                " -+"

                                此對話框讓您選擇 KViewShell 所使用的 PostScript 語言等級。所選擇的語言等級" -+"會明顯地影響列印速度，但是不會影響品質。

                                \n" -+"

                                等級 1最保守的選項，可以在所有印表機上列印。但是所產生的檔案會非常" -+"長，印得非常慢。

                                \n" -+"

                                等級 2等級 2 的 PostScript 檔比等級 1 小得多，列印速度也快得多。等" -+"級 2 的檔案也能被差不多全部的印表機接受。

                                \n" -+"

                                等級 3等級 3 的 PostScript 檔又比等級 2 的小得多，列印速度也快得" -+"多。但是等級 3 的檔案只有一些新型的印表機才有支援。如果您的印表機有支援，使用" -+"等級 3 最好。

                                " - - #. i18n: file kprintDialogPage_DJVUconversionoptions_basewidget.ui line 88 - #: rc.cpp:30 -@@ -293,21 +292,24 @@ - #, no-c-format - msgid "" - "

                                Good DJVU files are separated into foreground and background images. The " --"foreground mostly contains the text. With the render mode you can decide what " --"part of your page will be printed.

                                \n" --"

                                Print Full Page: The full page, including foreground and background " --"will be printed, either in color or in grayscale.

                                \n" -+"foreground mostly contains the text. With the render mode you can decide " -+"what part of your page will be printed.

                                \n" -+"

                                Print Full Page: The full page, including foreground and " -+"background will be printed, either in color or in grayscale.

                                \n" - "

                                Black & White: Foreground and background are printed, but only in " --"black-and-white. If this option is chosen, the files generated will print much " --"faster, but quality will not be as good.

                                \n" --"

                                Foreground Only: This option is useful if the background of the page " --"is disturbing and affects the readability of the text.

                                \n" -+"black-and-white. If this option is chosen, the files generated will print " -+"much faster, but quality will not be as good.

                                \n" -+"

                                Foreground Only: This option is useful if the background of the " -+"page is disturbing and affects the readability of the text.

                                \n" - "

                                Background Only: Print only the background of the page.

                                " - msgstr "" --"

                                好的 DJVU 檔會分為前景圖片與背景圖片。前景大部份只含文字。在反映模式（Render mode）下您可以決定您要列印哪一部份。

                                \n" -+"

                                好的 DJVU 檔會分為前景圖片與背景圖片。前景大部份只含文字。在反映模式" -+"（Render mode）下您可以決定您要列印哪一部份。

                                \n" - "

                                列印完整頁面：列印完整頁面，包括前景與背景，使用彩色或灰階。

                                \n" --"

                                黑白會印出前景與背景，但是是黑白的。這個選項產生的檔案印起來會快得多，但是品質比較不怎麼樣。

                                \n" --"

                                只印前景如果頁面的背景很複雜，會影響到本文的讀取時，可使用這個選項。

                                \n" -+"

                                黑白會印出前景與背景，但是是黑白的。這個選項產生的檔案印起來會快得" -+"多，但是品質比較不怎麼樣。

                                \n" -+"

                                只印前景如果頁面的背景很複雜，會影響到本文的讀取時，可使用這個選" -+"項。

                                \n" - "

                                只印背景只列印背景。

                                " - - #. i18n: file pageRangeWidget_base.ui line 16 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdvi.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdvi.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kdvi.po 2008-08-19 20:43:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kdvi.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kdvi\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-07-04 11:23+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -46,7 +45,8 @@ - - #: TeXFont_PFB.cpp:44 - msgid "" --"The font file %1 could be opened and read, but its font format is unsupported." -+"The font file %1 could be opened and read, but its font format is " -+"unsupported." - msgstr "這個 %1 檔案雖可讀啟，但此種字型格式不被支援。" - - #: TeXFont_PFB.cpp:50 -@@ -126,10 +126,12 @@ - - #: dviFile.cpp:117 - msgid "" --"The DVI file contains the wrong version of DVI output for this program. Hint: " --"If you use the typesetting system Omega, you have to use a special program, " --"such as oxdvi." --msgstr "DVI 輸出檔的版本錯誤。指引：如果是使用 Omega 來排版的話，請改用專用的程式，例如 oxdvi。" -+"The DVI file contains the wrong version of DVI output for this program. " -+"Hint: If you use the typesetting system Omega, you have to use a special " -+"program, such as oxdvi." -+msgstr "" -+"DVI 輸出檔的版本錯誤。指引：如果是使用 Omega 來排版的話，請改用專用的程式，例" -+"如 oxdvi。" - - #: dviFile.cpp:155 - msgid "" -@@ -160,7 +162,9 @@ - msgid "" - "File corruption! KDVI had trouble interpreting your DVI " - "file. Most likely this means that the DVI file is broken." --msgstr "檔案有誤！ KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已毀損。" -+msgstr "" -+"檔案有誤！ KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已" -+"毀損。" - - #: dviRenderer.cpp:212 dviRenderer.cpp:483 - msgid "DVI File Error" -@@ -172,14 +176,16 @@ - - #: dviRenderer.cpp:277 - msgid "" --"This DVI file contains source file information. You may click into the text " --"with the middle mouse button, and an editor will open the TeX-source file " --"immediately." --msgstr "這個 DVI 檔含有原始文稿資訊。您可以按一下滑鼠中鍵來開啟 TeX 文稿的編輯器。" -+"This DVI file contains source file information. You may click into the " -+"text with the middle mouse button, and an editor will open the TeX-source " -+"file immediately." -+msgstr "" -+"這個 DVI 檔含有原始文稿資訊。您可以按一下滑鼠中鍵來開啟 TeX 文稿的編輯" -+"器。" - - #: dviRenderer.cpp:286 - msgid "Explain in more detail..." --msgstr "更詳細的解釋......" -+msgstr "更詳細的解釋…..." - - #: dviRenderer.cpp:315 - msgid "Embedding PostScript Files" -@@ -197,9 +203,11 @@ - - #: dviRenderer.cpp:439 - msgid "" --"File error. The specified file '%1' does not exist. KDVI " --"already tried to add the ending '.dvi'." --msgstr "檔案錯誤。所指定的檔案 '%1' 不存在。KDVI 已嘗試加入 '.dvi' 副檔名。" -+"File error. The specified file '%1' does not exist. " -+"KDVI already tried to add the ending '.dvi'." -+msgstr "" -+"檔案錯誤。所指定的檔案 '%1' 不存在。KDVI 已嘗試加入 '." -+"dvi' 副檔名。" - - #: dviRenderer.cpp:441 - msgid "File Error!" -@@ -207,28 +215,29 @@ - - #: dviRenderer.cpp:452 - msgid "" --"Could not open file %1 which has type " --"%2. KDVI can only load DVI (.dvi) files." -+"Could not open file %1 which has type " -+"%2. KDVI can only load DVI (.dvi) files." - msgstr "" --"無法開啟 %1，檔案類型為 %2" --"。KDVI 只能載入 DVI (.dvi) 檔。" -+"無法開啟 %1，檔案類型為 %2。KDVI 只能載入 DVI (.dvi) 檔。" - - #: dviRenderer.cpp:463 dviRenderer.cpp:481 - msgid "" --"File corruption! KDVI had trouble interpreting your DVI file. Most likely " --"this means that the DVI file is broken." -+"File corruption! KDVI had trouble interpreting your DVI file. Most " -+"likely this means that the DVI file is broken." - msgstr "檔案有誤！KDVI 無法解譯您的 DVI 檔。很可能您的 DVI 檔已毀損。" - - #: dviRenderer.cpp:640 - msgid "" --"You have asked KDVI to locate the place in the DVI file which corresponds " --"to line %1 in the TeX-file %2. It seems, however, that the DVI " --"file does not contain the necessary source file information. We refer to the " --"manual of KDVI for a detailed explanation on how to include this information. " --"Press the F1 key to open the manual." --msgstr "" --"您要 KDVI 找到在 %2 TeX 文稿的 %1 行的相對應位置。但此 DVI 檔並沒有含必要的 TeX " --"文稿資訊。請按 F1 鍵，參考 KDVI 手冊的詳細說明。" -+"You have asked KDVI to locate the place in the DVI file which " -+"corresponds to line %1 in the TeX-file %2. It seems, " -+"however, that the DVI file does not contain the necessary source file " -+"information. We refer to the manual of KDVI for a detailed explanation on " -+"how to include this information. Press the F1 key to open the manual." -+msgstr "" -+"您要 KDVI 找到在 %2 TeX 文稿的 %1 列的相對應位置。但此 " -+"DVI 檔並沒有含必要的 TeX 文稿資訊。請按 F1 鍵，參考 KDVI 手冊的詳細說明。" - - #: dviRenderer.cpp:645 dviRenderer.cpp:685 - msgid "Could Not Find Reference" -@@ -236,14 +245,15 @@ - - #: dviRenderer.cpp:683 - msgid "" --"KDVI was not able to locate the place in the DVI file which corresponds to " --"line %1 in the TeX-file %2." --msgstr "KDVI 無法找到在 %2 TeX 文稿的 %1 行的相對應位置。" -+"KDVI was not able to locate the place in the DVI file which corresponds " -+"to line %1 in the TeX-file %2." -+msgstr "" -+"KDVI 無法找到在 %2 TeX 文稿的 %1 列的相對應位置。" - - #: dviRenderer.cpp:737 - msgid "" --"The DVI-file refers to the TeX-file %1 " --"which could not be found." -+"The DVI-file refers to the TeX-file %1 which could not be " -+"found." - msgstr "TeX 文稿 %1 的相對應 DVI 檔找不到。" - - #: dviRenderer.cpp:740 -@@ -253,10 +263,11 @@ - #: dviRenderer.cpp:747 - msgid "" - "You have not yet specified an editor for inverse search. Please choose your " --"favorite editor in the DVI options dialog " --"which you will find in the Settings-menu." -+"favorite editor in the DVI options dialog which you will " -+"find in the Settings-menu." - msgstr "" --"您尚未指定編輯器。請由 設定-選單 中的 DVI 選項對話框 指定您順手的編輯器。" -+"您尚未指定編輯器。請由 設定-選單 中的 DVI 選項對話框" -+" 指定您順手的編輯器。" - - #: dviRenderer.cpp:752 - msgid "Need to Specify Editor" -@@ -268,26 +279,21 @@ - - #: dviRenderer.cpp:785 - msgid "" --"The external program" --"
                                " --"
                                %1" --"
                                " --"
                                which was used to call the editor for inverse search, reported an error. " --"You might wish to look at the document info dialog " --"which you will find in the File-Menu for a precise error report. The manual for " --"KDVI contains a detailed explanation how to set up your editor for use with " --"KDVI, and a list of common problems.                                " --msgstr "" --"用來呼叫編輯器的外部程式 " --"
                                " --"
                                %1" --"
                                " --"
                                傳回錯誤。您可能需要查看一下 文件資訊對話框 的 檔案-選單 來得知詳細的情形。KDVI " --"的使用手冊有詳細的說明如何設定編輯器及一些其他的問題說明。                                " -+"The external program

                                %1

                                which " -+"was used to call the editor for inverse search, reported an error. You might " -+"wish to look at the document info dialog which you will " -+"find in the File-Menu for a precise error report. The manual for KDVI " -+"contains a detailed explanation how to set up your editor for use with KDVI, " -+"and a list of common problems.                                " -+msgstr "" -+"用來呼叫編輯器的外部程式

                                %1

                                " -+"傳回錯誤。您可能需要查看一下 文件資訊對話框 的 檔案-選單 來" -+"得知詳細的情形。KDVI 的使用手冊有詳細的說明如何設定編輯器及一些其他的問題說" -+"明。                                " - - #: dviRenderer.cpp:791 - msgid "Starting the editor..." --msgstr "啟動編輯器......" -+msgstr "啟動編輯器…..." - - #: dviRenderer_draw.cpp:269 - msgid "The DVI code set a character of an unknown font." -@@ -319,17 +325,18 @@ - - #: dviRenderer_export.cpp:83 - msgid "" --"KDVI could not locate the program 'dvipdfm' on your computer. That program is " --"essential for the export function to work. You can, however, convert the " --"DVI-file to PDF using the print function of KDVI, but that will often produce " --"documents which print ok, but are of inferior quality if viewed in the Acrobat " --"Reader. It may be wise to upgrade to a more recent version of your TeX " --"distribution which includes the 'dvipdfm' program.\n" --"Hint to the perplexed system administrator: KDVI uses the shell's PATH variable " --"when looking for programs." --msgstr "" --"KDVI 找不到 'dvipdfm' 程式。這個程式是輸出功能所必需。當然也可以由 KDVI 的列印功能來轉換 DVI 為 " --"PDF，但通常這樣一來印表沒有問題，由 Acrobat Reader 閱覽時則品質較差。更新您的 TeX 系統至含 'dvipdfm' 程式的版本會較明智。\n" -+"KDVI could not locate the program 'dvipdfm' on your computer. That program " -+"is essential for the export function to work. You can, however, convert the " -+"DVI-file to PDF using the print function of KDVI, but that will often " -+"produce documents which print ok, but are of inferior quality if viewed in " -+"the Acrobat Reader. It may be wise to upgrade to a more recent version of " -+"your TeX distribution which includes the 'dvipdfm' program.\n" -+"Hint to the perplexed system administrator: KDVI uses the shell's PATH " -+"variable when looking for programs." -+msgstr "" -+"KDVI 找不到 'dvipdfm' 程式。這個程式是輸出功能所必需。當然也可以由 KDVI 的列" -+"印功能來轉換 DVI 為 PDF，但通常這樣一來印表沒有問題，由 Acrobat Reader 閱覽時" -+"則品質較差。更新您的 TeX 系統至含 'dvipdfm' 程式的版本會較明智。\n" - "給還沒進入狀況的系統管理者：KDVI 使用 shell 的 PATH 環境變數來找程式。" - - #: dviRenderer_export.cpp:98 -@@ -362,15 +369,16 @@ - - #: dviRenderer_export.cpp:113 - msgid "" --"KDVI is currently using the external program 'dvipdfm' to convert your DVI-file " --"to PDF. Sometimes that can take a while because dvipdfm needs to generate its " --"own bitmap fonts Please be patient." -+"KDVI is currently using the external program 'dvipdfm' to convert your DVI-" -+"file to PDF. Sometimes that can take a while because dvipdfm needs to " -+"generate its own bitmap fonts Please be patient." - msgstr "" --"KDVI 目前使用 'dvipdfm' 外部程式來轉換 DVI 為 PDF 格式。可能會花些時間，因為 dvipdfm 要產生所需的點陣字型，請耐心等候。" -+"KDVI 目前使用 'dvipdfm' 外部程式來轉換 DVI 為 PDF 格式。可能會花些時間，因為 " -+"dvipdfm 要產生所需的點陣字型，請耐心等候。" - - #: dviRenderer_export.cpp:117 - msgid "Waiting for dvipdfm to finish..." --msgstr "等待 dvipdfm 完成工作......" -+msgstr "等待 dvipdfm 完成工作…..." - - #: dviRenderer_export.cpp:118 - msgid "dvipdfm progress dialog" -@@ -382,12 +390,13 @@ - - #: dviRenderer_export.cpp:136 - msgid "" --"The external program 'dvipdf', which was used to export the file, reported " --"an error. You might wish to look at the document info dialog " --"which you will find in the File-Menu for a precise error report." -+"The external program 'dvipdf', which was used to export the file, " -+"reported an error. You might wish to look at the document info " -+"dialog which you will find in the File-Menu for a precise error " -+"report." - msgstr "" --"'dvipdf' 外部程式是用來輸出 PDF 檔，並報告是否有錯誤。您可以查看 文件資訊對話框 " --"的檔案選單來得到更精確的錯誤訊息。" -+"'dvipdf' 外部程式是用來輸出 PDF 檔，並報告是否有錯誤。您可以查看 " -+"文件資訊對話框 的檔案選單來得到更精確的錯誤訊息。" - - #: dviRenderer_export.cpp:139 - msgid "Export: %1 to PDF" -@@ -399,17 +408,16 @@ - "PostScript format, and cannot be handled by the dvips " - "program that KDVI uses interally to print or to export to PostScript. The " - "functionality that you require is therefore unavailable in this version of " --"KDVI.

                                " --"

                                As a workaround, you can use the File/Export As" --"-Menu to save this file in PDF format, and then use a PDF viewer.

                                " --"

                                The author of KDVI apologizes for the inconvenience. If enough users " --"complain, the missing functionality might later be added.

                                " --msgstr "" --"" --"

                                與這個 DVI 檔關聯的是一個非 PostScript 格式的外部圖形檔，無法經由 dvips " --"處理。因此在這一版的 KDVI 中無法處理您的需求。

                                " --"

                                您可以用選單中的「檔案」→「輸出為」功能將檔案存成 PDF 格式，再使用 PDF 檢視器讀取。

                                " --"

                                KDVI 的作者為您的不方便道歉。如果有夠多的使用者都需要此功能，我們會試著加入。

                                " -+"KDVI.

                                As a workaround, you can use the File/Export As-" -+"Menu to save this file in PDF format, and then use a PDF viewer.

                                The " -+"author of KDVI apologizes for the inconvenience. If enough users complain, " -+"the missing functionality might later be added.

                                " -+msgstr "" -+"

                                與這個 DVI 檔關聯的是一個非 PostScript 格式的外部圖形檔，無法經由 " -+"dvips 處理。因此在這一版的 KDVI 中無法處理您的需求。

                                " -+"您可以用選單中的「檔案」→「輸出為」功能將檔案存成 PDF 格式，再使用 PDF 檢視器" -+"讀取。

                                KDVI 的作者為您的不方便道歉。如果有夠多的使用者都需要此功能，我" -+"們會試著加入。

                                " - - #: dviRenderer_export.cpp:187 - msgid "Functionality Unavailable" -@@ -425,16 +433,16 @@ - - #: dviRenderer_export.cpp:216 - msgid "" --"KDVI is currently using the external program 'dvips' to convert your DVI-file " --"to PostScript. Sometimes that can take a while because dvips needs to generate " --"its own bitmap fonts Please be patient." -+"KDVI is currently using the external program 'dvips' to convert your DVI-" -+"file to PostScript. Sometimes that can take a while because dvips needs to " -+"generate its own bitmap fonts Please be patient." - msgstr "" --"KDVI 目前使用 'dvips' 外部程式來轉換 DVI 為 PostScript 格式。可能會花些時間，因為 dvips " --"要產生所需的點陣字型，請耐心等候。" -+"KDVI 目前使用 'dvips' 外部程式來轉換 DVI 為 PostScript 格式。可能會花些時間，" -+"因為 dvips 要產生所需的點陣字型，請耐心等候。" - - #: dviRenderer_export.cpp:220 - msgid "Waiting for dvips to finish..." --msgstr "等待 dvips 完成工作......" -+msgstr "等待 dvips 完成工作…..." - - #: dviRenderer_export.cpp:221 - msgid "dvips progress dialog" -@@ -442,12 +450,13 @@ - - #: dviRenderer_export.cpp:299 - msgid "" --"The external program 'dvips', which was used to export the file, reported " --"an error. You might wish to look at the document info dialog " --"which you will find in the File-Menu for a precise error report." -+"The external program 'dvips', which was used to export the file, " -+"reported an error. You might wish to look at the document info " -+"dialog which you will find in the File-Menu for a precise error " -+"report." - msgstr "" --"'dvips' 外部程式是用來輸出 PostScript 檔，並報告是否有錯誤。您可以查看 文件資訊對話框 " --"的檔案選單來得到更精確的錯誤訊息。" -+"'dvips' 外部程式是用來輸出 PostScript 檔，並報告是否有錯誤。您可以查看 " -+"文件資訊對話框 的檔案選單來得到更精確的錯誤訊息。" - - #: dviRenderer_export.cpp:302 - msgid "Export: %1 to PostScript" -@@ -460,8 +469,7 @@ - - #: dviRenderer_prescan.cpp:105 - msgid "" --"Page %1: The PostScript file %2 could not be found." --"
                                " -+"Page %1: The PostScript file %2 could not be found.
                                " - msgstr "頁 %1：PostScript 檔案 %2 找不到。
                                " - - #: dviRenderer_prescan.cpp:255 -@@ -474,7 +482,7 @@ - - #: fontpool.cpp:46 - msgid "KDVI is currently generating bitmap fonts..." --msgstr "KDVI 正在產生點陣字......" -+msgstr "KDVI 正在產生點陣字…..." - - #: fontpool.cpp:47 - msgid "Aborts the font generation. Don't do this." -@@ -483,9 +491,12 @@ - #: fontpool.cpp:48 - msgid "" - "KDVI is currently generating bitmap fonts which are needed to display your " --"document. For this, KDVI uses a number of external programs, such as MetaFont. " --"You can find the output of these programs later in the document info dialog." --msgstr "KDVI 正在產生點陣字來做為顯示文件用。KDVI 會使用一些外部程式來達到這個目的。您可以由文件資訊對話框得知這些外部程式名稱。" -+"document. For this, KDVI uses a number of external programs, such as " -+"MetaFont. You can find the output of these programs later in the document " -+"info dialog." -+msgstr "" -+"KDVI 正在產生點陣字來做為顯示文件用。KDVI 會使用一些外部程式來達到這個目的。" -+"您可以由文件資訊對話框得知這些外部程式名稱。" - - #: fontpool.cpp:51 - msgid "KDVI is generating fonts. Please wait." -@@ -525,10 +536,11 @@ - - #: fontpool.cpp:284 - msgid "" --"" --"

                                KDVI was not able to locate all the font files which are necessary to " -+"

                                KDVI was not able to locate all the font files which are necessary to " - "display the current DVI file. Your document might be unreadable.

                                " --msgstr "

                                KDVI 無法找到完整的字型來顯示這個 DVI 檔。您的文件有可能沒辦法閱讀。

                                " -+msgstr "" -+"

                                KDVI 無法找到完整的字型來顯示這個 DVI 檔。您的文件有可能沒辦法閱讀。" -+"

                                " - - #: fontpool.cpp:288 - msgid "Not All Font Files Found" -@@ -536,23 +548,25 @@ - - #: fontpool.cpp:299 - msgid "Locating fonts..." --msgstr "找尋字型......" -+msgstr "找尋字型…..." - - #: fontpool.cpp:358 - msgid "" - "

                                KDVI relies on the kpsewhich program to locate font files on your " - "hard disc and to generate PK fonts, if necessary.

                                " --msgstr "

                                KDVI 使用 kpsewhich 程式來尋找您硬碟中的字型檔，需要時並產生 PK 字型。

                                " -+msgstr "" -+"

                                KDVI 使用 kpsewhich 程式來尋找您硬碟中的字型檔，需要時並產生 PK 字" -+"型。

                                " - - #: fontpool.cpp:361 - msgid "" - "

                                The shell process for the kpsewhich program could not be started. " - "Consequently, some font files could not be found, and your document might by " --"unreadable. If this error is reproducable please report the issue to the KDVI " --"developers using the 'Help' menu." --"

                                " -+"unreadable. If this error is reproducable please report the issue to the " -+"KDVI developers using the 'Help' menu.

                                " - msgstr "" --"

                                kpsewhich 程式無法啟動。因此，有些字型檔找不到，您的文件可能無法閱讀。如果可以重現此錯誤，請到「說明」選單中向 KDVI 開發團隊回報。

                                " -+"

                                kpsewhich 程式無法啟動。因此，有些字型檔找不到，您的文件可能無法閱讀。如果" -+"可以重現此錯誤，請到「說明」選單中向 KDVI 開發團隊回報。

                                " - - #: fontpool.cpp:367 fontpool.cpp:405 - msgid "Problem locating fonts - KDVI" -@@ -565,19 +579,20 @@ - #: fontpool.cpp:394 - msgid "" - "

                                There were problems running kpsewhich. As a result, some font files could " --"not be located, and your document might be unreadable.

                                " --"

                                Possible reason: The kpsewhich program is perhaps not installed on " --"your system, or it cannot be found in the current search path.

                                " --"

                                What you can do: The kpsewhich program is normally contained in " --"distributions of the TeX typesetting system. If TeX is not installed on your " --"system, you could install the TeTeX distribution (www.tetex.org). If you are " --"sure that TeX is installed, please try to use the kpsewhich program from the " --"command line to check if it really works.

                                " --msgstr "" --"

                                執行 kpsewhich 時發生問題。因此，有些字型檔找不到，您的文件可能無法閱讀。

                                " --"

                                可能的原因有：kpsewhich 程式沒有安裝，或不在您的執行路徑上。

                                " --"

                                建議處理方式：kpsewhich 程式通常會跟著 Tex 系統套件一起散佈。如果您沒有安裝 Tex，您可以安裝 TeTex " --"套件（www.tetex.org）。如果您確定 Tex 已安裝，請試著從命令列執行 kpsewhich，看看是否有問題。

                                " -+"not be located, and your document might be unreadable.

                                Possible " -+"reason: The kpsewhich program is perhaps not installed on your system, " -+"or it cannot be found in the current search path.

                                What you can do: The kpsewhich program is normally contained in distributions of the TeX " -+"typesetting system. If TeX is not installed on your system, you could " -+"install the TeTeX distribution (www.tetex.org). If you are sure that TeX is " -+"installed, please try to use the kpsewhich program from the command line to " -+"check if it really works.

                                " -+msgstr "" -+"

                                執行 kpsewhich 時發生問題。因此，有些字型檔找不到，您的文件可能無法閱讀。" -+"

                                可能的原因有：kpsewhich 程式沒有安裝，或不在您的執行路徑上。

                                建議處理方式：kpsewhich 程式通常會跟著 Tex 系統套件一起散布。如" -+"果您沒有安裝 Tex，您可以安裝 TeTex 套件（www.tetex.org）。如果您確定 Tex 已安" -+"裝，請試著從命令列執行 kpsewhich，看看是否有問題。

                                " - - #: fontpool.cpp:590 - msgid "Currently generating %1 at %2 dpi" -@@ -614,9 +629,11 @@ - #: infodialog.cpp:39 - msgid "" - "This text field shows detailed information about the currently loaded fonts. " --"This is useful for experts who want to locate problems in the setup of TeX or " --"KDVI." --msgstr "這個文字欄位會顯示所載入字型的詳細資訊。這對想解決 TeX 或 KDVI 問題的老手會很有幫助。" -+"This is useful for experts who want to locate problems in the setup of TeX " -+"or KDVI." -+msgstr "" -+"這個文字欄位會顯示所載入字型的詳細資訊。這對想解決 TeX 或 KDVI 問題的老手會很" -+"有幫助。" - - #: infodialog.cpp:43 - msgid "External Programs" -@@ -633,11 +650,11 @@ - #: infodialog.cpp:48 - msgid "" - "KDVI uses external programs, such as MetaFont, dvipdfm or dvips. This text " --"field shows the output of these programs. That is useful for experts who want " --"to find problems in the setup of TeX or KDVI." -+"field shows the output of these programs. That is useful for experts who " -+"want to find problems in the setup of TeX or KDVI." - msgstr "" --"KDVI 使用一些外部程式，例如 MetaFont, dvipdfm 或 dvips。這個文字欄位會顯示這些程式的輸出。這對想解決 TeX 或 KDVI " --"問題的老手會很有幫助。" -+"KDVI 使用一些外部程式，例如 MetaFont, dvipdfm 或 dvips。這個文字欄位會顯示這" -+"些程式的輸出。這對想解決 TeX 或 KDVI 問題的老手會很有幫助。" - - #: infodialog.cpp:64 - msgid "There is no DVI file loaded at the moment." -@@ -665,11 +682,11 @@ - - #: kdvi_multipage.cpp:70 - msgid "Document &Info" --msgstr "文件資訊 (&I)" -+msgstr "文件資訊(&I)" - - #: kdvi_multipage.cpp:71 - msgid "Embed External PostScript Files..." --msgstr "嵌入外部 PostScript 檔案......" -+msgstr "嵌入外部 PostScript 檔案…..." - - #: kdvi_multipage.cpp:72 - msgid "Enable All Warnings && Messages" -@@ -677,11 +694,11 @@ - - #: kdvi_multipage.cpp:73 - msgid "PostScript..." --msgstr "PostScript..." -+msgstr "PostScript…" - - #: kdvi_multipage.cpp:74 - msgid "PDF..." --msgstr "PDF..." -+msgstr "PDF…" - - #: kdvi_multipage.cpp:101 main.cpp:34 - msgid "KDVI" -@@ -695,8 +712,8 @@ - - #: kdvi_multipage.cpp:105 - msgid "" --"This program displays Device Independent (DVI) files which are produced by the " --"TeX typesetting system.\n" -+"This program displays Device Independent (DVI) files which are produced by " -+"the TeX typesetting system.\n" - "KDVI 1.3 is based on original code from KDVI version 0.43 and xdvik." - msgstr "" - "這個程式會顯示 DVI 檔，由 Tex 系統套件產生。\n" -@@ -724,7 +741,7 @@ - - #: kdvi_multipage.cpp:117 main.cpp:49 - msgid "Re-organisation of source code." --msgstr "重新組織程式源碼。" -+msgstr "重新組織程式原始碼。" - - #: kdvi_multipage.cpp:153 - msgid "Save File As" -@@ -750,8 +767,8 @@ - #: kdvi_multipage.cpp:251 - msgid "" - "The list of pages you selected was empty.\n" --"Maybe you made an error in selecting the pages, e.g. by giving an invalid range " --"like '7-2'." -+"Maybe you made an error in selecting the pages, e.g. by giving an invalid " -+"range like '7-2'." - msgstr "" - "您所選的頁數是空的。\n" - "或許您選頁的操作有誤，例如給了個無效的範圍，如 '7-2'。" -@@ -765,11 +782,12 @@ - "This function searches the DVI file for plain text. Unfortunately, this " - "version of KDVI treats only plain ASCII characters properly. Symbols, " - "ligatures, mathematical formulae, accented characters, and non-English text, " --"such as Russian or Korean, will most likely be messed up completely. Continue " --"anyway?" -+"such as Russian or Korean, will most likely be messed up completely. " -+"Continue anyway?                                " - msgstr "" --"此功能搜尋 DVI 檔中的純文字內容。很可惜，本版的 KDVI 只能正確處理純 ASCII " --"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會完全變成一團亂。要繼續嗎？" -+"此功能搜尋 DVI 檔中的純文字內容。很可惜，本版的 KDVI 只能正確處理純 " -+"ASCII 字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓" -+"文，將會完全變成一團亂。要繼續嗎？" - - #: kdvi_multipage.cpp:469 kdvi_multipage_texthandling.cpp:64 - msgid "Function May Not Work as Expected" -@@ -783,7 +801,8 @@ - "such as Russian or Korean, will most likely be messed up completely.                                " - msgstr "" - "此功能會將 DVI 檔轉為純文字檔。很可惜，本版的 KDVI 只能正確處理純 ASCII " --"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會完全變成一團亂。" -+"字元。符號、連體字、數理式子、重音符號及非英文語系文字，例如俄文或韓文，將會" -+"完全變成一團亂。                                " - - #: kdvi_multipage_texthandling.cpp:65 - msgid "Continue Anyway" -@@ -793,7 +812,9 @@ - msgid "" - "Check if the file is loaded in another KDVI.\n" - "If it is, bring up the other KDVI. Otherwise, load the file." --msgstr "請檢查是否此檔已被其他 KDVI 實體載入。如果是的話，請叫出該實體，否則請載入檔案。" -+msgstr "" -+"請檢查是否此檔已被其他 KDVI 實體載入。如果是的話，請叫出該實體，否則請載入檔" -+"案。" - - #: main.cpp:23 - msgid "Navigate to this page" -@@ -805,8 +826,8 @@ - - #: main.cpp:37 - msgid "" --"This program displays Device Independent (DVI) files which are produced by the " --"TeX typesetting system.\n" -+"This program displays Device Independent (DVI) files which are produced by " -+"the TeX typesetting system.\n" - "This KDVI version is based on original code from KDVI version 0.43 and xdvik." - msgstr "" - "這個程式會顯示 DVI 檔，由 Tex 系統套件產生。\n" -@@ -818,8 +839,8 @@ - - #: main.cpp:86 - msgid "" --"The URL %1 does not point to a local file. You can only specify local files if " --"you are using the '--unique' option." -+"The URL %1 does not point to a local file. You can only specify local files " -+"if you are using the '--unique' option." - msgstr "網址 %1 不是本地端檔案。您使用 --unique 選項時只能指定本地端檔案。" - - #: optionDialogFontsWidget.cpp:34 -@@ -833,8 +854,8 @@ - "either install the FreeType library and recompile KDVI yourself, or find a " - "precompiled software package for your operating system." - msgstr "" --"KDVI 需要 FreeType 來存取 type 1 字型。KDVI 編譯時並沒有編入 FreeType。如果您要使用 type 1 字型，您需重編譯 " --"KDVI，或找尋已編譯好的可執行檔。" -+"KDVI 需要 FreeType 來存取 type 1 字型。KDVI 編譯時並沒有編入 FreeType。如果您" -+"要使用 type 1 字型，您需重編譯 KDVI，或找尋已編譯好的可執行檔。" - - #: optionDialogSpecialWidget.cpp:32 - msgid "User-Defined Editor" -@@ -870,43 +891,45 @@ - - #: psgs.cpp:152 - msgid "Generating PostScript graphics..." --msgstr "產生 PostScript 圖檔......" -+msgstr "產生 PostScript 圖檔…..." - - #: psgs.cpp:250 - msgid "" - "The version of Ghostview that is installed on this computer does not " --"contain any of the Ghostview device drivers that are known to KDVI. PostScript " --"support has therefore been turned off in KDVI." -+"contain any of the Ghostview device drivers that are known to KDVI. " -+"PostScript support has therefore been turned off in KDVI.                                " - msgstr "" --"安裝在此電腦上的 Ghostview 的版本不含任何 KDVI 能辨識的 Ghostview 裝置驅動程式。PostScript " --"支援將被關閉。" -+"安裝在此電腦上的 Ghostview 的版本不含任何 KDVI 能辨識的 Ghostview 裝置驅" -+"動程式。PostScript 支援將被關閉。" - - #: psgs.cpp:253 - msgid "" --"" --"

                                The Ghostview program, which KDVI uses internally to display the PostScript " --"graphics that is included in this DVI file, is generally able to write its " --"output in a variety of formats. The sub-programs that Ghostview uses for these " --"tasks are called 'device drivers'; there is one device driver for each format " --"that Ghostview is able to write. Different versions of Ghostview often have " --"different sets of device drivers available. It seems that the version of " --"Ghostview that is installed on this computer does not contain " --"any of the device drivers that are known to KDVI.

                                " --"

                                It seems unlikely that a regular installation of Ghostview would not contain " --"these drivers. This error may therefore point to a serious misconfiguration of " --"the Ghostview installation on your computer.

                                " --"

                                If you want to fix the problems with Ghostview, you can use the command " --"gs --help to display the list of device drivers contained in " --"Ghostview. Among others, KDVI can use the 'png256', 'jpeg' and 'pnm' drivers. " --"Note that KDVI needs to be restarted to re-enable PostScript support.

                                " --msgstr "" --" " --"

                                KDVI 內部用以顯示此 DVI 檔中的 PostScript 圖形的 GhostView 程式，可以將它的輸出寫程不同的格式。Ghostview " --"使用的子程式稱為「裝置驅動程式」，每一種輸出格式都有自己的裝置驅動程式，不同版本的 Ghostview 也會提供不同的裝置驅動程式。看起來安裝在此電腦上的 " --"Ghostview 版本並沒有支援 任何 KDVI 能辨識的裝置驅動程式。

                                " --"

                                看起來您安裝的 Ghostview 可能不是很正常。也有可能是 Ghostview 在安裝時設定不正確。

                                " --"

                                如果您要修正此問題，您可以在命令列下使用 gs --help 顯示裝置驅動程式清單。此外 KDVI 還可以使用 " --"png256、jpeg 與 pnm 驅動程式。注意，KDVI 需要重新啟動才能重新開啟 PostScript 支援。

                                " -+"

                                The Ghostview program, which KDVI uses internally to display the " -+"PostScript graphics that is included in this DVI file, is generally able to " -+"write its output in a variety of formats. The sub-programs that Ghostview " -+"uses for these tasks are called 'device drivers'; there is one device driver " -+"for each format that Ghostview is able to write. Different versions of " -+"Ghostview often have different sets of device drivers available. It seems " -+"that the version of Ghostview that is installed on this computer does not " -+"contain any of the device drivers that are known to KDVI.

                                It seems unlikely that a regular installation of Ghostview would not " -+"contain these drivers. This error may therefore point to a serious " -+"misconfiguration of the Ghostview installation on your computer.

                                If " -+"you want to fix the problems with Ghostview, you can use the command " -+"gs --help to display the list of device drivers contained " -+"in Ghostview. Among others, KDVI can use the 'png256', 'jpeg' and 'pnm' " -+"drivers. Note that KDVI needs to be restarted to re-enable PostScript " -+"support.

                                " -+msgstr "" -+"

                                KDVI 內部用以顯示此 DVI 檔中的 PostScript 圖形的 GhostView 程式，可以" -+"將它的輸出寫程不同的格式。Ghostview 使用的子程式稱為「裝置驅動程式」，每一種" -+"輸出格式都有自己的裝置驅動程式，不同版本的 Ghostview 也會提供不同的裝置驅動程" -+"式。看起來安裝在此電腦上的 Ghostview 版本並沒有支援 任何 " -+"KDVI 能辨識的裝置驅動程式。

                                看起來您安裝的 Ghostview 可能不是很正常。" -+"也有可能是 Ghostview 在安裝時設定不正確。

                                如果您要修正此問題，您可以在" -+"命令列下使用 gs --help 顯示裝置驅動程式清單。此外 KDVI 還可" -+"以使用 png256、jpeg 與 pnm 驅動程式。注意，KDVI 需要重新啟動才能重新開啟 " -+"PostScript 支援。

                                " - - #. i18n: file kdvi_part.rc line 6 - #: rc.cpp:6 -@@ -924,8 +947,8 @@ - #: rc.cpp:21 - #, no-c-format - msgid "" --"You should enable this, if the use of font hinting improves readability on your " --"machine." -+"You should enable this, if the use of font hinting improves readability on " -+"your machine." - msgstr "如果字型提示可增進可讀性，那你可以試著開啟此選項。" - - #. i18n: file optionDialogFontsWidget_base.ui line 34 -@@ -933,12 +956,12 @@ - #, no-c-format - msgid "" - "Many modern fonts contain \"font hinting\" information which can be used to " --"improve the appearance of a font on low-resolution displays, such as a computer " --"monitor, or a notebook screen. However, many people find the \"improved\" fonts " --"quite ugly and prefer to have this option disabled." -+"improve the appearance of a font on low-resolution displays, such as a " -+"computer monitor, or a notebook screen. However, many people find the " -+"\"improved\" fonts quite ugly and prefer to have this option disabled." - msgstr "" --"目前的許多字型都含有 \"字型提示\" （font hinting）資訊，這在低解析度的螢幕可增進可讀性。但有不少朋友發現這種 \"改進\" " --"很醜，這時可能需要把這個選項關掉。" -+"目前的許多字型都含有 \"字型提示\" （font hinting）資訊，這在低解析度的螢幕可" -+"增進可讀性。但有不少朋友發現這種 \"改進\" 很醜，這時可能需要把這個選項關掉。" - - #. i18n: file optionDialogSpecialWidget_base.ui line 27 - #: rc.cpp:27 -@@ -957,12 +980,13 @@ - #, no-c-format - msgid "" - "Some DVI files contain PostScript graphics. If enabled, KDVI will use the " --"Ghostview PostScript interpreter to display these. You probably want to enable " --"this option, unless you have a DVI-file whose PostScript part is broken, or too " --"large for your machine." --msgstr "" --"有些 DVI 檔含有 PostScript 圖形。如果打開這個功能，KDVI 會使用 ghostview 的 PostScript " --"解譯器來顯示這些圖形。您可能得打開這個功能，除非您的 DVI 檔的 PostScript 圖形毀損，或圖形太大您的系統無法處理。" -+"Ghostview PostScript interpreter to display these. You probably want to " -+"enable this option, unless you have a DVI-file whose PostScript part is " -+"broken, or too large for your machine." -+msgstr "" -+"有些 DVI 檔含有 PostScript 圖形。如果打開這個功能，KDVI 會使用 ghostview 的 " -+"PostScript 解譯器來顯示這些圖形。您可能得打開這個功能，除非您的 DVI 檔的 " -+"PostScript 圖形毀損，或圖形太大您的系統無法處理。" - - #. i18n: file optionDialogSpecialWidget_base.ui line 41 - #: rc.cpp:36 -@@ -980,15 +1004,16 @@ - #: rc.cpp:42 - #, no-c-format - msgid "" --"

                                Some DVI files contain 'inverse search' information. If such a DVI file is " --"loaded, you can right-click into KDVI and an editor will open, load the TeX " --"file and jump to the correct position. You can select your favorite editor " --"here. If in doubt, 'nedit' is usually a good choice.

                                \n" -+"

                                Some DVI files contain 'inverse search' information. If such a DVI file " -+"is loaded, you can right-click into KDVI and an editor will open, load the " -+"TeX file and jump to the correct position. You can select your favorite " -+"editor here. If in doubt, 'nedit' is usually a good choice.

                                \n" - "

                                Check the KDVI manual to see how to prepare DVI files which support the " - "inverse search.

                                " - msgstr "" --"

                                有些 DVI 檔含有反向搜尋的資訊。如果載入此種 DVI 檔，您可以按滑鼠右鍵來打開編輯器，載入 TeX " --"文稿，並跳至相對應的位置。在此您可以選擇自己喜愛的編輯器。如果有疑問，'nedit' 常是好的選擇。

                                \n" -+"

                                有些 DVI 檔含有反向搜尋的資訊。如果載入此種 DVI 檔，您可以按滑鼠右鍵來打開" -+"編輯器，載入 TeX 文稿，並跳至相對應的位置。在此您可以選擇自己喜愛的編輯器。如" -+"果有疑問，'nedit' 常是好的選擇。

                                \n" - "

                                查閱 KDVI 的使用手冊，如何讓有反向搜尋的 DVI 檔作用。

                                " - - #. i18n: file optionDialogSpecialWidget_base.ui line 80 -@@ -1019,13 +1044,15 @@ - "Otherwise, bring the window with the file to the front'. If you are using an " - "editor like this, clicking into the DVI file will always open a new editor, " - "even if the TeX file is already open. Likewise, many editors have no command " --"line argument that would allow KDVI to specify the exact line which you wish to " --"edit.

                                \n" --"

                                If you feel that KDVI's support for a certain editor is inadequate, please " --"write to kebekus@kde.org.

                                " --msgstr "" --"

                                並非所有編輯器都適合做反向搜尋。例如，許多編輯器並無「若檔案尚未載入則載入檔案，否則將檔案視窗移至前景」的功能。如果您的編輯器沒有此功能，在 DVI " --"檔按一下滑鼠，即使 TeX 已經打開，還是會開啟一個新的編輯器。此外，有許多編輯器並無命令列參數供 KDVI 去指定特定行。

                                \n" -+"line argument that would allow KDVI to specify the exact line which you wish " -+"to edit.

                                \n" -+"

                                If you feel that KDVI's support for a certain editor is inadequate, " -+"please write to kebekus@kde.org.

                                " -+msgstr "" -+"

                                並非所有編輯器都適合做反向搜尋。例如，許多編輯器並無「若檔案尚未載入則載入" -+"檔案，否則將檔案視窗移至前景」的功能。如果您的編輯器沒有此功能，在 DVI 檔按一" -+"下滑鼠，即使 TeX 已經打開，還是會開啟一個新的編輯器。此外，有許多編輯器並無命" -+"令列參數供 KDVI 去指定特定行。

                                \n" - "

                                如果您覺得 KDVI 對某些編輯器支援不完整，請寫信給 kebekus@kde.org。

                                " - - #. i18n: file optionDialogSpecialWidget_base.ui line 135 -@@ -1039,9 +1066,11 @@ - #, no-c-format - msgid "" - "If you are using inverse search, KDVI uses this command line to start the " --"editor. The field '%f' is replaced with the filename, and '%l' is replaced with " --"the line number." --msgstr "如果您使用反向搜尋，KDVI 使用這個命令列去啟動編輯器。'%f' 欄位會被檔名取代，而且 '%l' 會被行數取代。" -+"editor. The field '%f' is replaced with the filename, and '%l' is replaced " -+"with the line number." -+msgstr "" -+"如果您使用反向搜尋，KDVI 使用這個命令列去啟動編輯器。'%f' 欄位會被檔名取代，" -+"而且 '%l' 會被列數取代。" - - #. i18n: file optionDialogSpecialWidget_base.ui line 154 - #: rc.cpp:65 -@@ -1074,7 +1103,9 @@ - msgid "" - "Allows KDVI to use MetaFont to produce bitmap fonts. Unless you have a very " - "specific reason, you probably want to enable this option." --msgstr "允許 KDVI 使用 MetaFont 來產生點陣字。除非您有很特殊的理由，否則您最好是打開。" -+msgstr "" -+"允許 KDVI 使用 MetaFont 來產生點陣字。除非您有很特殊的理由，否則您最好是打" -+"開。" - - #. i18n: file kdvi.kcfg line 15 - #: rc.cpp:80 -@@ -1086,21 +1117,23 @@ - #: rc.cpp:86 - #, no-c-format - msgid "" --"Use font hinting. You should enable this, if the use of font hinting improves " --"readability on your machine." --msgstr "使用字型提示（font hinting）。如果使用字型提示可增進可讀性，那你可以試試看。" -+"Use font hinting. You should enable this, if the use of font hinting " -+"improves readability on your machine." -+msgstr "" -+"使用字型提示（font hinting）。如果使用字型提示可增進可讀性，那你可以試試看。" - - #. i18n: file kdvi.kcfg line 21 - #: rc.cpp:89 - #, no-c-format - msgid "" - "Many modern fonts contain "font hinting" information which can be " --"used to improve the appearance of a font on low-resolution displays, such as a " --"computer monitor, or a notebook screen. However, many people find the " --""improved" fonts quite ugly and prefer to have this option disabled." -+"used to improve the appearance of a font on low-resolution displays, such as " -+"a computer monitor, or a notebook screen. However, many people find the " -+""improved" fonts quite ugly and prefer to have this option " -+"disabled." - msgstr "" --"目前的許多字型都含有「字型提示」（font " --"hinting）資訊，這在低解析度的螢幕可增進可讀性。但有不少朋友發現這種「改進」很醜，這時可能需要把這個選項關掉。" -+"目前的許多字型都含有「字型提示」（font hinting）資訊，這在低解析度的螢幕可增" -+"進可讀性。但有不少朋友發現這種「改進」很醜，這時可能需要把這個選項關掉。" - - #: special.cpp:39 - msgid "That makes 25 errors. Further error messages will not be printed." -@@ -1108,8 +1141,8 @@ - - #: special.cpp:224 - msgid "" --"Error in DVIfile '%1', page %2. Color pop command issued when the color stack " --"is empty." -+"Error in DVIfile '%1', page %2. Color pop command issued when the color " -+"stack is empty." - msgstr "DVI 檔 '%1'，頁 %2 錯誤。顏色堆疊錯誤。" - - #: special.cpp:309 -@@ -1140,10 +1173,8 @@ - msgstr "特殊命令 '%1' 尚未實作。" - - #: tips.cpp:3 --msgid "" --"

                                ...that KDVI can also load compressed DVI-files? \n" --msgstr "" --"

                                ......KDVI 可以載入壓縮過的 DVI 檔嗎？\n" -+msgid "

                                ...that KDVI can also load compressed DVI-files? \n" -+msgstr "

                                …...KDVI 可以載入壓縮過的 DVI 檔嗎？\n" - - #: tips.cpp:8 - msgid "" -@@ -1155,7 +1186,8 @@ - - #: tips.cpp:14 - msgid "" --"

                                ...that KDVI now supports inverse search? You can click into your DVI file \n" -+"

                                ...that KDVI now supports inverse search? You can click into your DVI " -+"file \n" - "with the middle mouse button and your editor opens, loads the TeX file, and\n" - "jumps to the proper line! The \n" - "manual explains how to set up your editor for this. \n" -@@ -1167,9 +1199,11 @@ - - #: tips.cpp:22 - msgid "" --"

                                ...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n" -+"

                                ...that KDVI supports forward search? If you use Emacs or XEmacs, you " -+"can \n" - "jump directly from the TeX file to the associated place in the DVI file. \n" --"The manual explains how to set up \n" -+"The manual explains how to set " -+"up \n" - "your editor for this. \n" - msgstr "" - "

                                ......KDVI 支援往前搜尋？如果您使用 Emacs 或 XEmacs，您可以\n" -@@ -1178,17 +1212,14 @@ - "設定編輯器達成此種功能。 \n" - - #: tips.cpp:30 --msgid "" --"

                                ...that KDVI now offers full text search? \n" --msgstr "" --"

                                ......KDVI 可以全文搜尋？\n" -+msgid "

                                ...that KDVI now offers full text search? \n" -+msgstr "

                                …...KDVI 可以全文搜尋？\n" - - #: tips.cpp:35 - msgid "" --"

                                ...that KDVI can save your DVI file as PostScript, PDF, and even plain text? " --"\n" --msgstr "" --"

                                ......KDVI 可以把 DVI 檔存成 PostScript，PDF 甚至純文字檔？\n" -+"

                                ...that KDVI can save your DVI file as PostScript, PDF, and even plain " -+"text? \n" -+msgstr "

                                …...KDVI 可以把 DVI 檔存成 PostScript，PDF 甚至純文字檔？\n" - - #: util.cpp:73 - msgid "Fatal Error! " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfax.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfax.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfax.po 2007-01-15 10:56:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfax.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,8 +5,7 @@ - "Project-Id-Version: kfax\n" - "POT-Creation-Date: 2006-11-13 02:37+0100\n" - "PO-Revision-Date: 2006-06-08 16:43+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -63,7 +62,7 @@ - - #: kfax.cpp:246 - msgid "A&dd..." --msgstr "新增傳真(&A)..." -+msgstr "新增傳真(&A)…" - - #: kfax.cpp:258 - msgid "&Rotate Page" -@@ -103,7 +102,7 @@ - - #: kfax.cpp:827 - msgid "Saving..." --msgstr "儲存中..." -+msgstr "儲存中…" - - #: kfax.cpp:835 - msgid "" -@@ -119,7 +118,7 @@ - - #: kfax.cpp:856 - msgid "Downloading..." --msgstr "載入中..." -+msgstr "載入中…" - - #: kfax.cpp:1444 - msgid "Page: %1 of %2" -@@ -156,7 +155,7 @@ - - #: kfax.cpp:1630 - msgid "Height (number of fax lines)" --msgstr "高度 (傳真行數)" -+msgstr "高度 (傳真列數)" - - #: kfax.cpp:1632 - msgid "Width (dots per fax line)" -@@ -203,10 +202,8 @@ - msgstr "列印重寫，還有許多程式碼修正" - - #: faxinput.cpp:61 --msgid "" --"Out of memory\n" --msgstr "" --"記憶體不足\n" -+msgid "Out of memory\n" -+msgstr "記憶體不足\n" - - #: faxinput.cpp:113 - msgid "" -@@ -238,16 +235,13 @@ - - #: faxinput.cpp:294 - msgid "" --"Due to patent reasons KFax can not handle LZW (Lempel-Ziv & Welch) compressed " --"Fax files.\n" --msgstr "" --"因為專利的理由，KFax 無法處理 LZW（Lempel-Ziv & Welch）壓縮傳真檔。\n" -+"Due to patent reasons KFax can not handle LZW (Lempel-Ziv & Welch) " -+"compressed Fax files.\n" -+msgstr "因為專利的理由，KFax 無法處理 LZW（Lempel-Ziv & Welch）壓縮傳真檔。\n" - - #: faxinput.cpp:299 --msgid "" --"This version can only handle Fax files\n" --msgstr "" --"這個版本只能處理傳真檔。\n" -+msgid "This version can only handle Fax files\n" -+msgstr "這個版本只能處理傳真檔。\n" - - #: faxinput.cpp:333 - msgid "Bad Fax File" -@@ -266,57 +260,45 @@ - "Only the first page of the PC Research multipage file\n" - "%1\n" - "will be shown\n" --msgstr "" --"只有 PC Research multipage 檔 %1 的第一頁會被顯示\n" -+msgstr "只有 PC Research multipage 檔 %1 的第一頁會被顯示\n" - - #: faxinput.cpp:465 - msgid "" - "No fax found in file:\n" - "%1\n" --msgstr "" --"檔案 %1 中找不到傳真\n" -+msgstr "檔案 %1 中找不到傳真\n" - - #: kfax_printsettings.cpp:30 - msgid "" --"" --"

                                'Ignore Paper Margins'

                                " --"

                                If this checkbox is enabled, the paper margins will be ignored and the fax " --"will be printed on the full paper size.

                                " --"

                                If this checkbox is disabled, KFax will respect the standard paper margins " --"and print the fax inside this printable area.

                                " --msgstr "" --" " --"

                                忽略頁面留白

                                " --"

                                如果勾選此選項，頁面留白會被忽略，傳真會印到整個頁面。

                                " --"

                                反之，KFax 會依標準的頁面留白設定，並在可列印的區域裡列印。

                                " -+"

                                'Ignore Paper Margins'

                                If this checkbox is " -+"enabled, the paper margins will be ignored and the fax will be printed on " -+"the full paper size.

                                If this checkbox is disabled, KFax will respect " -+"the standard paper margins and print the fax inside this printable area.

                                " -+"                                " -+msgstr "" -+"

                                忽略頁面留白

                                如果勾選此選項，頁面留白會被忽" -+"略，傳真會印到整個頁面。

                                反之，KFax 會依標準的頁面留白設定，並在可列印" -+"的區域裡列印。

                                " - - #: kfax_printsettings.cpp:41 - msgid "" --"" --"

                                'Horizontal centered'

                                " --"

                                If this checkbox is enabled, the fax will be centered horizontally on the " --"page.

                                " --"

                                If this checkbox is disabled, the fax will be printed at the left side of " --"the page.

                                " -+"

                                'Horizontal centered'

                                If this checkbox is " -+"enabled, the fax will be centered horizontally on the page.

                                If this " -+"checkbox is disabled, the fax will be printed at the left side of the page. " - msgstr "" --" " --"

                                水平置中

                                " --"

                                如果勾選此選項，傳真內容會水平置中。

                                " --"

                                反之，則會列印在左側。

                                " -+"

                                水平置中

                                如果勾選此選項，傳真內容會水平置中。" -+"

                                反之，則會列印在左側。

                                " - - #: kfax_printsettings.cpp:52 - msgid "" --"" --"

                                'Vertical centered'

                                " --"

                                If this checkbox is enabled, the fax will be centered vertically on the " --"page.

                                " --"

                                If this checkbox is disabled, the fax will be printed at the top of the " --"page.

                                " -+"

                                'Vertical centered'

                                If this checkbox is " -+"enabled, the fax will be centered vertically on the page.

                                If this " -+"checkbox is disabled, the fax will be printed at the top of the page.

                                " - msgstr "" --" " --"

                                垂直置中

                                " --"

                                如果勾選此選項，則傳真會垂直置中。

                                " --"

                                反之，則傳真會印在頁面的頂端。

                                " -+"

                                垂直置中

                                如果勾選此選項，則傳真會垂直置中。

                                反之，則傳真會印在頁面的頂端。

                                " - - #: kfax_printsettings.cpp:64 - msgid "&Layout" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfaxview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfaxview.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfaxview.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfaxview.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfaxview\n" - "POT-Creation-Date: 2005-10-15 02:46+0200\n" - "PO-Revision-Date: 2006-06-09 09:16+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -57,8 +56,8 @@ - - #: faxrenderer.cpp:160 faxrenderer.cpp:164 - msgid "" --"File error. The specified file '%1' could not be " --"loaded." -+"File error. The specified file '%1' could not be loaded." -+"" - msgstr "檔案錯誤。指定的檔案 %1 無法載入。" - - #: main.cpp:20 -@@ -108,6 +107,6 @@ - - #: main.cpp:106 - msgid "" --"The URL %1 does not point to a local file. You can only specify local files if " --"you are using the '--unique' option." -+"The URL %1 does not point to a local file. You can only specify local files " -+"if you are using the '--unique' option." - msgstr "網址 %1 不是本地端檔案。您使用 --unique 選項時只能指定本地端檔案。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_bmp.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_bmp.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_bmp.po 2005-09-10 11:24:09.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_bmp.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfilt_bmp\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2002-10-16 22:48+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dds.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dds.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dds.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dds.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_dds\n" - "POT-Creation-Date: 2004-11-01 01:46+0100\n" - "PO-Revision-Date: 2006-06-09 09:21+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dvi.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dvi.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_dvi.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_dvi.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_dvi\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 09:48+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_exr.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_exr.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_exr.po 2007-10-08 12:00:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_exr.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_exr\n" - "POT-Creation-Date: 2007-08-23 01:13+0200\n" - "PO-Revision-Date: 2006-06-09 10:30+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_gif.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_gif.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_gif.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_gif.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kfile_gif\n" - "POT-Creation-Date: 2005-03-14 01:33+0100\n" - "PO-Revision-Date: 2006-06-09 10:31+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ico.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ico.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ico.po 2005-09-10 11:24:09.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ico.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfile_ico\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2002-10-16 22:46+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_jpeg.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_jpeg.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_jpeg.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_jpeg.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kfile_jpeg\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:40+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pcx.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pcx.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pcx.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pcx.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_pcx\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:41+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -41,3 +40,7 @@ - #: kfile_pcx.cpp:111 - msgid "None" - msgstr "無" -+ -+#, fuzzy -+#~ msgid " dpi" -+#~ msgstr " dpi" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pdf.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pdf.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pdf.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pdf.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kfile_pdf\n" - "POT-Creation-Date: 2005-04-20 15:05+0200\n" - "PO-Revision-Date: 2006-06-09 10:42+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_png.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_png.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_png.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_png.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kfile_png\n" - "POT-Creation-Date: 2004-12-16 01:20+0100\n" - "PO-Revision-Date: 2006-06-09 10:44+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pnm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pnm.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_pnm.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_pnm.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_pnm\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:45+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ps.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ps.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_ps.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_ps.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kfile_ps\n" - "POT-Creation-Date: 2005-03-29 01:16+0200\n" - "PO-Revision-Date: 2006-06-09 10:45+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_rgb.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_rgb.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_rgb.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_rgb.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_rgb\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:48+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tga.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tga.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tga.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tga.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kfile_tga\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:50+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tiff.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tiff.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_tiff.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_tiff.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,8 +8,7 @@ - "Project-Id-Version: kfile_tiff\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 10:51+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xbm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xbm.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xbm.po 2005-09-10 11:24:09.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xbm.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kfile_xbm\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2002-10-16 22:45+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xpm.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xpm.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kfile_xpm.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kfile_xpm.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kfile_xpm\n" - "POT-Creation-Date: 2004-11-15 01:37+0100\n" - "PO-Revision-Date: 2006-06-09 10:52+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kgamma.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kgamma.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kgamma.po 2006-10-01 18:34:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kgamma.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kgamma\n" - "POT-Creation-Date: 2006-09-24 02:37+0200\n" - "PO-Revision-Date: 2006-06-09 10:56+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -78,15 +77,16 @@ - #: kgamma.cpp:585 - msgid "" - "

                                Monitor Gamma

                                This is a tool for changing monitor gamma correction. " --"Use the four sliders to define the gamma correction either as a single value, " --"or separately for the red, green and blue components. You may need to correct " --"the brightness and contrast settings of your monitor for good results. The test " --"images help you to find proper settings." --"
                                You can save them system-wide to XF86Config (root access is required for " --"that) or to your own KDE settings. On multi head systems you can correct the " --"gamma values separately for all screens." -+"Use the four sliders to define the gamma correction either as a single " -+"value, or separately for the red, green and blue components. You may need to " -+"correct the brightness and contrast settings of your monitor for good " -+"results. The test images help you to find proper settings.
                                You can save " -+"them system-wide to XF86Config (root access is required for that) or to your " -+"own KDE settings. On multi head systems you can correct the gamma values " -+"separately for all screens." - msgstr "" --"

                                Monitor Gamma

                                這是改變監式器 Gamma 修正的工具。用四個滑動器來定義 Gamma " --"修正，看是要定義為單一值，還是分別調整紅綠藍三原色的值。您可能也需要修正量度、對比等設定。測試圖片可以幫您找到適合的設定值。" --"
                                您可以將設定值存到系統的 XF86Config 設定中（但是需要 root 權限），或是存到您自己的 KDE 設定中。在多頭系統中您修正不同螢幕的 " --"Gamma 值。" -+"

                                Monitor Gamma

                                這是改變監式器 Gamma 修正的工具。用四個滑動器來定義 " -+"Gamma 修正，看是要定義為單一值，還是分別調整紅綠藍三原色的值。您可能也需要修" -+"正量度、對比等設定。測試圖片可以幫您找到適合的設定值。
                                您可以將設定值存到" -+"系統的 XF86Config 設定中（但是需要 root 權限），或是存到您自己的 KDE 設定中。" -+"在多頭系統中您修正不同螢幕的 Gamma 值。" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kghostview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kghostview.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kghostview.po 2008-08-19 20:43:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kghostview.po 2011-11-11 15:45:17.000000000 +0100 -@@ -10,8 +10,7 @@ - "Project-Id-Version: kghostview\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-06-09 11:22+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,8 +28,8 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --"ycchou@ccca.nctu.edu.tw,edt1023@speedymail.org, franklin at goodhorse dot idv " --"dot tw" -+"ycchou@ccca.nctu.edu.tw,edt1023@speedymail.org, franklin at goodhorse dot " -+"idv dot tw" - - #: infodialog.cpp:36 - msgid "Document Information" -@@ -271,24 +270,22 @@ - - #: kgv_view.cpp:747 - msgid "" --"An error occurred in rendering." --"
                                %1" --"
                                The display may contain errors." --"
                                Below are any error messages which were received from Ghostscript (" --"%2) which may help you.                                " --msgstr "" --"上色時發生錯誤。" --"
                                %1" --"
                                顯示可能會有問題。" --"
                                底下是從 Ghostscript 中接收到的錯誤訊息（%2）。                                " -+"An error occurred in rendering.
                                %1
                                The display " -+"may contain errors.
                                Below are any error messages which were received from " -+"Ghostscript (%2) which may help you.                                " -+msgstr "" -+"上色時發生錯誤。
                                %1
                                顯示可能會有問題。
                                底下" -+"是從 Ghostscript 中接收到的錯誤訊息（%2）。" - - #: kgvconfigdialog.cpp:113 - msgid "" --"Your version of gs (version %1) is too old, since it has security issues which " --"are impossible to resolve. Please upgrade to a newer version.\n" --"KGhostView will try to work with it, but it may not display any files at all.\n" --"Version %2 seems to be appropriate on your system, although newer versions will " --"work as well." -+"Your version of gs (version %1) is too old, since it has security issues " -+"which are impossible to resolve. Please upgrade to a newer version.\n" -+"KGhostView will try to work with it, but it may not display any files at " -+"all.\n" -+"Version %2 seems to be appropriate on your system, although newer versions " -+"will work as well." - msgstr "" - "你的 gs 版本(%1)太舊，由於有安全上的問題，請更新 gs。\n" - "KGhostView 將試著使用，但可能無法正確運作。\n" -@@ -306,7 +303,8 @@ - - #: kgvdocument.cpp:99 - msgid "" --"Could not open %1: File does not exist." -+"Could not open %1: File does not exist." - msgstr "無法開啟 %1 ：檔案不存在。" - - #: kgvdocument.cpp:108 -@@ -321,13 +319,13 @@ - - #: kgvdocument.cpp:158 - msgid "" --"Could not open %1 which has type " --"%2. KGhostview can only load PostScript (.ps, .eps) and Portable " -+"Could not open %1 which has type %" -+"2. KGhostview can only load PostScript (.ps, .eps) and Portable " - "Document Format (.pdf) files." - msgstr "" --"無法開啟 %1，檔案型態為 %2" --"。KGhostview 只能載入 PostScript (.ps, .eps) 及 Portable Document Format (.pdf) " --"檔。" -+"無法開啟 %1，檔案型態為 %2。KGhostview 只能載入 PostScript (.ps, .eps) 及 Portable Document " -+"Format (.pdf) 檔。" - - #: kgvdocument.cpp:192 kgvdocument.cpp:223 - msgid "Could not uncompress %1." -@@ -361,8 +359,8 @@ - - #: kgvdocument.cpp:537 - msgid "" --"Printing failure:" --"
                                Could not convert to PostScript                                " -+"Printing failure:
                                Could not convert to PostScript" - msgstr "列印失敗：
                                無法轉換成 PostScript                                " - - #: kgvshell.cpp:82 -@@ -415,7 +413,9 @@ - msgid "" - "Page to open. Use --page=3 to show the third page, for example. Note that if " - "the page does not exist, any other page may be displayed" --msgstr "要開啟的頁數。例如用 --page=3 來顯示第三頁。注意，如果該頁不存在，可能會顯示其他頁。" -+msgstr "" -+"要開啟的頁數。例如用 --page=3 來顯示第三頁。注意，如果該頁不存在，可能會顯示" -+"其他頁。" - - #: main.cpp:34 - msgid "Magnification of the display" -@@ -426,7 +426,8 @@ - "The orientation of the shown image. Use either \"auto\", \"portrait\", " - "\"landscape\", \"upsidedown\" or \"seascape\"" - msgstr "" --"圖形顯示方向。使用 \"自動\"、\"portrait\"、\"landscape\"、\"upsidedown\" 或 \"seascape\"" -+"圖形顯示方向。使用 \"自動\"、\"portrait\"、\"landscape\"、\"upsidedown\" 或 " -+"\"seascape\"" - - #: main.cpp:36 - msgid "Equivalent to orientation=portrait" -@@ -470,7 +471,9 @@ - msgid "" - "Anti-aliasing makes the result look better, but it makes the display take " - "longer" --msgstr "啟動平滑功能（Anti-alias，又叫反鋸齒功能）會讓結果看起來好一點，但是要花長一點的時間。" -+msgstr "" -+"啟動平滑功能（Anti-alias，又叫反鋸齒功能）會讓結果看起來好一點，但是要花長一" -+"點的時間。" - - #. i18n: file generalsettingswidget.ui line 42 - #: rc.cpp:27 -@@ -488,12 +491,10 @@ - #: rc.cpp:33 - #, no-c-format - msgid "" --"Ghostscript is the basic renderer (the program which draws the picture)" --"
                                \n" -+"Ghostscript is the basic renderer (the program which draws the picture)
                                \n" - "In case of problems you might want to see its error messages" - msgstr "" --"Ghostscript 是基本的描繪程式（畫出圖片的程式）。" --"
                                \n" -+"Ghostscript 是基本的描繪程式（畫出圖片的程式）。
                                \n" - "發生問題時您可能會想看它的錯誤訊息。" - - #. i18n: file generalsettingswidget.ui line 62 -@@ -574,7 +575,9 @@ - msgid "" - "Anti-aliasing makes the result look better, specially regarding text, but it " - "makes the display take longer" --msgstr "平滑功能（Anti-alias）會讓結果看起來比較好，尤其是文字，但是會花比較長的時間。" -+msgstr "" -+"平滑功能（Anti-alias）會讓結果看起來比較好，尤其是文字，但是會花比較長的時" -+"間。" - - #. i18n: file kghostview.kcfg line 20 - #: rc.cpp:82 -@@ -586,16 +589,18 @@ - #: rc.cpp:85 - #, no-c-format - msgid "" --"Whether to see a window with Ghostscript messages. This can give you additional " --"information on the files you see. In case of an error, a window will popup " --"regardless of this option." --msgstr "決定是否要看 Ghostscript 訊息視窗。它能讓您取得更多關於檔案的資訊。如果發生問題的話，這個視窗會跳出來，不管您有沒有設定。" -+"Whether to see a window with Ghostscript messages. This can give you " -+"additional information on the files you see. In case of an error, a window " -+"will popup regardless of this option." -+msgstr "" -+"決定是否要看 Ghostscript 訊息視窗。它能讓您取得更多關於檔案的資訊。如果發生問" -+"題的話，這個視窗會跳出來，不管您有沒有設定。" - - #. i18n: file kghostview.kcfg line 25 - #: rc.cpp:88 - #, no-c-format - msgid "Use Platform Fonts" --msgstr "使用平台字型(&U)" -+msgstr "使用平臺字型(&U)" - - #. i18n: file kghostview.kcfg line 30 - #: rc.cpp:91 -@@ -613,14 +618,15 @@ - #: rc.cpp:97 - #, no-c-format - msgid "" --"Sometimes information is available on page names which can be used in the list " --"panner instead of just the numbers. Most often, these names are, in fact, " --"another numbering. Often, the first few pages use roman numbering (i, ii, iii, " --"iv ...) followed by arabic numbers from one (1, 2, 3...) when the real content " --"starts." -+"Sometimes information is available on page names which can be used in the " -+"list panner instead of just the numbers. Most often, these names are, in " -+"fact, another numbering. Often, the first few pages use roman numbering (i, " -+"ii, iii, iv ...) followed by arabic numbers from one (1, 2, 3...) when the " -+"real content starts." - msgstr "" --"有時在頁面清單中可以使用頁面名稱，而不是只顯示編號。通常頁面名稱實際上是另一個編號系統。一般來說，前幾頁介紹、目錄等會用羅馬數字編號（i, ii, iii " --"等等），書本內容才會用數字編號。" -+"有時在頁面清單中可以使用頁面名稱，而不是只顯示編號。通常頁面名稱實際上是另一" -+"個編號系統。一般來說，前幾頁介紹、目錄等會用羅馬數字編號（i, ii, iii 等等），" -+"書本內容才會用數字編號。" - - #. i18n: file kghostview.kcfg line 40 - #: rc.cpp:100 -@@ -654,7 +660,9 @@ - "Kghostview does not, itself, display the document: it relies on ghostscript, " - "and therefore needs it to be available. Here you can define the ghostscript " - "interpreter to use." --msgstr "Kghostview 本身不顯示文件。它是依靠 ghostscript。您可以在此定義 ghostscript 使用的解譯器。" -+msgstr "" -+"Kghostview 本身不顯示文件。它是依靠 ghostscript。您可以在此定義 ghostscript " -+"使用的解譯器。" - - #. i18n: file kghostview.kcfg line 57 - #: rc.cpp:115 -@@ -672,8 +680,8 @@ - #: rc.cpp:121 - #, no-c-format - msgid "" --"This is the version of ghostscript you are running. Normally you will not need " --"to change this since it gets detected automatically." -+"This is the version of ghostscript you are running. Normally you will not " -+"need to change this since it gets detected automatically." - msgstr "您所執行的 ghostscript 版本。通常您不需要改變這個值，它會自動偵測。" - - #. i18n: file kghostview.kcfg line 71 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kiconedit.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kiconedit.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kiconedit.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kiconedit.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,8 +5,7 @@ - "Project-Id-Version: kiconedit\n" - "POT-Creation-Date: 2006-03-05 03:45+0100\n" - "PO-Revision-Date: 2006-06-19 10:26+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -156,7 +155,7 @@ - - #: kiconedit.cpp:293 - msgid "Resi&ze..." --msgstr "改變大小(&Z)..." -+msgstr "改變大小(&Z)…" - - #: kiconedit.cpp:295 - msgid "" -@@ -452,8 +451,8 @@ - msgid "" - "Statusbar\n" - "\n" --"The statusbar gives information on the status of the current icon. The fields " --"are:\n" -+"The statusbar gives information on the status of the current icon. The " -+"fields are:\n" - "\n" - "\t- Application messages\n" - "\t- Cursor position\n" -@@ -514,10 +513,8 @@ - msgstr "徒手" - - #: kicongrid.cpp:1020 --msgid "" --"There was an error loading a blank image.\n" --msgstr "" --"載入空白圖案發生錯誤。\n" -+msgid "There was an error loading a blank image.\n" -+msgstr "載入空白圖案發生錯誤。\n" - - #: kicongrid.cpp:1152 - msgid "All selected" -@@ -550,10 +547,8 @@ - msgstr "已貼上" - - #: kicongrid.cpp:1359 kicongrid.cpp:1394 --msgid "" --"Invalid pixmap data in clipboard!\n" --msgstr "" --"剪貼簿中的圖案資料不正確。\n" -+msgid "Invalid pixmap data in clipboard!\n" -+msgstr "剪貼簿中的圖案資料不正確。\n" - - #: kicongrid.cpp:1901 - msgid "Drawn Array" -@@ -613,15 +608,13 @@ - msgid "" - "The URL: %1 \n" - "seems to be malformed.\n" --msgstr "" --"網址 %1 似乎是錯誤的。\n" -+msgstr "網址 %1 似乎是錯誤的。\n" - - #: kicon.cpp:89 kicon.cpp:104 - msgid "" - "There was an error loading:\n" - "%1\n" --msgstr "" --"載入 %1 時發生錯誤。\n" -+msgstr "載入 %1 時發生錯誤。\n" - - #: kicon.cpp:178 - msgid "Save Icon As" -@@ -643,8 +636,7 @@ - msgid "" - "There was an error saving:\n" - "%1\n" --msgstr "" --"儲存 %1 時發生錯誤。\n" -+msgstr "儲存 %1 時發生錯誤。\n" - - #: kresize.cpp:36 - msgid "Size" -@@ -749,11 +741,11 @@ - - #: kiconconfig.cpp:141 - msgid "&Add..." --msgstr "新增(&A)..." -+msgstr "新增(&A)…" - - #: kiconconfig.cpp:144 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: kiconconfig.cpp:247 - msgid "Select Background" -@@ -769,7 +761,7 @@ - - #: kiconconfig.cpp:280 - msgid "Choose..." --msgstr "選擇..." -+msgstr "選擇…" - - #: kiconconfig.cpp:283 - msgid "Preview" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kmrml.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kmrml.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kmrml.po 2007-01-15 10:56:26.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kmrml.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kmrml\n" - "POT-Creation-Date: 2006-11-25 02:35+0100\n" - "PO-Revision-Date: 2006-11-27 17:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -74,8 +73,7 @@ - msgid "" - "There is no image collection available\n" - "at %1.\n" --msgstr "" --"在 %1 上沒有可用的影像收藏清單。\n" -+msgstr "在 %1 上沒有可用的影像收藏清單。\n" - - #: mrml_part.cpp:208 - msgid "No Image Collection" -@@ -104,11 +102,11 @@ - - #: mrml_part.cpp:313 - msgid "Connecting to indexing server at %1..." --msgstr "設定在 %1 的索引伺服器..." -+msgstr "設定在 %1 的索引伺服器…" - - #: mrml_part.cpp:354 - msgid "Downloading reference files..." --msgstr "下載參考檔案中..." -+msgstr "下載參考檔案中…" - - #: mrml_part.cpp:497 - msgid "" -@@ -136,11 +134,11 @@ - - #: mrml_part.cpp:691 - msgid "Random search..." --msgstr "隨機搜尋..." -+msgstr "隨機搜尋…" - - #: mrml_part.cpp:692 - msgid "Searching..." --msgstr "正在搜尋..." -+msgstr "正在搜尋…" - - #: mrml_part.cpp:701 - msgid "Ready." -@@ -184,8 +182,8 @@ - - #: mrml_view.cpp:300 - msgid "" --"You can refine queries by giving feedback about the current result and pressing " --"the Search button again." -+"You can refine queries by giving feedback about the current result and " -+"pressing the Search button again." - msgstr "您可以使用目前的結果再做更進一步的搜尋。" - - #: mrml_view.cpp:301 -@@ -269,7 +267,7 @@ - - #: kcontrol/indexer.cpp:180 - msgid "Writing data..." --msgstr "寫入資料中..." -+msgstr "寫入資料中…" - - #: kcontrol/kcmkmrml.cpp:51 - msgid "KCMKMrml" -@@ -288,7 +286,9 @@ - "Cannot find executables \"gift\" and/or \"gift-add-collection.pl\" in the " - "PATH.\n" - "Please install the \"GNU Image Finding Tool\"." --msgstr "在執行路徑中找不到可執行檔 \"gift\" 或 \"gift-add-connection.pl\"。請先安裝 GNU 影像尋找工具。" -+msgstr "" -+"在執行路徑中找不到可執行檔 \"gift\" 或 \"gift-add-connection.pl\"。請先安裝 " -+"GNU 影像尋找工具。" - - #: kcontrol/kcmkmrml.cpp:107 - msgid "Do you really want the configuration to be reset to the defaults?" -@@ -301,19 +301,17 @@ - #: kcontrol/kcmkmrml.cpp:133 - msgid "" - "

                                Image Index

                                KDE can make use of the GNU Image Finding Tool (GIFT) to " --"perform queries based not just on filenames, but on file content." --"

                                For example, you can search for an image by giving an example image that " --"looks similar to the one you are looking for.

                                " --"

                                For this to work, your image directories need to be indexed by, for example, " --"the GIFT server.

                                " --"

                                Here you can configure the servers (you can also query remote servers) and " --"the directories to index.

                                " -+"perform queries based not just on filenames, but on file content.

                                For " -+"example, you can search for an image by giving an example image that looks " -+"similar to the one you are looking for.

                                For this to work, your image " -+"directories need to be indexed by, for example, the GIFT server.

                                Here " -+"you can configure the servers (you can also query remote servers) and the " -+"directories to index.

                                " - msgstr "" --"

                                影像索引

                                KDE 可以使用 GNU 影像搜尋工具（GNu Image Finding " --"Tool，GIFT）來執行影像搜尋，不只是搜尋檔名，還有檔案內容。 " --"

                                例如，您可以給一張圖片，搜尋跟這張圖片類似的圖片。

                                " --"

                                您要先將影像目錄索引建立在 GIFT 伺服器上。

                                " --"

                                您可以在這裡設定建索引的伺服器與目錄。

                                " -+"

                                影像索引

                                KDE 可以使用 GNU 影像搜尋工具（GNu Image Finding Tool，" -+"GIFT）來執行影像搜尋，不只是搜尋檔名，還有檔案內容。

                                例如，您可以給一張圖" -+"片，搜尋跟這張圖片類似的圖片。

                                您要先將影像目錄索引建立在 GIFT 伺服器" -+"上。

                                您可以在這裡設定建索引的伺服器與目錄。

                                " - - #: kcontrol/mainpage.cpp:64 - msgid "Indexing Server Configuration" -@@ -329,8 +327,8 @@ - - #: kcontrol/mainpage.cpp:172 - msgid "" --"You did not specify any folders to be indexed. This means you will be unable to " --"perform queries on your computer." -+"You did not specify any folders to be indexed. This means you will be unable " -+"to perform queries on your computer." - msgstr "您沒有指定要建索引的資料夾。這表示您無法在您的電腦上執行查詢。" - - #: kcontrol/mainpage.cpp:312 -@@ -343,13 +341,14 @@ - - #: kcontrol/mainpage.cpp:388 kcontrol/mainpage.cpp:436 - msgid "Processing..." --msgstr "處理中..." -+msgstr "處理中…" - - #: kcontrol/mainpage.cpp:426 - msgid "" - "The settings have been saved. Now, the configured directories need to be " - "indexed. This may take a while. Do you want to do this now?" --msgstr "設定已儲存。現在，要來建立目錄的索引了。這可能會花一點時間，您要開始了嗎？" -+msgstr "" -+"設定已儲存。現在，要來建立目錄的索引了。這可能會花一點時間，您要開始了嗎？" - - #: kcontrol/mainpage.cpp:430 - msgid "Start Indexing Now?" -@@ -386,9 +385,8 @@ - - #: server/watcher.cpp:146 - msgid "" --"The server with the command line" --"
                                %1" --"
                                is not available anymore. Do you want to restart it?" -+"The server with the command line
                                %1
                                is not available anymore. Do " -+"you want to restart it?" - msgstr "伺服器命令列
                                %1
                                無法使用。您要重新啟動嗎？" - - #: server/watcher.cpp:150 server/watcher.cpp:179 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kolourpaint.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kolourpaint.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kolourpaint.po 2008-02-13 10:55:25.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kolourpaint.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kolourpaint\n" - "POT-Creation-Date: 2007-10-23 01:13+0200\n" - "PO-Revision-Date: 2007-06-22 12:00+0800\n" --"Last-Translator: Franklin Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -93,27 +93,33 @@ - - #: kpdocument.cpp:304 - msgid "" --"The image \"%1\" may have more colors than the current screen mode. In order to " --"display it, some colors may be changed. Try increasing your screen depth to at " --"least %2bpp.\n" -+"The image \"%1\" may have more colors than the current screen mode. In order " -+"to display it, some colors may be changed. Try increasing your screen depth " -+"to at least %2bpp.\n" - "It also contains translucency which is not fully supported. The translucency " - "data will be approximated with a 1-bit transparency mask." - msgstr "" --"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %2 bpp。\n" --"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。" -+"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改" -+"變。您可以試著將您的位元深度調高到至少 %2 bpp。\n" -+"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模" -+"擬。" - - #: kpdocument.cpp:315 - msgid "" --"The image \"%1\" may have more colors than the current screen mode. In order to " --"display it, some colors may be changed. Try increasing your screen depth to at " --"least %2bpp." --msgstr "影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %2 bpp。" -+"The image \"%1\" may have more colors than the current screen mode. In order " -+"to display it, some colors may be changed. Try increasing your screen depth " -+"to at least %2bpp." -+msgstr "" -+"影像 %1 所含的顏色可能比目前的螢幕模式還多。為了要顯示此檔，有些顏色會被改" -+"變。您可以試著將您的位元深度調高到至少 %2 bpp。" - - #: kpdocument.cpp:320 - msgid "" - "The image \"%1\" contains translucency which is not fully supported. The " - "translucency data will be approximated with a 1-bit transparency mask." --msgstr "影像 %1 包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。" -+msgstr "" -+"影像 %1 包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩" -+"來模擬。" - - #: kpdocument.cpp:333 - msgid "Could not open \"%1\" - out of graphics memory." -@@ -141,11 +147,12 @@ - - #: kpdocument.cpp:469 - msgid "" --"" --"

                                The %1 format may not be able to preserve all of the image's color " --"information.

                                " --"

                                Are you sure you want to save in this format?

                                " --msgstr "

                                格式 %1 可能無法保留影像中所有的顏色資訊。

                                您確定要用這個格式儲存嗎？

                                " -+"

                                The %1 format may not be able to preserve all of the image's " -+"color information.

                                Are you sure you want to save in this format?

                                " -+msgstr "" -+"

                                格式 %1 可能無法保留影像中所有的顏色資訊。

                                您確定要用這" -+"個格式儲存嗎？

                                " - - #: kpdocument.cpp:476 - msgid "Lossy File Format" -@@ -153,14 +160,12 @@ - - #: kpdocument.cpp:484 - msgid "" --"" --"

                                Saving the image at the low color depth of %1-bit may result in the loss of " --"color information. Any transparency will also be removed.

                                " --"

                                Are you sure you want to save at this color depth?

                                " --msgstr "" --"" --"

                                將影像儲存在較低位元深度（%1 bpp）會導至顏色資訊流失。透明度資料也會被移除。

                                " --"

                                您確定要以此位元深度儲存嗎？

                                " -+"

                                Saving the image at the low color depth of %1-bit may result in the " -+"loss of color information. Any transparency will also be removed.

                                Are " -+"you sure you want to save at this color depth?

                                " -+msgstr "" -+"

                                將影像儲存在較低位元深度（%1 bpp）會導至顏色資訊流失。透明度資料也會被" -+"移除。

                                您確定要以此位元深度儲存嗎？

                                " - - #: kpdocument.cpp:491 - msgid "Low Color Depth" -@@ -280,21 +285,27 @@ - "It also contains translucency which is not fully supported. The translucency " - "data will be approximated with a 1-bit transparency mask." - msgstr "" --"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %1 bpp。\n" --"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。" -+"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會" -+"被改變。您可以試著將您的位元深度調高到至少 %1 bpp。\n" -+"它也包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模" -+"擬。" - - #: kpmainwindow_edit.cpp:76 - msgid "" - "The image to be pasted may have more colors than the current screen mode. In " - "order to display it, some colors may be changed. Try increasing your screen " - "depth to at least %1bpp." --msgstr "要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會被改變。您可以試著將您的位元深度調高到至少 %1 bpp。" -+msgstr "" -+"要貼上的影像所含的顏色可能比目前的螢幕模式還多。為了要顯示此影像，有些顏色會" -+"被改變。您可以試著將您的位元深度調高到至少 %1 bpp。" - - #: kpmainwindow_edit.cpp:80 - msgid "" --"The image to be pasted contains translucency which is not fully supported. The " --"translucency data will be approximated with a 1-bit transparency mask." --msgstr "要貼上的影像包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明遮罩來模擬。" -+"The image to be pasted contains translucency which is not fully supported. " -+"The translucency data will be approximated with a 1-bit transparency mask." -+msgstr "" -+"要貼上的影像包含了目前尚未完整支援的半透明資料。半透明資料將會以一位元的透明" -+"遮罩來模擬。" - - #: kpmainwindow_edit.cpp:109 - msgid "Paste in &New Window" -@@ -306,11 +317,11 @@ - - #: kpmainwindow_edit.cpp:121 - msgid "C&opy to File..." --msgstr "複製到檔案(&O)..." -+msgstr "複製到檔案(&O)…" - - #: kpmainwindow_edit.cpp:123 - msgid "Paste &From File..." --msgstr "從檔案貼上(&F)..." -+msgstr "從檔案貼上(&F)…" - - #: kpmainwindow_edit.cpp:460 tools/kptoolselection.cpp:718 - msgid "Text: Create Box" -@@ -327,15 +338,12 @@ - - #: kpmainwindow_edit.cpp:718 - msgid "" --"" --"

                                KolourPaint cannot paste the contents of the clipboard as the data " --"unexpectedly disappeared.

                                " --"

                                This usually occurs if the application which was responsible for the " --"clipboard contents has been closed.

                                " --msgstr "" --"" --"

                                KolourPaint 無法貼上剪貼簿中的內容，因為資料不見了。

                                " --"

                                這通常是因為負責剪貼簿內容的應用程式被關閉了。

                                " -+"

                                KolourPaint cannot paste the contents of the clipboard as the data " -+"unexpectedly disappeared.

                                This usually occurs if the application which " -+"was responsible for the clipboard contents has been closed.

                                " -+msgstr "" -+"

                                KolourPaint 無法貼上剪貼簿中的內容，因為資料不見了。

                                這通常是因" -+"為負責剪貼簿內容的應用程式被關閉了。

                                " - - #: kpmainwindow_edit.cpp:724 - msgid "Cannot Paste" -@@ -367,11 +375,11 @@ - - #: kpmainwindow_file.cpp:82 - msgid "E&xport..." --msgstr "匯出(&X)..." -+msgstr "匯出(&X)…" - - #: kpmainwindow_file.cpp:85 - msgid "Scan..." --msgstr "掃描..." -+msgstr "掃描…" - - #: kpmainwindow_file.cpp:89 - msgid "Reloa&d" -@@ -465,34 +473,29 @@ - #: kpmainwindow_help.cpp:133 - msgid "" - "

                                To acquire a screenshot, press %1. The screenshot will be placed " --"into the clipboard and you will be able to paste it in KolourPaint.

                                " --"

                                You may configure the Desktop Screenshot shortcut in the KDE Control " --"Center module Keyboard Shortcuts.

                                " --"

                                Alternatively, you may try the application " --"KSnapshot.

                                " --msgstr "" --"

                                要取得螢幕快照，請按下 %1。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint 中選擇貼上。

                                " --"

                                您可以在 KDE 控制中心模組裡的「鍵盤捷徑" --"」中設定螢幕快照的快速鍵。

                                " --"

                                您也可以試試 KSnapshot。

                                " -+"into the clipboard and you will be able to paste it in KolourPaint.

                                You may configure the Desktop Screenshot shortcut in the KDE " -+"Control Center module Keyboard " -+"Shortcuts.

                                Alternatively, you may try the application KSnapshot.

                                " -+msgstr "" -+"

                                要取得螢幕快照，請按下 %1。螢幕快照會被放在剪貼簿中，您可以在 " -+"KolourPaint 中選擇貼上。

                                您可以在 KDE 控制中心模組裡的「鍵盤捷徑」中設定螢幕快照的快速鍵。

                                您" -+"也可以試試 KSnapshot。

                                " - - #: kpmainwindow_help.cpp:154 - msgid "" --"

                                You do not appear to be running KDE.

                                " --"

                                Once you have loaded KDE:" --"
                                " --"

                                To acquire a screenshot, press %1" --". The screenshot will be placed into the clipboard and you will be able to " --"paste it in KolourPaint.

                                " --"

                                Alternatively, you may try the application " --"KSnapshot.

                                " --msgstr "" --"

                                您似乎並不是使用 KDE。

                                " --"

                                當您載入 KDE 後：" --"
                                " --"

                                要取得螢幕快照，請按下 %1。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint " --"中選擇貼上。

                                " --"

                                您也可以試試 KSnapshot。

                                " -+"

                                You do not appear to be running KDE.

                                Once you have loaded KDE:" -+"

                                To acquire a screenshot, press %1. The screenshot " -+"will be placed into the clipboard and you will be able to paste it in " -+"KolourPaint.

                                Alternatively, you may try the application " -+"KSnapshot.

                                " -+msgstr "" -+"

                                您似乎並不是使用 KDE。

                                當您載入 KDE 後：

                                要取得螢幕" -+"快照，請按下 %1。螢幕快照會被放在剪貼簿中，您可以在 KolourPaint 中選擇" -+"貼上。

                                您也可以試試 KSnapshot。

                                " - - #: kpmainwindow_help.cpp:183 - msgid "Acquiring Screenshots" -@@ -500,7 +503,7 @@ - - #: kpmainwindow_image.cpp:92 - msgid "R&esize / Scale..." --msgstr "改變/調整大小(&E)..." -+msgstr "改變/調整大小(&E)…" - - #: kpmainwindow_image.cpp:95 - msgid "Se&t as Image (Crop)" -@@ -508,15 +511,15 @@ - - #: kpmainwindow_image.cpp:101 - msgid "&Flip..." --msgstr "反轉(&F)..." -+msgstr "反轉(&F)…" - - #: kpmainwindow_image.cpp:104 - msgid "&Rotate..." --msgstr "旋轉(&R)..." -+msgstr "旋轉(&R)…" - - #: kpmainwindow_image.cpp:107 - msgid "S&kew..." --msgstr "扭曲(&K)..." -+msgstr "扭曲(&K)…" - - #: kpmainwindow_image.cpp:110 - msgid "Reduce to Mo&nochrome (Dithered)" -@@ -536,7 +539,7 @@ - - #: kpmainwindow_image.cpp:122 - msgid "&More Effects..." --msgstr "更多效果(&M)..." -+msgstr "更多效果(&M)…" - - #. i18n: file kolourpaintui.rc line 71 - #: kpmainwindow_image.cpp:160 rc.cpp:6 rc.cpp:18 rc.cpp:24 rc.cpp:36 -@@ -625,15 +628,12 @@ - - #: kpmainwindow_tools.cpp:525 - msgid "" --"" --"

                                Resizing the image to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure want to resize the image?

                                " --msgstr "" --"" --"

                                改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要改變影像大小嗎？

                                " -+"

                                Resizing the image to %1x%2 may take a substantial amount of memory. " -+"This can reduce system responsiveness and cause other application resource " -+"problems.

                                Are you sure want to resize the image?

                                " -+msgstr "" -+"

                                改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降" -+"低，並造成其他應用程式資源的問題。

                                您確定要改變影像大小嗎？

                                " - - #: kpmainwindow_tools.cpp:535 tools/kptoolresizescale.cpp:1137 - msgid "Resize Image?" -@@ -1272,22 +1272,19 @@ - - #: tools/kptoolresizescale.cpp:647 - msgid "" --"" --"
                                  " --"
                                • Resize: The size of the picture will be increased by creating new " --"areas to the right and/or bottom (filled in with the background color) or " --"decreased by cutting it at the right and/or bottom.
                                  • " --"
                                • Scale: The picture will be expanded by duplicating pixels or " --"squashed by dropping pixels.
                                  • " --"
                                • Smooth Scale: This is the same as Scale " --"except that it blends neighboring pixels to produce a smoother looking " --"picture.
                                " --msgstr "" --" " --"
                                  " --"
                                • 改變大小：圖片變大的話，會在右方與下方產生新的區域，並填滿背景顏色。若圖片變小，則會將右方與下方的區域切掉。
                                  • " --"
                                • 調整大小：圖片會以複製像素的方式變大，或是以丟棄像素的方式變小。
                                  • " --"
                                • 平滑調整大小：跟「調整大小」一樣，不過會將鄰近的像素混合，以產生較順眼的圖片。
                                " -+"
                                • Resize: The size of the picture will be increased by " -+"creating new areas to the right and/or bottom (filled in with the background " -+"color) or decreased by cutting it at the right and/or bottom.
                                • Scale: The picture will be expanded by duplicating pixels or " -+"squashed by dropping pixels.
                                • Smooth Scale: This is the same " -+"as Scale except that it blends neighboring pixels to produce a " -+"smoother looking picture.
                                " -+msgstr "" -+"
                                • 改變大小：圖片變大的話，會在右方與下方產生新的區域，並填" -+"滿背景顏色。若圖片變小，則會將右方與下方的區域切掉。
                                • 調整大小：圖片會以複製像素的方式變大，或是以丟棄像素的方式變小。
                                • 平滑調" -+"整大小：跟「調整大小」一樣，不過會將鄰近的像素混合，以產生較順眼的圖片。" -+"
                                " - - #: tools/kptoolresizescale.cpp:669 - msgid "&Resize" -@@ -1334,15 +1331,14 @@ - - #: tools/kptoolresizescale.cpp:1115 - msgid "" --"" --"

                                Resizing the text box to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure you want to resize the text box?

                                " --msgstr "" --"" --"

                                改變文字盒大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要調整文字盒大小嗎？

                                " -+"

                                Resizing the text box to %1x%2 may take a substantial amount of " -+"memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure you want to resize the text box?

                                " -+msgstr "" -+"

                                改變文字盒大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能" -+"降低，並造成其他應用程式資源的問題。

                                您確定要調整文字盒大小嗎？

                                " - - #: tools/kptoolresizescale.cpp:1123 - msgid "Resize Text Box?" -@@ -1354,26 +1350,21 @@ - - #: tools/kptoolresizescale.cpp:1129 - msgid "" --"" --"

                                Resizing the image to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure you want to resize the image?

                                " --msgstr "" --"" --"

                                改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要改變影像大小嗎？

                                " -+"

                                Resizing the image to %1x%2 may take a substantial amount of memory. " -+"This can reduce system responsiveness and cause other application resource " -+"problems.

                                Are you sure you want to resize the image?

                                " -+msgstr "" -+"

                                改變影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降" -+"低，並造成其他應用程式資源的問題。

                                您確定要改變影像大小嗎？

                                " - - #: tools/kptoolresizescale.cpp:1147 - msgid "" --"" --"

                                Scaling the image to %1x%2 may take a substantial amount of memory. This can " --"reduce system responsiveness and cause other application resource problems.

                                " --"

                                Are you sure you want to scale the image?

                                " --msgstr "" --"" --"

                                調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要調整影像大小嗎？

                                " -+"

                                Scaling the image to %1x%2 may take a substantial amount of memory. " -+"This can reduce system responsiveness and cause other application resource " -+"problems.

                                Are you sure you want to scale the image?

                                " -+msgstr "" -+"

                                調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降" -+"低，並造成其他應用程式資源的問題。

                                您確定要調整影像大小嗎？

                                " - - #: tools/kptoolresizescale.cpp:1155 - msgid "Scale Image?" -@@ -1385,15 +1376,14 @@ - - #: tools/kptoolresizescale.cpp:1161 - msgid "" --"" --"

                                Scaling the selection to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure you want to scale the selection?

                                " --msgstr "" --"" --"

                                調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要調整選擇區域的大小嗎？

                                " -+"

                                Scaling the selection to %1x%2 may take a substantial amount of " -+"memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure you want to scale the selection?

                                " -+msgstr "" -+"

                                調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統" -+"效能降低，並造成其他應用程式資源的問題。

                                您確定要調整選擇區域的大小" -+"嗎？

                                " - - #: tools/kptoolresizescale.cpp:1169 - msgid "Scale Selection?" -@@ -1405,15 +1395,14 @@ - - #: tools/kptoolresizescale.cpp:1179 - msgid "" --"" --"

                                Smooth Scaling the image to %1x%2 may take a substantial amount of memory. " --"This can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure you want to smooth scale the image?

                                " -+"

                                Smooth Scaling the image to %1x%2 may take a substantial amount of " -+"memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure you want to smooth scale the image?" - msgstr "" --"" --"

                                平滑調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要平滑調整影像大小嗎？

                                " -+"

                                平滑調整影像大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效" -+"能降低，並造成其他應用程式資源的問題。

                                您確定要平滑調整影像大小嗎？" - - #: tools/kptoolresizescale.cpp:1187 - msgid "Smooth Scale Image?" -@@ -1425,15 +1414,14 @@ - - #: tools/kptoolresizescale.cpp:1193 - msgid "" --"" --"

                                Smooth Scaling the selection to %1x%2 may take a substantial amount of " --"memory. This can reduce system responsiveness and cause other application " --"resource problems.

                                " --"

                                Are you sure you want to smooth scale the selection?

                                " --msgstr "" --"" --"

                                平滑調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要平滑調整選擇區域的大小嗎？

                                " -+"

                                Smooth Scaling the selection to %1x%2 may take a substantial amount " -+"of memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure you want to smooth scale the selection?" -+"

                                " -+msgstr "" -+"

                                平滑調整選擇區域的大小到 %1 x %2 會用到相當可觀的記憶體。這可能會造成" -+"系統效能降低，並造成其他應用程式資源的問題。

                                您確定要平滑調整選擇區域" -+"的大小嗎？

                                " - - #: tools/kptoolresizescale.cpp:1201 - msgid "Smooth Scale Selection?" -@@ -1494,15 +1482,13 @@ - - #: tools/kptoolrotate.cpp:457 - msgid "" --"" --"

                                Rotating the selection to %1x%2 may take a substantial amount of memory. " --"This can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure want to rotate the selection?

                                " -+"

                                Rotating the selection to %1x%2 may take a substantial amount of " -+"memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure want to rotate the selection?

                                " - msgstr "" --"" --"

                                旋轉選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要旋轉選擇的區域嗎？

                                " -+"

                                旋轉選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能" -+"降低，並造成其他應用程式資源的問題。

                                您確定要旋轉選擇的區域嗎？

                                " - - #: tools/kptoolrotate.cpp:465 - msgid "Rotate Selection?" -@@ -1514,15 +1500,12 @@ - - #: tools/kptoolrotate.cpp:472 - msgid "" --"" --"

                                Rotating the image to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure want to rotate the image?

                                " --msgstr "" --"" --"

                                旋轉影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要旋轉影像嗎？

                                " -+"

                                Rotating the image to %1x%2 may take a substantial amount of memory. " -+"This can reduce system responsiveness and cause other application resource " -+"problems.

                                Are you sure want to rotate the image?

                                " -+msgstr "" -+"

                                旋轉影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，" -+"並造成其他應用程式資源的問題。

                                您確定要旋轉影像嗎？

                                " - - #: tools/kptoolrotate.cpp:480 - msgid "Rotate Image?" -@@ -1622,15 +1605,13 @@ - - #: tools/kptoolskew.cpp:406 - msgid "" --"" --"

                                Skewing the selection to %1x%2 may take a substantial amount of memory. This " --"can reduce system responsiveness and cause other application resource " --"problems.

                                " --"

                                Are you sure want to skew the selection?

                                " --msgstr "" --"" --"

                                扭曲選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要扭曲選擇的區域嗎？

                                " -+"

                                Skewing the selection to %1x%2 may take a substantial amount of " -+"memory. This can reduce system responsiveness and cause other application " -+"resource problems.

                                Are you sure want to skew the selection?

                                " -+msgstr "" -+"

                                扭曲選擇的區域到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能" -+"降低，並造成其他應用程式資源的問題。

                                您確定要扭曲選擇的區域嗎？

                                " - - #: tools/kptoolskew.cpp:414 - msgid "Skew Selection?" -@@ -1642,14 +1623,12 @@ - - #: tools/kptoolskew.cpp:421 - msgid "" --"" --"

                                Skewing the image to %1x%2 may take a substantial amount of memory. This can " --"reduce system responsiveness and cause other application resource problems.

                                " --"

                                Are you sure want to skew the image?

                                " --msgstr "" --"" --"

                                扭曲影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，並造成其他應用程式資源的問題。

                                " --"

                                您確定要扭曲影像嗎？

                                " -+"

                                Skewing the image to %1x%2 may take a substantial amount of memory. " -+"This can reduce system responsiveness and cause other application resource " -+"problems.

                                Are you sure want to skew the image?

                                " -+msgstr "" -+"

                                扭曲影像到 %1 x %2 會用到相當可觀的記憶體。這可能會造成系統效能降低，" -+"並造成其他應用程式資源的問題。

                                您確定要扭曲影像嗎？

                                " - - #: tools/kptoolskew.cpp:429 - msgid "Skew Image?" -@@ -1725,34 +1704,30 @@ - - #: widgets/kpcolorsimilaritycube.cpp:70 - msgid "" --"" --"

                                Color Similarity is how close colors must be in the RGB Color Cube to " --"be considered the same.

                                " --"

                                If you set it to something other than Exact" --", you can work more effectively with dithered images and photos.

                                " --"

                                This feature applies to transparent selections, as well as the Flood Fill, " --"Color Eraser and Autocrop tools.

                                " --"

                                To configure it, double click on the cube.

                                " --msgstr "" --"" --"

                                顏色相似度是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的顏色。

                                " --"

                                如果您設定為精確之外的其他值，您可以更有效率地處理抖色後圖片（dithered image）。

                                " --"

                                這個功能會套用在透明的選擇區域，及填滿顏色、清除顏色、自動切割等工具。

                                " -+"

                                Color Similarity is how close colors must be in the RGB Color " -+"Cube to be considered the same.

                                If you set it to something other than " -+"Exact, you can work more effectively with dithered images and photos." -+"

                                This feature applies to transparent selections, as well as the Flood " -+"Fill, Color Eraser and Autocrop tools.

                                To configure it, double click " -+"on the cube.

                                " -+msgstr "" -+"

                                顏色相似度是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的" -+"顏色。

                                如果您設定為精確之外的其他值，您可以更有效率地處理抖色後" -+"圖片（dithered image）。

                                這個功能會套用在透明的選擇區域，及填滿顏色、" -+"清除顏色、自動切割等工具。

                                " - - #: widgets/kpcolorsimilaritycube.cpp:91 - msgid "" --"" --"

                                Color Similarity is how close colors must be in the RGB Color Cube to " --"be considered the same.

                                " --"

                                If you set it to something other than Exact" --", you can work more effectively with dithered images and photos.

                                " --"

                                This feature applies to transparent selections, as well as the Flood Fill, " --"Color Eraser and Autocrop tools.

                                " --msgstr "" --"" --"

                                顏色相似度是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的顏色。

                                " --"

                                如果您設定為精確之外的其他值，您可以更有效率地處理抖色後圖片（dithered image）。

                                " --"

                                這個功能會套用在透明的選擇區域，及填滿顏色、清除顏色、自動切割等工具。

                                " -+"

                                Color Similarity is how close colors must be in the RGB Color " -+"Cube to be considered the same.

                                If you set it to something other than " -+"Exact, you can work more effectively with dithered images and photos." -+"

                                This feature applies to transparent selections, as well as the Flood " -+"Fill, Color Eraser and Autocrop tools.

                                " -+msgstr "" -+"

                                顏色相似度是指顏色在 RGB 顏色立方體中的距離有多近則認定為相同的" -+"顏色。

                                如果您設定為精確之外的其他值，您可以更有效率地處理抖色後" -+"圖片（dithered image）。

                                這個功能會套用在透明的選擇區域，及填滿顏色、" -+"清除顏色、自動切割等工具。

                                " - - #: widgets/kpcolorsimilaritydialog.cpp:50 - msgid "Color Similarity" -@@ -1781,7 +1756,7 @@ - - #: widgets/kpsqueezedtextlabel.cpp:114 - msgid "..." --msgstr "..." -+msgstr "…" - - #: widgets/kptoolwidgetbrush.cpp:135 - msgid "1x1" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kooka.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kooka.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kooka.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kooka.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kooka\n" - "POT-Creation-Date: 2006-04-23 03:56+0200\n" - "PO-Revision-Date: 2006-06-13 11:36+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -194,8 +193,8 @@ - - #: imgprintdialog.cpp:73 - msgid "" --"Calculates the print size from the scan resolution. Enter the scan resolution " --"in the dialog field below." -+"Calculates the print size from the scan resolution. Enter the scan " -+"resolution in the dialog field below." - msgstr "根據掃描的解析度來計算列印大小。請在底下對話框輸入掃描的解析度。" - - #: imgprintdialog.cpp:77 -@@ -204,8 +203,8 @@ - - #: imgprintdialog.cpp:79 - msgid "" --"Set the print size yourself in the dialog below. The image is centered on the " --"paper." -+"Set the print size yourself in the dialog below. The image is centered on " -+"the paper." - msgstr "在底下的對話框自行指定列印大小。影像會置於紙張中央。" - - #: imgprintdialog.cpp:83 -@@ -214,7 +213,8 @@ - - #: imgprintdialog.cpp:84 - msgid "" --"Printout uses maximum space on the selected pager. Aspect ratio is maintained." -+"Printout uses maximum space on the selected pager. Aspect ratio is " -+"maintained." - msgstr "使用所選擇紙張最大可用的空間大小來縮放要列印的影像。會保持長寬比例。" - - #: imgprintdialog.cpp:94 -@@ -319,13 +319,13 @@ - - #: kocrgocr.cpp:81 - msgid "" --"GOCR is an Open Source project for optical character recognition.

                                " --"The author of gocr is Joerg Schulenburg
                                For more information about " -+"GOCR is an Open Source project for optical character recognition.

                                作者為 Joerg Schulenburg
                                " --"您可以在 http://jocr.sourceforge.net " --"取得更多資訊。" -+"GOCR 是一個可以做光學文字辨識（OCR）的自由軟體專案。

                                作者為 Joerg " -+"Schulenburg
                                您可以在 http://jocr." -+"sourceforge.net 取得更多資訊。" - - #: kocrgocr.cpp:110 - msgid "" -@@ -398,15 +398,14 @@ - - #: kocrkadmos.cpp:90 - msgid "" --"This version of Kooka was linked with the KADMOS OCR/ICR engine" --", a commercial engine for optical character recognition.

                                " --"Kadmos is a product of re Recognition AG
                                For more information about " --"Kadmos OCR see " --"http://www.rerecognition.com" --msgstr "" --"這個版本的 Kooka 連結到一個商業版的光學文字辨識系統，叫做 KADMOS OCR/ICR。

                                Kadmos " --"re Recognition AG 的產品。
                                您可以在 " --"http://www.rerecognition.com 找到更多資訊。" -+"This version of Kooka was linked with the KADMOS OCR/ICR engine, a " -+"commercial engine for optical character recognition.

                                Kadmos is a product " -+"of re Recognition AG
                                For more information about Kadmos OCR see http://www.rerecognition.com" -+msgstr "" -+"這個版本的 Kooka 連結到一個商業版的光學文字辨識系統，叫做 KADMOS OCR/ICR。

                                Kadmos re Recognition AG 的產品。
                                您可以在 http://www.rerecognition.com 找到更多資訊。" - - #: kocrkadmos.cpp:110 - msgid "European Countries" -@@ -485,23 +484,20 @@ - - #: kocrocrad.cpp:82 - msgid "" --"ocrad is a Free Software project for optical character recognition." --"

                                The author of ocrad is Antonio Diaz" --"
                                For more information about ocrad see " --"http://www.gnu.org/software/ocrad/ocrad.html" --"

                                Images should be scanned in black/white mode for ocrad." --"
                                Best results are achieved if the characters are at least 20 pixels high." --"

                                Problems arise, as usual, with very bold or very light or broken characters, " --"the same with merged character groups." --msgstr "" --"ocrad 是一套可以做光學文字辨識的自由軟體專案。 " --"

                                作者是 Antonio Diaz" --"
                                您可以在 " --"http://www.gnu.org/software/ocrad/ocrad.html 找到更多資訊。 " --"

                                影像在交給 ocrad 處理前要以黑白模式來掃描。" --"
                                若是文字至少有 20 像素以上，則辨識結果會最好。 " --"

                                不過在遇到（非常）粗體字，或是非常淡，或不清楚的字元，辨識就容易出問題。" -+"ocrad is a Free Software project for optical character recognition.

                                The " -+"author of ocrad is Antonio Diaz
                                For more information about ocrad " -+"see http://www.gnu." -+"org/software/ocrad/ocrad.html

                                Images should be scanned in black/white " -+"mode for ocrad.
                                Best results are achieved if the characters are at least " -+"20 pixels high.

                                Problems arise, as usual, with very bold or very light or " -+"broken characters, the same with merged character groups." -+msgstr "" -+"ocrad 是一套可以做光學文字辨識的自由軟體專案。

                                作者是 Antonio Diaz
                                您可以在 http://www.gnu.org/software/ocrad/ocrad.html 找到更多資訊。

                                影像在" -+"交給 ocrad 處理前要以黑白模式來掃描。
                                若是文字至少有 20 像素以上，則辨識" -+"結果會最好。

                                不過在遇到（非常）粗體字，或是非常淡，或不清楚的字元，辨識就" -+"容易出問題。" - - #: kocrocrad.cpp:121 - msgid "" -@@ -541,11 +537,11 @@ - - #: kooka.cpp:140 - msgid "&OCR Image..." --msgstr "辨識影像中的文字(&O)..." -+msgstr "辨識影像中的文字(&O)…" - - #: kooka.cpp:144 - msgid "O&CR on Selection..." --msgstr "選擇文字辨識(&C)..." -+msgstr "選擇文字辨識(&C)…" - - #: kooka.cpp:149 - msgid "Scale to W&idth" -@@ -565,7 +561,7 @@ - - #: kooka.cpp:182 - msgid "Set Zoom..." --msgstr "設定縮放..." -+msgstr "設定縮放…" - - #: kooka.cpp:187 - msgid "Create From Selectio&n" -@@ -601,15 +597,15 @@ - - #: kooka.cpp:223 - msgid "&Create Folder..." --msgstr "建立資料夾(&C)..." -+msgstr "建立資料夾(&C)…" - - #: kooka.cpp:228 - msgid "&Save Image..." --msgstr "儲存影像(&S)..." -+msgstr "儲存影像(&S)…" - - #: kooka.cpp:233 - msgid "&Import Image..." --msgstr "匯入影像(&I)..." -+msgstr "匯入影像(&I)…" - - #: kooka.cpp:238 - msgid "&Delete Image" -@@ -735,7 +731,7 @@ - "stations configured for SANE!" - msgstr "" - "勾選此選項，您可以在網路上查詢可用的掃描器。\n" --"請注意，這不表示會在整個網路上尋找，而是在設定 SANE 的站台上尋找。" -+"請注意，這不表示會在整個網路上尋找，而是在設定 SANE 的站臺上尋找。" - - #: kookapref.cpp:326 - msgid "Show the scanner selection box on next startup" -@@ -743,7 +739,8 @@ - - #: kookapref.cpp:329 - msgid "" --"Check this if you once checked 'do not show the scanner selection on startup',\n" -+"Check this if you once checked 'do not show the scanner selection on " -+"startup',\n" - "but you want to see it again." - msgstr "勾選此選項的話，下次啟動就會再詢問您要使用哪個掃描器。" - -@@ -753,8 +750,8 @@ - - #: kookapref.cpp:337 - msgid "" --"Check this if you want Kooka to load the last selected image into the viewer on " --"startup.\n" -+"Check this if you want Kooka to load the last selected image into the viewer " -+"on startup.\n" - "If your images are large, that might slow down Kooka's start." - msgstr "" - "勾選此選項的話，Kooka 啟動時會載入上次檢視的最後一張影像。\n" -@@ -831,11 +828,11 @@ - - #: kookapref.cpp:431 - msgid "Frame color &1: " --msgstr "框架顏色 1 (&1)：" -+msgstr "框架顏色 1(&1)：" - - #: kookapref.cpp:435 - msgid "Frame color &2: " --msgstr "框架顏色 2 (&2)：" -+msgstr "框架顏色 2(&2)：" - - #: kookapref.cpp:504 - msgid "" -@@ -1014,10 +1011,8 @@ - msgstr "KADMOS 安裝問題" - - #: ksaneocr.cpp:607 --msgid "" --"The KADMOS OCR system could not be started:\n" --msgstr "" --"KADMOS OCR 系統無法啟動：\n" -+msgid "The KADMOS OCR system could not be started:\n" -+msgstr "KADMOS OCR 系統無法啟動：\n" - - #: ksaneocr.cpp:609 - msgid "" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpdf.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpdf.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpdf.po 2008-08-19 20:43:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpdf.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: kpdf\n" - "POT-Creation-Date: 2008-07-23 01:41+0200\n" - "PO-Revision-Date: 2007-04-12 12:11+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -38,10 +37,12 @@ - - #: ui/presentationwidget.cpp:329 - msgid "" --"There are two ways of exiting presentation mode, you can press either ESC key " --"or click with the quit button that appears when placing the mouse in the " -+"There are two ways of exiting presentation mode, you can press either ESC " -+"key or click with the quit button that appears when placing the mouse in the " - "top-right corner. Of course you can cycle windows (Alt+TAB by default)" --msgstr "有兩個方法離開展示模式。您可以按下 ESC 鍵，或是將滑鼠移到右下角然後點選「離開」。當然您也可以用 ALT+TAB 切換視窗。" -+msgstr "" -+"有兩個方法離開展示模式。您可以按下 ESC 鍵，或是將滑鼠移到右下角然後點選「離" -+"開」。當然您也可以用 ALT+TAB 切換視窗。" - - #: ui/thumbnaillist.cpp:568 - msgid "Show bookmarked pages only" -@@ -159,7 +160,7 @@ - - #: ui/pageview.cpp:1126 - msgid "Save to File..." --msgstr "儲存到檔案..." -+msgstr "儲存到檔案…" - - #: ui/pageview.cpp:1144 - msgid "Image [%1x%2] copied to clipboard." -@@ -224,21 +225,26 @@ - - #: conf/dlgperformance.ui.h:25 - msgid "" --"Keeps used memory as low as possible. Do not reuse anything. (For systems with " --"low memory.)" --msgstr "盡量減少記憶體使用量。不要重複使用任何東西。（給記憶體較少的系統用的。）" -+"Keeps used memory as low as possible. Do not reuse anything. (For systems " -+"with low memory.)" -+msgstr "" -+"盡量減少記憶體使用量。不要重複使用任何東西。（給記憶體較少的系統用的。）" - - #: conf/dlgperformance.ui.h:31 - msgid "" - "A good compromise between memory usage and speed gain. Preload next page and " - "boost searches. (For systems with 256MB of memory, typically.)" --msgstr "這是記憶體使用量與速度增益的折衷方案。預先載入下一頁並加速搜尋。（給 256 MB 左右記憶體的系統用的。）" -+msgstr "" -+"這是記憶體使用量與速度增益的折衷方案。預先載入下一頁並加速搜尋。（給 256 MB " -+"左右記憶體的系統用的。）" - - #: conf/dlgperformance.ui.h:37 - msgid "" - "Keeps everything in memory. Preload next pages. Boost searches. (For systems " - "with more than 512MB of memory.)" --msgstr "盡量在記憶體中保留每個東西。預先載入下一頁並加速搜尋。（給超過 512MB 記憶體的系統用的。）" -+msgstr "" -+"盡量在記憶體中保留每個東西。預先載入下一頁並加速搜尋。（給超過 512MB 記憶體的" -+"系統用的。）" - - #: conf/preferencesdialog.cpp:29 - msgid "General" -@@ -286,8 +292,8 @@ - - #: core/document.cpp:998 core/document.cpp:1006 - msgid "" --"The pdf file is trying to execute an external application and for your safety " --"kpdf does not allow that." -+"The pdf file is trying to execute an external application and for your " -+"safety kpdf does not allow that." - msgstr "此 PDF 檔正試著執行外部應用程式，但為了安全起見，kpdf 不允許此動作。" - - #: core/document.cpp:1019 -@@ -392,9 +398,11 @@ - #: core/generator_pdf/generator_pdf.cpp:486 - msgid "" - "The margins you specified change the page aspect ratio. Do you want to print " --"with the aspect ratio changed or do you want the margins to be adapted so that " --"the aspect ratio is preserved?" --msgstr "您指定的邊界會改變頁面的比例。您要依指定的邊界來列印，還是保留頁面比例並修改邊界？" -+"with the aspect ratio changed or do you want the margins to be adapted so " -+"that the aspect ratio is preserved?" -+msgstr "" -+"您指定的邊界會改變頁面的比例。您要依指定的邊界來列印，還是保留頁面比例並修改" -+"邊界？" - - #: core/generator_pdf/generator_pdf.cpp:487 - msgid "Aspect ratio change" -@@ -498,7 +506,7 @@ - - #: core/link.cpp:26 - msgid "Execute '%1'..." --msgstr "執行 %1..." -+msgstr "執行 %1…" - - #: core/link.cpp:39 - msgid "First Page" -@@ -530,11 +538,11 @@ - - #: core/link.cpp:57 - msgid "Find..." --msgstr "尋找..." -+msgstr "尋找…" - - #: core/link.cpp:59 - msgid "Go To Page..." --msgstr "跳到頁面..." -+msgstr "跳到頁面…" - - #: shell/main.cpp:22 - msgid "kpdf, a kde pdf viewer based on xpdf" -@@ -604,7 +612,9 @@ - "Forces the rasterization of each page into an image before printing it. This " - "usually gives somewhat worse results, but is useful when printing documents " - "that appear to print incorrectly." --msgstr "在每一頁的圖片列印前強制光柵。通常結果會變差，但是若某些文件列印結果不正確時，此選項可能有用。" -+msgstr "" -+"在每一頁的圖片列印前強制光柵。通常結果會變差，但是若某些文件列印結果不正確" -+"時，此選項可能有用。" - - #: part.cpp:172 - msgid "Show &Navigation Panel" -@@ -644,7 +654,7 @@ - - #: part.cpp:290 - msgid "Configure KPDF..." --msgstr "設定 KPDF..." -+msgstr "設定 KPDF…" - - #: part.cpp:294 - msgid "&Properties" -@@ -660,7 +670,7 @@ - - #: part.cpp:434 - msgid "Converting from ps to pdf..." --msgstr "從 ps 轉換為 pdf..." -+msgstr "從 ps 轉換為 pdf…" - - #: part.cpp:445 - msgid "You do not have ps2pdf installed, so kpdf cannot open postscript files." -@@ -679,18 +689,18 @@ - - #: part.cpp:612 - msgid "Reloading the document..." --msgstr "重新載入文件中..." -+msgstr "重新載入文件中…" - - #: part.cpp:641 - msgid "" --"This link points to a close document action that does not work when using the " --"embedded viewer." -+"This link points to a close document action that does not work when using " -+"the embedded viewer." - msgstr "這個連結指到一個已關閉的文件動作，該動作在嵌入式檢視器中無法進行。" - - #: part.cpp:689 - msgid "" --"This link points to a quit application action that does not work when using the " --"embedded viewer." -+"This link points to a quit application action that does not work when using " -+"the embedded viewer." - msgstr "這個連結指到一個離開應用程式的動作，該動作在嵌入式檢視器中無法進行。" - - #: part.cpp:702 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpovmodeler.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpovmodeler.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kpovmodeler.po 2006-10-01 18:34:11.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kpovmodeler.po 2011-11-11 15:45:17.000000000 +0100 -@@ -1,7 +1,7 @@ - # translation of kpovmodeler.po to Chinese Traditional - # Copyright (C) 2002,2003, 2006 Free Software Foundation, Inc. - # --# 繁體中文是由簡體中文翻譯轉換後修改而成，特此致謝。 -+# 傳統字漢語是由簡化字漢語翻譯轉換後修改而成，特此致謝。 - # - # Xiong Jiang , 2002,2003. - # Frank Weng (a.k.a. Franklin) , 2006. -@@ -10,8 +10,7 @@ - "Project-Id-Version: kpovmodeler\n" - "POT-Creation-Date: 2006-05-28 03:57+0200\n" - "PO-Revision-Date: 2006-09-12 09:50+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -22,7 +21,7 @@ - msgid "" - "_: NAME OF TRANSLATORS\n" - "Your names" --msgstr "KDE 簡體中文翻譯組，Frank Weng (a.k.a. Franklin)" -+msgstr "KDE 簡化字漢語翻譯組，Frank Weng (a.k.a. Franklin)" - - #: _translatorinfo.cpp:3 - msgid "" -@@ -598,7 +597,7 @@ - - #: pmdeclareedit.cpp:71 pmlinkedit.cpp:69 - msgid "Select..." --msgstr "選擇..." -+msgstr "選擇…" - - #: pmdeclareedit.cpp:123 - msgid "Please enter an identifier!" -@@ -1549,15 +1548,15 @@ - - #: pmlayoutsettings.cpp:49 - msgid "Default view layout:" --msgstr "預設檢視佈局：" -+msgstr "預設檢視布局：" - - #: pmlayoutsettings.cpp:54 - msgid "Available View Layouts" --msgstr "可用檢視佈局" -+msgstr "可用檢視布局" - - #: pmlayoutsettings.cpp:72 pmsettingsdialog.cpp:112 - msgid "View Layout" --msgstr "檢視佈局" -+msgstr "檢視布局" - - #: pmlayoutsettings.cpp:77 pmnamedobjectedit.cpp:39 - msgid "Name:" -@@ -1613,12 +1612,12 @@ - - #: pmlayoutsettings.cpp:213 - msgid "View layouts may not have empty names." --msgstr "檢視佈局名稱不能為空。" -+msgstr "檢視布局名稱不能為空。" - - #: pmlayoutsettings.cpp:223 - msgid "" - "The docking position of the first view layout entry has to be 'New Column'." --msgstr "第一個檢視佈局項目的嵌入位置必須為「新欄」。" -+msgstr "第一個檢視布局項目的嵌入位置必須為「新欄」。" - - #: pmlayoutsettings.cpp:263 pmlayoutsettings.cpp:267 - msgid "Unnamed" -@@ -2056,9 +2055,10 @@ - - #: pmmovecommand.cpp:449 - msgid "" --"The %1 \"%2\" can't be moved because it contains a link to the declare \"%3\" " --"and the insert point is not after the declare." --msgstr "%1 \"%2\" 不能被移動，因為它含有到宣告 %3 的連結，並且插入點不在該宣告後面。" -+"The %1 \"%2\" can't be moved because it contains a link to the declare \"%3" -+"\" and the insert point is not after the declare." -+msgstr "" -+"%1 \"%2\" 不能被移動，因為它含有到宣告 %3 的連結，並且插入點不在該宣告後面。" - - #: pmnormal.cpp:91 - msgid "normal" -@@ -2082,7 +2082,7 @@ - - #: pmobjectlibrarysettings.cpp:49 - msgid "Create..." --msgstr "建立..." -+msgstr "建立…" - - #: pmobjectlibrarysettings.cpp:63 - msgid "Library Details" -@@ -2234,8 +2234,8 @@ - "unsupported povray code to the scene, you can put this code between the two " - "special comments \"//*PMRawBegin\" and \"//*PMRawEnd\"." - msgstr "" --"注意：完整的 povray 語法還沒有支援。如果您要在場景裡新增尚未支援的 povray 代碼，您可以把該代碼放在兩個特別的註解 //*PMRawBegin " --"和 //*PMRawEnd 之間。" -+"注意：完整的 povray 語法還沒有支援。如果您要在場景裡新增尚未支援的 povray 代" -+"碼，您可以把該代碼放在兩個特別的註解 //*PMRawBegin 和 //*PMRawEnd 之間。" - - #: pmparser.cpp:110 - msgid "Line %1: " -@@ -2275,11 +2275,11 @@ - - #: pmpart.cpp:244 - msgid "Import..." --msgstr "匯入..." -+msgstr "匯入…" - - #: pmpart.cpp:247 - msgid "&Export..." --msgstr "匯出(&E)..." -+msgstr "匯出(&E)…" - - #: pmpart.cpp:254 pmrendermodesdialog.cpp:41 pmrendermodesdialog.cpp:243 - msgid "Render Modes" -@@ -2291,7 +2291,7 @@ - - #: pmpart.cpp:261 - msgid "Render Modes..." --msgstr "成像模式..." -+msgstr "成像模式…" - - #: pmpart.cpp:263 pmpovraywidget.cpp:108 - msgid "Render Window" -@@ -2598,15 +2598,15 @@ - - #: pmpart.cpp:1447 - msgid "Cutting selection..." --msgstr "正在剪下選擇區..." -+msgstr "正在剪下選擇區…" - - #: pmpart.cpp:1462 - msgid "Deleting selection..." --msgstr "正在刪除選擇區..." -+msgstr "正在刪除選擇區…" - - #: pmpart.cpp:1471 - msgid "Copying selection to clipboard..." --msgstr "正在將選擇區複製到剪貼簿..." -+msgstr "正在將選擇區複製到剪貼簿…" - - #: pmpart.cpp:1484 pmpart.cpp:1522 - msgid "Drag" -@@ -2618,15 +2618,15 @@ - - #: pmpart.cpp:1550 - msgid "Inserting clipboard contents..." --msgstr "正在插入剪貼簿內容..." -+msgstr "正在插入剪貼簿內容…" - - #: pmpart.cpp:1679 - msgid "Undo last change..." --msgstr "取消最後的改變..." -+msgstr "取消最後的改變…" - - #: pmpart.cpp:1697 - msgid "Redo last change..." --msgstr "重做最後的改變..." -+msgstr "重做最後的改變…" - - #: pmpart.cpp:2230 - msgid "Declare" -@@ -3182,16 +3182,12 @@ - msgstr "需要一個圖形物件" - - #: pmpovrayrenderwidget.cpp:72 --msgid "" --"Can't render an empty scene.\n" --msgstr "" --"無法成像空的場景。\n" -+msgid "Can't render an empty scene.\n" -+msgstr "無法成像空的場景。\n" - - #: pmpovrayrenderwidget.cpp:82 --msgid "" --"Couldn't write the scene to a temp file.\n" --msgstr "" --"無法將場景寫入暫存檔。\n" -+msgid "Couldn't write the scene to a temp file.\n" -+msgstr "無法將場景寫入暫存檔。\n" - - #: pmpovrayrenderwidget.cpp:141 - msgid "" -@@ -3227,11 +3223,11 @@ - - #: pmpovraysettings.cpp:97 - msgid "Add..." --msgstr "新增..." -+msgstr "新增…" - - #: pmpovraysettings.cpp:104 pmrendermodesdialog.cpp:61 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: pmpovraysettings.cpp:108 pmrendermodesdialog.cpp:63 - msgid "Up" -@@ -3567,7 +3563,7 @@ - - #: pmrawedit.cpp:38 - msgid "Povray code:" --msgstr "Povray 源碼：" -+msgstr "Povray 原始碼：" - - #: pmrendermanager.cpp:1317 - msgid "not supported" -@@ -3798,7 +3794,7 @@ - - #: pmsettingsdialog.cpp:113 - msgid "Display Settings for View Layouts" --msgstr "檢視佈局的顯示設定" -+msgstr "檢視布局的顯示設定" - - #: pmsettingsdialog.cpp:120 - msgid "Object Libraries" -@@ -3866,11 +3862,11 @@ - - #: pmshell.cpp:163 - msgid "View Layouts" --msgstr "檢視佈局" -+msgstr "檢視布局" - - #: pmshell.cpp:170 - msgid "Save View Layout..." --msgstr "儲存檢視佈局..." -+msgstr "儲存檢視布局…" - - #: pmshell.cpp:405 pmshell.cpp:438 - msgid "Povray Modeler Files (*.kpm)" -@@ -4179,19 +4175,19 @@ - - #: pmviewlayoutmanager.cpp:713 pmviewlayoutmanager.cpp:752 - msgid "Could not open the view layouts file." --msgstr "無法開啟檢視佈局檔案。" -+msgstr "無法開啟檢視布局檔案。" - - #: pmviewlayoutmanager.cpp:746 - msgid "View layouts not found." --msgstr "找不到檢視佈局。" -+msgstr "找不到檢視布局。" - - #: pmviewlayoutmanager.cpp:871 - msgid "Save View Layout" --msgstr "儲存檢視佈局" -+msgstr "儲存檢視布局" - - #: pmviewlayoutmanager.cpp:882 - msgid "Enter view layout name:" --msgstr "輸入檢視佈局名稱：" -+msgstr "輸入檢視布局名稱：" - - #: pmwarp.cpp:106 - msgid "warp" -@@ -4233,7 +4229,8 @@ - msgid "" - "This document was created with a newer version of KPovModeler. The whole " - "document may not be loaded correctly." --msgstr "這個文件是用較新版本的 KPovModeler 建立的。因此可能不能正確載入整份文件。" -+msgstr "" -+"這個文件是用較新版本的 KPovModeler 建立的。因此可能不能正確載入整份文件。" - - #: pmxmlparser.cpp:114 pmxmlparser.cpp:175 - msgid "Wrong top level tag" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kruler.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kruler.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kruler.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kruler.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kruler\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-13 08:44+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -19,7 +18,8 @@ - msgid "" - "This is a tool to measure pixel distances and colors on the screen. It is " - "useful for working on layouts of dialogs, web pages etc." --msgstr "這是一個量測螢幕圖素距離及顏色的工具。在對話框、網頁設計等排版時非常有用。" -+msgstr "" -+"這是一個量測螢幕圖素距離及顏色的工具。在對話框、網頁設計等排版時非常有用。" - - #: klineal.cpp:122 - msgid "This is the current distance measured in pixels." -@@ -27,10 +27,12 @@ - - #: klineal.cpp:134 - msgid "" --"This is the current color in hexadecimal rgb representation as you may use it " --"in HTML or as a QColor name. The rectangles background shows the color of the " --"pixel inside the little square at the end of the line cursor." --msgstr "這是目前用十六進位 RGB 表示顏色，您可以在超文字連結或 QColor 名稱上使用。矩形背景顯示游標末行小正方形內的像素顏色。" -+"This is the current color in hexadecimal rgb representation as you may use " -+"it in HTML or as a QColor name. The rectangles background shows the color of " -+"the pixel inside the little square at the end of the line cursor." -+msgstr "" -+"這是目前用十六進位 RGB 表示顏色，您可以在超文字連結或 QColor 名稱上使用。矩形" -+"背景顯示游標末行小正方形內的像素顏色。" - - #: klineal.cpp:147 - msgid "KRuler" -@@ -86,11 +88,11 @@ - - #: klineal.cpp:162 - msgid "&Choose Color..." --msgstr "選擇顏色(&C)..." -+msgstr "選擇顏色(&C)…" - - #: klineal.cpp:163 - msgid "Choose &Font..." --msgstr "選擇字型(&F)..." -+msgstr "選擇字型(&F)…" - - #: klineal.cpp:293 - msgid "&Full Screen Height" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksnapshot.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksnapshot.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksnapshot.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksnapshot.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: head\n" - "POT-Creation-Date: 2006-07-01 03:59+0200\n" - "PO-Revision-Date: 2006-03-23 13:11+0800\n" --"Last-Translator: You-Cheng Hsieh \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -27,7 +27,8 @@ - msgstr "" - "這是目前快照的預覽。\n" - "\n" --"這張圖片能夠拖曳至其他的程式或文件內成為完整的快照。請用 Konqueror 檔案管理員試試看。\n" -+"這張圖片能夠拖曳至其他的程式或文件內成為完整的快照。請用 Konqueror 檔案管理員" -+"試試看。\n" - "\n" - "您也可以按下 Ctrl+C 將圖片複製到剪貼簿。" - -@@ -129,26 +130,25 @@ - msgid "" - "Using this menu, you can select from the four following snapshot modes:\n" - "

                                \n" --"Full Screen - captures the entire desktop." --"
                                \n" --"Window Under Cursor - captures only the window (or menu) that is under " --"the mouse cursor when the snapshot is taken." --"
                                \n" --"Region - captures only the region of the desktop that you specify. When " --"taking a new snapshot in this mode you will be able to select any area of the " --"screen by clicking and dragging the mouse.

                                \n" --"Section of Window - captures only a section of the window. When taking a " --"new snapshot in this mode you will be able to select any child window by moving " --"the mouse over it.

                                The " -+"author of gocr is Joerg Schulenburg
                                For more information about " - "gocr see                                 http://jocr.sourceforge.net" - msgstr "" --"GOCR 是一個可以做光學文字辨識（OCR）的自由軟體專案。

                                " -+"Full Screen - captures the entire desktop.
                                \n" -+"Window Under Cursor - captures only the window (or menu) that is " -+"under the mouse cursor when the snapshot is taken.
                                \n" -+"Region - captures only the region of the desktop that you specify. " -+"When taking a new snapshot in this mode you will be able to select any area " -+"of the screen by clicking and dragging the mouse.

                                \n" -+"Section of Window - captures only a section of the window. When " -+"taking a new snapshot in this mode you will be able to select any child " -+"window by moving the mouse over it.

                                " - msgstr "" - "使用這個選單，您可以選擇以下四種快照模式：\n" - "

                                \n" --"全螢幕 - 擷取整個桌面。" --"
                                \n" -+"全螢幕 - 擷取整個桌面。
                                \n" - "游標下的視窗 - 擷取快照時只會擷取位於滑鼠游標之下的視窗（或選單）。" - "
                                \n" --"部份桌面區域 - 只擷取您指定的桌面區域。以這個模式擷取快照時您可以用滑鼠點擊並拖曳來選擇螢幕上的任何區域。

                                \n" --"部份視窗區域 - 只擷取部份視窗區域。以這個模式擷取快照時您可以移動滑鼠來選擇任何子視窗。

                                " -+"部份桌面區域 - 只擷取您指定的桌面區域。以這個模式擷取快照時您可以用滑" -+"鼠點擊並拖曳來選擇螢幕上的任何區域。

                                \n" -+"部份視窗區域 - 只擷取部份視窗區域。以這個模式擷取快照時您可以移動滑鼠" -+"來選擇任何子視窗。

                                " - - #. i18n: file ksnapshotwidget.ui line 177 - #: rc.cpp:61 -@@ -166,7 +166,7 @@ - #: rc.cpp:67 - #, no-c-format - msgid "&Save As..." --msgstr "儲存快照(&S)..." -+msgstr "儲存快照(&S)…" - - #. i18n: file ksnapshotwidget.ui line 214 - #: rc.cpp:70 -@@ -175,7 +175,9 @@ - "Click this button to save the current snapshot. To quickly save the snapshot " - "without showing the file dialog, press Ctrl+Shift+S. The filename is " - "automatically incremented after each save." --msgstr "按下這個按鈕來儲存目前的快照。要快速儲存快照而不顯示檔案對話窗，按下 Ctrl+Shift+S。檔案名稱會在每次儲存後自動遞增。" -+msgstr "" -+"按下這個按鈕來儲存目前的快照。要快速儲存快照而不顯示檔案對話窗，按下 Ctrl" -+"+Shift+S。檔案名稱會在每次儲存後自動遞增。" - - #. i18n: file ksnapshotwidget.ui line 222 - #: rc.cpp:73 -@@ -213,7 +215,7 @@ - - #: ksnapshot.cpp:120 - msgid "Quick Save Snapshot &As..." --msgstr "快速儲存快照(&A)..." -+msgstr "快速儲存快照(&A)…" - - #: ksnapshot.cpp:121 - msgid "" -@@ -223,7 +225,7 @@ - - #: ksnapshot.cpp:125 - msgid "Save Snapshot &As..." --msgstr "儲存快照(&A)..." -+msgstr "儲存快照(&A)…" - - #: ksnapshot.cpp:126 - msgid "Save the snapshot to the file specified by the user." -@@ -298,21 +300,25 @@ - #~ msgid "" - #~ "This button creates a snapshot image of the screen.\n" - #~ "\n" --#~ "If the delay is set to \"No Delay\" the snapshot will be taken when you click the mouse." -+#~ "If the delay is set to \"No Delay\" the snapshot will be taken when you " -+#~ "click the mouse." - #~ msgstr "" - #~ "按下該扭將會捕捉目前螢幕的影像。\n" - #~ "\n" --#~ "如果抓圖延遲的時間設定為不延遲，那當您按下滑鼠按鈕時，當時的畫面就會被擷取下來。" -+#~ "如果抓圖延遲的時間設定為不延遲，那當您按下滑鼠按鈕時，當時的畫面就會被擷取" -+#~ "下來。" - - #~ msgid "&Print Snapshot..." --#~ msgstr "列印快照(&P)..." -+#~ msgstr "列印快照(&P)…" - - #, fuzzy - #~ msgid "&Save Snapshot" --#~ msgstr "儲存快照(&S)..." -+#~ msgstr "儲存快照(&S)…" - - #, fuzzy --#~ msgid "This button saves the snapshot to the default location, then increments the filename." -+#~ msgid "" -+#~ "This button saves the snapshot to the default location, then increments " -+#~ "the filename." - #~ msgstr "按下這按鈕把這快照另存新檔。" - - #~ msgid "&Only grab the window containing the pointer" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksvgplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksvgplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/ksvgplugin.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/ksvgplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,8 +9,7 @@ - "Project-Id-Version: ksvgplugin\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-09 17:15+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -51,7 +50,7 @@ - - #: ksvg_plugin.cpp:121 - msgid "Save to PNG..." --msgstr "儲存到 PNG 檔..." -+msgstr "儲存到 PNG 檔…" - - #: ksvg_plugin.cpp:123 - msgid "About KSVG" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kuickshow.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kuickshow.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kuickshow.po 2007-05-14 12:22:53.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kuickshow.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kuickshow\n" - "POT-Creation-Date: 2007-03-26 02:14+0200\n" - "PO-Revision-Date: 2006-12-18 13:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -221,7 +220,7 @@ - - #: imagewindow.cpp:192 kuickshow.cpp:254 - msgid "Print Image..." --msgstr "列印影像..." -+msgstr "列印影像…" - - #: imagewindow.cpp:201 - msgid "More Brightness" -@@ -285,7 +284,8 @@ - #: imagewindow.cpp:431 - msgid "" - "Unable to load the image %1.\n" --"Perhaps the file format is unsupported or your Imlib is not installed properly." -+"Perhaps the file format is unsupported or your Imlib is not installed " -+"properly." - msgstr "" - "無法載入影像 %1。\n" - "也許該檔案格式不支援，或您的 Imlib 未安裝妥當。" -@@ -332,7 +332,8 @@ - "resource-consuming and even make your computer hang.\n" - "Do you want to continue?" - msgstr "" --"您將要檢視一個非常大的檔案（%1 x %2 像素），這可能非常消耗資源，甚至會使您的電腦當住。\n" -+"您將要檢視一個非常大的檔案（%1 x %2 像素），這可能非常消耗資源，甚至會使您的" -+"電腦當住。\n" - "您想要繼續嗎？" - - #: kuickconfigdlg.cpp:48 -@@ -357,7 +358,7 @@ - - #: kuickfile.cpp:109 - msgid "Downloading %1..." --msgstr "下載 %1 中..." -+msgstr "下載 %1 中…" - - #: kuickfile.cpp:110 - #, c-format -@@ -368,13 +369,15 @@ - - #: kuickshow.cpp:136 - msgid "" --"_n: Do you really want to display this 1 image at the same time? This might be " --"quite resource intensive and could overload your computer." --"
                                If you choose %1, only the first image will be shown.\n" --"Do you really want to display these %n images at the same time? This might be " --"quite resource intensive and could overload your computer." --"
                                If you choose %1, only the first image will be shown." --msgstr "您確定要同時顯示這 %n 張圖片嗎？這可能非常耗用資源，也許會使您的電腦超載。
                                如果您選擇 %1，則只會顯示第一張圖片。" -+"_n: Do you really want to display this 1 image at the same time? This might " -+"be quite resource intensive and could overload your computer.
                                If you " -+"choose %1, only the first image will be shown.\n" -+"Do you really want to display these %n images at the same time? This might " -+"be quite resource intensive and could overload your computer.
                                If you " -+"choose %1, only the first image will be shown." -+msgstr "" -+"您確定要同時顯示這 %n 張圖片嗎？這可能非常耗用資源，也許會使您的電腦超載。" -+"
                                如果您選擇 %1，則只會顯示第一張圖片。" - - #: kuickshow.cpp:137 - msgid "Display Multiple Images?" -@@ -382,7 +385,7 @@ - - #: kuickshow.cpp:256 - msgid "Configure %1..." --msgstr "設定 %1..." -+msgstr "設定 %1…" - - #: kuickshow.cpp:260 - msgid "Start Slideshow" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewbrowserplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewbrowserplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewbrowserplugin.po 2005-09-10 11:24:09.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewbrowserplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kviewbrowserplugin\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2002-10-17 22:25+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewcanvas.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewcanvas.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewcanvas.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewcanvas.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kviewcanvas\n" - "POT-Creation-Date: 2004-10-12 01:17+0200\n" - "PO-Revision-Date: 2006-06-09 17:08+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kvieweffectsplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kvieweffectsplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kvieweffectsplugin.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kvieweffectsplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kvieweffectsplugin\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-09 17:09+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,15 +15,15 @@ - - #: kvieweffects.cpp:40 - msgid "&Gamma Correction..." --msgstr "Gamma 修正(&G)..." -+msgstr "Gamma 修正(&G)…" - - #: kvieweffects.cpp:43 - msgid "&Blend Color..." --msgstr "混合顏色(&B)..." -+msgstr "混合顏色(&B)…" - - #: kvieweffects.cpp:46 - msgid "Change &Intensity (Brightness)..." --msgstr "改變強度（亮度）(&I)..." -+msgstr "改變強度（亮度）(&I)…" - - #: kvieweffects.cpp:69 - msgid "Change Intensity" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview.po 2011-11-11 15:45:17.000000000 +0100 -@@ -5,8 +5,7 @@ - "Project-Id-Version: kview\n" - "POT-Creation-Date: 2005-03-07 01:42+0100\n" - "PO-Revision-Date: 2006-06-09 17:14+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -31,7 +30,8 @@ - - #: kview.cpp:147 - msgid "" --"An error occurred while loading the KViewViewer KPart. Check your installation." -+"An error occurred while loading the KViewViewer KPart. Check your " -+"installation." - msgstr "載入 KViewViewer KPart 時發生錯誤。請檢查您的安裝。" - - #: kview.cpp:471 -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewpresenterplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewpresenterplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewpresenterplugin.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewpresenterplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kviewpresenterplugin\n" - "POT-Creation-Date: 2005-01-31 01:31+0100\n" - "PO-Revision-Date: 2006-06-09 17:13+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,7 +16,7 @@ - - #: kviewpresenter.cpp:70 - msgid "&Image List..." --msgstr "影像清單(&I)..." -+msgstr "影像清單(&I)…" - - #. i18n: file imagelistdialog.ui line 155 - #: kviewpresenter.cpp:73 kviewpresenter.cpp:372 kviewpresenter.cpp:373 -@@ -36,7 +35,7 @@ - - #: kviewpresenter.cpp:100 - msgid "Open &Multiple Files..." --msgstr "開啟多個檔案(&M)..." -+msgstr "開啟多個檔案(&M)…" - - #: kviewpresenter.cpp:366 kviewpresenter.cpp:367 - msgid "Stop &Slideshow" -@@ -114,8 +113,8 @@ - #: rc.cpp:42 - #, no-c-format - msgid "" --"This is the interval the program will wait before showing the next image in the " --"slideshow." -+"This is the interval the program will wait before showing the next image in " -+"the slideshow." - msgstr "這是程式在播放兩張影像之間的間隔時間。" - - #. i18n: file imagelistdialog.ui line 203 -@@ -128,10 +127,10 @@ - #: rc.cpp:48 - #, no-c-format - msgid "Sa&ve List..." --msgstr "儲存清單(&V)..." -+msgstr "儲存清單(&V)…" - - #. i18n: file imagelistdialog.ui line 233 - #: rc.cpp:51 - #, no-c-format - msgid "&Load List..." --msgstr "載入清單(&L)..." -+msgstr "載入清單(&L)…" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview_scale.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview_scale.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kview_scale.po 2005-09-10 13:15:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kview_scale.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kview_scale\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2002-10-17 22:24+0800\n" --"Last-Translator: Keanu \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -15,7 +15,7 @@ - - #: kview_scale.cpp:49 - msgid "&Scale Image..." --msgstr "影像比例... (&S)" -+msgstr "影像比例…(&S)" - - #: kview_scale.cpp:64 - msgid "Scale Image" -@@ -79,13 +79,13 @@ - #: rc.cpp:3 - #, no-c-format - msgid "&Image" --msgstr "影像 (&I)" -+msgstr "影像(&I)" - - #. i18n: file kview_scale.rc line 10 - #: rc.cpp:6 - #, no-c-format - msgid "&Extra Toolbar" --msgstr "其它工具列 (&E)" -+msgstr "其它工具列(&E)" - - #: scaledlg.cpp:149 - msgid "pixels/in" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewscannerplugin.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewscannerplugin.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewscannerplugin.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewscannerplugin.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kviewscannerplugin\n" - "POT-Creation-Date: 2005-05-18 21:25+0200\n" - "PO-Revision-Date: 2006-06-09 17:06+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,13 +16,15 @@ - - #: kviewscanner.cpp:49 - msgid "&Scan Image..." --msgstr "掃描影像... (&S)" -+msgstr "掃描影像…(&S)" - - #: kviewscanner.cpp:76 - msgid "" - "You do not appear to have SANE support, or your scanner is not attached " - "properly. Please check these items before scanning again." --msgstr "您似乎沒有安裝 SANE，或是您的掃描器沒有正確地接上。請檢查這些項目後再掃描一次。" -+msgstr "" -+"您似乎沒有安裝 SANE，或是您的掃描器沒有正確地接上。請檢查這些項目後再掃描一" -+"次。" - - #: kviewscanner.cpp:79 - msgid "No Scan-Service Available" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewshell.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewshell.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewshell.po 2008-08-19 20:43:07.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewshell.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: kviewshell\n" - "POT-Creation-Date: 2008-07-08 01:19+0200\n" - "PO-Revision-Date: 2006-06-15 07:59+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -77,10 +76,12 @@ - - #: kmultipage.cpp:1475 - msgid "" --"The search string %1 could not be found by the end of the " --"document. Should the search be restarted from the beginning of the " -+"The search string %1 could not be found by the end of " -+"the document. Should the search be restarted from the beginning of the " - "document?" --msgstr "已經搜尋到文件底部，但是找不到搜尋字串 %1。要從文件的開頭繼續找嗎？" -+msgstr "" -+"已經搜尋到文件底部，但是找不到搜尋字串 %1。要從文件的開" -+"頭繼續找嗎？" - - #: kmultipage.cpp:1478 kmultipage.cpp:1620 - msgid "Text Not Found" -@@ -92,10 +93,12 @@ - - #: kmultipage.cpp:1617 - msgid "" --"The search string %1 could not be found by the beginning " --"of the document. Should the search be restarted from the end of the " --"document?" --msgstr "已經搜尋到文件自開頭，但是找不到搜尋字串 %1。要從文件的底部繼續找嗎？" -+"The search string %1 could not be found by the " -+"beginning of the document. Should the search be restarted from the end of " -+"the document?" -+msgstr "" -+"已經搜尋到文件自開頭，但是找不到搜尋字串 %1。要從文件的" -+"底部繼續找嗎？" - - #: kmultipage.cpp:1713 - #, c-format -@@ -123,7 +126,7 @@ - - #: kmultipage.cpp:1926 - msgid "Exporting to text..." --msgstr "匯出到文字..." -+msgstr "匯出到文字…" - - #: kmultipage.cpp:1926 - msgid "Abort" -@@ -143,15 +146,13 @@ - - #: kprintDialogPage_pageoptions.cpp:44 - msgid "" --"" --"

                                If this option is enabled, the pages will be printed centered on the paper; " --"this makes more visually-appealing printouts.

                                " --"

                                If the option is not enabled, all pages will be placed in the top-left " --"corner of the paper.

                                " --msgstr "" --"" --"

                                如果開啟此選項，頁面會被置於紙張中央，讓印出來的結果更易閱讀。

                                " --"

                                若未開啟，則會被置於紙張的左上角。

                                " -+"

                                If this option is enabled, the pages will be printed centered on the " -+"paper; this makes more visually-appealing printouts.

                                If the option is " -+"not enabled, all pages will be placed in the top-left corner of the paper." -+msgstr "" -+"

                                如果開啟此選項，頁面會被置於紙張中央，讓印出來的結果更易閱讀。

                                " -+"若未開啟，則會被置於紙張的左上角。

                                " - - #: kprintDialogPage_pageoptions.cpp:52 - msgid "Automatically choose landscape or portrait orientation" -@@ -159,24 +160,23 @@ - - #: kprintDialogPage_pageoptions.cpp:53 - msgid "" --"If this option is enabled, some pages might be rotated to better fit the paper " --"size." -+"If this option is enabled, some pages might be rotated to better fit the " -+"paper size." - msgstr "如果開啟此選項，有些頁面會改變方向，以符合紙張大小。" - - #: kprintDialogPage_pageoptions.cpp:54 - msgid "" --"" --"

                                If this option is enabled, landscape or portrait orientation are " -+"

                                If this option is enabled, landscape or portrait orientation are " - "automatically chosen on a page-by-page basis. This makes better use of the " --"paper and gives more visually-appealing printouts.

                                " --"

                                Note: This option overrides the Portrait/Landscape option chosen in " --"the printer properties. If this option is enabled, and if the pages in your " --"document have different sizes, then some pages might be rotated while others " --"are not.

                                " --msgstr "" --"" --"

                                如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不會有問題。

                                " --"

                                注意：這個選項會覆蓋印表機內容所設定的方向。如果開啟此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。

                                " -+"paper and gives more visually-appealing printouts.

                                Note: This " -+"option overrides the Portrait/Landscape option chosen in the printer " -+"properties. If this option is enabled, and if the pages in your document " -+"have different sizes, then some pages might be rotated while others are not." -+"

                                " -+msgstr "" -+"

                                如果開啟此選項，每一頁會自動判斷要使用橫向還是直向。這會讓列印結果較不" -+"會有問題。

                                注意：這個選項會覆蓋印表機內容所設定的方向。如果開啟" -+"此選項，而且您的文件大小不同，則有些頁面會轉換，有些不會。

                                " - - #: kprintDialogPage_pageoptions.cpp:73 - msgid "Shrink oversized pages to fit paper size" -@@ -184,22 +184,21 @@ - - #: kprintDialogPage_pageoptions.cpp:74 - msgid "" --"If this option is enabled, large pages that would not fit the printer's paper " --"size will be shrunk." -+"If this option is enabled, large pages that would not fit the printer's " -+"paper size will be shrunk." - msgstr "如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。" - - #: kprintDialogPage_pageoptions.cpp:75 - msgid "" --"" --"

                                If this option is enabled, large pages that would not fit the printer's " --"paper size will be shrunk so that edges won't be cut off during printing.

                                " --"

                                Note: If this option is enabled, and if the pages in your document " --"have different sizes, then different pages might be shrunk by different scaling " --"factors.

                                " --msgstr "" --"" --"

                                如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。

                                " --"

                                注意：若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。

                                " -+"

                                If this option is enabled, large pages that would not fit the " -+"printer's paper size will be shrunk so that edges won't be cut off during " -+"printing.

                                Note: If this option is enabled, and if the pages in " -+"your document have different sizes, then different pages might be shrunk by " -+"different scaling factors.

                                " -+msgstr "" -+"

                                如果開啟此選項，超過紙張大小的頁面會被縮小以符合紙張的尺寸。

                                " -+"注意：若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可" -+"能不同。

                                " - - #: kprintDialogPage_pageoptions.cpp:84 - msgid "Expand small pages to fit paper size" -@@ -213,16 +212,14 @@ - - #: kprintDialogPage_pageoptions.cpp:86 - msgid "" --"" --"

                                If this option is enabled, small pages will be enlarged so that they fit the " --"printer's paper size.

                                " --"

                                Note: If this option is enabled, and if the pages in your document " --"have different sizes, then different pages might be expanded by different " --"scaling factors.

                                " --msgstr "" --"" --"

                                如果開啟此選項，較小的頁面會被放大以符合紙張的尺寸。

                                " --"

                                注意：若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。

                                " -+"

                                If this option is enabled, small pages will be enlarged so that they " -+"fit the printer's paper size.

                                Note: If this option is enabled, " -+"and if the pages in your document have different sizes, then different pages " -+"might be expanded by different scaling factors.

                                " -+msgstr "" -+"

                                如果開啟此選項，較小的頁面會被放大以符合紙張的尺寸。

                                注意：若是開啟此選項，而您的文件每一頁大小不同，則每一頁被縮放的比例也可能不同。" -+"

                                " - - #: kviewpart.cpp:116 - msgid "No MultiPage found." -@@ -240,11 +237,10 @@ - - #: kviewpart.cpp:139 - msgid "" --"" --"

                                The specified library %1 could not be loaded. The error message " --"returned was:

                                " --"

                                %2

                                " --msgstr "

                                無法載入指定的函式庫 %1。錯誤訊息為：

                                %2

                                " -+"

                                The specified library %1 could not be loaded. The error " -+"message returned was:

                                %2

                                " -+msgstr "" -+"

                                無法載入指定的函式庫 %1。錯誤訊息為：

                                %2

                                " - - #: kviewpart.cpp:143 kviewpart.cpp:819 - msgid "The library does not export a factory for creating components." -@@ -252,27 +248,27 @@ - - #: kviewpart.cpp:146 kviewpart.cpp:822 - msgid "" --"The factory does not support creating components of the specified type." -+"The factory does not support creating components of the specified type." - msgstr "此工廠不支援建立指定型態的元件。" - - #: kviewpart.cpp:150 - msgid "" --"" --"

                                Problem: The document %1 cannot be shown.

                                " --"

                                Reason: The software component %2 which is required to display " --"your files could not be initialized. This could point to serious " --"misconfiguration of your KDE system, or to damaged program files.

                                " --"

                                What you can do: You could try to re-install the software packages in " --"question. If that does not help, you could file an error report, either to the " --"provider of your software (e.g. the vendor of your Linux distribution), or " --"directly to the authors of the software. The entry Report Bug... " --"in the Help menu helps you to contact the KDE programmers.

                                " --msgstr "" --"" --"

                                問題：此文件 %1 無法顯示。

                                " --"

                                理由：需要用於顯示您的檔案的軟體元件 %2 無法初始化。這可能是因為您的 KDE " --"系統設定有嚴重的問題，或是程式檔案已損毀。

                                " --"

                                解決方法：您可以試著重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。

                                " -+"

                                Problem: The document %1 cannot be shown.

                                Reason: The software component %2 which is required to " -+"display your files could not be initialized. This could point to serious " -+"misconfiguration of your KDE system, or to damaged program files.

                                What you can do: You could try to re-install the software " -+"packages in question. If that does not help, you could file an error report, " -+"either to the provider of your software (e.g. the vendor of your Linux " -+"distribution), or directly to the authors of the software. The entry " -+"Report Bug... in the Help menu helps you to contact the KDE " -+"programmers.

                                " -+msgstr "" -+"

                                問題：此文件 %1 無法顯示。

                                理由：需要用於" -+"顯示您的檔案的軟體元件 %2 無法初始化。這可能是因為您的 KDE 系統設定有" -+"嚴重的問題，或是程式檔案已損毀。

                                解決方法：您可以試著重新安裝有" -+"問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。

                                " - - #: kviewpart.cpp:159 kviewpart.cpp:836 - msgid "Error Initializing Software Component" -@@ -280,7 +276,7 @@ - - #: kviewpart.cpp:173 - msgid "Text..." --msgstr "文字..." -+msgstr "文字…" - - #: kviewpart.cpp:193 - msgid "Show &Sidebar" -@@ -292,7 +288,7 @@ - - #: kviewpart.cpp:196 - msgid "&Watch File" --msgstr "監看檔案 (&W)" -+msgstr "監看檔案(&W)" - - #: kviewpart.cpp:197 - msgid "Show Scrollbars" -@@ -332,7 +328,7 @@ - - #: kviewpart.cpp:232 - msgid "Custom Size..." --msgstr "自訂大小..." -+msgstr "自訂大小…" - - #: kviewpart.cpp:236 - msgid "&Use Document Specified Paper Size" -@@ -433,7 +429,7 @@ - - #: kviewpart.cpp:654 - msgid "Loading '%1'..." --msgstr "載入 %1 中..." -+msgstr "載入 %1 中…" - - #: kviewpart.cpp:671 - msgid "File Error! Could not create temporary file." -@@ -441,33 +437,36 @@ - - #: kviewpart.cpp:680 - msgid "" --"File Error! Could not create temporary file " --"%1." -+"File Error! Could not create temporary file " -+"%1." - msgstr "" --"檔案錯誤。無法建立暫存檔 %1。" -+"檔案錯誤。無法建立暫存檔 %1。" - - #: kviewpart.cpp:701 - msgid "" --"File Error! Could not open the file " --"%1 for uncompression. The file will not be loaded.                                " -+"File Error! Could not open the file %1 for uncompression. The file will not be loaded." - msgstr "" - "檔案錯誤。無法開啟檔案 %1 " - "來解壓縮。檔案無法載入。" - - #: kviewpart.cpp:704 - msgid "" --"This error typically occurs if you do not have enough permissions to read " --"the file. You can check ownership and permissions if you right-click on the " --"file in the Konqueror file manager and then choose the 'Properties' menu." -+"This error typically occurs if you do not have enough permissions to " -+"read the file. You can check ownership and permissions if you right-click on " -+"the file in the Konqueror file manager and then choose the 'Properties' menu." -+"" - msgstr "這個錯誤通常是因為您沒有讀取檔案的權限。" - - #: kviewpart.cpp:714 - msgid "Uncompressing..." --msgstr "解壓縮中..." -+msgstr "解壓縮中…" - - #: kviewpart.cpp:715 - msgid "" --"Uncompressing the file %1. Please wait." -+"Uncompressing the file %1. Please wait." - msgstr "檔案 %1 解壓縮中。請稍候。" - - #: kviewpart.cpp:748 -@@ -475,13 +474,15 @@ - "File Error! Could not uncompress the file " - "%1. The file will not be loaded." - msgstr "" --"檔案錯誤。無法解壓縮檔案 %1。檔案無法載入。" -+"檔案錯誤。無法解壓縮檔案 %1。檔案無法載入。" - - #: kviewpart.cpp:750 - msgid "" --"This error typically occurs if the file is corrupt. If you want to be sure, " --"try to decompress the file manually using command-line tools." --msgstr "這個錯誤通常是因為檔案已損毀。您可以試著用命令列手動解壓縮此檔。" -+"This error typically occurs if the file is corrupt. If you want to be " -+"sure, try to decompress the file manually using command-line tools." -+msgstr "" -+"這個錯誤通常是因為檔案已損毀。您可以試著用命令列手動解壓縮此檔。" - - #: kviewpart.cpp:776 - msgid "" -@@ -493,34 +494,35 @@ - msgid "" - "The file has mime type %1 which is not supported by any of the " - "installed KViewShell plugins." --msgstr "此檔案的 MIME 型態為%1，並未被所有安裝的 KViewShell 外掛程式支援。" -+msgstr "" -+"此檔案的 MIME 型態為%1，並未被所有安裝的 KViewShell 外掛程式支援。" -+"" - - #: kviewpart.cpp:816 - msgid "" --"" --"

                                The specified library %1 could not be loaded. The error message " --"returned was:

                                " --"

                                %2

                                " --msgstr "

                                指定的函式庫 %1 無法載入。錯誤訊息為：

                                %2

                                " -+"

                                The specified library %1 could not be loaded. The error " -+"message returned was:

                                %2

                                " -+msgstr "" -+"

                                指定的函式庫 %1 無法載入。錯誤訊息為：

                                %2

                                " - - #: kviewpart.cpp:826 - msgid "" --"" --"

                                Problem: The document %1 cannot be shown.

                                " --"

                                Reason: The software component %2 which is required to display " --"files of type %3 could not be initialized. This could point to serious " --"misconfiguration of your KDE system, or to damaged program files.

                                " --"

                                What you can do: You could try to re-install the software packages in " --"question. If that does not help, you could file an error report, either to the " --"provider of your software (e.g. the vendor of your Linux distribution), or " --"directly to the authors of the software. The entry Report Bug... " --"in the Help menu helps you to contact the KDE programmers.

                                " --msgstr "" --"" --"

                                問題：此文件 %1 無法顯示。

                                " --"

                                理由：需要用於顯示檔案型態 %3 的軟體元件 %2 無法初始化。這可能是因為您的 KDE " --"系統設定有嚴重的問題，或是程式檔案已損毀。

                                " --"

                                解決方法：您可以試著重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。

                                " -+"

                                Problem: The document %1 cannot be shown.

                                Reason: The software component %2 which is required to " -+"display files of type %3 could not be initialized. This could point " -+"to serious misconfiguration of your KDE system, or to damaged program files." -+"

                                What you can do: You could try to re-install the software " -+"packages in question. If that does not help, you could file an error report, " -+"either to the provider of your software (e.g. the vendor of your Linux " -+"distribution), or directly to the authors of the software. The entry " -+"Report Bug... in the Help menu helps you to contact the KDE " -+"programmers.

                                " -+msgstr "" -+"

                                問題：此文件 %1 無法顯示。

                                理由：需要用於" -+"顯示檔案型態 %3 的軟體元件 %2 無法初始化。這可能是因為您的 KDE " -+"系統設定有嚴重的問題，或是程式檔案已損毀。

                                解決方法：您可以試著" -+"重新安裝有問題的軟體套件。如果不行，您可以在「說明」選單中選擇「回報錯誤」。" -+"

                                " - - #: kviewpart.cpp:929 - msgid "Your document has been modified. Do you really want to close it?" -@@ -667,9 +669,11 @@ - - #: main.cpp:96 - msgid "" --"The URL %1 does not point to a local file. You can only specify local files if " --"you are using the '--unique' option." --msgstr "網址 %1 並沒有指到本地的檔案。如果您使用 '--unique' 的選項時，您只能指定本地的檔案。" -+"The URL %1 does not point to a local file. You can only specify local files " -+"if you are using the '--unique' option." -+msgstr "" -+"網址 %1 並沒有指到本地的檔案。如果您使用 '--unique' 的選項時，您只能指定本地" -+"的檔案。" - - #: marklist.cpp:185 - msgid "Select for printing" -@@ -811,7 +815,8 @@ - "
                                  \n" - "
                                • Enabled: Always underline links
                                  • \n" - "
                                • Disabled: Never underline links
                                  • \n" --"
                                • Only on Hover: Underline when the mouse is moved over the link
                                  • \n" -+"
                                • Only on Hover: Underline when the mouse is moved over the link\n" - "
                                " - msgstr "" - "控制超連結如何顯示底線：\n" -@@ -924,15 +929,11 @@ - "\n" - " \n" - " Controls how hyperlinks are underlined:\n" --" " --"
                                  \n" --" " --"
                                • UL_Enabled: Always underline links
                                  • \n" --" " --"
                                • UL_Disabled: Never underline links
                                  • \n" --" " --"
                                • UL_OnlyOnHover: Underline when the mouse is moved over the link
                                  • " --"\n" -+"
                                    \n" -+"
                                  • UL_Enabled: Always underline links
                                    • \n" -+"
                                  • UL_Disabled: Never underline links
                                    • \n" -+"
                                  • UL_OnlyOnHover: Underline when the mouse is moved over " -+"the link
                                    • \n" - "
                                  \n" - " \n" - " " -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewviewer.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewviewer.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/kviewviewer.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/kviewviewer.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kviewviewer\n" - "POT-Creation-Date: 2005-07-24 01:35+0200\n" - "PO-Revision-Date: 2006-06-09 15:54+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -45,17 +44,18 @@ - - #: kviewviewer.cpp:78 - msgid "" --"Unable to find a suitable Image Canvas. This probably means that KView was not " --"installed properly." -+"Unable to find a suitable Image Canvas. This probably means that KView was " -+"not installed properly." - msgstr "找不到適合的影像畫布（Image Canvas）。這可能表示 KView 安裝不正確。" - - #: kviewviewer.cpp:80 - msgid "" --"Accessing the KImageViewer interface of the Image Canvas failed. Something in " --"your setup is broken (a component claims to be a KImageViewer::Canvas but it is " --"not)." -+"Accessing the KImageViewer interface of the Image Canvas failed. Something " -+"in your setup is broken (a component claims to be a KImageViewer::Canvas but " -+"it is not)." - msgstr "" --"存取影像畫布的 KImageViewer 介面時失敗。您的設定中有些不正確（一個元件宣稱它為 KImageViewer::Canvas 但是實際上不是）。" -+"存取影像畫布的 KImageViewer 介面時失敗。您的設定中有些不正確（一個元件宣稱它" -+"為 KImageViewer::Canvas 但是實際上不是）。" - - #: kviewviewer.cpp:92 kviewviewer.cpp:530 - msgid "" -@@ -85,8 +85,8 @@ - - #: kviewviewer.cpp:213 kviewviewer.cpp:607 - msgid "" --"The image could not be saved to disk. A possible causes is that you don't have " --"permission to write to that file." -+"The image could not be saved to disk. A possible causes is that you don't " -+"have permission to write to that file." - msgstr "影像無法儲存到磁碟。一個可能的原因是您沒有寫入檔案的權限。" - - #: kviewviewer.cpp:298 -@@ -147,7 +147,7 @@ - - #: kviewviewer.cpp:757 - msgid "Save Image As..." --msgstr "另存影像為..." -+msgstr "另存影像為…" - - #: kviewviewer.cpp:806 - #, c-format -@@ -163,7 +163,8 @@ - msgstr "" - "您已修改的影像 %1 在磁碟中已被別人修改。\n" - "您要重新載入檔案，並將您所做的改變丟棄嗎？\n" --"如果不要重新載入，而後您又儲存此檔案，別人所做的已經存在磁碟中的修改就會消失。" -+"如果不要重新載入，而後您又儲存此檔案，別人所做的已經存在磁碟中的修改就會消" -+"失。" - - #: kviewviewer.cpp:818 - msgid "Do Not Reload" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkfaximgage.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkfaximgage.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkfaximgage.po 2006-07-22 10:04:05.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkfaximgage.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: libkfaximgage\n" - "POT-Creation-Date: 2005-10-15 02:46+0200\n" - "PO-Revision-Date: 2006-06-09 15:47+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -40,16 +39,14 @@ - - #: kfaximage.cpp:372 - msgid "" --"Due to patent reasons LZW (Lempel-Ziv & Welch) compressed Fax files cannot be " --"loaded yet.\n" -+"Due to patent reasons LZW (Lempel-Ziv & Welch) compressed Fax files cannot " -+"be loaded yet.\n" - msgstr "" - "因為專利的問題，LZW（Lempel-Ziv & Welch）壓縮傳真格式檔目前無法載入。\n" - - #: kfaximage.cpp:377 --msgid "" --"This version can only handle Fax files\n" --msgstr "" --"這個版本只能處理傳真檔。\n" -+msgid "This version can only handle Fax files\n" -+msgstr "這個版本只能處理傳真檔。\n" - - #: kfaximage.cpp:406 - msgid "%1: Bad Fax File" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkscan.po kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkscan.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdegraphics/libkscan.po 2008-02-13 10:55:25.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdegraphics/libkscan.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,8 +7,7 @@ - "Project-Id-Version: libkscan\n" - "POT-Creation-Date: 2008-02-01 01:56+0100\n" - "PO-Revision-Date: 2006-06-09 15:44+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -33,8 +32,8 @@ - - #: gammadialog.cpp:59 - msgid "" --"Edit the custom gamma table
                                  This gamma table is passed to the scanner " --"hardware." -+"Edit the custom gamma table
                                  This gamma table is passed to the " -+"scanner hardware." - msgstr "編輯自訂 gamma 表格
                                  這個 gamma 表格會被傳送到掃描器硬體。" - - #: gammadialog.cpp:67 -@@ -278,7 +277,8 @@ - "than this are considered to be part of the image." - msgstr "" - "自動偵測的門檻。\n" --"所有像素（在黑色背景時）高於或（在白色背景時）低於此值時，就被認為是此影像的一部份。" -+"所有像素（在黑色背景時）高於或（在白色背景時）低於此值時，就被認為是此影像的" -+"一部份。" - - #: previewer.cpp:238 - msgid "Dust size:" -@@ -323,11 +323,12 @@ - - #: previewer.cpp:608 - msgid "" --"The autodetection of images on the preview depends on the background color of " --"the preview image (Think of a preview of an empty scanner).\n" -+"The autodetection of images on the preview depends on the background color " -+"of the preview image (Think of a preview of an empty scanner).\n" - "Please select whether the background of the preview image is black or white" - msgstr "" --"預覽時的自動偵測影像是依據預覽影像的背景顏色（把預覽想成是一個空的掃描器）。\n" -+"預覽時的自動偵測影像是依據預覽影像的背景顏色（把預覽想成是一個空的掃描" -+"器）。\n" - "請選擇預覽影像時的背景是黑色或白色。" - - #: previewer.cpp:609 -@@ -336,7 +337,7 @@ - - #: scandialog.cpp:75 - msgid "&Scanning" --msgstr "掃描 (&S)" -+msgstr "掃描(&S)" - - #: scandialog.cpp:113 - msgid "Startup Options" -@@ -348,7 +349,7 @@ - - #: scandialog.cpp:119 - msgid "&Ask for the scan device on plugin startup" --msgstr "啟動外掛程式時詢問掃描設備 (&A)" -+msgstr "啟動外掛程式時詢問掃描設備(&A)" - - #: scandialog.cpp:121 - msgid "" -@@ -358,11 +359,11 @@ - - #: scandialog.cpp:125 - msgid "&Query the network for scan devices" --msgstr "查詢網路上的掃描設備 (&Q)" -+msgstr "查詢網路上的掃描設備(&Q)" - - #: scandialog.cpp:127 - msgid "Check this if you want to query for configured network scan stations." --msgstr "若您想查詢已設定的網路掃描站台，您可以勾選此選項。" -+msgstr "若您想查詢已設定的網路掃描站臺，您可以勾選此選項。" - - #: scanparams.cpp:118 - msgid "Scanner Settings" -@@ -374,7 +375,7 @@ - - #: scanparams.cpp:161 - msgid "&Preview Scan" --msgstr "預覽掃描 (&P)" -+msgstr "預覽掃描(&P)" - - #: scanparams.cpp:166 - msgid "Scanning in progress" -@@ -382,7 +383,7 @@ - - #: scanparams.cpp:279 - msgid "Source..." --msgstr "來源..." -+msgstr "來源…" - - #: scanparams.cpp:341 - msgid "Resolution" -@@ -394,7 +395,7 @@ - - #: scanparams.cpp:465 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: scanparams.cpp:500 - msgid "Acquire a gray preview even in color mode (faster)" -@@ -402,15 +403,15 @@ - - #: scanparams.cpp:518 - msgid "" --"Problem: No Scanner was found

                                  Your system does not provide a SANE " --"(Scanner Access Now Easy) installation, which is required by the KDE scan " --"support.

                                  Please install and configure SANE correctly on your system.

                                  " --"Visit the SANE homepage under http://www.sane-project.org to find out more " --"about SANE installation and configuration. " -+"Problem: No Scanner was found

                                  Your system does not provide a SANE " -+"(Scanner Access Now Easy) installation, which is required by the KDE " -+"scan support.

                                  Please install and configure SANE correctly on your system." -+"

                                  Visit the SANE homepage under http://www.sane-project.org to find out " -+"more about SANE installation and configuration. " - msgstr "" --"問題：沒有找到掃瞄器

                                  您的系統上沒有安裝 SANE（Scanner Access Now Easy）。

                                  " --"

                                  請安裝並設定好 SANE。

                                  " --"

                                  您可以在 http://www.sane-project.org/ 找到關於 SANE 安裝與設定的資訊。" -+"問題：沒有找到掃描器

                                  您的系統上沒有安裝 SANE（Scanner Access Now " -+"Easy）。

                                  請安裝並設定好 SANE。

                                  您可以在 http://www.sane-" -+"project.org/ 找到關於 SANE 安裝與設定的資訊。" - - #: scanparams.cpp:589 - msgid "*|All Files (*)" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/cupsdconf.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/cupsdconf.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/cupsdconf.po 2005-09-10 13:15:02.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/cupsdconf.po 2011-11-11 15:45:17.000000000 +0100 -@@ -9,7 +9,7 @@ - "Project-Id-Version: cupsdconf\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-06 21:34+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -62,8 +62,8 @@ - - #: cupsd.conf.template.cpp:1 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Server name (ServerName)\n" - "

                                  \n" - "The hostname of your server, as advertised to the world.\n" -@@ -75,7 +75,7 @@ - msgstr "" - "伺服器名稱 (ServerName)\n" - "

                                  \n" --"您的伺服器的主機名稱，做為對外界公佈使用。\n" -+"您的伺服器的主機名稱，做為對外界公布使用。\n" - "預設上 CUPS 會使用系統的主機名稱。

                                  \n" - "

                                  \n" - "要設定客戶端使用的預設伺服器，請查閱 client.conf 檔案。

                                  \n" -@@ -84,8 +84,8 @@ - - #: cupsd.conf.template.cpp:11 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Server administrator (ServerAdmin)\n" - "

                                  \n" - "The email address to send all complaints or problems to.\n" -@@ -102,8 +102,8 @@ - - #: cupsd.conf.template.cpp:19 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Access log (AccessLog)\n" - "

                                  \n" - "The access log file; if this does not start with a leading /\n" -@@ -128,8 +128,8 @@ - - #: cupsd.conf.template.cpp:31 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Data directory (DataDir)\n" - "

                                  \n" - "The root directory for the CUPS data files.\n" -@@ -146,8 +146,8 @@ - - #: cupsd.conf.template.cpp:39 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Default character set (DefaultCharset)\n" - "

                                  \n" - "The default character set to use. If not specified,\n" -@@ -166,8 +166,8 @@ - - #: cupsd.conf.template.cpp:48 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Default language (DefaultLanguage)\n" - "

                                  \n" - "The default language if not specified by the browser.\n" -@@ -184,8 +184,8 @@ - - #: cupsd.conf.template.cpp:56 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Document directory (DocumentRoot)\n" - "

                                  \n" - "The root directory for HTTP documents that are served.\n" -@@ -202,8 +202,8 @@ - - #: cupsd.conf.template.cpp:64 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Error log (ErrorLog)\n" - "

                                  \n" - "The error log file; if this does not start with a leading /\n" -@@ -228,8 +228,8 @@ - - #: cupsd.conf.template.cpp:76 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Font path (FontPath)\n" - "

                                  \n" - "The path to locate all font files (currently only for pstoraster).\n" -@@ -246,8 +246,8 @@ - - #: cupsd.conf.template.cpp:84 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Log level (LogLevel)\n" - "

                                  \n" - "Controls the number of messages logged to the ErrorLog\n" -@@ -259,8 +259,7 @@ - "

                                • warn: Log errors and warnings.
                                  • \n" - "
                                • error: Log only errors.
                                  • \n" - "
                                • none: Log nothing.
                                  • \n" --"
                                " --"

                                \n" -+"

                              \n" - "ex: info

                              \n" - msgstr "" - "紀錄檔等級 (LogLevel)\n" -@@ -274,14 +273,13 @@ - "
                            • warn： 記錄錯誤與警告。
                              • \n" - "
                            • error： 只記錄錯誤。
                              • \n" - "
                            • none： 不記錄任何事。
                              • \n" --"
                            " --"

                            \n" -+"

                          \n" - "例： info

                          \n" - - #: cupsd.conf.template.cpp:99 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max log size (MaxLogSize)\n" - "

                          \n" - "Controls the maximum size of each log file before they are\n" -@@ -298,8 +296,8 @@ - - #: cupsd.conf.template.cpp:107 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Page log (PageLog)\n" - "

                          \n" - "The page log file; if this does not start with a leading /\n" -@@ -324,8 +322,8 @@ - - #: cupsd.conf.template.cpp:119 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Preserve job history (PreserveJobHistory)\n" - "

                          \n" - "Whether or not to preserve the job history after a\n" -@@ -342,8 +340,8 @@ - - #: cupsd.conf.template.cpp:127 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Preserve job files (PreserveJobFiles)\n" - "

                          \n" - "Whether or not to preserve the job files after a\n" -@@ -360,8 +358,8 @@ - - #: cupsd.conf.template.cpp:135 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Printcap file (Printcap)\n" - "

                          \n" - "The name of the printcap file. Default is no filename.\n" -@@ -378,8 +376,8 @@ - - #: cupsd.conf.template.cpp:143 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Request directory (RequestRoot)\n" - "

                          \n" - "The directory where request files are stored.\n" -@@ -396,8 +394,8 @@ - - #: cupsd.conf.template.cpp:151 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Remote root user (RemoteRoot)\n" - "

                          \n" - "The name of the user assigned to unauthenticated accesses\n" -@@ -414,8 +412,8 @@ - - #: cupsd.conf.template.cpp:159 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Server binaries (ServerBin)\n" - "

                          \n" - "The root directory for the scheduler executables.\n" -@@ -432,8 +430,8 @@ - - #: cupsd.conf.template.cpp:167 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Server files (ServerRoot)\n" - "

                          \n" - "The root directory for the scheduler.\n" -@@ -450,8 +448,8 @@ - - #: cupsd.conf.template.cpp:175 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "User (User)\n" - "

                          \n" - "The user the server runs under. Normally this\n" -@@ -478,8 +476,8 @@ - - #: cupsd.conf.template.cpp:188 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Group (Group)\n" - "

                          \n" - "The group the server runs under. Normally this\n" -@@ -498,8 +496,8 @@ - - #: cupsd.conf.template.cpp:197 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "RIP cache (RIPCache)\n" - "

                          \n" - "The amount of memory that each RIP should use to cache\n" -@@ -520,8 +518,8 @@ - - #: cupsd.conf.template.cpp:207 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Temporary files (TempDir)\n" - "

                          \n" - "The directory to put temporary files in. This directory must be\n" -@@ -540,8 +538,8 @@ - - #: cupsd.conf.template.cpp:216 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Filter limit (FilterLimit)\n" - "

                          \n" - "Sets the maximum cost of all job filters that can be run\n" -@@ -566,8 +564,8 @@ - - #: cupsd.conf.template.cpp:228 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Listen to (Port/Listen)\n" - "

                          \n" - "Ports/addresses that are listened to. The default port 631 is reserved\n" -@@ -598,12 +596,13 @@ - - #: cupsd.conf.template.cpp:243 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Hostname lookups (HostNameLookups)\n" - "

                          \n" - "Whether or not to do lookups on IP addresses to get a\n" --"fully-qualified hostname. This defaults to Off for performance reasons...

                          \n" -+"fully-qualified hostname. This defaults to Off for performance reasons...\n" - "

                          \n" - "ex: On

                          \n" - msgstr "" -@@ -616,8 +615,8 @@ - - #: cupsd.conf.template.cpp:251 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Keep alive (KeepAlive)\n" - "

                          \n" - "Whether or not to support the Keep-Alive connection\n" -@@ -634,8 +633,8 @@ - - #: cupsd.conf.template.cpp:259 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Keep-alive timeout (KeepAliveTimeout)\n" - "

                          \n" - "The timeout (in seconds) before Keep-Alive connections are\n" -@@ -652,8 +651,8 @@ - - #: cupsd.conf.template.cpp:267 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max clients (MaxClients)\n" - "

                          \n" - "Controls the maximum number of simultaneous clients that\n" -@@ -670,8 +669,8 @@ - - #: cupsd.conf.template.cpp:275 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max request size (MaxRequestSize)\n" - "

                          \n" - "Controls the maximum size of HTTP requests and print files.\n" -@@ -688,12 +687,12 @@ - - #: cupsd.conf.template.cpp:283 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Client timeout (Timeout)\n" - "

                          \n" --"The timeout (in seconds) before requests time out. Default is 300 seconds.

                          " --"\n" -+"The timeout (in seconds) before requests time out. Default is 300 seconds.\n" - "

                          \n" - "ex: 300

                          \n" - msgstr "" -@@ -705,8 +704,8 @@ - - #: cupsd.conf.template.cpp:290 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Use browsing (Browsing)\n" - "

                          \n" - "Whether or not to listen to printer \n" -@@ -741,8 +740,8 @@ - - #: cupsd.conf.template.cpp:307 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Use short names (BrowseShortNames)\n" - "

                          \n" - "Whether or not to use \"short\" names for remote printers\n" -@@ -761,8 +760,8 @@ - - #: cupsd.conf.template.cpp:316 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse addresses (BrowseAddress)\n" - "

                          \n" - "Specifies a broadcast address to be used. By\n" -@@ -785,8 +784,8 @@ - - #: cupsd.conf.template.cpp:327 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse allow/deny (BrowseAllow/BrowseDeny)\n" - "

                          \n" - "BrowseAllow: specifies an address mask to allow for incoming browser\n" -@@ -809,8 +808,7 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                          \n" -+"

                          \n" - "The hostname/domainname restrictions only work if you have turned hostname\n" - "lookups on!

                          \n" - msgstr "" -@@ -836,15 +834,14 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                          \n" -+"

                          \n" - "主機名稱/網域名稱的限制只有當您開啟主機名稱查詢時\n" - "才會運作！

                          \n" - - #: cupsd.conf.template.cpp:354 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse interval (BrowseInterval)\n" - "

                          \n" - "The time between browsing updates in seconds. Default\n" -@@ -867,14 +864,14 @@ - "因此這代表更新之間的最大時間間隔。

                          \n" - "

                          \n" - "將這個設為 0 以停止對外廣播，如此您的本機印表機就不會\n" --"被公佈，但您仍然可以看到其他主機上的印表機

                          \n" -+"被公布，但您仍然可以看到其他主機上的印表機

                          \n" - "

                          \n" - "例： 30

                          \n" - - #: cupsd.conf.template.cpp:368 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse order (BrowseOrder)\n" - "

                          \n" - "Specifies the order of BrowseAllow/BrowseDeny comparisons.

                          \n" -@@ -889,8 +886,8 @@ - - #: cupsd.conf.template.cpp:375 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse poll (BrowsePoll)\n" - "

                          \n" - "Poll the named server(s) for printers.

                          \n" -@@ -905,8 +902,8 @@ - - #: cupsd.conf.template.cpp:382 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse port (BrowsePort)\n" - "

                          \n" - "The port used for UDP broadcasts. By default this is\n" -@@ -925,8 +922,8 @@ - - #: cupsd.conf.template.cpp:391 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse relay (BrowseRelay)\n" - "

                          \n" - "Relay browser packets from one address/network to another.

                          \n" -@@ -941,8 +938,8 @@ - - #: cupsd.conf.template.cpp:398 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse timeout (BrowseTimeout)\n" - "

                          \n" - "The timeout (in seconds) for network printers - if we don't\n" -@@ -965,8 +962,8 @@ - - #: cupsd.conf.template.cpp:409 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Implicit classes (ImplicitClasses)\n" - "

                          \n" - "Whether or not to use implicit classes.

                          \n" -@@ -1003,8 +1000,8 @@ - - #: cupsd.conf.template.cpp:427 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "System group (SystemGroup)\n" - "

                          \n" - "The group name for \"System\" (printer administration)\n" -@@ -1024,8 +1021,8 @@ - - #: cupsd.conf.template.cpp:436 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Encryption certificate (ServerCertificate)\n" - "

                          \n" - "The file to read containing the server's certificate.\n" -@@ -1042,8 +1039,8 @@ - - #: cupsd.conf.template.cpp:444 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Encryption key (ServerKey)\n" - "

                          \n" - "The file to read containing the server's key.\n" -@@ -1060,8 +1057,8 @@ - - #: cupsd.conf.template.cpp:452 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Access permissions\n" - "# Access permissions for each directory served by the scheduler.\n" - "Locations are relative to DocumentRoot...\n" -@@ -1148,40 +1145,38 @@ - - #: cupsd.conf.template.cpp:495 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Authentication (AuthType)\n" - "

                          \n" --"The authorization to use:" --"

                          \n" -+"The authorization to use:

                          \n" - "

                            \n" - "
                          • None - Perform no authentication.
                            • \n" --"
                          • Basic - Perform authentication using the HTTP Basic method.
                            • \n" --"
                          • Digest - Perform authentication using the HTTP Digest method.
                            • \n" --"
                          " --"

                          \n" -+"

                        • Basic - Perform authentication using the HTTP Basic method.\n" -+"
                        • Digest - Perform authentication using the HTTP Digest method.\n" -+"

                        \n" - "Note: local certificate authentication can be substituted by\n" - "the client for Basic or Digest when connecting to the\n" - "localhost interface.

                        \n" - msgstr "" - "授權 (AuthType)\n" - "

                        \n" --"要使用的授權：" --"

                        \n" -+"要使用的授權：

                        \n" - "

                          \n" - "
                        • 無 - 不進行授權。
                          • \n" - "
                        • 基礎 - 使用 HTTP 基礎方法進行授權。
                          • \n" - "
                        • 摘要 - 使用 HTTP 摘要方法進行授權。
                          • \n" --"
                        " --"

                        \n" -+"

                      \n" - "注意：當連線到 localhost 界面時，本地端\n" - "認證授權可以被客戶端以基礎或摘要\n" - "的方式代替。

                      \n" - - #: cupsd.conf.template.cpp:508 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Class (AuthClass)\n" - "

                      \n" - "The authorization class; currently only Anonymous, User,\n" -@@ -1196,8 +1191,8 @@ - - #: cupsd.conf.template.cpp:515 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "

                      The user/group names allowed to access the resource. The format is a\n" - "comma separated list.

                      \n" - msgstr "" -@@ -1206,8 +1201,8 @@ - - #: cupsd.conf.template.cpp:519 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Satisfy (Satisfy)\n" - "

                      \n" - "This directive controls whether all specified conditions must\n" -@@ -1244,8 +1239,8 @@ - - #: cupsd.conf.template.cpp:537 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Authentication group name (AuthGroupName)\n" - "

                      \n" - "The group name for Group authorization.

                      \n" -@@ -1256,8 +1251,8 @@ - - #: cupsd.conf.template.cpp:542 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "ACL order (Order)\n" - "

                      \n" - "The order of Allow/Deny processing.

                      \n" -@@ -1268,8 +1263,8 @@ - - #: cupsd.conf.template.cpp:547 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Allow\n" - "

                      \n" - "Allows access from the specified hostname, domain, IP address, or\n" -@@ -1286,8 +1281,7 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                      \n" -+"

                      \n" - "The host and domain address require that you enable hostname lookups\n" - "with \"HostNameLookups On\" above.

                      \n" - msgstr "" -@@ -1307,15 +1301,14 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                      \n" -+"

                      \n" - "主機與網域位址需要您在上面的「HostNameLookups On」\n" - "啟用主機名稱查詢。

                      \n" - - #: cupsd.conf.template.cpp:568 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "ACL addresses (Allow/Deny)\n" - "

                      \n" - "Allows/Denies access from the specified hostname, domain, IP address, or\n" -@@ -1332,8 +1325,7 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                      \n" -+"

                      \n" - "The host and domain address require that you enable hostname lookups\n" - "with \"HostNameLookups On\" above.

                      \n" - msgstr "" -@@ -1353,15 +1345,14 @@ - "nnn.nnn.nnn.nnn\n" - "nnn.nnn.nnn.nnn/mm\n" - "nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n" --"" --"

                      \n" -+"

                      \n" - "主機與網域位址需要您在上面的「HostNameLookups On」\n" - "啟用主機名稱查詢。

                      \n" - - #: cupsd.conf.template.cpp:589 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Encryption (Encryption)\n" - "

                      \n" - "Whether or not to use encryption; this depends on having\n" -@@ -1373,8 +1364,7 @@ - "

                    • Never - Never use encryption
                      • \n" - "
                    • Required - Use TLS encryption upgrade
                      • \n" - "
                    • IfRequested - Use encryption if the server requests it
                      • \n" --"
                    " --"

                    \n" -+"

                  \n" - "The default value is \"IfRequested\".

                  \n" - msgstr "" - "加密 (Encryption)\n" -@@ -1388,14 +1378,13 @@ - "
                • 永不 - 永遠不使用加密
                  • \n" - "
                • 必須的 - 使用 TLS 加密升級
                  • \n" - "
                • 如果要求 - 如果伺服器要求就使用加密
                  • \n" --"
                " --"

                \n" -+"

              \n" - "預設數值是「如果要求」。

              \n" - - #: cupsd.conf.template.cpp:604 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Access permissions\n" - "

              \n" - "Access permissions for each directory served by the scheduler.\n" -@@ -1408,8 +1397,8 @@ - - #: cupsd.conf.template.cpp:610 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Auto purge jobs (AutoPurgeJobs)\n" - "

              \n" - "Automatically purge jobs when not needed for quotas.\n" -@@ -1422,8 +1411,8 @@ - - #: cupsd.conf.template.cpp:616 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Browse protocols (BrowseProtocols)\n" - "

              \n" - "Which protocols to use for browsing. Can be\n" -@@ -1432,8 +1421,7 @@ - "

            • all - Use all supported protocols.
              • \n" - "
            • cups - Use the CUPS browse protocol.
              • \n" - "
            • slp - Use the SLPv2 protocol.
              • \n" --"
            " --"

            \n" -+"

          \n" - "The default is cups.

          \n" - "

          \n" - "Note: If you choose to use SLPv2, it is strongly recommended that\n" -@@ -1450,8 +1438,7 @@ - "

        • 全部 - 使用所有支援的協定。
          • \n" - "
        • cups - 使用 CUPS 瀏覽協定。
          • \n" - "
        • slp - 使用 SLPv2 協定。
          • \n" --"
        " --"

        \n" -+"

      \n" - "預設值為 cups。

      \n" - "

      \n" - "注意：如果您選擇使用 SLPv2 ，強烈建議\n" -@@ -1462,8 +1449,8 @@ - - #: cupsd.conf.template.cpp:634 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Classification (Classification)\n" - "

      \n" - "The classification level of the server. If set, this\n" -@@ -1482,8 +1469,8 @@ - - #: cupsd.conf.template.cpp:643 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Allow overrides (ClassifyOverride)\n" - "

      \n" - "Whether to allow users to override the classification\n" -@@ -1504,8 +1491,8 @@ - - #: cupsd.conf.template.cpp:653 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Hide implicit members (HideImplicitMembers)\n" - "

      \n" - "Whether or not to show the members of an\n" -@@ -1532,8 +1519,8 @@ - - #: cupsd.conf.template.cpp:666 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Use "any" classes (ImplicitAnyClasses)\n" - "

      \n" - "Whether or not to create AnyPrinter implicit\n" -@@ -1564,8 +1551,8 @@ - - #: cupsd.conf.template.cpp:681 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max jobs (MaxJobs)\n" - "

      \n" - "Maximum number of jobs to keep in memory (active and completed).\n" -@@ -1578,8 +1565,8 @@ - - #: cupsd.conf.template.cpp:687 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max jobs per user (MaxJobsPerUser)\n" - "

      \n" - "The MaxJobsPerUser directive controls the maximum number of active\n" -@@ -1604,11 +1591,12 @@ - - #: cupsd.conf.template.cpp:699 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Max jobs per printer (MaxJobsPerPrinter)\n" - "

      \n" --"The MaxJobsPerPrinter directive controls the maximum number of active\n" -+"The MaxJobsPerPrinter directive controls the maximum number of active\n" - "jobs that are allowed for each printer or class. Once a printer or class\n" - "reaches the limit, new jobs will be rejected until one of the active jobs\n" - "is completed, stopped, aborted, or canceled.

      \n" -@@ -1630,8 +1618,8 @@ - - #: cupsd.conf.template.cpp:711 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Port\n" - "

      \n" - "The port value that the CUPS daemon is listening to. Default is 631.

      \n" -@@ -1642,8 +1630,8 @@ - - #: cupsd.conf.template.cpp:716 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "Address\n" - "

      \n" - "The address that the CUPS daemon is listening at. Leave it empty or use\n" -@@ -1656,8 +1644,8 @@ - - #: cupsd.conf.template.cpp:722 - msgid "" --"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, " --"etc.)\n" -+"_: Do not translate the keyword between brackets (e.g. ServerName, " -+"ServerAdmin, etc.)\n" - "

      Check this box if you want to use SSL encryption with this address/port.\n" - "

      \n" - msgstr "" -@@ -1782,9 +1770,10 @@ - - #: cupsddialog.cpp:182 - msgid "" --"Some options were not recognized by this configuration tool. They will be left " --"untouched and you won't be able to change them." --msgstr "組態工具無法辨識某些選項，因此這些參數將會保留不予更動，而您將不能改變它們。" -+"Some options were not recognized by this configuration tool. They will be " -+"left untouched and you won't be able to change them." -+msgstr "" -+"組態工具無法辨識某些選項，因此這些參數將會保留不予更動，而您將不能改變它們。" - - #: cupsddialog.cpp:184 - msgid "Unrecognized Options" -@@ -1800,8 +1789,8 @@ - - #: cupsddialog.cpp:239 - msgid "" --"Unable to retrieve configuration file from the CUPS server. You probably don't " --"have the access permissions to perform this operation." -+"Unable to retrieve configuration file from the CUPS server. You probably " -+"don't have the access permissions to perform this operation." - msgstr "無法連上 CUPS 主機傳回組態檔案。也許是您沒權限進行這個操作。" - - #: cupsddialog.cpp:249 -@@ -1814,14 +1803,14 @@ - - #: cupsddialog.cpp:270 - msgid "" --"The config file has not been uploaded to the CUPS server. The daemon will not " --"be restarted." -+"The config file has not been uploaded to the CUPS server. The daemon will " -+"not be restarted." - msgstr "設定檔案尚未上傳到 CUPS 伺服器。因此服務程式將不會重新啟動。" - - #: cupsddialog.cpp:274 - msgid "" --"Unable to upload the configuration file to CUPS server. You probably don't have " --"the access permissions to perform this operation." -+"Unable to upload the configuration file to CUPS server. You probably don't " -+"have the access permissions to perform this operation." - msgstr "組態檔案無法上傳到 CUPS 伺服器。您可能沒權限進行這個操作。" - - #: cupsddialog.cpp:277 -@@ -2135,26 +2124,26 @@ - #: cupsdsplash.cpp:49 - msgid "" - "

      This tool will help you to configure graphically the server of the CUPS " --"printing system. The available options are grouped into sets of related topics " --"and can be accessed quickly through the icon view located on the left. Each " --"option has a default value that is shown if it has not been previously set. " --"This default value should be OK in most cases.

      " --"
      " --"

      You can access a short help message for each option using either the '?' " --"button in the the title bar, or the button at the bottom of this dialog.

      " --msgstr "" --"

      這個工具將可以透過圖形介面引導你設定CUPS列印系統伺服器。所有可以設定的選項都分類成為樹狀的結構，而且可以輕易的在左邊的樹狀結構中找到你需要的設定。每個" --"選項都有預設值，如果沒有事先設定就會顯示此值。在大多數的情況下預設值應該是沒問題的。

      " --"
      " --"

      您可以使用標題列中的「?」按鈕或此對話盒底部的按鈕來取得每個選項的簡短說明訊息。

      " -+"printing system. The available options are grouped into sets of related " -+"topics and can be accessed quickly through the icon view located on the " -+"left. Each option has a default value that is shown if it has not been " -+"previously set. This default value should be OK in most cases.


      You " -+"can access a short help message for each option using either the '?' button " -+"in the the title bar, or the button at the bottom of this dialog.

      " -+msgstr "" -+"

      這個工具將可以透過圖形介面引導你設定CUPS列印系統伺服器。所有可以設定的選項" -+"都分類成為樹狀的結構，而且可以輕易的在左邊的樹狀結構中找到你需要的設定。每個" -+"選項都有預設值，如果沒有事先設定就會顯示此值。在大多數的情況下預設值應該是沒" -+"問題的。


      您可以使用標題列中的「?」按鈕或此對話盒底部的按鈕來取得每" -+"個選項的簡短說明訊息。

      " - - #: editlist.cpp:33 - msgid "Add..." --msgstr "增加..." -+msgstr "增加…" - - #: editlist.cpp:34 - msgid "Edit..." --msgstr "編輯..." -+msgstr "編輯…" - - #: editlist.cpp:36 - msgid "Default List" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_dir.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_dir.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_dir.po 2005-09-10 13:15:02.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_dir.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kabc_dir\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-10 17:38+0800\n" --"Last-Translator: Stanley Wong \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_file.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_file.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_file.po 2006-07-22 10:04:33.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_file.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kabc_file\n" - "POT-Creation-Date: 2006-06-20 03:54+0200\n" - "PO-Revision-Date: 2005-08-10 17:41+0800\n" --"Last-Translator: Stanley Wong \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabcformat_binary.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabcformat_binary.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabcformat_binary.po 2006-07-22 10:04:33.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabcformat_binary.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kabcformat_binary\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2002-10-07 03:23+0800\n" --"Last-Translator: Chen Yang \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_ldapkio.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_ldapkio.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_ldapkio.po 2005-09-10 13:15:02.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_ldapkio.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kabc_ldapkio\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-10 17:47+0800\n" --"Last-Translator: Stanley Wong \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -19,11 +19,11 @@ - - #: resourceldapkioconfig.cpp:58 - msgid "Edit Attributes..." --msgstr "編輯屬性..." -+msgstr "編輯屬性…" - - #: resourceldapkioconfig.cpp:59 - msgid "Offline Use..." --msgstr "離線使用..." -+msgstr "離線使用…" - - #: resourceldapkioconfig.cpp:171 - msgid "Attributes Configuration" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_net.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_net.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_net.po 2007-05-14 12:23:06.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_net.po 2011-11-11 15:45:17.000000000 +0100 -@@ -7,7 +7,7 @@ - "Project-Id-Version: kabc_net\n" - "POT-Creation-Date: 2007-03-05 02:37+0100\n" - "PO-Revision-Date: 2006-03-23 14:06+0800\n" --"Last-Translator: You-Cheng Hsieh \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_sql.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_sql.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kabc_sql.po 2005-09-10 13:15:02.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kabc_sql.po 2011-11-11 15:45:17.000000000 +0100 -@@ -8,7 +8,7 @@ - "Project-Id-Version: kabc_sql\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-10 18:23+0800\n" --"Last-Translator: Stanley Wong \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/katepart.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/katepart.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/katepart.po 2008-08-19 20:43:19.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/katepart.po 2011-11-11 15:45:17.000000000 +0100 -@@ -11,8 +11,7 @@ - "Project-Id-Version: katepart\n" - "POT-Creation-Date: 2008-05-21 01:17+0200\n" - "PO-Revision-Date: 2006-12-18 13:07+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -43,7 +42,7 @@ - - #: part/kateprinter.cpp:647 - msgid "Print &line numbers" --msgstr "列印行號(&L)" -+msgstr "列印列號(&L)" - - #: part/kateprinter.cpp:650 - msgid "Print syntax &guide" -@@ -51,19 +50,22 @@ - - #: part/kateprinter.cpp:659 - msgid "" --"

      This option is only available if some text is selected in the document.

      " --"

      If available and enabled, only the selected text is printed.

      " --msgstr "

      這個選項只有在文件中有某些文字被選取時才能使用。

      如果可以使用並啟用它，就只會列印選擇的文字。

      " -+"

      This option is only available if some text is selected in the document.

      If available and enabled, only the selected text is printed.

      " -+msgstr "" -+"

      這個選項只有在文件中有某些文字被選取時才能使用。

      如果可以使用並啟用" -+"它，就只會列印選擇的文字。

      " - - #: part/kateprinter.cpp:662 - msgid "" --"

      If enabled, line numbers will be printed on the left side of the page(s).

      " -+"

      If enabled, line numbers will be printed on the left side of the page(s)." -+"

      " - msgstr "

      如果啟用，行的編號會印在紙張的左邊。

      " - - #: part/kateprinter.cpp:664 - msgid "" --"

      Print a box displaying typographical conventions for the document type, as " --"defined by the syntax highlighting being used." -+"

      Print a box displaying typographical conventions for the document type, " -+"as defined by the syntax highlighting being used." - msgstr "

      列印一個方塊來顯示所用語法突顯定義的文件類型的印刷協定。

      " - - #: part/kateprinter.cpp:700 -@@ -84,7 +86,7 @@ - - #: part/kateprinter.cpp:720 - msgid "Choo&se Font..." --msgstr "選擇字型(&S)..." -+msgstr "選擇字型(&S)…" - - #: part/kateprinter.cpp:724 - msgid "Header Properties" -@@ -124,29 +126,20 @@ - - #: part/kateprinter.cpp:790 - msgid "" --"
        " --"
      • %u: current user name
        • " --"
      • %d: complete date/time in short format
        • " --"
      • %D: complete date/time in long format
        • " --"
      • %h: current time
        • " --"
      • %y: current date in short format
        • " --"
      • %Y: current date in long format
        • " --"
      • %f: file name
        • " --"
      • %U: full URL of the document
        • " --"
      • %p: page number
      " --"
      Note: Do not use the '|' (vertical bar) character." --msgstr "" --"
        " --"
      • %u： 目前的使用者名稱
        • " --"
      • %d： 短格式的完整日期/時刻
        • " --"
      • %D： 長格式的完整日期/時刻
        • " --"
      • %h： 目前的時刻
        • " --"
      • %y： 短格式的目前日期
        • " --"
      • %Y： 長格式的目前日期
        • " --"
      • %f： 檔案名稱
        • " --"
      • %U： 文件的完整網址
        • " --"
      • %p： 頁碼
      " --"
      注意： 請 勿 使用「|」(垂直條) 字元。" -+"
      • %u: current user name
      • %d: complete date/" -+"time in short format
      • %D: complete date/time in long format
      • %h: current time
      • %y: current date in short " -+"format
      • %Y: current date in long format
      • %f: " -+"file name
      • %U: full URL of the document
      • %p: " -+"page number

      Note: Do not use the '|' (vertical " -+"bar) character." -+msgstr "" -+"
      • %u： 目前的使用者名稱
      • %d： 短格式的完整日" -+"期/時刻
      • %D： 長格式的完整日期/時刻
      • %h： 目" -+"前的時刻
      • %y： 短格式的目前日期
      • %Y： 長格式" -+"的目前日期
      • %f： 檔案名稱
      • %U： 文件的完整網" -+"址
      • %p： 頁碼

      注意： 請 勿 使用" -+"「|」(垂直條) 字元。" - - #: part/kateprinter.cpp:804 - msgid "

      Format of the page footer. The following tags are supported:

      " -@@ -154,7 +147,7 @@ - - #: part/kateprinter.cpp:908 - msgid "L&ayout" --msgstr "佈局(&A)" -+msgstr "布局(&A)" - - #: part/kateprinter.cpp:915 part/kateschema.cpp:834 - msgid "&Schema:" -@@ -186,17 +179,20 @@ - - #: part/kateprinter.cpp:954 - msgid "" --"

      If enabled, the background color of the editor will be used.

      " --"

      This may be useful if your color scheme is designed for a dark " --"background.

      " --msgstr "

      如果啟用，會使用編輯器的背景顏色。

      這在您的配色設定是設計為暗色背景時可能很有用。

      " -+"

      If enabled, the background color of the editor will be used.

      This " -+"may be useful if your color scheme is designed for a dark background.

      " -+msgstr "" -+"

      如果啟用，會使用編輯器的背景顏色。

      這在您的配色設定是設計為暗色背景" -+"時可能很有用。

      " - - #: part/kateprinter.cpp:957 - msgid "" - "

      If enabled, a box as defined in the properties below will be drawn around " - "the contents of each page. The Header and Footer will be separated from the " - "contents with a line as well.

      " --msgstr "

      如果啟用，在下面的屬性中定義的方塊會畫在每一頁內容的周圍。頁首與頁尾也會以線絛來與內容隔開。

      " -+msgstr "" -+"

      如果啟用，在下面的屬性中定義的方塊會畫在每一頁內容的周圍。頁首與頁尾也會以" -+"線絛來與內容隔開。

      " - - #: part/kateprinter.cpp:961 - msgid "The width of the box outline" -@@ -285,7 +281,7 @@ - - #: part/katefactory.cpp:89 - msgid "Testing, ..." --msgstr "測試中，..." -+msgstr "測試中，…" - - #: part/katefactory.cpp:90 - msgid "Former Core Developer" -@@ -390,8 +386,8 @@ - - #: part/katesearch.cpp:78 - msgid "" --"Look up a piece of text or regular expression and replace the result with some " --"given text." -+"Look up a piece of text or regular expression and replace the result with " -+"some given text." - msgstr "尋找文字或正規表示式中的一部份並以所給的文字來取代搜尋結果。" - - #: part/katesearch.cpp:331 -@@ -479,11 +475,11 @@ - - #: part/katesearch.cpp:917 - msgid "" --"

      Usage: ifind:[:bcrs] PATTERN" --"
      ifind does incremental or 'as-you-type' search

      " -+"

      Usage: ifind:[:bcrs] PATTERN
      ifind does incremental or " -+"'as-you-type' search

      " - msgstr "" --"

      用法： ifind:[:bcrs] PATTERN" --"
      ifind 進行的是增加式或「如同您輸入」的搜尋

      " -+"

      用法： ifind:[:bcrs] PATTERN
      ifind 進行的是增加式或「如同" -+"您輸入」的搜尋

      " - - #: part/katesearch.cpp:921 - msgid "

      Usage: replace[:bceprsw] PATTERN REPLACEMENT

      " -@@ -491,36 +487,30 @@ - - #: part/katesearch.cpp:924 - msgid "" --"

      Options

      " --"

      b - Search backward" --"
      c - Search from cursor" --"
      r - Pattern is a regular expression" --"
      s - Case sensitive search" --msgstr "" --"

      選項

      " --"

      b - 向後搜尋" --"
      c - 自游標處搜尋" --"
      r - Pattern 為正規表示式" --"
      s - 區分大小寫的搜尋" -+"

      Options

      b - Search backward
      c - Search " -+"from cursor
      r - Pattern is a regular expression
      s - Case " -+"sensitive search" -+msgstr "" -+"

      選項

      b - 向後搜尋
      c - 自游標處搜尋" -+"
      r - Pattern 為正規表示式
      s - 區分大小寫的搜尋" - - #: part/katesearch.cpp:933 - msgid "" --"
      e - Search in selected text only" --"
      w - Search whole words only" -+"
      e - Search in selected text only
      w - Search whole words " -+"only" - msgstr "
      e - 只在選取的文字中搜尋
      w - 只搜尋整個文字" - - #: part/katesearch.cpp:939 - msgid "" --"
      p - Prompt for replace

      " --"

      If REPLACEMENT is not present, an empty string is used.

      " --"

      If you want to have whitespace in your PATTERN, you need to quote both " --"PATTERN and REPLACEMENT with either single or double quotes. To have the quote " --"characters in the strings, prepend them with a backslash." --msgstr "" --"
      p - 取代時先提示

      " --"

      若 REPLACEMENT 未出現，則使用空字串。

      " --"

      如果您想要在 PATTERN 中加入空白，您需要將 PATTERN 與 REPLACEMENT " --"兩者都以單或雙引號標示。要在字串中使用引號字元，請在引號前加上反斜線。" -+"
      p - Prompt for replace

      If REPLACEMENT is not present, an " -+"empty string is used.

      If you want to have whitespace in your PATTERN, " -+"you need to quote both PATTERN and REPLACEMENT with either single or double " -+"quotes. To have the quote characters in the strings, prepend them with a " -+"backslash." -+msgstr "" -+"
      p - 取代時先提示

      若 REPLACEMENT 未出現，則使用空字串。

      如果您想要在 PATTERN 中加入空白，您需要將 PATTERN 與 REPLACEMENT 兩者都" -+"以單或雙引號標示。要在字串中使用引號字元，請在引號前加上反斜線。" - - #: part/kateluaindentscript.cpp:86 - msgid "indenter.register requires 2 parameters (event id, function to call)" -@@ -530,7 +520,8 @@ - msgid "" - "indenter.register requires 2 parameters (event id (number), function to call " - "(function))" --msgstr "indenter.register 需要兩個參數（事件代碼,呼叫的函式）型態為（數值，函式）" -+msgstr "" -+"indenter.register 需要兩個參數（事件代碼,呼叫的函式）型態為（數值，函式）" - - #: part/kateluaindentscript.cpp:108 - msgid "indenter.register:invalid event id" -@@ -542,23 +533,25 @@ - - #: part/kateluaindentscript.cpp:126 - msgid "document.textLine:One parameter (line number) required" --msgstr "document.textLine：需要一個參數（行號）" -+msgstr "document.textLine：需要一個參數（列號）" - - #: part/kateluaindentscript.cpp:130 - msgid "document.textLine:One parameter (line number) required (number)" --msgstr "document.textLine：需要一個參數（行號）型態為數值" -+msgstr "document.textLine：需要一個參數（列號）型態為數值" - - #: part/kateluaindentscript.cpp:139 - msgid "" --"document.removeText:Four parameters needed (start line, start col,end line, end " --"col)" -+"document.removeText:Four parameters needed (start line, start col,end line, " -+"end col)" - msgstr "document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列）" - - #: part/kateluaindentscript.cpp:143 - msgid "" --"document.removeText:Four parameters needed (start line, start col,end line, end " --"col) (4x number)" --msgstr "document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列），四個參數都為數值" -+"document.removeText:Four parameters needed (start line, start col,end line, " -+"end col) (4x number)" -+msgstr "" -+"document.removeText：需要四個參數（啟始行,啟始列,結束行,結束列），四個參數都" -+"為數值" - - #: part/kateluaindentscript.cpp:152 - msgid "document.insertText:Three parameters needed (line,col,text)" -@@ -566,9 +559,10 @@ - - #: part/kateluaindentscript.cpp:156 - msgid "" --"document.removeText:Three parameters needed (line,col,text) " --"(number,number,string)" --msgstr "document.removeText：需要三個參數(行,列,文字) 型態分別為 (數值,數值,字串)" -+"document.removeText:Three parameters needed (line,col,text) (number,number," -+"string)" -+msgstr "" -+"document.removeText：需要三個參數(行,列,文字) 型態分別為 (數值,數值,字串)" - - #: part/kateluaindentscript.cpp:253 - msgid "LUA interpreter could not be initialized" -@@ -719,15 +713,19 @@ - - #: part/katedocument.cpp:2580 - msgid "" --"Do you really want to save this file? Both your open file and the file on disk " --"were changed. There could be some data lost." --msgstr "您確定要儲存這個檔案？您所開啟的檔案與磁碟上的檔案都已變更。可能會有某些資料遺失。" -+"Do you really want to save this file? Both your open file and the file on " -+"disk were changed. There could be some data lost." -+msgstr "" -+"您確定要儲存這個檔案？您所開啟的檔案與磁碟上的檔案都已變更。可能會有某些資料" -+"遺失。" - - #: part/katedocument.cpp:2591 - msgid "" --"The selected encoding cannot encode every unicode character in this document. " --"Do you really want to save it? There could be some data lost." --msgstr "所選的編碼無法轉換這個文件中的每一個 unicode 字元。您確定要儲存它？可能會有某些資料遺失。" -+"The selected encoding cannot encode every unicode character in this " -+"document. Do you really want to save it? There could be some data lost." -+msgstr "" -+"所選的編碼無法轉換這個文件中的每一個 unicode 字元。您確定要儲存它？可能會有某" -+"些資料遺失。" - - #: part/katedocument.cpp:2642 - msgid "" -@@ -849,31 +847,32 @@ - - #: part/katefiletype.cpp:339 - msgid "" --"

      This string allows you to configure Kate's settings for the files selected " --"by this mimetype using Kate variables. You can set almost any configuration " --"option, such as highlight, indent-mode, encoding, etc.

      " --"

      For a full list of known variables, see the manual.

      " -+"

      This string allows you to configure Kate's settings for the files " -+"selected by this mimetype using Kate variables. You can set almost any " -+"configuration option, such as highlight, indent-mode, encoding, etc.

      For a full list of known variables, see the manual.

      " - msgstr "" --"

      此字串讓您可以使用 Kate 變數來設定 Kate 於此檔案類型所選定的檔案設定值。您幾乎可以設定任何組態選項，像是突顯文字、行內模式、編碼等等。

      " --"

      需要可用變數的完整清單，請查閱手冊。

      " -+"

      此字串讓您可以使用 Kate 變數來設定 Kate 於此檔案類型所選定的檔案設定值。您" -+"幾乎可以設定任何組態選項，像是突顯文字、行內模式、編碼等等。

      需要可用變" -+"數的完整清單，請查閱手冊。

      " - - #: part/katefiletype.cpp:344 - msgid "" --"The wildcards mask allows you to select files by filename. A typical mask uses " --"an asterisk and the file extension, for example *.txt; *.text" --". The string is a semicolon-separated list of masks." -+"The wildcards mask allows you to select files by filename. A typical mask " -+"uses an asterisk and the file extension, for example *.txt; *.text. The string is a semicolon-separated list of masks." - msgstr "" --"萬用字元遮罩允許您以檔案名稱選擇檔案。典型的遮罩使用星號與檔案的延伸檔名，例如 *.txt; *.text" --"。此字串是以分號隔開的遮罩清單。" -+"萬用字元遮罩允許您以檔案名稱選擇檔案。典型的遮罩使用星號與檔案的延伸檔名，例" -+"如 *.txt; *.text。此字串是以分號隔開的遮罩清單。" - - #: part/katefiletype.cpp:349 - msgid "" - "The mime type mask allows you to select files by mimetype. The string is a " --"semicolon-separated list of mimetypes, for example " --"text/plain; text/english." -+"semicolon-separated list of mimetypes, for example text/plain; text/" -+"english." - msgstr "" --"MIME 類型遮罩允許您以 MIME 類型選擇檔案。此字串為以分號隔開的 MIME 類型清單，例如 " --"text/plain; text/english。" -+"MIME 類型遮罩允許您以 MIME 類型選擇檔案。此字串為以分號隔開的 MIME 類型清單，" -+"例如 text/plain; text/english。" - - #: part/katefiletype.cpp:353 - msgid "Displays a wizard that helps you easily select mimetypes." -@@ -881,9 +880,11 @@ - - #: part/katefiletype.cpp:355 - msgid "" --"Sets a priority for this file type. If more than one file type selects the same " --"file, the one with the highest priority will be used." --msgstr "設定這個檔案類型的優先權。如果超過一個以上的檔案類型選擇同樣的檔案，具有最高優先權的將會被使用。" -+"Sets a priority for this file type. If more than one file type selects the " -+"same file, the one with the highest priority will be used." -+msgstr "" -+"設定這個檔案類型的優先權。如果超過一個以上的檔案類型選擇同樣的檔案，具有最高" -+"優先權的將會被使用。" - - #: part/katefiletype.cpp:427 - msgid "New Filetype" -@@ -897,8 +898,8 @@ - #: part/katefiletype.cpp:504 - msgid "" - "Select the MimeTypes you want for this file type.\n" --"Please note that this will automatically edit the associated file extensions as " --"well." -+"Please note that this will automatically edit the associated file extensions " -+"as well." - msgstr "" - "選擇您想要用於這個檔案類型的 MIME 類型。\n" - "請注意這樣也會自動編輯關連的延伸檔名。" -@@ -919,7 +920,8 @@ - - #: part/kateviewhelpers.cpp:239 - msgid "" --"

      For help on individual commands, do 'help <command>'

      " -+"

      For help on individual commands, do 'help <command>'" - msgstr "

      需要個別指令的協助，請使用 'help <command>'

      " - - #: part/kateviewhelpers.cpp:250 -@@ -932,16 +934,14 @@ - - #: part/kateviewhelpers.cpp:258 - msgid "" --"

      This is the Katepart command line." --"
      Syntax: command [ arguments ]" --"
      For a list of available commands, enter help list" --"
      For help for individual commands, enter help <command>" --"

      " --msgstr "" --"

      這是 Katepart 命令列。" --"
      語法： command [ arguments ]" --"
      需要可以用指令的清單，輸入 help list" --"
      需要個別制定的說明，輸入 help <command>

      " -+"

      This is the Katepart command line.
      Syntax: command " -+"[ arguments ]
      For a list of available commands, enter " -+"help list
      For help for individual commands, enter " -+"help <command>

      " -+msgstr "" -+"

      這是 Katepart 命令列。
      語法： command [ arguments ]
      需要可以用指令的清單，輸入 help list
      需要" -+"個別制定的說明，輸入 help <command>

      " - - #: part/kateviewhelpers.cpp:345 - msgid "Success: " -@@ -1018,7 +1018,7 @@ - - #: part/kateschema.cpp:327 - msgid "Line numbers:" --msgstr "行號:" -+msgstr "列號:" - - #: part/kateschema.cpp:333 - msgid "Bracket highlight:" -@@ -1026,7 +1026,7 @@ - - #: part/kateschema.cpp:339 - msgid "Word wrap markers:" --msgstr "文字折行標記:" -+msgstr "文字折列標記:" - - #: part/kateschema.cpp:345 - msgid "Tab markers:" -@@ -1038,17 +1038,19 @@ - - #: part/kateschema.cpp:358 - msgid "" --"

      Sets the background color of the selection.

      " --"

      To set the text color for selected text, use the \"" --"Configure Highlighting\" dialog.

      " --msgstr "

      設定選擇區的背景顏色。

      要設定選取文字的文字顏色，請使用「設定突顯」對話盒。

      " -+"

      Sets the background color of the selection.

      To set the text color " -+"for selected text, use the \"Configure Highlighting\" dialog.

      " -+msgstr "" -+"

      設定選擇區的背景顏色。

      要設定選取文字的文字顏色，請使用「設定突顯" -+"」對話盒。

      " - - #: part/kateschema.cpp:361 - msgid "" --"

      Sets the background color of the selected marker type.

      " --"

      Note: The marker color is displayed lightly because of " --"transparency.

      " --msgstr "

      設定選取標記類型的背景顏色。

      注意：標記的顏色因為透明度的關係看起來會比較淡。

      " -+"

      Sets the background color of the selected marker type.

      Note: " -+"The marker color is displayed lightly because of transparency.

      " -+msgstr "" -+"

      設定選取標記類型的背景顏色。

      注意：標記的顏色因為透明度的關係" -+"看起來會比較淡。

      " - - #: part/kateschema.cpp:364 - msgid "

      Select the marker type you want to change.

      " -@@ -1056,31 +1058,34 @@ - - #: part/kateschema.cpp:365 - msgid "" --"

      Sets the background color of the currently active line, which means the line " --"where your cursor is positioned.

      " -+"

      Sets the background color of the currently active line, which means the " -+"line where your cursor is positioned.

      " - msgstr "

      設定目前作用中的行的背景顏色，亦即您的游標所在的行。

      " - - #: part/kateschema.cpp:368 - msgid "" --"

      This color will be used to draw the line numbers (if enabled) and the lines " --"in the code-folding pane.

      " --msgstr "

      這個色彩會用來繪製行號（如果啟用）與程式碼折疊窗格中的直線。

      " -+"

      This color will be used to draw the line numbers (if enabled) and the " -+"lines in the code-folding pane.

      " -+msgstr "

      這個色彩會用來繪製列號（如果啟用）與程式碼折疊窗格中的直線。

      " - - #: part/kateschema.cpp:370 - msgid "" --"

      Sets the bracket matching color. This means, if you place the cursor e.g. at " --"a (, the matching ) will be highlighted with this color.

      " --msgstr "

      設定對應括號顏色。這表示，如果您將游標置於像(的位置時，對應的)就會以這個顏色來突顯。

      " -+"

      Sets the bracket matching color. This means, if you place the cursor e.g. " -+"at a (, the matching ) will be highlighted with this color.

      " -+msgstr "" -+"

      設定對應括號顏色。這表示，如果您將游標置於像(的位置時，對應的)就會以這個顏色來突顯。

      " - - #: part/kateschema.cpp:374 - msgid "" --"

      Sets the color of Word Wrap-related markers:

      Static Word Wrap
      " --"
      A vertical line which shows the column where text is going to be " -+"

      Sets the color of Word Wrap-related markers:

      Static Word Wrap
      A vertical line which shows the column where text is going to be " - "wrapped
      Dynamic Word Wrap
      An arrow shown to the left of " - "visually-wrapped lines
      " - msgstr "" --"

      設定文字折行相關標記的色彩：

      靜態文字折行
      一條用來顯示文字要在何處折行的垂直直線
      " --"動態文字折行
      一個用來顯示虛擬折行左方的箭頭
      " -+"

      設定文字折列相關標記的色彩：

      靜態文字折列
      一條用來顯示" -+"文字要在何處折列的垂直直線
      動態文字折列
      一個用來顯示虛擬折列" -+"左方的箭頭
      " - - #: part/kateschema.cpp:380 - msgid "

      Sets the color of the tabulator marks:

      " -@@ -1089,15 +1094,14 @@ - #: part/kateschema.cpp:605 - msgid "" - "This list displays the default styles for the current schema and offers the " --"means to edit them. The style name reflects the current style settings." --"

      To edit the colors, click the colored squares, or select the color to edit " --"from the popup menu." --"

      You can unset the Background and Selected Background colors from the popup " --"menu when appropriate." --msgstr "" --"這個清單顯示目前基模的預設風格，並且提供工具來編輯它們。風格名稱反應目前的風格設定值。" --"

      要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。" --"

      您可以在適當的時候從彈出式選單中取消設定背景與選擇的背景顏色。" -+"means to edit them. The style name reflects the current style settings.

      To " -+"edit the colors, click the colored squares, or select the color to edit from " -+"the popup menu.

      You can unset the Background and Selected Background " -+"colors from the popup menu when appropriate." -+msgstr "" -+"這個清單顯示目前基模的預設風格，並且提供工具來編輯它們。風格名稱反應目前的風" -+"格設定值。

      要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。

      您可" -+"以在適當的時候從彈出式選單中取消設定背景與選擇的背景顏色。" - - #: part/katedialogs.cpp:1267 part/kateschema.cpp:689 - msgid "H&ighlight:" -@@ -1105,23 +1109,22 @@ - - #: part/kateschema.cpp:711 - msgid "" --"This list displays the contexts of the current syntax highlight mode and offers " --"the means to edit them. The context name reflects the current style settings." --"

      To edit using the keyboard, press <SPACE> " --"and choose a property from the popup menu." --"

      To edit the colors, click the colored squares, or select the color to edit " --"from the popup menu." --"

      You can unset the Background and Selected Background colors from the context " --"menu when appropriate." --msgstr "" --"這個清單顯示目前的語法突顯模式的背景，並且提供工具來編輯它們。背景名稱反應目前的風格設定值。" --"

      要使用鍵盤編輯，按<空白鍵>並從彈出選單選擇屬性。" --"

      要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。" --"

      您可以在適當的時候從快顯選單中取消設定背景與選擇的背景顏色。" -+"This list displays the contexts of the current syntax highlight mode and " -+"offers the means to edit them. The context name reflects the current style " -+"settings.

      To edit using the keyboard, press <SPACE> " -+"and choose a property from the popup menu.

      To edit the colors, click the " -+"colored squares, or select the color to edit from the popup menu.

      You can " -+"unset the Background and Selected Background colors from the context menu " -+"when appropriate." -+msgstr "" -+"這個清單顯示目前的語法突顯模式的背景，並且提供工具來編輯它們。背景名稱反應目" -+"前的風格設定值。

      要使用鍵盤編輯，按<空白鍵>並從彈出" -+"選單選擇屬性。

      要編輯顏色，單擊顏色方塊，或從彈出選單選擇要編輯的顏色。

      " -+"您可以在適當的時候從快顯選單中取消設定背景與選擇的背景顏色。" - - #: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:406 - msgid "&New..." --msgstr "新的(&N)..." -+msgstr "新的(&N)…" - - #: part/kateschema.cpp:853 - msgid "Colors" -@@ -1194,19 +1197,19 @@ - - #: part/kateschema.cpp:1108 - msgid "Normal &Color..." --msgstr "一般色彩(&C)..." -+msgstr "一般色彩(&C)…" - - #: part/kateschema.cpp:1109 - msgid "&Selected Color..." --msgstr "已選取的顏色(&S)..." -+msgstr "已選取的顏色(&S)…" - - #: part/kateschema.cpp:1110 - msgid "&Background Color..." --msgstr "背景顏色(&B)..." -+msgstr "背景顏色(&B)…" - - #: part/kateschema.cpp:1111 - msgid "S&elected Background Color..." --msgstr "選擇背景顏色(&E)..." -+msgstr "選擇背景顏色(&E)…" - - #: part/kateschema.cpp:1122 - msgid "Unset Background Color" -@@ -1232,8 +1235,7 @@ - - #: part/katesyntaxdocument.cpp:76 - msgid "" --"The error %4" --"
      has been detected in the file %1 at %2/%3      " -+"The error %4
      has been detected in the file %1 at %2/%3      " - msgstr "在檔案 %1 中的 %2/%3 偵測到
      錯誤 %4      " - - #: part/katesyntaxdocument.cpp:84 -@@ -1260,7 +1262,7 @@ - - #: part/katedialogs.cpp:161 part/katedialogs.cpp:1132 - msgid "Configure..." --msgstr "設定..." -+msgstr "設定…" - - #: part/katedialogs.cpp:163 - msgid "Insert leading Doxygen \"*\" when typing" -@@ -1268,7 +1270,7 @@ - - #: part/katedialogs.cpp:164 - msgid "Adjust indentation of code pasted from the clipboard" --msgstr "從剪貼簿中貼上源碼時調整縮排" -+msgstr "從剪貼簿中貼上原始碼時調整縮排" - - #: part/katedialogs.cpp:166 - msgid "Indentation with Spaces" -@@ -1328,7 +1330,8 @@ - - #: part/katedialogs.cpp:211 - msgid "" --"Indentations of more than the selected number of spaces will not be shortened." -+"Indentations of more than the selected number of spaces will not be " -+"shortened." - msgstr "超過所選取的空白部份的縮排將無法縮減。" - - #: part/katedialogs.cpp:214 -@@ -1356,7 +1359,9 @@ - msgid "" - "If this option is selected, pasted code from the clipboard is indented. " - "Triggering the undo-action removes the indentation." --msgstr "選取此選項的話，從剪貼簿中貼上程式源碼時，會做縮排。只要復原就可以取消縮排動作。" -+msgstr "" -+"選取此選項的話，從剪貼簿中貼上程式原始碼時，會做縮排。只要復原就可以取消" -+"縮排動作。" - - #: part/katedialogs.cpp:227 - msgid "The number of spaces to indent with." -@@ -1364,9 +1369,10 @@ - - #: part/katedialogs.cpp:230 - msgid "" --"If this button is enabled, additional indenter specific options are available " --"and can be configured in an extra dialog." --msgstr "如果啟用這個按鈕，就可以使用額外的縮排指定選項並且可以在特別對話盒中設定。" -+"If this button is enabled, additional indenter specific options are " -+"available and can be configured in an extra dialog." -+msgstr "" -+"如果啟用這個按鈕，就可以使用額外的縮排指定選項並且可以在特別對話盒中設定。" - - #: part/katedialogs.cpp:282 - msgid "Configure Indenter" -@@ -1382,7 +1388,7 @@ - - #: part/katedialogs.cpp:363 - msgid "Wrap c&ursor" --msgstr "游標自動折行(&U)" -+msgstr "游標自動折列(&U)" - - #: part/katedialogs.cpp:367 - msgid "&PageUp/PageDown moves cursor" -@@ -1418,29 +1424,33 @@ - msgid "" - "Sets the number of lines to maintain visible above and below the cursor when " - "possible." --msgstr "設定在可能的情況下保持在游標上下方可見的行數。" -+msgstr "設定在可能的情況下保持在游標上下方可見的列數。" - - #: part/katedialogs.cpp:400 - msgid "" --"When selected, pressing the home key will cause the cursor to skip whitespace " --"and go to the start of a line's text. The same applies for the end key." --msgstr "當選擇時，按下 home 按鍵會造成游標忽略空白並移動到文字行的開頭。end 按鍵也有類似的行為，除了是移到文字行的結尾之外。" -+"When selected, pressing the home key will cause the cursor to skip " -+"whitespace and go to the start of a line's text. The same applies for the " -+"end key." -+msgstr "" -+"當選擇時，按下 home 按鍵會造成游標忽略空白並移動到文字行的開頭。end 按鍵也有" -+"類似的行為，除了是移到文字行的結尾之外。" - - #: part/katedialogs.cpp:405 - msgid "" - "When on, moving the insertion cursor using the Left and Right " --"keys will go on to previous/next line at beginning/end of the line, similar to " --"most editors." --"

      When off, the insertion cursor cannot be moved left of the line start, but " --"it can be moved off the line end, which can be very handy for programmers." -+"keys will go on to previous/next line at beginning/end of the line, similar " -+"to most editors.

      When off, the insertion cursor cannot be moved left of " -+"the line start, but it can be moved off the line end, which can be very " -+"handy for programmers." - msgstr "" --"當開啟的時候，使用Left與Right鍵移動插入模式游標會移至上/下一行的行開頭/結尾，如同多數的編輯器一般。" --"

      當關閉的時候，插入模式游標不能左移至行的開頭，但是它可以移至行的結尾，這對程式設計師而言是很方便的。" -+"當開啟的時候，使用Left與Right鍵移動插入模式游標會移至上/下一列" -+"的行開頭/結尾，如同多數的編輯器一般。

      當關閉的時候，插入模式游標不能左移至" -+"行的開頭，但是它可以移至行的結尾，這對程式設計師而言是很方便的。" - - #: part/katedialogs.cpp:411 - msgid "" --"Selects whether the PageUp and PageDown keys should alter the vertical position " --"of the cursor relative to the top of the view." -+"Selects whether the PageUp and PageDown keys should alter the vertical " -+"position of the cursor relative to the top of the view." - msgstr "選擇 PageUp 與 PageDown 按鍵是否應該根據檢視的頂端替換游標的垂直位置。" - - #: part/katedialogs.cpp:473 -@@ -1461,19 +1471,19 @@ - - #: part/katedialogs.cpp:490 - msgid "Static Word Wrap" --msgstr "靜態文字折行" -+msgstr "靜態文字折列" - - #: part/katedialogs.cpp:492 - msgid "Enable static &word wrap" --msgstr "啟用靜態文字折行(&W)" -+msgstr "啟用靜態文字折列(&W)" - - #: part/katedialogs.cpp:496 - msgid "&Show static word wrap marker (if applicable)" --msgstr "顯示靜態文字折行標記（如果可以）(&S)" -+msgstr "顯示靜態文字折列標記（如果可以）(&S)" - - #: part/katedialogs.cpp:502 - msgid "Wrap words at:" --msgstr "在第..字元自動折行:" -+msgstr "在第..字元自動折列:" - - #: part/katedialogs.cpp:507 - msgid "Remove &trailing spaces" -@@ -1517,33 +1527,37 @@ - - #: part/katedialogs.cpp:542 - msgid "" --"Automatically start a new line of text when the current line exceeds the length " --"specified by the Wrap words at: option." --"

      This option does not wrap existing lines of text - use the " --"Apply Static Word Wrap option in the Tools menu for that purpose." --"

      If you want lines to be visually wrapped instead, according to the " --"width of the view, enable Dynamic Word Wrap in the View Defaults " --"config page." --msgstr "" --"當目前的行超過了由 文字折行於: 選項指定的長度時自動開始以新的文字行。" --"

      這個選項不會影響文字中已存在的行 - 使用 工具 選單中的 套用靜態文字折行 選項可以達到這個目的。" --"

      如果您想要各行以 虛擬折行 取代，根據檢視的寬度，啟用 檢視預設值 設定頁面中的 動態文字折行。" -+"Automatically start a new line of text when the current line exceeds the " -+"length specified by the Wrap words at: option.

      This option does not " -+"wrap existing lines of text - use the Apply Static Word Wrap option " -+"in the Tools menu for that purpose.

      If you want lines to be " -+"visually wrapped instead, according to the width of the view, enable " -+"Dynamic Word Wrap in the View Defaults config page." -+msgstr "" -+"當目前的行超過了由 文字折列於: 選項指定的長度時自動開始以新的文字行。" -+"

      這個選項不會影響文字中已存在的行 - 使用 工具 選單中的 套用靜態文" -+"字折列 選項可以達到這個目的。

      如果您想要各行以 虛擬折列 取代，根" -+"據檢視的寬度，啟用 檢視預設值 設定頁面中的 動態文字折列。" - - #: part/katedialogs.cpp:550 - msgid "" - "If the Word Wrap option is selected this entry determines the length (in " - "characters) at which the editor will automatically start a new line." --msgstr "自動折行將會計算編輯器上的字元數， 若是到達指定的長度則會從下一行開始。" -+msgstr "" -+"自動折列將會計算編輯器上的字元數， 若是到達指定的長度則會從下一列開始。" - - #: part/katedialogs.cpp:553 - msgid "" - "When the user types a left bracket ([,(, or {) KateView automatically enters " - "the right bracket (}, ), or ]) to the right of the cursor." --msgstr "當使用者輸入左括號([,(, 或 {)， KateView將會在游標的右邊自動補上右括號(},), 或 ])。" -+msgstr "" -+"當使用者輸入左括號([,(, 或 {)， KateView將會在游標的右邊自動補上右括號(},), " -+"或 ])。" - - #: part/katedialogs.cpp:556 - msgid "" --"The editor will display a symbol to indicate the presence of a tab in the text." -+"The editor will display a symbol to indicate the presence of a tab in the " -+"text." - msgstr "編輯器將會在文件中顯示一個符號來代表 tab 鍵" - - #: part/katedialogs.cpp:560 -@@ -1554,36 +1568,33 @@ - #: part/katedialogs.cpp:563 - msgid "" - "This determines where KateView will get the search text from (this will be " --"automatically entered into the Find Text dialog): " --"
      " --"

        " --"
      • Nowhere: Don't guess the search text.
        • " --"
      • Selection Only: Use the current text selection, if available.
        • " --"
      • Selection, then Current Word: Use the current selection if " --"available, otherwise use the current word.
        • " --"
      • Current Word Only: Use the word that the cursor is currently resting " --"on, if available.
        • " --"
      • Current Word, then Selection: Use the current word if available, " --"otherwise use the current selection.
      Note that, in all the above " --"modes, if a search string has not been or cannot be determined, then the Find " --"Text Dialog will fall back to the last search text." -+"automatically entered into the Find Text dialog):
      • Nowhere: Don't guess the search text.
      • Selection Only: Use the " -+"current text selection, if available.
      • Selection, then Current " -+"Word: Use the current selection if available, otherwise use the current " -+"word.
      • Current Word Only: Use the word that the cursor is " -+"currently resting on, if available.
      • Current Word, then Selection:" -+" Use the current word if available, otherwise use the current selection." -+"
      Note that, in all the above modes, if a search string has not been " -+"or cannot be determined, then the Find Text Dialog will fall back to the " -+"last search text." - msgstr "" - "這裡決定 KateView 要從哪裏開始搜尋文字（這會被自動輸入到搜尋文字對話盒）：" --"
      " --"
        " --"
      • 完全沒有： 不猜測搜尋的文字。
        • " --"
      • 只有選擇區： 如果可以，使用目前的文字選擇區。
        • " --"
      • 選擇區，接著目前的文字： 如果可以就使用目前的選擇區，否則使用目前的文字。
        • " --"
      • 只有目前的文字： 如果可以，是用游標目前所處的文字。
        • " --"
      • 目前的文字，接著選擇區： 如果可以使用目前的文字，否則使用目前的選擇區。
      " --"請注意，在上面所有的模式中，如果搜尋字串尚未或無法決定，尋找文字對話盒將會退回到上次搜尋的文字。" -+"
      • 完全沒有： 不猜測搜尋的文字。
      • 只有選擇區： " -+"如果可以，使用目前的文字選擇區。
      • 選擇區，接著目前的文字： 如果" -+"可以就使用目前的選擇區，否則使用目前的文字。
      • 只有目前的文字： " -+"如果可以，是用游標目前所處的文字。
      • 目前的文字，接著選擇區： 如" -+"果可以使用目前的文字，否則使用目前的選擇區。
      請注意，在上面所有的模" -+"式中，如果搜尋字串尚未或無法決定，尋找文字對話盒將會退回到上次搜尋的文字。" - - #: part/katedialogs.cpp:588 - msgid "" - "If this is enabled, the editor will calculate the number of spaces up to the " --"next tab position as defined by the tab width, and insert that number of spaces " --"instead of a TAB character." --msgstr "如果啟用此項，編輯器將會計算達到定義的 tab 寬度前的空格數目，並插入相對數量的空格以代替 TAB 字元。" -+"next tab position as defined by the tab width, and insert that number of " -+"spaces instead of a TAB character." -+msgstr "" -+"如果啟用此項，編輯器將會計算達到定義的 tab 寬度前的空格數目，並插入相對數量的" -+"空格以代替 TAB 字元。" - - #: part/katedialogs.cpp:592 - msgid "" -@@ -1594,27 +1605,27 @@ - #: part/katedialogs.cpp:595 - msgid "" - "

      If this option is checked, a vertical line will be drawn at the word wrap " --"column as defined in the Editing properties." --"

      Note that the word wrap marker is only drawn if you use a fixed pitch font." -+"column as defined in the Editing properties.

      Note that " -+"the word wrap marker is only drawn if you use a fixed pitch font." - msgstr "" --"

      如果核取此選項，一條垂直線會出現在文字折行處（於 編輯 屬性中定義）。" --"

      注意文字折行標記只會在您使用固定字型時出現。" -+"

      如果核取此選項，一條垂直線會出現在文字折列處（於 編輯 屬" -+"性中定義）。

      注意文字折列標記只會在您使用固定字型時出現。" - - #: part/katedialogs.cpp:651 - msgid "Word Wrap" --msgstr "自動折行" -+msgstr "自動折列" - - #: part/katedialogs.cpp:653 - msgid "&Dynamic word wrap" --msgstr "動態文字折行(&D)" -+msgstr "動態文字折列(&D)" - - #: part/katedialogs.cpp:656 - msgid "Dynamic word wrap indicators (if applicable):" --msgstr "顯示動態文字折行指示器（如果可以）:" -+msgstr "顯示動態文字折列指示器（如果可以）:" - - #: part/katedialogs.cpp:659 - msgid "Follow Line Numbers" --msgstr "跟隨行號" -+msgstr "跟隨列號" - - #: part/katedialogs.cpp:660 - msgid "Always On" -@@ -1622,7 +1633,7 @@ - - #: part/katedialogs.cpp:664 - msgid "Vertically align dynamically wrapped lines to indentation depth:" --msgstr "垂直對齊動態折行至縮排深度：" -+msgstr "垂直對齊動態折列至縮排深度：" - - #: part/katedialogs.cpp:667 - #, no-c-format -@@ -1655,7 +1666,7 @@ - - #: part/katedialogs.cpp:683 - msgid "Show &line numbers" --msgstr "顯示行號(&L)" -+msgstr "顯示列號(&L)" - - #: part/katedialogs.cpp:684 - msgid "Show &scrollbar marks" -@@ -1679,56 +1690,58 @@ - - #: part/katedialogs.cpp:702 part/kateview.cpp:360 - msgid "" --"If this option is checked, the text lines will be wrapped at the view border on " --"the screen." --msgstr "如果核取此選項，文字會根據螢幕上視窗寬度來折行。" -+"If this option is checked, the text lines will be wrapped at the view border " -+"on the screen." -+msgstr "如果核取此選項，文字會根據螢幕上視窗寬度來折列。" - - #: part/katedialogs.cpp:704 part/kateview.cpp:363 - msgid "Choose when the Dynamic Word Wrap Indicators should be displayed" --msgstr "選擇何時要顯示動態文字折行指示器" -+msgstr "選擇何時要顯示動態文字折列指示器" - - #: part/katedialogs.cpp:709 - msgid "" --"

      Enables the start of dynamically wrapped lines to be aligned vertically to " --"the indentation level of the first line. This can help to make code and markup " --"more readable.

      " --"

      Additionally, this allows you to set a maximum width of the screen, as a " --"percentage, after which dynamically wrapped lines will no longer be vertically " --"aligned. For example, at 50%, lines whose indentation levels are deeper than " --"50% of the width of the screen will not have vertical alignment applied to " --"subsequent wrapped lines.

      " --msgstr "" --"

      啟用要與縮排層級的第一行垂直對齊動態文字折行。這樣可以協助讓程式碼與標記更加容易閱讀。

      " --"

      另外，這也可以讓您使用百分比設定螢幕的最大寬度，這樣一來動態文字折行就不會再進行垂直對齊。例如，在 50% 時，縮排層級深度大於螢幕寬度的 50% " --"的行進行文字折行時將不會有垂直對齊。

      " -+"

      Enables the start of dynamically wrapped lines to be aligned vertically " -+"to the indentation level of the first line. This can help to make code and " -+"markup more readable.

      Additionally, this allows you to set a maximum " -+"width of the screen, as a percentage, after which dynamically wrapped lines " -+"will no longer be vertically aligned. For example, at 50%, lines whose " -+"indentation levels are deeper than 50% of the width of the screen will not " -+"have vertical alignment applied to subsequent wrapped lines.

      " -+msgstr "" -+"

      啟用要與縮排層級的第一列垂直對齊動態文字折列。這樣可以協助讓程式碼與標記更" -+"加容易閱讀。

      另外，這也可以讓您使用百分比設定螢幕的最大寬度，這樣一來動" -+"態文字折列就不會再進行垂直對齊。例如，在 50% 時，縮排層級深度大於螢幕寬度的 " -+"50% 的行進行文字折列時將不會有垂直對齊。

      " - - #: part/katedialogs.cpp:718 - msgid "" --"If this option is checked, every new view will display line numbers on the left " --"hand side." -+"If this option is checked, every new view will display line numbers on the " -+"left hand side." - msgstr "如果核取此選項，每個新的檢視會在左手邊顯示行的編號。" - - #: part/katedialogs.cpp:721 - msgid "" - "If this option is checked, every new view will display an icon border on the " --"left hand side." --"
      " --"
      The icon border shows bookmark signs, for instance." --msgstr "如果核取此選項，每個新的檢視會在左手邊顯示圖示邊框。

      例如，圖示邊框顯示書籤記號。" -+"left hand side.

      The icon border shows bookmark signs, for instance." -+msgstr "" -+"如果核取此選項，每個新的檢視會在左手邊顯示圖示邊框。

      例如，圖示邊框顯" -+"示書籤記號。" - - #: part/katedialogs.cpp:725 - msgid "" - "If this option is checked, every new view will show marks on the vertical " --"scrollbar." --"
      " --"
      These marks will, for instance, show bookmarks." --msgstr "如果核取此選項，每個新的檢視會在垂直捲動軸顯示標記。

      這些標記會，例如，顯示書籤記號。" -+"scrollbar.

      These marks will, for instance, show bookmarks." -+msgstr "" -+"如果核取此選項，每個新的檢視會在垂直捲動軸顯示標記。

      這些標記會，例" -+"如，顯示書籤記號。" - - #: part/katedialogs.cpp:729 - msgid "" --"If this option is checked, every new view will display marks for code folding, " --"if code folding is available." --msgstr "如果核取此選項，而程式碼摺疊也可以使用時。每個新的檢視會在左手邊顯示程式碼摺疊標記。" -+"If this option is checked, every new view will display marks for code " -+"folding, if code folding is available." -+msgstr "" -+"如果核取此選項，而程式碼摺疊也可以使用時。每個新的檢視會在左手邊顯示程式碼摺" -+"疊標記。" - - #: part/katedialogs.cpp:732 - msgid "" -@@ -1737,12 +1750,12 @@ - - #: part/katedialogs.cpp:734 - msgid "The bookmarks will be ordered by the line numbers they are placed at." --msgstr "書籤會根據它們設置的行數來排序。" -+msgstr "書籤會根據它們設置的列數來排序。" - - #: part/katedialogs.cpp:736 - msgid "" --"Each new bookmark will be added to the bottom, independently from where it is " --"placed in the document." -+"Each new bookmark will be added to the bottom, independently from where it " -+"is placed in the document." - msgstr "每個新的書籤會新增至底部，跟它在文件中的位置無關。" - - #: part/katedialogs.cpp:739 -@@ -1835,19 +1848,21 @@ - - #: part/katedialogs.cpp:920 - msgid "" --"

      Backing up on save will cause Kate to copy the disk file to " --"'<prefix><filename><suffix>' before saving changes." --"

      The suffix defaults to ~ and prefix is empty by default" --msgstr "" --"

      儲存時備份會使 Kate 在儲存變更之前將磁碟檔案複製為 '<prefix><filename><suffix>' " --"。" --"

      預設前綴為 ~ 而預設後綴為空白" -+"

      Backing up on save will cause Kate to copy the disk file to '<" -+"prefix><filename><suffix>' before saving changes.

      The " -+"suffix defaults to ~ and prefix is empty by default" -+msgstr "" -+"

      儲存時備份會使 Kate 在儲存變更之前將磁碟檔案複製為 '<prefix><" -+"filename><suffix>' 。

      預設前綴為 ~ 而預設後綴為空" -+"白" - - #: part/katedialogs.cpp:924 - msgid "" --"Check this if you want the editor to autodetect the end of line type.The first " --"found end of line type will be used for the whole file." --msgstr "如果您希望編輯器自動偵測行尾類型請核取此項。第一個找到的行尾類型將被用在整個檔案。" -+"Check this if you want the editor to autodetect the end of line type.The " -+"first found end of line type will be used for the whole file." -+msgstr "" -+"如果您希望編輯器自動偵測行尾類型請核取此項。第一個找到的行尾類型將被用在整個" -+"檔案。" - - #: part/katedialogs.cpp:927 - msgid "Check this if you want backups of local files when saving" -@@ -1867,23 +1882,24 @@ - - #: part/katedialogs.cpp:935 - msgid "" --"The editor will search the given number of folder levels upwards for " --".kateconfig file and load the settings line from it." -+"The editor will search the given number of folder levels upwards for ." -+"kateconfig file and load the settings line from it." - msgstr "編輯器將向上搜尋所給資料夾層級數的 .kateconfig 檔案並從其載入設定行。" - - #: part/katedialogs.cpp:938 - msgid "" --"The editor will load given number of blocks (of around 2048 lines) of text into " --"memory; if the filesize is bigger than this the other blocks are swapped to " --"disk and loaded transparently as-needed." --"
      This can cause little delays while navigating in the document; a larger " --"block count increases the editing speed at the cost of memory. " --"
      For normal usage, just choose the highest possible block count: limit it " --"only if you have problems with the memory usage." --msgstr "" --"編輯器將從文字中載入所給數目的區塊（約 2048 行）到記憶體中；如果檔案大小超過這個大小其他的區塊會暫存於磁碟中並依需要載入。" --"
      這會造成在文件中閱覽時有些許延遲；載入較多的區塊會增加編輯的速度並花費更多記憶體。" --"
      在一般的用途，只要選擇最大可能區塊：只有在您有記憶體使用量上的問題時才限制它。" -+"The editor will load given number of blocks (of around 2048 lines) of text " -+"into memory; if the filesize is bigger than this the other blocks are " -+"swapped to disk and loaded transparently as-needed.
      This can cause " -+"little delays while navigating in the document; a larger block count " -+"increases the editing speed at the cost of memory.
      For normal usage, " -+"just choose the highest possible block count: limit it only if you have " -+"problems with the memory usage." -+msgstr "" -+"編輯器將從文字中載入所給數目的區塊（約 2048 列）到記憶體中；如果檔案大小超過" -+"這個大小其他的區塊會暫存於磁碟中並依需要載入。
      這會造成在文件中閱覽時有些" -+"許延遲；載入較多的區塊會增加編輯的速度並花費更多記憶體。
      在一般的用途，只" -+"要選擇最大可能區塊：只有在您有記憶體使用量上的問題時才限制它。" - - #: part/katedialogs.cpp:977 - msgid "" -@@ -1921,12 +1937,12 @@ - - #: part/katedialogs.cpp:1324 - msgid "Do&wnload..." --msgstr "下載(&W)..." -+msgstr "下載(&W)…" - - #: part/katedialogs.cpp:1332 - msgid "" --"Choose a Syntax Highlight mode from this list to view its properties " --"below." -+"Choose a Syntax Highlight mode from this list to view its " -+"properties below." - msgstr "從這個清單選擇語法突顯模式以檢視它的屬性。" - - #: part/katedialogs.cpp:1335 -@@ -1938,30 +1954,33 @@ - #: part/katedialogs.cpp:1338 - msgid "" - "The list of Mime Types used to determine which files to highlight using the " --"current highlight mode." --"

      Click the wizard button on the left of the entry field to display the " --"MimeType selection dialog." --msgstr "MIME 類型清單是用來決定哪些檔案要使用目前的語法突顯模式來突顯。

      按下項目欄位左方的精靈按鈕以顯示 MIME 類型選擇對話盒。" -+"current highlight mode.

      Click the wizard button on the left of the entry " -+"field to display the MimeType selection dialog." -+msgstr "" -+"MIME 類型清單是用來決定哪些檔案要使用目前的語法突顯模式來突顯。

      按下項目欄" -+"位左方的精靈按鈕以顯示 MIME 類型選擇對話盒。" - - #: part/katedialogs.cpp:1342 - msgid "" - "Display a dialog with a list of all available mime types to choose from." --"

      The File Extensions entry will automatically be edited as " --"well." --msgstr "顯示含有所有可用 MIME 類型清單以供選擇的對話盒。

      延伸檔名項目也會自動被編輯。" -+"

      The File Extensions entry will automatically be edited " -+"as well." -+msgstr "" -+"顯示含有所有可用 MIME 類型清單以供選擇的對話盒。

      延伸檔名" -+"項目也會自動被編輯。" - - #: part/katedialogs.cpp:1346 - msgid "" --"Click this button to download new or updated syntax highlight descriptions from " --"the Kate website." -+"Click this button to download new or updated syntax highlight descriptions " -+"from the Kate website." - msgstr "按下這個按鈕以自 Kate 網站下載新的或更新過的語法突顯描述。" - - #: part/katedialogs.cpp:1424 - msgid "" - "Select the MimeTypes you want highlighted using the '%1' syntax highlight " - "rules.\n" --"Please note that this will automatically edit the associated file extensions as " --"well." -+"Please note that this will automatically edit the associated file extensions " -+"as well." - msgstr "" - "選擇您想要使用「%1」語法突顯規則來突顯的 MIME 類型。\n" - "請注意這樣也會自動編輯關連的延伸檔名。" -@@ -2004,7 +2023,7 @@ - - #: part/katedialogs.cpp:1589 - msgid "&Save File As..." --msgstr "儲存檔案為(&S)..." -+msgstr "儲存檔案為(&S)…" - - #: part/katedialogs.cpp:1590 - msgid "Lets you select a location and save the file again." -@@ -2031,7 +2050,9 @@ - msgid "" - "Do nothing. Next time you focus the file, or try to save it or close it, you " - "will be prompted again." --msgstr "不做任何事。下一次您將焦點移到這個檔案，或嘗試儲存它、關閉它時，您將會被再次提示。" -+msgstr "" -+"不做任何事。下一次您將焦點移到這個檔案，或嘗試儲存它、關閉它時，您將會被再次" -+"提示。" - - #: part/katedialogs.cpp:1621 - msgid "&View Difference" -@@ -2039,9 +2060,11 @@ - - #: part/katedialogs.cpp:1626 - msgid "" --"Calculates the difference between the editor contents and the disk file using " --"diff(1) and opens the diff file with the default application for that." --msgstr "使用 diff(1) 計算編輯器內容與磁碟檔案之間的差異，並以預設的應用程式開啟 diff 檔案。" -+"Calculates the difference between the editor contents and the disk file " -+"using diff(1) and opens the diff file with the default application for that." -+msgstr "" -+"使用 diff(1) 計算編輯器內容與磁碟檔案之間的差異，並以預設的應用程式開啟 diff " -+"檔案。" - - #: part/katedialogs.cpp:1630 - msgid "Overwrite" -@@ -2053,8 +2076,8 @@ - - #: part/katedialogs.cpp:1699 - msgid "" --"The diff command failed. Please make sure that diff(1) is installed and in your " --"PATH." -+"The diff command failed. Please make sure that diff(1) is installed and in " -+"your PATH." - msgstr "diff 指令失敗。請確定 diff(1) 已安裝於您的 PATH。" - - #: part/katedialogs.cpp:1701 -@@ -2063,11 +2086,12 @@ - - #: part/katedialogs.cpp:1716 - msgid "" --"Ignoring means that you will not be warned again (unless the disk file changes " --"once more): if you save the document, you will overwrite the file on disk; if " --"you do not save then the disk file (if present) is what you have." -+"Ignoring means that you will not be warned again (unless the disk file " -+"changes once more): if you save the document, you will overwrite the file on " -+"disk; if you do not save then the disk file (if present) is what you have." - msgstr "" --"忽略代表您將不會再次被警告（除非磁碟檔案再次變更）：如果您儲存該文件，您將會覆蓋磁碟上的檔案；如果您不儲存那麼磁碟檔案（如果還在）就會保持原樣。" -+"忽略代表您將不會再次被警告（除非磁碟檔案再次變更）：如果您儲存該文件，您將會" -+"覆蓋磁碟上的檔案；如果您不儲存那麼磁碟檔案（如果還在）就會保持原樣。" - - #: part/katedialogs.cpp:1720 - msgid "You Are on Your Own" -@@ -2092,7 +2116,7 @@ - - #: part/katespell.cpp:57 - msgid "Spelling (from cursor)..." --msgstr "拼字檢查（從游標處）..." -+msgstr "拼字檢查（從游標處）…" - - #: part/katespell.cpp:58 - msgid "Check the document's spelling from the cursor and forward" -@@ -2100,7 +2124,7 @@ - - #: part/katespell.cpp:60 - msgid "Spellcheck Selection..." --msgstr "拼字檢查選擇區..." -+msgstr "拼字檢查選擇區…" - - #: part/katespell.cpp:61 - msgid "Check spelling of the selected text" -@@ -2114,7 +2138,9 @@ - msgid "" - "The spelling program could not be started. Please make sure you have set the " - "correct spelling program and that it is properly configured and in your PATH." --msgstr "無法啟動拼字檢查程式。請檢查您已設定了正確的拼字檢查程式並且它已經設定完成且位於您的 PATH 中。" -+msgstr "" -+"無法啟動拼字檢查程式。請檢查您已設定了正確的拼字檢查程式並且它已經設定完成且" -+"位於您的 PATH 中。" - - #: part/katespell.cpp:210 - msgid "The spelling program seems to have crashed." -@@ -2157,16 +2183,16 @@ - - #: part/kateview.cpp:238 - msgid "&Word Wrap Document" --msgstr "文件自動折行(&W)" -+msgstr "文件自動折列(&W)" - - #: part/kateview.cpp:239 - msgid "" - "Use this command to wrap all lines of the current document which are longer " --"than the width of the current view, to fit into this view." --"
      " --"
      This is a static word wrap, meaning it is not updated when the view is " --"resized." --msgstr "使用這個指令讓目前文件中所有比目前視窗寬度更長的行折為多行。

      這是靜態的文字折行，亦即當視窗改變大小後並不會隨之更新。" -+"than the width of the current view, to fit into this view.

      This is a " -+"static word wrap, meaning it is not updated when the view is resized." -+msgstr "" -+"使用這個指令讓目前文件中所有比目前視窗寬度更長的行折為多行。

      這是靜態" -+"的文字折列，亦即當視窗改變大小後並不會隨之更新。" - - #: part/kateview.cpp:244 - msgid "&Indent" -@@ -2174,11 +2200,12 @@ - - #: part/kateview.cpp:245 - msgid "" --"Use this to indent a selected block of text." --"
      " --"
      You can configure whether tabs should be honored and used or replaced with " --"spaces, in the configuration dialog." --msgstr "使用這個來將選擇的文字區塊縮排。

      您可以在組態對話盒中設定要優先使用跳格(Tab)或以空格代替。" -+"Use this to indent a selected block of text.

      You can configure " -+"whether tabs should be honored and used or replaced with spaces, in the " -+"configuration dialog." -+msgstr "" -+"使用這個來將選擇的文字區塊縮排。

      您可以在組態對話盒中設定要優先使用跳" -+"格(Tab)或以空格代替。" - - #: part/kateview.cpp:247 - msgid "&Unindent" -@@ -2194,12 +2221,12 @@ - - #: part/kateview.cpp:251 - msgid "" --"Use this to clean the indentation of a selected block of text (only tabs/only " --"spaces)" --"
      " --"
      You can configure whether tabs should be honored and used or replaced with " --"spaces, in the configuration dialog." --msgstr "使用這個來清除所選文字區塊的縮排(只有跳格/只有空白)

      您可以在組態對話盒中設定要優先使用跳格(Tab)或以空格代替。" -+"Use this to clean the indentation of a selected block of text (only tabs/" -+"only spaces)

      You can configure whether tabs should be honored and " -+"used or replaced with spaces, in the configuration dialog." -+msgstr "" -+"使用這個來清除所選文字區塊的縮排(只有跳格/只有空白)

      您可以在組態對話盒" -+"中設定要優先使用跳格(Tab)或以空格代替。" - - #: part/kateview.cpp:254 - msgid "&Align" -@@ -2207,7 +2234,8 @@ - - #: part/kateview.cpp:255 - msgid "" --"Use this to align the current line or block of text to its proper indent level." -+"Use this to align the current line or block of text to its proper indent " -+"level." - msgstr "使用這個將目前的行或文字的區塊對齊它的縮排層級。" - - #: part/kateview.cpp:257 -@@ -2216,10 +2244,12 @@ - - #: part/kateview.cpp:259 - msgid "" --"This command comments out the current line or a selected block of text.

      " --"The characters for single/multiple line comments are defined within the " --"language's highlighting." --msgstr "這個指令為目前的行或選擇的文字區塊加上註解。

      單行/多行的註解字元都在語言的突顯中定義。" -+"This command comments out the current line or a selected block of text." -+"

      The characters for single/multiple line comments are defined within " -+"the language's highlighting." -+msgstr "" -+"這個指令為目前的行或選擇的文字區塊加上註解。

      單行/多行的註解字元都在語" -+"言的突顯中定義。" - - #: part/kateview.cpp:262 - msgid "Unco&mment" -@@ -2230,7 +2260,9 @@ - "This command removes comments from the current line or a selected block of " - "text.

      The characters for single/multiple line comments are defined " - "within the language's highlighting." --msgstr "這個指令會移除目前的行或選擇的文字區塊的註解。

      單行/多行的註解字元都在語言的突顯中定義。" -+msgstr "" -+"這個指令會移除目前的行或選擇的文字區塊的註解。

      單行/多行的註解字元都在" -+"語言的突顯中定義。" - - #: part/kateview.cpp:267 - msgid "&Read Only Mode" -@@ -2246,8 +2278,8 @@ - - #: part/kateview.cpp:274 - msgid "" --"Convert the selection to uppercase, or the character to the right of the cursor " --"if no text is selected." -+"Convert the selection to uppercase, or the character to the right of the " -+"cursor if no text is selected." - msgstr "將選擇區轉換為大寫，如果沒有選擇文字則使用游標右方的字元。" - - #: part/kateview.cpp:277 -@@ -2256,8 +2288,8 @@ - - #: part/kateview.cpp:279 - msgid "" --"Convert the selection to lowercase, or the character to the right of the cursor " --"if no text is selected." -+"Convert the selection to lowercase, or the character to the right of the " -+"cursor if no text is selected." - msgstr "將選擇區轉換為小寫，如果沒有選擇文字則使用游標右方的字元。" - - #: part/kateview.cpp:282 -@@ -2266,7 +2298,8 @@ - - #: part/kateview.cpp:284 - msgid "" --"Capitalize the selection, or the word under the cursor if no text is selected." -+"Capitalize the selection, or the word under the cursor if no text is " -+"selected." - msgstr "將選擇區轉換為大寫，如果沒有選擇文字則使用游標下方的文字。" - - #: part/kateview.cpp:287 -@@ -2291,13 +2324,13 @@ - - #: part/kateview.cpp:308 - msgid "" --"This command opens a dialog and lets you choose a line that you want the cursor " --"to move to." --msgstr "這個指令開啟對話盒並讓您選擇您想要游標移動到哪一行。" -+"This command opens a dialog and lets you choose a line that you want the " -+"cursor to move to." -+msgstr "這個指令開啟對話盒並讓您選擇您想要游標移動到哪一列。" - - #: part/kateview.cpp:310 - msgid "&Configure Editor..." --msgstr "編輯器設定(&C)..." -+msgstr "編輯器設定(&C)…" - - #: part/kateview.cpp:311 - msgid "Configure various aspects of this editor." -@@ -2339,8 +2372,8 @@ - - #: part/kateview.cpp:335 - msgid "" --"If you have selected something within the current document, this will no longer " --"be selected." -+"If you have selected something within the current document, this will no " -+"longer be selected." - msgstr "如果您在目前的文件中已經選擇某些東西，將無法選擇此項。" - - #: part/kateview.cpp:337 -@@ -2381,11 +2414,11 @@ - - #: part/kateview.cpp:357 - msgid "&Dynamic Word Wrap" --msgstr "動態折行(&D)" -+msgstr "動態折列(&D)" - - #: part/kateview.cpp:362 - msgid "Dynamic Word Wrap Indicators" --msgstr "動態文字折行指示器" -+msgstr "動態文字折列指示器" - - #: part/kateview.cpp:367 - msgid "&Off" -@@ -2393,7 +2426,7 @@ - - #: part/kateview.cpp:368 - msgid "Follow &Line Numbers" --msgstr "跟隨行號(&L)" -+msgstr "跟隨列號(&L)" - - #: part/kateview.cpp:369 - msgid "&Always On" -@@ -2419,8 +2452,8 @@ - - #: part/kateview.cpp:384 - msgid "" --"Show/hide the icon border.

      The icon border shows bookmark symbols, for " --"instance." -+"Show/hide the icon border.

      The icon border shows bookmark symbols, " -+"for instance." - msgstr "顯示/隱藏圖示邊框。

      例如，圖示邊框顯示書籤標記。" - - #: part/kateview.cpp:385 -@@ -2429,7 +2462,7 @@ - - #: part/kateview.cpp:388 - msgid "Show &Line Numbers" --msgstr "顯示行號(&L)" -+msgstr "顯示列號(&L)" - - #: part/kateview.cpp:391 - msgid "Show/hide the line numbers on the left hand side of the view." -@@ -2437,7 +2470,7 @@ - - #: part/kateview.cpp:392 - msgid "Hide &Line Numbers" --msgstr "隱藏行號(&L)" -+msgstr "隱藏列號(&L)" - - #: part/kateview.cpp:395 - msgid "Show Scroll&bar Marks" -@@ -2445,8 +2478,8 @@ - - #: part/kateview.cpp:398 - msgid "" --"Show/hide the marks on the vertical scrollbar.

      " --"The marks, for instance, show bookmarks." -+"Show/hide the marks on the vertical scrollbar.

      The marks, for " -+"instance, show bookmarks." - msgstr "顯示/隱藏垂直捲動軸標記。

      例如，顯示書籤標記。" - - #: part/kateview.cpp:399 -@@ -2455,17 +2488,17 @@ - - #: part/kateview.cpp:402 - msgid "Show Static &Word Wrap Marker" --msgstr "顯示靜態文字折行標記(&W)" -+msgstr "顯示靜態文字折列標記(&W)" - - #: part/kateview.cpp:406 - msgid "" --"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column " --"as defined in the editing properties" --msgstr "顯示/隱藏文字折行標記，一條在編輯屬性中定義繪製於文字折行處的垂直線" -+"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap " -+"column as defined in the editing properties" -+msgstr "顯示/隱藏文字折列標記，一條在編輯屬性中定義繪製於文字折列處的垂直線" - - #: part/kateview.cpp:408 - msgid "Hide Static &Word Wrap Marker" --msgstr "隱藏靜態文字折行標記(&W)" -+msgstr "隱藏靜態文字折列標記(&W)" - - #: part/kateview.cpp:411 - msgid "Switch to Command Line" -@@ -2545,19 +2578,19 @@ - - #: part/kateview.cpp:504 - msgid "Select to Previous Line" --msgstr "選擇至上一行" -+msgstr "選擇至上一列" - - #: part/kateview.cpp:508 - msgid "Scroll Line Up" --msgstr "向上捲動一行" -+msgstr "向上捲動一列" - - #: part/kateview.cpp:512 - msgid "Move to Next Line" --msgstr "移至下一行" -+msgstr "移至下一列" - - #: part/kateview.cpp:515 - msgid "Move to Previous Line" --msgstr "移至上一行" -+msgstr "移至上一列" - - #: part/kateview.cpp:518 - msgid "Move Character Right" -@@ -2569,11 +2602,11 @@ - - #: part/kateview.cpp:525 - msgid "Select to Next Line" --msgstr "選擇至下一行" -+msgstr "選擇至下一列" - - #: part/kateview.cpp:529 - msgid "Scroll Line Down" --msgstr "向下捲動一行" -+msgstr "向下捲動一列" - - #: part/kateview.cpp:534 - msgid "Scroll Page Up" -@@ -2707,7 +2740,8 @@ - - #: part/katehighlight.cpp:1972 - msgid "" --"%1: Deprecated syntax. Attribute (%2) not addressed by symbolic name
      " -+"%1: Deprecated syntax. Attribute (%2) not addressed by symbolic " -+"name
      " - msgstr "%1：不建議的語法。屬性 (%2) 未依連結名稱排列
      " - - #: part/katehighlight.cpp:2339 -@@ -3840,17 +3874,17 @@ - msgid "" - "_: Translators: This is the first part of two strings wich will comprise the " - "sentence 'Show completions when a word is at least N characters'. The first " --"part is on the right side of the N, which is represented by a spinbox widget, " --"followed by the second part: 'characters long'. Characters is a ingeger number " --"between and including 1 and 30. Feel free to leave the second part of the " --"sentence blank if it suits your language better. \n" -+"part is on the right side of the N, which is represented by a spinbox " -+"widget, followed by the second part: 'characters long'. Characters is a " -+"ingeger number between and including 1 and 30. Feel free to leave the second " -+"part of the sentence blank if it suits your language better. \n" - "Show completions &when a word is at least" - msgstr "顯示補齊當文字最少為(&W)" - - #: plugins/wordcompletion/docwordcompletion.cpp:517 - msgid "" --"_: This is the second part of two strings that will comprise teh sentence 'Show " --"completions when a word is at least N characters'\n" -+"_: This is the second part of two strings that will comprise teh sentence " -+"'Show completions when a word is at least N characters'\n" - "characters long." - msgstr "字元長度." - -@@ -3867,7 +3901,7 @@ - - #: plugins/insertfile/insertfileplugin.cpp:79 - msgid "Insert File..." --msgstr "插入檔案..." -+msgstr "插入檔案…" - - #: plugins/insertfile/insertfileplugin.cpp:88 - msgid "Choose File to Insert" -@@ -3912,12 +3946,13 @@ - #: plugins/kdatatool/kate_kdatatool.cpp:183 - msgid "" - "Data tools are only available when text is selected, or when the right mouse " --"button is clicked over a word. If no data tools are offered even when text is " --"selected, you need to install them. Some data tools are part of the KOffice " --"package." -+"button is clicked over a word. If no data tools are offered even when text " -+"is selected, you need to install them. Some data tools are part of the " -+"KOffice package." - msgstr "" --"資料工具只有在文字被選擇或在文字上方按下滑鼠右鍵時才可以使用。如果即使選擇了文字仍然沒有提供資料工具，您需要安裝它們。有些資料工具是 KOffice " --"套件的一部份。" -+"資料工具只有在文字被選擇或在文字上方按下滑鼠右鍵時才可以使用。如果即使選擇了" -+"文字仍然沒有提供資料工具，您需要安裝它們。有些資料工具是 KOffice 套件的一部" -+"份。" - - #: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371 - msgid "Search Incrementally" -@@ -3993,8 +4028,8 @@ - - #: plugins/isearch/ISearchPlugin.cpp:269 - msgid "" --"_: Incremental Search has passed both the end of the document and the original " --"starting position\n" -+"_: Incremental Search has passed both the end of the document and the " -+"original starting position\n" - "Overwrapped I-Search:" - msgstr "重覆折返遞增搜尋:" - -@@ -4048,7 +4083,8 @@ - - #: plugins/autobookmarker/autobookmarker.cpp:302 - msgid "" --"

      If enabled, the pattern matching will be case sensitive, otherwise not.

      " -+"

      If enabled, the pattern matching will be case sensitive, otherwise not." - msgstr "

      如果啟用，樣式的比對將會是區分大小寫的，相反則無。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:305 -@@ -4058,9 +4094,11 @@ - #: plugins/autobookmarker/autobookmarker.cpp:309 - msgid "" - "

      If enabled, the pattern matching will use minimal matching; if you do not " --"know what that is, please read the appendix on regular expressions in the kate " --"manual.

      " --msgstr "

      如果啟用，樣式的比對會使用最小符合；如果您不知道那代表什麼，請閱讀 kate 手冊中正規表示式的附錄。

      " -+"know what that is, please read the appendix on regular expressions in the " -+"kate manual.

      " -+msgstr "" -+"

      如果啟用，樣式的比對會使用最小符合；如果您不知道那代表什麼，請閱讀 kate 手" -+"冊中正規表示式的附錄。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:313 - msgid "&File mask:" -@@ -4068,36 +4106,39 @@ - - #: plugins/autobookmarker/autobookmarker.cpp:319 - msgid "" --"

      A list of filename masks, separated by semicolons. This can be used to limit " --"the usage of this entity to files with matching names.

      " --"

      Use the wizard button to the right of the mimetype entry below to easily " --"fill out both lists.

      " -+"

      A list of filename masks, separated by semicolons. This can be used to " -+"limit the usage of this entity to files with matching names.

      Use the " -+"wizard button to the right of the mimetype entry below to easily fill out " -+"both lists.

      " - msgstr "" --"

      檔案名稱遮罩的清單，以分號隔開。這可以用來限制符合此名稱的檔案數目。

      " --"

      使用 MIME 類型項目右邊的精靈按鈕可以很輕鬆的填好兩邊的清單。

      " -+"

      檔案名稱遮罩的清單，以分號隔開。這可以用來限制符合此名稱的檔案數目。

      使用 MIME 類型項目右邊的精靈按鈕可以很輕鬆的填好兩邊的清單。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:330 - msgid "" --"

      A list of mime types, separated by semicolon. This can be used to limit the " --"usage of this entity to files with matching mime types.

      " --"

      Use the wizard button on the right to get a list of existing file types to " --"choose from, using it will fill in the file masks as well.

      " -+"

      A list of mime types, separated by semicolon. This can be used to limit " -+"the usage of this entity to files with matching mime types.

      Use the " -+"wizard button on the right to get a list of existing file types to choose " -+"from, using it will fill in the file masks as well.

      " - msgstr "" --"

      MIME 類型的清單，以分號隔開。這可以用來限制符合此 MIME 類型的檔案項目。

      " --"

      使用右邊的精靈按鈕可以取得既存檔案類型的清單以供選擇，也可以使用它來填入檔案遮罩。

      " -+"

      MIME 類型的清單，以分號隔開。這可以用來限制符合此 MIME 類型的檔案項目。

      使用右邊的精靈按鈕可以取得既存檔案類型的清單以供選擇，也可以使用它來填入" -+"檔案遮罩。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:340 - msgid "" --"

      Click this button to display a checkable list of mimetypes available on your " --"system. When used, the file masks entry above will be filled in with the " --"corresponding masks.

      " --msgstr "

      按下這個按鈕以顯示在你系統中可用的 MIME 類型核取清單。在使用時，上方的檔案遮罩項目將填入相對的遮罩。

      " -+"

      Click this button to display a checkable list of mimetypes available on " -+"your system. When used, the file masks entry above will be filled in with " -+"the corresponding masks.

      " -+msgstr "" -+"

      按下這個按鈕以顯示在你系統中可用的 MIME 類型核取清單。在使用時，上方的檔案" -+"遮罩項目將填入相對的遮罩。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:365 - msgid "" - "Select the MimeTypes for this pattern.\n" --"Please note that this will automatically edit the associated file extensions as " --"well." -+"Please note that this will automatically edit the associated file extensions " -+"as well." - msgstr "" - "選擇這個樣式的 MIME 類型。\n" - "請注意這樣也會自動編輯關連的延伸檔名。" -@@ -4121,19 +4162,16 @@ - #: plugins/autobookmarker/autobookmarker.cpp:394 - msgid "" - "

      This list shows your configured autobookmark entities. When a document is " --"opened, each entity is used in the following way: " --"

        " --"
      1. The entity is dismissed, if a mime and/or filename mask is defined, and " --"neither matches the document.
        2. " --"
      2. Otherwise each line of the document is tried against the pattern, and a " --"bookmark is set on matching lines.
    " --"

    Use the buttons below to manage your collection of entities.

    " --msgstr "" --"

    這個清單顯示您設定的自動書籤項目。當開啟一份文件時，每個項目都會以下列方式來使用：" --"

      " --"
    1. 此項目無效，如果 MIME 和/或檔案名稱遮罩已定義，卻無相符的文件。
      2. " --"
    2. 除非本文件的每一行都比對過，而書籤也設定於符合的行中。
" --"

使用下列按鈕來管理您自己收集的項目。

" -+"opened, each entity is used in the following way:
  1. The entity is " -+"dismissed, if a mime and/or filename mask is defined, and neither matches " -+"the document.
  2. Otherwise each line of the document is tried against " -+"the pattern, and a bookmark is set on matching lines.

    3. Use the " -+"buttons below to manage your collection of entities.

    " -+msgstr "" -+"

    這個清單顯示您設定的自動書籤項目。當開啟一份文件時，每個項目都會以下列方式" -+"來使用：

    1. 此項目無效，如果 MIME 和/或檔案名稱遮罩已定義，卻無相符的文" -+"件。
    2. 除非本文件的每一列都比對過，而書籤也設定於符合的行中。

      3. 使用下列按鈕來管理您自己收集的項目。

      " - - #: plugins/autobookmarker/autobookmarker.cpp:409 - msgid "Press this button to create a new autobookmark entity." -@@ -4145,7 +4183,7 @@ - - #: plugins/autobookmarker/autobookmarker.cpp:416 - msgid "&Edit..." --msgstr "編輯(&E)..." -+msgstr "編輯(&E)…" - - #: plugins/autobookmarker/autobookmarker.cpp:419 - msgid "Press this button to edit the currently selected entity." -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kcmshell.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kcmshell.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kcmshell.po 2006-10-01 18:34:22.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kcmshell.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,8 +6,7 @@ - "Project-Id-Version: kcmshell\n" - "POT-Creation-Date: 2006-08-13 04:02+0200\n" - "PO-Revision-Date: 2006-02-13 13:04+0800\n" --"Last-Translator: Frank Weng (a.k.a. Franklin) \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Traditional Chinese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs_colors.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs_colors.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs_colors.po 2006-01-19 18:50:12.000000000 +0100 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs_colors.po 2011-11-11 15:45:17.000000000 +0100 -@@ -6,7 +6,7 @@ - "Project-Id-Version: kdelibs_colors\n" - "POT-Creation-Date: 2005-05-18 21:23+0200\n" - "PO-Revision-Date: 2005-08-09 16:00+0800\n" --"Last-Translator: Chao-Hsiung Liao \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese (traditional) \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -diff -Nuar kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs.po kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs.po ---- kde-i18n-zh_TW-3.5.10.ORI/messages/kdelibs/kdelibs.po 2008-08-19 20:43:19.000000000 +0200 -+++ kde-i18n-zh_TW-3.5.10/messages/kdelibs/kdelibs.po 2011-11-11 15:45:17.000000000 +0100 -@@ -12,7 +12,7 @@ - "Project-Id-Version: kdelibs\n" - "POT-Creation-Date: 2008-07-08 01:18+0200\n" - "PO-Revision-Date: 2007-09-18 14:32+0800\n" --"Last-Translator: Franklin Weng \n" -+"Last-Translator: Wei-Lun Chao \n" - "Language-Team: Chinese Traditional \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -29,12 +29,13 @@ - #: rc.cpp:6 - #, no-c-format - msgid "" --"Please choose the default text editing component that you wish to use in this " --"application. If you choose System Default, the application will honor " --"your changes in the Control Center. All other choices will override that " --"setting." -+"Please choose the default text editing component that you wish to use in " -+"this application. If you choose System Default, the application will " -+"honor your changes in the Control Center. All other choices will override " -+"that setting." - msgstr "" --"請選擇您想要在此應用程式中使用的預設文字編輯元件。如果您選擇系統預設值，應用程式將會遵從您在控制中心的變更。所有其他的選項都會覆蓋那個選項。" -+"請選擇您想要在此應用程式中使用的預設文字編輯元件。如果您選擇系統預設值，應用程式將會遵從您在控制中心的變更。所有其他的選項都會覆蓋那個選項。" - - #. i18n: file ./kcert/kcertpart.rc line 4 - #: rc.cpp:9 -@@ -58,7 +59,8 @@ - #: rc.cpp:18 - #, no-c-format - msgid "" --"The currently set shortcut or the shortcut you are entering will show up here." -+"The currently set shortcut or the shortcut you are entering will show up " -+"here." - msgstr "已設定的快速鍵或是你剛剛設定的快速鍵將會顯示在這邊" - - #. i18n: file ./kdeui/kshortcutdialog_advanced.ui line 182 -@@ -89,12 +91,12 @@ - #: rc.cpp:39 - #, no-c-format - msgid "" --"Select this checkbox to enable the entry of multi-key shortcuts. A multi-key " --"shortcut consists of a sequence of up to 4 keys. For example, you could assign " --"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline." -+"Select this checkbox to enable the entry of multi-key shortcuts. A multi-" -+"key shortcut consists of a sequence of up to 4 keys. For example, you could " -+"assign \"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline." - msgstr "" --"如果您要使用多重按鍵作捷徑，請選擇此項。您最多可用4個按鍵作捷徑。例如您可把 \"Ctrl+F,B\" 連至 Font-Bold 和把 " --"\"Ctrl+F,U\" 連至 Font-Underline。" -+"如果您要使用多重按鍵作捷徑，請選擇此項。您最多可用4個按鍵作捷徑。例如您可把 " -+"\"Ctrl+F,B\" 連至 Font-Bold 和把 \"Ctrl+F,U\" 連至 Font-Underline。" - - #. i18n: file ./kdeui/ui_standards.rc line 4 - #: common_texts.cpp:77 rc.cpp:42 rc.cpp:262 -@@ -180,26 +182,26 @@ - #: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322 - #, no-c-format - msgid "" --"" --"

      This word was considered to be an \"unknown word\" because it does not match " --"any entry in the dictionary currently in use. It may also be a word in a " --"foreign language.

      \n" --"

      If the word is not misspelled, you may add it to the dictionary by clicking " --"Add to Dictionary. If you don't want to add the unknown word to the " --"dictionary, but you want to leave it unchanged, click Ignore or " --"Ignore All.

      \n" -+"

      This word was considered to be an \"unknown word\" because it does " -+"not match any entry in the dictionary currently in use. It may also be a " -+"word in a foreign language.

      \n" -+"

      If the word is not misspelled, you may add it to the dictionary by " -+"clicking Add to Dictionary. If you don't want to add the unknown word " -+"to the dictionary, but you want to leave it unchanged, click Ignore " -+"or Ignore All.

      \n" - "

      However, if the word is misspelled, you can try to find the correct " --"replacement in the list below. If you cannot find a replacement there, you may " --"type it in the text box below, and click Replace or Replace All" --".

      \n" -+"replacement in the list below. If you cannot find a replacement there, you " -+"may type it in the text box below, and click Replace or Replace " -+"All.

      \n" - "      " - msgstr "" --"" --"

      由於在使用中的字典內找不到這個詞語，它被當成一個\"未知詞語\"。它也有可能是一個外語。

      \n" --"

      如果它真的沒有拼錯字，您可以按加到字典中來把它加入字典裏。如果您不希望這樣做，但仍想這個詞語保持原狀，您可以按略過或" --"全部略過。

      \n" --"

      然而，要是它拼錯了，試在下面的相近詞語中找出一個正確的。找不到的話，您也可自行輸入一個，然後按取代或全部取代來更正它。

      " --"\n" -+"

      由於在使用中的字典內找不到這個詞語，它被當成一個\"未知詞語\"。它也有可" -+"能是一個外語。

      \n" -+"

      如果它真的沒有拼錯字，您可以按加到字典中來把它加入字典裏。如果您不" -+"希望這樣做，但仍想這個詞語保持原狀，您可以按略過或全部略過。\n" -+"

      然而，要是它拼錯了，試在下面的相近詞語中找出一個正確的。找不到的話，您也可" -+"自行輸入一個，然後按取代或全部取代來更正它。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 52 -@@ -236,7 +238,7 @@ - #: rc.cpp:119 rc.cpp:336 - #, no-c-format - msgid "... the misspelled word shown in context ..." --msgstr "... 內文中有拼字錯誤的詞語 ..." -+msgstr "… 內文中有拼字錯誤的詞語…" - - #. i18n: file ./kdeui/kspellui.ui line 94 - #: rc.cpp:122 rc.cpp:339 -@@ -249,15 +251,16 @@ - #, no-c-format - msgid "" - "\n" --"

      Here you can see a text excerpt showing the unknown word in its context. If " --"this information is not sufficient to choose the best replacement for the " -+"

      Here you can see a text excerpt showing the unknown word in its context. " -+"If this information is not sufficient to choose the best replacement for the " - "unknown word, you can click on the document you are proofing, read a larger " - "part of the text and then return here to continue proofing.

      \n" - "      " - msgstr "" - "\n" --"

      在這裏您可以找到內文中拼錯詞附近的文字。如果覺得文字太少，不能確定要用哪一個詞語作替代的話，您可以另外打開檢驗的文件，閱讀更多文字，並根據上文下理來作決定" --"。然後回到這裏繼續。

      \n" -+"

      在這裏您可以找到內文中拼錯詞附近的文字。如果覺得文字太少，不能確定要用哪一" -+"個詞語作替代的話，您可以另外打開檢驗的文件，閱讀更多文字，並根據上文下理來作" -+"決定。然後回到這裏繼續。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 107 -@@ -272,18 +275,17 @@ - msgid "" - "\n" - "

      The unknown word was detected and considered unknown because it is not " --"included in the dictionary." --"
      \n" --"Click here if you consider that the unknown word is not misspelled and you want " --"to avoid wrongly detecting it again in the future. If you want to let it remain " --"as is, but not add it to the dictionary, then click Ignore or " --"Ignore All instead.

      \n" -+"included in the dictionary.
      \n" -+"Click here if you consider that the unknown word is not misspelled and you " -+"want to avoid wrongly detecting it again in the future. If you want to let " -+"it remain as is, but not add it to the dictionary, then click Ignore " -+"or Ignore All instead.

      \n" - "      " - msgstr "" - "\n" --"

      偵測到一個未知詞語(在字典內找不到)。" --"
      \n" --"如果您認為它沒有拼措，並且不要再次顯示，就請按這裏。若您認為它是對的，但不想加入字典中，可以按略過或全部略過。

      \n" -+"

      偵測到一個未知詞語(在字典內找不到)。
      \n" -+"如果您認為它沒有拼措，並且不要再次顯示，就請按這裏。若您認為它是對的，但不想" -+"加入字典中，可以按略過或全部略過。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 138 -@@ -297,8 +299,8 @@ - #, no-c-format - msgid "" - "\n" --"

      Click here to replace all occurrences of the unknown text with the text in " --"the edit box above (to the left).

      \n" -+"

      Click here to replace all occurrences of the unknown text with the text " -+"in the edit box above (to the left).

      \n" - "      " - msgstr "" - "\n" -@@ -322,16 +324,20 @@ - #, no-c-format - msgid "" - "\n" --"

      If the unknown word is misspelled, you should check if the correction for it " --"is available and if it is, click on it. If none of the words in this list is a " --"good replacement you may type the correct word in the edit box above.

      \n" --"

      To correct this word click Replace if you want to correct only this " --"occurrence or Replace All if you want to correct all occurrences.

      \n" -+"

      If the unknown word is misspelled, you should check if the correction for " -+"it is available and if it is, click on it. If none of the words in this list " -+"is a good replacement you may type the correct word in the edit box above.\n" -+"

      To correct this word click Replace if you want to correct only " -+"this occurrence or Replace All if you want to correct all occurrences." -+"

      \n" - "      " - msgstr "" - "\n" --"

      如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面按一下。要是沒有，您也可以在上面的方格內輸入正確的詞語。

      \n" --"

      確定後，就按取代來更正。要一次更改全部錯誤，請按全部取代。

      " -+"

      如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面" -+"按一下。要是沒有，您也可以在上面的方格內輸入正確的詞語。

      \n" -+"

      確定後，就按取代來更正。要一次更改全部錯誤，請按全部取代。" - - #. i18n: file ./kdeui/kspellui.ui line 179 - #: kdeui/keditcl2.cpp:833 kutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397 -@@ -344,8 +350,8 @@ - #, no-c-format - msgid "" - "\n" --"

      Click here to replace this occurrence of the unknown text with the text in " --"the edit box above (to the left).

      \n" -+"

      Click here to replace this occurrence of the unknown text with the text " -+"in the edit box above (to the left).

      \n" - "      " - msgstr "" - "\n" -@@ -363,16 +369,18 @@ - #, no-c-format - msgid "" - "\n" --"

      If the unknown word is misspelled, you should type the correction for your " --"misspelled word here or select it from the list below.

      \n" -+"

      If the unknown word is misspelled, you should type the correction for " -+"your misspelled word here or select it from the list below.

      \n" - "

      You can then click Replace if you want to correct only this " - "occurrence of the word or Replace All if you want to correct all " - "occurrences.

      \n" - "      " - msgstr "" - "\n" --"

      如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面按一下。要是沒有，您也可以在方格內輸入正確的詞語。

      \n" --"

      確定後，就按取代來更正這個錯誤。要一次更正全部錯誤，請按全部取代。

      \n" -+"

      如果未知詞語是拼錯字的話，您應檢查一下有沒有適當的更正。有的話，就在它上面" -+"按一下。要是沒有，您也可以在方格內輸入正確的詞語。

      \n" -+"

      確定後，就按取代來更正這個錯誤。要一次更正全部錯誤，請按全部取代" -+"。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 209 -@@ -387,14 +395,15 @@ - msgid "" - "\n" - "

      Click here to let this occurrence of the unknown word remain as is.

      \n" --"

      This action is useful when the word is a name, an acronym, a foreign word or " --"any other unknown word that you want to use but not add to the dictionary.

      \n" -+"

      This action is useful when the word is a name, an acronym, a foreign word " -+"or any other unknown word that you want to use but not add to the dictionary." -+"

      \n" - "      " - msgstr "" - "\n" --"

      按這裡使這個未知詞語保持原狀。" --"

      \n" --"

      當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把它加入字典內時，這個選項便很有用。

      \n" -+"

      按這裡使這個未知詞語保持原狀。

      \n" -+"

      當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把" -+"它加入字典內時，這個選項便很有用。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 223 -@@ -408,16 +417,17 @@ - #, no-c-format - msgid "" - "\n" --"

      Click here to let all occurrences of the unknown word remain as they are.

      " --"\n" --"

      This action is useful when the word is a name, an acronym, a foreign word or " --"any other unknown word that you want to use but not add to the dictionary.

      \n" -+"

      Click here to let all occurrences of the unknown word remain as they are." -+"

      \n" -+"

      This action is useful when the word is a name, an acronym, a foreign word " -+"or any other unknown word that you want to use but not add to the dictionary." -+"

      \n" - "      " - msgstr "" - "\n" --"

      按這裡使所有未知詞語保持原狀。" --"

      \n" --"

      當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把它加入字典內時，這個選項便很有用。

      \n" -+"

      按這裡使所有未知詞語保持原狀。

      \n" -+"

      當這個詞語是一個名字、縮寫、外語或其他未知詞語，而您希望使用它，但又不想把" -+"它加入字典內時，這個選項便很有用。

      \n" - "      " - - #. i18n: file ./kdeui/kspellui.ui line 248 -@@ -430,7 +440,7 @@ - #: kdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383 - #, no-c-format - msgid "English" --msgstr "英文" -+msgstr "英語" - - #. i18n: file ./kdeui/kspellui.ui line 261 - #: rc.cpp:206 rc.cpp:386 -@@ -454,16 +464,17 @@ - #: rc.cpp:220 - #, no-c-format - msgid "" --"This dialog provides you with notification and details of scripting errors that " --"occur on web pages. In many cases it is due to an error in the web site as " --"designed by its author. In other cases it is the result of a programming error " --"in Konqueror. If you suspect the former, please contact the webmaster of the " --"site in question. Conversely if you suspect an error in Konqueror, please file " --"a bug report at http://bugs.kde.org/. A test case which illustrates the " --"problem will be appreciated." --msgstr "" --"這個對話框會告訴您網頁上 Javascript 錯誤的詳細資料。這些錯誤大部份是網頁作者所犯的。如果不是，那就是 Konqueror " --"的程式碼有問題了。前者可以透過聯絡網站管理員來解決，後者則請報告至 http://bugs.kde.org/，可以附上測試案例的話更好。" -+"This dialog provides you with notification and details of scripting errors " -+"that occur on web pages. In many cases it is due to an error in the web " -+"site as designed by its author. In other cases it is the result of a " -+"programming error in Konqueror. If you suspect the former, please contact " -+"the webmaster of the site in question. Conversely if you suspect an error " -+"in Konqueror, please file a bug report at http://bugs.kde.org/. A test case " -+"which illustrates the problem will be appreciated." -+msgstr "" -+"這個對話框會告訴您網頁上 Javascript 錯誤的詳細資料。這些錯誤大部份是網頁作者" -+"所犯的。如果不是，那就是 Konqueror 的程式碼有問題了。前者可以透過聯絡網站管理" -+"員來解決，後者則請報告至 http://bugs.kde.org/，可以附上測試案例的話更好。" - - #. i18n: file ./khtml/kjserrordlg.ui line 39 - #: kdeui/kstdaction_p.h:58 kdeui/kstdguiitem.cpp:161 rc.cpp:226 -@@ -529,8 +540,8 @@ - #: rc.cpp:274 - #, no-c-format - msgid "" --"This is the default language that the spell checker will use. The drop down box " --"will list all of the dictionaries of your existing languages." -+"This is the default language that the spell checker will use. The drop down " -+"box will list all of the dictionaries of your existing languages." - msgstr "這是拼字檢查程式預設使用的語言。對話盒中會列出您目前語言的所有字典。" - - #. i18n: file ./kspell2/ui/configui.ui line 34 -@@ -550,9 +561,10 @@ - #: rc.cpp:283 - #, no-c-format - msgid "" --"If checked, the \"spell as you type\" mode is active and all misspelled words " --"are immediately highlighted." --msgstr "如果開啟此選項的話，會開啟「即時拼字檢查」模式，所有拼錯的字都會立即標出。" -+"If checked, the \"spell as you type\" mode is active and all misspelled " -+"words are immediately highlighted." -+msgstr "" -+"如果開啟此選項的話，會開啟「即時拼字檢查」模式，所有拼錯的字都會立即標出。" - - #. i18n: file ./kspell2/ui/configui.ui line 56 - #: rc.cpp:286 -@@ -564,9 +576,12 @@ - #: rc.cpp:289 - #, no-c-format - msgid "" --"If checked, words that consist of only uppercase letters are not spell checked. " --"This is useful if you have a lot of acronyms, such as KDE for example." --msgstr "如果開啟此選項的話，全部大寫的單字不會做拼字檢查。如果您有一大堆的頭字語如 KDE 之類的，這應該會很有用。" -+"If checked, words that consist of only uppercase letters are not spell " -+"checked. This is useful if you have a lot of acronyms, such as KDE for " -+"example." -+msgstr "" -+"如果開啟此選項的話，全部大寫的單字不會做拼字檢查。如果您有一大堆的頭字語如 " -+"KDE 之類的，這應該會很有用。" - - #. i18n: file ./kspell2/ui/configui.ui line 67 - #: rc.cpp:292 -@@ -580,7 +595,9 @@ - msgid "" - "If checked, concatenated words made of existing words are not spell checked. " - "This is useful in some languages." --msgstr "如果開啟此選項，由已存在的字形成的連接字不會做拼字檢查。這對某些語言是滿有用的。" -+msgstr "" -+"如果開啟此選項，由已存在的字形成的連接字不會做拼字檢查。這對某些語言是滿有用" -+"的。" - - #. i18n: file ./kspell2/ui/configui.ui line 80 - #: rc.cpp:298 -@@ -598,9 +615,11 @@ - #: rc.cpp:304 - #, no-c-format - msgid "" --"To add a word you want to ignore, type it in the top edit field and click Add. " --"To remove a word, highlight it in the list and click Remove." --msgstr "要新增忽略的字，請在上面欄位中輸入並按下「新增」。要移除一個字，請選擇後按下「移除」。" -+"To add a word you want to ignore, type it in the top edit field and click " -+"Add. To remove a word, highlight it in the list and click Remove." -+msgstr "" -+"要新增忽略的字，請在上面欄位中輸入並按下「新增」。要移除一個字，請選擇後按下" -+"「移除」。" - - #. i18n: file ./kspell2/ui/kspell2ui.ui line 282 - #: rc.cpp:431 -@@ -630,9 +649,10 @@ - #: rc.cpp:449 - #, no-c-format - msgid "" --"If true .local domain will be browsed. It is always link-local, using multicast " --"DNS." --msgstr "如果設為真，則會瀏覽本地端網路。它會使用群體廣播 (multicast) DNS 伺服器。" -+"If true .local domain will be browsed. It is always link-local, using " -+"multicast DNS." -+msgstr "" -+"如果設為真，則會瀏覽本地端網路。它會使用群體廣播 (multicast) DNS 伺服器。" - - #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 18 - #: rc.cpp:452 -@@ -652,7 +672,9 @@ - msgid "" - "Select publishing in LAN (multicast) or WAN (unicast, needs configured DNS " - "server)" --msgstr "請選擇要在 LAN（使用群體廣播 multicast）還是 WAN（需要設定 DNS 伺服器）上發布。" -+msgstr "" -+"請選擇要在 LAN（使用群體廣播 multicast）還是 WAN（需要設定 DNS 伺服器）上發" -+"布。" - - #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 26 - #: rc.cpp:461 -@@ -660,7 +682,9 @@ - msgid "" - "Specifies if publishing should be by default link-local using multicast DNS " - "(LAN) or 'wide-area' using normal DNS server (WAN)." --msgstr "這裡讓您指定發布時預設是要在 LAN 上，使用群體廣播 DNS 伺服器，還是在 WAN 上使用一般的 DNS 伺服器。" -+msgstr "" -+"這裡讓您指定發布時預設是要在 LAN 上，使用群體廣播 DNS 伺服器，還是在 WAN 上使" -+"用一般的 DNS 伺服器。" - - #. i18n: file ./dnssd/kcm_kdnssd.kcfg line 34 - #: rc.cpp:464 -@@ -672,19 +696,20 @@ - #: rc.cpp:467 - #, no-c-format - msgid "" --"Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This must " --"match domain specified in /etc/mdnsd.conf. This value is used only if " -+"Domain name for publishing using 'wide-area' (normal DNS) ZeroConf. This " -+"must match domain specified in /etc/mdnsd.conf. This value is used only if " - "PublishType is set to WAN.\n" - msgstr "" --"這裡填寫要在 WAN ZeroConf 上使用的網域名稱。必須要跟 /etc/mdnsd.conf 中指定的網域一樣。這只在發布型態設定為 WAN 時使用。\n" -+"這裡填寫要在 WAN ZeroConf 上使用的網域名稱。必須要跟 /etc/mdnsd.conf 中指定的" -+"網域一樣。這只在發布型態設定為 WAN 時使用。\n" - - #: _translatorinfo.cpp:1 - msgid "" - "_: NAME OF TRANSLATORS\n" - "Your names" - msgstr "" --"Chih-Wei Huang,Kenduest Lee,Jouston Huang (Huang, Jiun-Jeng),Kenduest Lee,Wang " --"Jian,Anthony Fok,Yuan-Chen Cheng,Wang Jian,Funda Wang,Sarah Smith,Xiong " -+"Chih-Wei Huang,Kenduest Lee,Jouston Huang (Huang, Jiun-Jeng),Kenduest Lee," -+"Wang Jian,Anthony Fok,Yuan-Chen Cheng,Wang Jian,Funda Wang,Sarah Smith,Xiong " - "Jiang,Chia-Lin, Kao,Stanley Wong" - - #: _translatorinfo.cpp:3 -@@ -692,11 +717,11 @@ - "_: EMAIL OF TRANSLATORS\n" - "Your emails" - msgstr "" --",,,," --",,,,,," --",,,,,," --",,,,,," --",," -+",,,,,,,,,,,,,,,,,," -+",,,,,," -+"" - - #: common_texts.cpp:24 kdeui/kconfigdialog.cpp:56 kutils/kcmultidialog.cpp:59 - #: kutils/kcmultidialog.h:104 kutils/ksettings/dialog.cpp:571 -@@ -925,11 +950,11 @@ - - #: common_texts.cpp:94 - msgid "&New Window..." --msgstr "開新視窗(&N)..." -+msgstr "開新視窗(&N)…" - - #: common_texts.cpp:95 - msgid "New &Window..." --msgstr "開新視窗(&W)..." -+msgstr "開新視窗(&W)…" - - #: common_texts.cpp:96 - msgid "&New Window" -@@ -953,11 +978,11 @@ - - #: common_texts.cpp:101 - msgid "Open..." --msgstr "開啟..." -+msgstr "開啟…" - - #: common_texts.cpp:102 kdeui/kstdaction_p.h:41 kdeui/kstdguiitem.cpp:226 - msgid "&Open..." --msgstr "開啟(&O)..." -+msgstr "開啟(&O)…" - - #: common_texts.cpp:104 - msgid "&Cut" -@@ -994,15 +1019,15 @@ - - #: common_texts.cpp:112 - msgid "Save As..." --msgstr "另存新檔..." -+msgstr "另存新檔…" - - #: common_texts.cpp:113 - msgid "S&ave As..." --msgstr "另存新檔...(&A)" -+msgstr "另存新檔…(&A)" - - #: common_texts.cpp:116 kdeui/kstdaction_p.h:47 kdeui/kstdguiitem.cpp:207 - msgid "&Print..." --msgstr "列印(&P)..." -+msgstr "列印(&P)…" - - #: common_texts.cpp:117 kdeui/kmessagebox.cpp:837 kdeui/kmessagebox.cpp:867 - msgid "Sorry" -@@ -1031,7 +1056,7 @@ - - #: common_texts.cpp:126 - msgid "Roman" --msgstr "正體" -+msgstr "羅馬體" - - #: common_texts.cpp:132 kdeui/kmessagebox.cpp:913 - msgid "Information" -@@ -1051,7 +1076,7 @@ - - #: common_texts.cpp:136 - msgid "Browse..." --msgstr "瀏覽..." -+msgstr "瀏覽…" - - #: common_texts.cpp:137 kdecore/kkeyserver_x11.cpp:127 kdeui/keditcl2.cpp:107 - #: kdeui/keditcl2.cpp:120 kdeui/keditcl2.cpp:377 kdeui/keditcl2.cpp:390 -@@ -1067,7 +1092,7 @@ - - #: common_texts.cpp:139 - msgid "&Properties..." --msgstr "內容(&P)..." -+msgstr "內容(&P)…" - - #: common_texts.cpp:140 kdeui/kstdguiitem.cpp:279 - msgid "Properties" -@@ -1184,7 +1209,7 @@ - - #: common_texts.cpp:171 kdeui/kstdaction_p.h:65 - msgid "&Replace..." --msgstr "取代(&R)..." -+msgstr "取代(&R)…" - - #: common_texts.cpp:173 kabc/ldapconfigwidget.cpp:156 - #: kabc/ldapconfigwidget.cpp:168 kdeui/klineedit.cpp:914 -@@ -1210,7 +1235,7 @@ - - #: common_texts.cpp:179 kdeui/kstdaction_p.h:61 khtml/khtml_part.cpp:4258 - msgid "&Find..." --msgstr "尋找(&F)..." -+msgstr "尋找(&F)…" - - #: common_texts.cpp:180 kdeui/kstdaction_p.h:62 - msgid "Find &Next" -@@ -1226,11 +1251,11 @@ - - #: common_texts.cpp:184 - msgid "&Edit Bookmarks..." --msgstr "編輯書籤(&E)..." -+msgstr "編輯書籤(&E)…" - - #: common_texts.cpp:186 kdeui/kstdaction_p.h:93 - msgid "&Spelling..." --msgstr "拼字檢查(&S)..." -+msgstr "拼字檢查(&S)…" - - #: common_texts.cpp:187 kdeui/kstdaction.cpp:238 kdeui/kstdaction_p.h:95 - msgid "Show &Menubar" -@@ -1247,11 +1272,11 @@ - - #: common_texts.cpp:190 - msgid "Configure &Key Bindings..." --msgstr "設定按鍵連結(&K)..." -+msgstr "設定按鍵連結(&K)…" - - #: common_texts.cpp:191 - msgid "&Preferences..." --msgstr "偏好設定(&P)..." -+msgstr "偏好設定(&P)…" - - #: common_texts.cpp:193 kdeui/kmessagebox.cpp:928 - msgid "Do not show this message again" -@@ -1684,7 +1709,9 @@ - msgid "" - "Address book file %1 not found! Make sure the old address book is " - "located there and you have read permission for this file." --msgstr "找不到地址簿檔 %1！請確定以往的地址簿真的位於那裡，並且您擁有它的讀取權。" -+msgstr "" -+"找不到地址簿檔 %1！請確定以往的地址簿真的位於那裡，並且您擁有它的讀取" -+"權。" - - #: kabc/kab2kabc.cpp:435 - msgid "Kab to Kabc Converter" -@@ -1832,11 +1859,11 @@ - - #: kabc/distributionlistdialog.cpp:152 - msgid "New List..." --msgstr "新清單..." -+msgstr "新清單…" - - #: kabc/distributionlistdialog.cpp:156 - msgid "Rename List..." --msgstr "重新命名清單..." -+msgstr "重新命名清單…" - - #: kabc/distributionlistdialog.cpp:160 kabc/distributionlisteditor.cpp:137 - msgid "Remove List" -@@ -1870,7 +1897,7 @@ - - #: kabc/distributionlistdialog.cpp:198 - msgid "Change Email..." --msgstr "變更 Email..." -+msgstr "變更 Email…" - - #: kabc/distributionlistdialog.cpp:202 kabc/distributionlisteditor.cpp:152 - msgid "Remove Entry" -@@ -2387,7 +2414,8 @@ - #: kded/kde-menu.cpp:111 - msgid "" - "KDE Menu query tool.\n" --"This tool can be used to find in which menu a specific application is shown.\n" -+"This tool can be used to find in which menu a specific application is " -+"shown.\n" - "The --highlight option can be used to visually indicate to the user where\n" - "in the KDE menu a specific application is located." - msgstr "" -@@ -2410,9 +2438,10 @@ - - #: kded/kde-menu.cpp:142 - msgid "" --"You must specify at least one of --print-menu-id, --print-menu-name or " --"--highlight" --msgstr "你最少要指定下列一項 --print-menu-id, --print-menu-name 或 --highlight " -+"You must specify at least one of --print-menu-id, --print-menu-name or --" -+"highlight" -+msgstr "" -+"你最少要指定下列一項 --print-menu-id, --print-menu-name 或 --highlight " - - #: kded/kde-menu.cpp:164 - msgid "No menu item '%1'." -@@ -2431,16 +2460,12 @@ - msgstr "新的主機名稱" - - #: kded/khostname.cpp:79 --msgid "" --"Error: HOME environment variable not set.\n" --msgstr "" --"錯誤: 沒有設定 HOME 環境變數。\n" -+msgid "Error: HOME environment variable not set.\n" -+msgstr "錯誤: 沒有設定 HOME 環境變數。\n" - - #: kded/khostname.cpp:88 --msgid "" --"Error: DISPLAY environment variable not set.\n" --msgstr "" --"錯誤: 沒有設定 DISPLAY 環境變數。\n" -+msgid "Error: DISPLAY environment variable not set.\n" -+msgstr "錯誤: 沒有設定 DISPLAY 環境變數。\n" - - #: kded/khostname.cpp:359 - msgid "KDontChangeTheHostName" -@@ -2527,7 +2552,7 @@ - - #: kded/kbuildsycoca.cpp:750 - msgid "Reloading KDE configuration, please wait..." --msgstr "正在重新載入 KDE 組態，請稍候..." -+msgstr "正在重新載入 KDE 組態，請稍候…" - - #: kded/kbuildsycoca.cpp:751 - msgid "KDE Configuration Manager" -@@ -2563,7 +2588,7 @@ - - #: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2596 - msgid "Ta&b Page Mode" --msgstr "標籤頁模式 (&B)" -+msgstr "標籤頁模式(&B)" - - #: kmdi/kmdiguiclient.cpp:144 kmdi/kmdimainfrm.cpp:2597 - msgid "I&DEAl Mode" -@@ -2671,7 +2696,7 @@ - - #: kmdi/kmdimainfrm.cpp:2633 - msgid "&Dock/Undock" --msgstr "&Dock/Undock..." -+msgstr "&Dock/Undock…" - - #: kmdi/kmdichildfrmcaption.cpp:71 kmdi/kmdichildview.cpp:63 - #: kmdi/kmdichildview.cpp:89 -@@ -2730,15 +2755,15 @@ - - #: kdecore/kapplication.cpp:931 - msgid "" --"_: Dear Translator! Translate this string to the string 'LTR' in left-to-right " --"languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew " --"and Arabic) to get proper widget layout." -+"_: Dear Translator! Translate this string to the string 'LTR' in left-to-" -+"right languages (as english) or to 'RTL' in right-to-left languages (such as " -+"Hebrew and Arabic) to get proper widget layout." - msgstr "LTR" - - #: kdecore/kapplication.cpp:1404 - msgid "" --"There was an error setting up inter-process communications for KDE. The message " --"returned by the system was:\n" -+"There was an error setting up inter-process communications for KDE. The " -+"message returned by the system was:\n" - "\n" - msgstr "" - "在設定 KDE 的跨進程通訊時發生了錯誤。\n" -@@ -2899,14 +2924,13 @@ - - #: kdecore/kapplication.cpp:1476 - msgid "" --"sets the client geometry of the main widget - see man X for the argument format" -+"sets the client geometry of the main widget - see man X for the argument " -+"format" - msgstr "設定主視窗部件的客戶區大小和位置 - 請參考 man X 取得參數的格式。" - - #: kdecore/kapplication.cpp:1516 --msgid "" --"The style %1 was not found\n" --msgstr "" --"沒有找到 %1 風格\n" -+msgid "The style %1 was not found\n" -+msgstr "沒有找到 %1 風格\n" - - #: kdecore/kapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044 - #: kstyles/web/webstyle.cpp:1604 -@@ -2959,16 +2983,12 @@ - "%1" - - #: kdecore/kapplication.cpp:2637 --msgid "" --"Could not register with DCOP.\n" --msgstr "" --"無法在 DCOP 上登錄。\n" -+msgid "Could not register with DCOP.\n" -+msgstr "無法在 DCOP 上登錄。\n" - - #: kdecore/kapplication.cpp:2672 --msgid "" --"KLauncher could not be reached via DCOP.\n" --msgstr "" --"無法透過 DCOP 呼叫 KLauncher。\n" -+msgid "KLauncher could not be reached via DCOP.\n" -+msgstr "無法透過 DCOP 呼叫 KLauncher。\n" - - #: kdecore/kwinmodule.cpp:456 - #, c-format -@@ -2976,16 +2996,12 @@ - msgstr "桌面 %1" - - #: kdecore/kconfigbackend.cpp:1107 kdecore/kconfigbackend.cpp:1116 --msgid "" --"Will not save configuration.\n" --msgstr "" --"將不會儲存設定。\n" -+msgid "Will not save configuration.\n" -+msgstr "將不會儲存設定。\n" - - #: kdecore/kconfigbackend.cpp:1109 kdecore/kconfigbackend.cpp:1117 --msgid "" --"Configuration file \"%1\" not writable.\n" --msgstr "" --"設定檔 \"%1\" 是不可寫入的。\n" -+msgid "Configuration file \"%1\" not writable.\n" -+msgstr "設定檔 \"%1\" 是不可寫入的。\n" - - #: kdecore/kconfigbackend.cpp:1124 - msgid "Please contact your system administrator." -@@ -3013,16 +3029,12 @@ - msgstr "這個應用程式是由某個不願透露姓名的人編寫。" - - #: kdecore/kcmdlineargs.cpp:629 --msgid "" --"Please use http://bugs.kde.org to report bugs.\n" --msgstr "" --"請使用 http://bugs.kde.org 報告問題。\n" -+msgid "Please use http://bugs.kde.org to report bugs.\n" -+msgstr "請使用 http://bugs.kde.org 報告問題。\n" - - #: kdecore/kcmdlineargs.cpp:632 kdecore/kcmdlineargs.cpp:634 --msgid "" --"Please report bugs to %1.\n" --msgstr "" --"請回報問題到 %1。\n" -+msgid "Please report bugs to %1.\n" -+msgstr "請回報問題到 %1。\n" - - #: kdecore/kcmdlineargs.cpp:660 - msgid "Unexpected argument '%1'." -@@ -3049,10 +3061,8 @@ - msgstr "[%1-選項]" - - #: kdecore/kcmdlineargs.cpp:816 --msgid "" --"Usage: %1 %2\n" --msgstr "" --"用法：%1 %2\n" -+msgid "Usage: %1 %2\n" -+msgstr "用法：%1 %2\n" - - #: kdecore/kcmdlineargs.cpp:819 - msgid "Generic options" -@@ -3216,7 +3226,7 @@ - - #: kdecore/kstdaccel.cpp:81 kdeui/keditcl2.cpp:976 - msgid "Go to Line" --msgstr "跳至行數" -+msgstr "跳至列數" - - #: kdecore/kstdaccel.cpp:82 - msgid "Add Bookmark" -@@ -3496,10 +3506,10 @@ - - #: kdecore/klocale.cpp:217 - msgid "" --"_: Dear translator, please do not translate this string in any form, but pick " --"the _right_ value out of NoPlural/TwoForms/French... If not sure what to do " --"mail thd@kde.org and coolo@kde.org, they will tell you. Better leave that out " --"if unsure, the programs will crash!!\n" -+"_: Dear translator, please do not translate this string in any form, but " -+"pick the _right_ value out of NoPlural/TwoForms/French... If not sure what " -+"to do mail thd@kde.org and coolo@kde.org, they will tell you. Better leave " -+"that out if unsure, the programs will crash!!\n" - "Definition of PluralForm - to be set by the translator of kdelibs.po" - msgstr "NoPlural" - -@@ -4003,7 +4013,7 @@ - - #: kdecore/kcharsets.cpp:44 khtml/khtml_part.cpp:280 - msgid "Arabic" --msgstr "阿拉伯文" -+msgstr "阿拉伯語" - - #: kdecore/kcharsets.cpp:45 khtml/khtml_part.cpp:281 - msgid "Baltic" -@@ -4015,41 +4025,41 @@ - - #: kdecore/kcharsets.cpp:47 - msgid "Chinese Simplified" --msgstr "簡體中文" -+msgstr "簡化字漢語" - - #: kdecore/kcharsets.cpp:48 - msgid "Chinese Traditional" --msgstr "繁體中文" -+msgstr "傳統字漢語" - - #: kdecore/kcharsets.cpp:49 - msgid "Cyrillic" --msgstr "斯拉夫文" -+msgstr "斯拉夫語" - - #: kdecore/kcharsets.cpp:50 khtml/khtml_part.cpp:284 - msgid "Greek" --msgstr "希臘文" -+msgstr "希臘語" - - #: kdecore/kcharsets.cpp:51 kdeui/ksconfig.cpp:235 kdeui/ksconfig.cpp:395 - #: kdeui/ksconfig.cpp:656 khtml/khtml_part.cpp:285 - msgid "Hebrew" --msgstr "希伯來文" -+msgstr "希伯來語" - - #: kdecore/kcharsets.cpp:52 khtml/khtml_part.cpp:286 - msgid "Japanese" --msgstr "日文" -+msgstr "日語" - - #: kdecore/kcharsets.cpp:53 - msgid "Korean" --msgstr "韓文" -+msgstr "韓語" - - #: kdecore/kcharsets.cpp:54 - msgid "Thai" --msgstr "泰文" -+msgstr "泰語" - - #: kdecore/kcharsets.cpp:55 kdeui/ksconfig.cpp:240 kdeui/ksconfig.cpp:400 - #: kdeui/ksconfig.cpp:661 khtml/khtml_part.cpp:290 - msgid "Turkish" --msgstr "土耳其文" -+msgstr "土耳其語" - - #: kdecore/kcharsets.cpp:56 khtml/khtml_part.cpp:293 - msgid "Western European" -@@ -4057,7 +4067,7 @@ - - #: kdecore/kcharsets.cpp:57 - msgid "Tamil" --msgstr "坦米爾文" -+msgstr "坦米爾語" - - #: kdecore/kcharsets.cpp:58 - msgid "Unicode" -@@ -4065,11 +4075,11 @@ - - #: kdecore/kcharsets.cpp:59 - msgid "Northern Saami" --msgstr "北部沙米文" -+msgstr "北部沙米語" - - #: kdecore/kcharsets.cpp:60 - msgid "Vietnamese" --msgstr "越南文" -+msgstr "越南語" - - #: kdecore/kcharsets.cpp:61 - msgid "South-Eastern Europe" -@@ -4102,10 +4112,8 @@ - "不只一項。\n" - - #: kdecore/kcompletion.cpp:644 --msgid "" --"There is no matching item available.\n" --msgstr "" --"找不到相符的項目。\n" -+msgid "There is no matching item available.\n" -+msgstr "找不到相符的項目。\n" - - #: kdecore/kcalendarsystemhebrew.cpp:402 - msgid "Tishrey" -@@ -4166,37 +4174,29 @@ - #: kdecore/kaboutdata.cpp:388 - msgid "" - "_: replace this with information about your translation team\n" --"

      KDE is translated into many languages thanks to the work of the translation " --"teams all over the world.

      " --"

      For more information on KDE internationalization visit http://l10n.kde.org

      " --msgstr "" --"

      關於 KDE 的中文化

      " --"
      " --"

      KDE 的繁體中文翻譯是由李爵樺" --"、薛景中" --"、陳更新" --"、以及黃峻崢" --"等人所領導的 ZH-L10N 中文化計劃所主導，以及來自世界各地的志願工作者所義務參與。

      " --"

      如果您想要協助 KDE 的繁體中文化工作，請參考 ZH-L10N 中文化計劃：" --"
      http://i18n.linux.org.tw/" --"
      " --"
      或加入zh-l10n@linux.org.tw郵件論壇。

      " --"
      " --"

      特別感謝

      " --"" --"

      KDE 能夠翻譯成各國語言要特別感謝來自各地的翻譯小組大量的熬夜所得出來的結果。若是需要對於 KDE 國際化更進一步的資訊，請參考 http://i18n.kde.org/

      " --"

      特別感謝的忙碌譯者們：

      Abel Cheung (R.I.P. Deaddog), Joe Man, Jouston, T.H.Hsieh, " --"等等。" -+"

      KDE is translated into many languages thanks to the work of the " -+"translation teams all over the world.

      For more information on KDE " -+"internationalization visit http://l10n.kde." -+"org

      " -+msgstr "" -+"

      關於 KDE 的中文化

      KDE 的傳統字漢語翻譯是由李爵樺、薛景中、陳更新、以及黃峻崢等人所領導的 ZH-L10N 中文化計劃所主" -+"導，以及來自世界各地的志願工作者所義務參與。

      如果您想要協助 KDE 的繁體" -+"中文化工作，請參考 ZH-L10N 中文化計劃：
      http://i18n.linux.org.tw/

      或加入zh-l10n@linux.org.tw郵件論壇。

      特" -+"別感謝