From 452672a0df6fa1ce4dee0361ffdec89e24066c8c Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 15 Oct 2024 00:04:35 -0700 Subject: [PATCH 01/69] Add support for xfixes client_disconnect_mode --- src/modules/xcb/xcbconnection.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/modules/xcb/xcbconnection.cpp b/src/modules/xcb/xcbconnection.cpp index 4cc6f36b..92f29619 100644 --- a/src/modules/xcb/xcbconnection.cpp +++ b/src/modules/xcb/xcbconnection.cpp @@ -173,6 +173,16 @@ XCBConnection::XCBConnection(XCBModule *xcb, const std::string &name) if (xfixes_query && xfixes_query->major_version >= 2) { hasXFixes_ = true; xfixesFirstEvent_ = reply->first_event; + +#ifdef XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE + if (xfixes_query->major_version >= 6) { + FCITX_XCB_INFO() + << "Set XFIXES client disconnect mode to TERMINATE"; + xcb_xfixes_set_client_disconnect_mode( + conn_.get(), + XCB_XFIXES_CLIENT_DISCONNECT_FLAGS_TERMINATE); + } +#endif } } } -- Gitee From 42f847f2086b9b92c20ad4ae89b0bcaa7f9acb59 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 3 Nov 2024 09:31:12 -0800 Subject: [PATCH 02/69] Simplify the xcb tray window logic and avoid SNI transitional flicker between two UI (#1166) Right now both virtual keyboard and classicui want SNI. When transition between two UI, sni is disabled and then re-enabled which is causing XCB tray window being show/hide immediately. This change try to simplify the xcb tray window logic: 1. hide, if suspend() 2. If SNI addon is not available. show on resume If SNI addon is available, defer 1sec and check SNI status. SNI enable/disable logic is updated to allow multiple enable/disable by using a reference counter. disable() is deferred with event dispatcher, to avoid enable/disable causing register/unregistration. --- .../notificationitem/notificationitem.cpp | 23 +++++++++++++------ .../notificationitem/notificationitem.h | 4 +++- .../notificationitem_public.h | 4 ++++ src/ui/classic/xcbui.cpp | 15 ++++-------- src/ui/classic/xcbui.h | 2 -- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/modules/notificationitem/notificationitem.cpp b/src/modules/notificationitem/notificationitem.cpp index b94f7789..1182d32c 100644 --- a/src/modules/notificationitem/notificationitem.cpp +++ b/src/modules/notificationitem/notificationitem.cpp @@ -27,6 +27,7 @@ FCITX_DEFINE_LOG_CATEGORY(notificationitem, "notificationitem"); #define SNI_DEBUG() FCITX_LOGC(::notificationitem, Debug) +#define SNI_ERROR() FCITX_LOGC(::notificationitem, Error) namespace fcitx { @@ -363,7 +364,8 @@ void NotificationItem::maybeScheduleRegister() { } void NotificationItem::enable() { - if (enabled_) { + enabled_ += 1; + if (enabled_ > 1) { return; } @@ -373,13 +375,20 @@ void NotificationItem::enable() { } void NotificationItem::disable() { - if (!enabled_) { - return; - } + instance_->eventDispatcher().scheduleWithContext( + lifeTimeTracker_.watch(), [this]() { + if (enabled_ == 0) { + SNI_ERROR() + << "NotificationItem::disable called without enable."; + return; + } - SNI_DEBUG() << "Disable SNI"; - enabled_ = false; - setRegistered(false); + SNI_DEBUG() << "Disable SNI"; + enabled_ -= 1; + if (enabled_ == 0) { + setRegistered(false); + } + }); } void NotificationItem::cleanUp() { diff --git a/src/modules/notificationitem/notificationitem.h b/src/modules/notificationitem/notificationitem.h index def6b0df..34c1f357 100644 --- a/src/modules/notificationitem/notificationitem.h +++ b/src/modules/notificationitem/notificationitem.h @@ -10,6 +10,7 @@ #include #include #include "fcitx-utils/dbus/servicewatcher.h" +#include "fcitx-utils/trackableobject.h" #include "fcitx/addoninstance.h" #include "fcitx/instance.h" #include "dbus_public.h" @@ -60,10 +61,11 @@ private: eventHandlers_; std::unique_ptr pendingRegisterCall_; std::string sniWatcherName_; - bool enabled_ = false; + uint32_t enabled_ = 0; bool registered_ = false; std::unique_ptr scheduleRegister_; HandlerTable handlers_; + TrackableObject lifeTimeTracker_; }; } // namespace fcitx diff --git a/src/modules/notificationitem/notificationitem_public.h b/src/modules/notificationitem/notificationitem_public.h index ab06e6a5..04039149 100644 --- a/src/modules/notificationitem/notificationitem_public.h +++ b/src/modules/notificationitem/notificationitem_public.h @@ -7,6 +7,7 @@ #ifndef _FCITX_MODULES_NOTIFICATIONITEM_NOTIFICATIONITEM_PUBLIC_H_ #define _FCITX_MODULES_NOTIFICATIONITEM_NOTIFICATIONITEM_PUBLIC_H_ +#include #include namespace fcitx { @@ -15,12 +16,15 @@ using NotificationItemCallback = std::function; } // namespace fcitx +// When enable is called FCITX_ADDON_DECLARE_FUNCTION(NotificationItem, enable, void()); +// Callback will be called when registered changed. FCITX_ADDON_DECLARE_FUNCTION( NotificationItem, watch, std::unique_ptr>( NotificationItemCallback)); FCITX_ADDON_DECLARE_FUNCTION(NotificationItem, disable, void()); +// Can be used to query current state. FCITX_ADDON_DECLARE_FUNCTION(NotificationItem, registered, bool()); #endif // _FCITX_MODULES_NOTIFICATIONITEM_NOTIFICATIONITEM_PUBLIC_H_ diff --git a/src/ui/classic/xcbui.cpp b/src/ui/classic/xcbui.cpp index 5a29edb8..cdb2dd44 100644 --- a/src/ui/classic/xcbui.cpp +++ b/src/ui/classic/xcbui.cpp @@ -742,15 +742,15 @@ int XCBUI::scaledDPI(int dpi) { return targetDPI; } -void XCBUI::resume() { updateTray(); } +void XCBUI::resume() {} void XCBUI::suspend() { inputWindow_->update(nullptr); - updateTray(); + trayWindow_->suspend(); } -void XCBUI::updateTray() { - bool enableTray = enableTray_ && !parent_->suspended(); +void XCBUI::setEnableTray(bool enable) { + bool enableTray = enable && !parent_->suspended(); if (enableTray) { trayWindow_->resume(); } else { @@ -758,13 +758,6 @@ void XCBUI::updateTray() { } } -void XCBUI::setEnableTray(bool enable) { - if (enable != enableTray_) { - enableTray_ = enable; - updateTray(); - } -} - void XCBUI::scheduleUpdateScreen() { initScreenEvent_->setNextInterval(100000); initScreenEvent_->setOneShot(); diff --git a/src/ui/classic/xcbui.h b/src/ui/classic/xcbui.h index d381ab9e..b2e90eda 100644 --- a/src/ui/classic/xcbui.h +++ b/src/ui/classic/xcbui.h @@ -73,7 +73,6 @@ private: void refreshManager(); void readXSettings(); void initScreen(); - void updateTray(); void scheduleUpdateScreen(); static void destroyCairoDevice(cairo_device_t *device); @@ -90,7 +89,6 @@ private: bool needFreeColorMap_ = false; std::unique_ptr inputWindow_; std::unique_ptr trayWindow_; - bool enableTray_ = false; std::string iconThemeName_; -- Gitee From 66a729ac51e8ce79a9da79e382076e678f9a721b Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Tue, 5 Nov 2024 23:28:58 -0500 Subject: [PATCH 03/69] initial support emscripten build (#1170) --- CMakeLists.txt | 1 + cmake/Fcitx5CompilerSettings.cmake | 2 +- src/lib/fcitx-utils/endian_p.h | 2 +- src/modules/spell/CMakeLists.txt | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac1e1dcb..aa90bad4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ option(ENABLE_XDGAUTOSTART "Enable xdg autostart desktop file installation" On) option(USE_FLATPAK_ICON "Use flatpak icon name for desktop files" Off) option(ENABLE_EMOJI "Enable emoji module" On) option(ENABLE_LIBUUID "Use libuuid for uuid generation" On) +option(BUILD_SPELL_DICT "Build en_dict.fscd for English spell check" On) set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for follwing app by default.") if (ENABLE_EMOJI) diff --git a/cmake/Fcitx5CompilerSettings.cmake b/cmake/Fcitx5CompilerSettings.cmake index 66136f0b..5e766d30 100644 --- a/cmake/Fcitx5CompilerSettings.cmake +++ b/cmake/Fcitx5CompilerSettings.cmake @@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}") -if(NOT APPLE) +if(NOT APPLE AND NOT EMSCRIPTEN) set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") endif() diff --git a/src/lib/fcitx-utils/endian_p.h b/src/lib/fcitx-utils/endian_p.h index d524dfa2..524a26fa 100644 --- a/src/lib/fcitx-utils/endian_p.h +++ b/src/lib/fcitx-utils/endian_p.h @@ -8,7 +8,7 @@ #define _FCITX_UTILS_ENDIAN_P_H_ #include -#if defined(__linux__) || defined(__GLIBC__) +#if defined(__linux__) || defined(__GLIBC__) || defined(__EMSCRIPTEN__) #include #elif defined(__APPLE__) diff --git a/src/modules/spell/CMakeLists.txt b/src/modules/spell/CMakeLists.txt index 094e1a58..ab1ce4df 100644 --- a/src/modules/spell/CMakeLists.txt +++ b/src/modules/spell/CMakeLists.txt @@ -17,6 +17,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/spell.conf" DESTINATION "${FCITX_INST COMPONENT config) fcitx5_export_module(Spell TARGET spell BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS spell_public.h INSTALL) +if (BUILD_SPELL_DICT) set(DICT_COMP_SRC comp_spell_dict.cpp ) @@ -46,3 +47,4 @@ add_custom_command( "${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}") add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}") install(FILES "${SPELL_EN_DICT}" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/spell") +endif() -- Gitee From 8e9040c9ea74c9f81903a608239f1280d8610322 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 5 Nov 2024 20:29:30 -0800 Subject: [PATCH 04/69] Reset hover index when window is updated or hide (#1168) Fix #1167 --- src/ui/classic/inputwindow.cpp | 2 +- src/ui/classic/waylandinputwindow.cpp | 5 +---- src/ui/classic/xcbinputwindow.cpp | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ui/classic/inputwindow.cpp b/src/ui/classic/inputwindow.cpp index e0ae4f5c..f65c4841 100644 --- a/src/ui/classic/inputwindow.cpp +++ b/src/ui/classic/inputwindow.cpp @@ -271,10 +271,10 @@ void InputWindow::setTextToLayout( } std::pair InputWindow::update(InputContext *inputContext) { + hoverIndex_ = -1; if ((parent_->suspended() && parent_->instance()->currentUI() != "kimpanel") || !inputContext) { - hoverIndex_ = -1; visible_ = false; return {0, 0}; } diff --git a/src/ui/classic/waylandinputwindow.cpp b/src/ui/classic/waylandinputwindow.cpp index c05b4328..5b8bc950 100644 --- a/src/ui/classic/waylandinputwindow.cpp +++ b/src/ui/classic/waylandinputwindow.cpp @@ -5,18 +5,14 @@ * */ #include "waylandinputwindow.h" -#include -#include "fcitx/misc_p.h" #include "common.h" #include "waylandim_public.h" #include "waylandui.h" #include "waylandwindow.h" #include "wl_compositor.h" #include "wl_region.h" -#include "wp_fractional_scale_manager_v1.h" #include "zwp_input_method_v2.h" #include "zwp_input_panel_v1.h" -#include "zwp_input_popup_surface_v2.h" #ifdef __linux__ #include @@ -151,6 +147,7 @@ void WaylandInputWindow::update(fcitx::InputContext *ic) { if (!visible()) { CLASSICUI_DEBUG() << "Hide Wayland Input Window."; + hoverIndex_ = -1; window_->hide(); repaintIC_.unwatch(); panelSurface_.reset(); diff --git a/src/ui/classic/xcbinputwindow.cpp b/src/ui/classic/xcbinputwindow.cpp index 93c3b55c..ac5ef85e 100644 --- a/src/ui/classic/xcbinputwindow.cpp +++ b/src/ui/classic/xcbinputwindow.cpp @@ -165,6 +165,7 @@ void XCBInputWindow::update(InputContext *inputContext) { if (!visible()) { if (oldVisible) { xcb_unmap_window(ui_->connection(), wid_); + hoverIndex_ = -1; } return; } -- Gitee From c927bcdab47486ae4322585e9b2ea7f9b07b2837 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Wed, 6 Nov 2024 08:55:33 -0500 Subject: [PATCH 05/69] move SpellModuleFactory to header (#1171) --- src/modules/spell/spell.cpp | 7 ------- src/modules/spell/spell.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/spell/spell.cpp b/src/modules/spell/spell.cpp index cc3d951f..a4229234 100644 --- a/src/modules/spell/spell.cpp +++ b/src/modules/spell/spell.cpp @@ -7,7 +7,6 @@ #include "spell.h" #include "fcitx-config/iniparser.h" -#include "fcitx/addonmanager.h" #include "config.h" #include "spell-custom.h" #ifdef ENABLE_ENCHANT @@ -110,12 +109,6 @@ Spell::hintForDisplay(const std::string &language, SpellProvider provider, return iter->second->hint(language, word, limit); } - -class SpellModuleFactory : public AddonFactory { - AddonInstance *create(AddonManager *manager) override { - return new Spell(manager->instance()); - } -}; } // namespace fcitx FCITX_ADDON_FACTORY(fcitx::SpellModuleFactory) diff --git a/src/modules/spell/spell.h b/src/modules/spell/spell.h index 60778962..3cfa2db5 100644 --- a/src/modules/spell/spell.h +++ b/src/modules/spell/spell.h @@ -13,6 +13,7 @@ #include "fcitx-utils/i18n.h" #include "fcitx/addonfactory.h" #include "fcitx/addoninstance.h" +#include "fcitx/addonmanager.h" #include "fcitx/instance.h" #include "spell_public.h" @@ -104,6 +105,12 @@ public: private: Spell *parent_; }; + +class SpellModuleFactory : public AddonFactory { + AddonInstance *create(AddonManager *manager) override { + return new Spell(manager->instance()); + } +}; } // namespace fcitx #endif // _FCITX_MODULES_SPELL_SPELL_H_ -- Gitee From 5e52ade745be8d303d87d101ebcb519a4cd77650 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Thu, 7 Nov 2024 00:01:32 -0500 Subject: [PATCH 06/69] disable process functions on iOS (#1173) --- src/lib/fcitx-utils/misc.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/lib/fcitx-utils/misc.cpp b/src/lib/fcitx-utils/misc.cpp index e31993cb..5a31671c 100644 --- a/src/lib/fcitx-utils/misc.cpp +++ b/src/lib/fcitx-utils/misc.cpp @@ -21,13 +21,22 @@ #include #endif #elif defined(__APPLE__) +#include +#if TARGET_OS_OSX #include #endif +#endif namespace fcitx { void startProcess(const std::vector &args, const std::string &workingDirectory) { +#if defined(__APPLE__) && TARGET_OS_IPHONE + FCITX_UNUSED(args); + FCITX_UNUSED(workingDirectory); + FCITX_ERROR() << "Not implemented"; + return; +#else /* exec command */ pid_t child_pid; @@ -67,6 +76,7 @@ void startProcess(const std::vector &args, int status; waitpid(child_pid, &status, 0); } +#endif } std::string getProcessName(pid_t pid) { @@ -111,6 +121,11 @@ std::string getProcessName(pid_t pid) { kvm_close(vm); return result; #elif defined(__APPLE__) +#if TARGET_OS_IPHONE + FCITX_UNUSED(pid); + FCITX_ERROR() << "Not implemented"; + return ""; +#else std::string result; result.reserve(2 * MAXCOMLEN); @@ -118,6 +133,7 @@ std::string getProcessName(pid_t pid) { return {}; } return result; +#endif #else auto path = fmt::format("/proc/{}/exe", pid); if (auto link = fs::readlink(path)) { @@ -135,6 +151,9 @@ ssize_t getline(UniqueCPtr &lineptr, size_t *n, std::FILE *stream) { } bool isInFlatpak() { +#ifdef __APPLE__ + return false; +#else static const bool flatpak = []() { if (checkBoolEnvVar("FCITX_OVERRIDE_FLATPAK")) { return true; @@ -142,6 +161,7 @@ bool isInFlatpak() { return fs::isreg("/.flatpak-info"); }(); return flatpak; +#endif } } // namespace fcitx -- Gitee From 717034ced24ff6df23c2b1e82704b2f853ddc3f0 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sat, 9 Nov 2024 15:48:35 -0800 Subject: [PATCH 07/69] Add more konsole name variant to blacklist. --- src/im/keyboard/keyboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/im/keyboard/keyboard.h b/src/im/keyboard/keyboard.h index ff5573da..8b534150 100644 --- a/src/im/keyboard/keyboard.h +++ b/src/im/keyboard/keyboard.h @@ -98,7 +98,7 @@ FCITX_CONFIGURATION( this, "LongPressBlocklist", _("Applications disabled for long press"), - {"konsole"}}; + {"konsole", "org.kde.konsole"}}; ConditionalHidden longPress{ this, "LongPress", _("Long Press behavior"), "fcitx://config/addon/keyboard/longpress"};); -- Gitee From 0c415a160384546976fb7595b107bb794e86d9ee Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 12 Nov 2024 07:38:55 -0800 Subject: [PATCH 08/69] Refactor EventLoop class and introduce a new virtual-base class EventLoopInterface (#1175) --- src/lib/fcitx-utils/CMakeLists.txt | 3 +- src/lib/fcitx-utils/event.cpp | 86 +++++ src/lib/fcitx-utils/event.h | 63 +--- src/lib/fcitx-utils/event_libuv.cpp | 345 ++++-------------- src/lib/fcitx-utils/event_libuv.h | 249 +++++++++++++ src/lib/fcitx-utils/event_p.h | 21 ++ src/lib/fcitx-utils/event_sdevent.cpp | 115 +++--- ...vent_common.cpp => eventloopinterface.cpp} | 12 +- src/lib/fcitx-utils/eventloopinterface.h | 136 +++++++ 9 files changed, 645 insertions(+), 385 deletions(-) create mode 100644 src/lib/fcitx-utils/event.cpp create mode 100644 src/lib/fcitx-utils/event_libuv.h create mode 100644 src/lib/fcitx-utils/event_p.h rename src/lib/fcitx-utils/{event_common.cpp => eventloopinterface.cpp} (84%) create mode 100644 src/lib/fcitx-utils/eventloopinterface.h diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index dd67e07d..5276f535 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -45,7 +45,6 @@ set(FCITX_UTILS_SOURCES cutf8.cpp color.cpp i18nstring.cpp - event_common.cpp eventdispatcher.cpp library.cpp fs.cpp @@ -60,6 +59,8 @@ set(FCITX_UTILS_SOURCES misc.cpp semver.cpp keydata.cpp + event.cpp + eventloopinterface.cpp ) set(FCITX_UTILS_HEADERS diff --git a/src/lib/fcitx-utils/event.cpp b/src/lib/fcitx-utils/event.cpp new file mode 100644 index 00000000..ce11aebf --- /dev/null +++ b/src/lib/fcitx-utils/event.cpp @@ -0,0 +1,86 @@ + +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ + +#include "event.h" +#include +#include +#include +#include +#include +#include "event_p.h" +#include "eventloopinterface.h" +#include "macros.h" + +namespace fcitx { + +class EventLoopPrivate { +public: + EventLoopPrivate(std::unique_ptr impl) + : impl_(std::move(impl)) {} + + std::unique_ptr impl_; +}; + +EventLoop::EventLoop() : EventLoop(createDefaultEventLoop()) {} + +EventLoop::EventLoop(std::unique_ptr impl) + : d_ptr(std::make_unique(std::move(impl))) {} + +EventLoop::~EventLoop() = default; + +const char *EventLoop::impl() { return defaultEventLoopImplementation(); } + +const char *EventLoop::implementation() const { + FCITX_D(); + return d->impl_->implementation(); +} + +void *EventLoop::nativeHandle() { + FCITX_D(); + return d->impl_->nativeHandle(); +} + +bool EventLoop::exec() { + FCITX_D(); + return d->impl_->exec(); +} + +void EventLoop::exit() { + FCITX_D(); + return d->impl_->exit(); +} + +std::unique_ptr EventLoop::addIOEvent(int fd, IOEventFlags flags, + IOCallback callback) { + FCITX_D(); + return d->impl_->addIOEvent(fd, flags, std::move(callback)); +} + +std::unique_ptr +EventLoop::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) { + FCITX_D(); + return d->impl_->addTimeEvent(clock, usec, accuracy, std::move(callback)); +} + +std::unique_ptr EventLoop::addExitEvent(EventCallback callback) { + FCITX_D(); + return d->impl_->addExitEvent(std::move(callback)); +} + +std::unique_ptr EventLoop::addDeferEvent(EventCallback callback) { + FCITX_D(); + return d->impl_->addDeferEvent(std::move(callback)); +} + +std::unique_ptr EventLoop::addPostEvent(EventCallback callback) { + FCITX_D(); + return d->impl_->addPostEvent(std::move(callback)); +} + +} // namespace fcitx diff --git a/src/lib/fcitx-utils/event.h b/src/lib/fcitx-utils/event.h index 066df708..11b4e8ac 100644 --- a/src/lib/fcitx-utils/event.h +++ b/src/lib/fcitx-utils/event.h @@ -8,76 +8,29 @@ #define _FCITX_UTILS_EVENT_H_ #include -#include #include -#include +#include #include #include #include "fcitxutils_export.h" namespace fcitx { -enum class IOEventFlag { - In = (1 << 0), - Out = (1 << 1), - Err = (1 << 2), - Hup = (1 << 3), - EdgeTrigger = (1 << 4), -}; - -using IOEventFlags = Flags; - -class FCITXUTILS_EXPORT EventLoopException : public std::runtime_error { -public: - EventLoopException(int error); - - FCITX_NODISCARD int error() const { return errno_; } - -private: - int errno_; -}; - -struct FCITXUTILS_EXPORT EventSource { - virtual ~EventSource(); - FCITX_NODISCARD virtual bool isEnabled() const = 0; - virtual void setEnabled(bool enabled) = 0; - FCITX_NODISCARD virtual bool isOneShot() const = 0; - virtual void setOneShot() = 0; -}; - -struct FCITXUTILS_EXPORT EventSourceIO : public EventSource { - FCITX_NODISCARD virtual int fd() const = 0; - virtual void setFd(int fd) = 0; - FCITX_NODISCARD virtual IOEventFlags events() const = 0; - virtual void setEvents(IOEventFlags flags) = 0; - FCITX_NODISCARD virtual IOEventFlags revents() const = 0; -}; - -struct FCITXUTILS_EXPORT EventSourceTime : public EventSource { - virtual void setNextInterval(uint64_t time); - FCITX_NODISCARD virtual uint64_t time() const = 0; - virtual void setTime(uint64_t time) = 0; - FCITX_NODISCARD virtual uint64_t accuracy() const = 0; - virtual void setAccuracy(uint64_t accuracy) = 0; - FCITX_NODISCARD virtual clockid_t clock() const = 0; -}; - -using IOCallback = - std::function; -using TimeCallback = std::function; -using EventCallback = std::function; - -FCITXUTILS_EXPORT uint64_t now(clockid_t clock); - class EventLoopPrivate; class FCITXUTILS_EXPORT EventLoop { public: EventLoop(); + EventLoop(std::unique_ptr impl); virtual ~EventLoop(); bool exec(); void exit(); - static const char *impl(); + /** + * Return the default implementation name. + */ + FCITXUTILS_DEPRECATED static const char *impl(); + + const char *implementation() const; void *nativeHandle(); FCITX_NODISCARD std::unique_ptr diff --git a/src/lib/fcitx-utils/event_libuv.cpp b/src/lib/fcitx-utils/event_libuv.cpp index f84c7e36..6e6580cb 100644 --- a/src/lib/fcitx-utils/event_libuv.cpp +++ b/src/lib/fcitx-utils/event_libuv.cpp @@ -6,13 +6,18 @@ * */ +#include "event_libuv.h" +#include +#include #include #include #include #include +#include #include #include -#include "event.h" +#include "event_p.h" +#include "eventloopinterface.h" #include "log.h" #include "trackableobject.h" @@ -20,6 +25,12 @@ namespace fcitx { +std::unique_ptr createDefaultEventLoop() { + return std::make_unique(); +} + +const char *defaultEventLoopImplementation() { return "libuv"; } + FCITX_DEFINE_LOG_CATEGORY(libuv_logcategory, "libuv"); static int IOEventFlagsToLibUVFlags(IOEventFlags flags) { @@ -46,60 +57,6 @@ void IOEventCallback(uv_poll_t *handle, int status, int events); void TimeEventCallback(uv_timer_t *handle); void PostEventCallback(uv_prepare_t *handle); -enum class LibUVSourceEnableState { Disabled = 0, Oneshot = 1, Enabled = 2 }; - -struct UVLoop { - UVLoop() { uv_loop_init(&loop_); } - - ~UVLoop(); - - operator uv_loop_t *() { return &loop_; } - - uv_loop_t loop_; -}; - -struct LibUVSourceBase { -public: - LibUVSourceBase(std::shared_ptr loop) : loop_(loop) {} - - virtual ~LibUVSourceBase() { cleanup(); }; - void cleanup() { - if (!handle_) { - return; - } - auto *handle = handle_; - handle_->data = nullptr; - handle_ = nullptr; - uv_close(handle, [](uv_handle_t *handle) { free(handle); }); - } - - virtual void init(uv_loop_t *loop) = 0; - - void resetEvent() { - cleanup(); - if (state_ == LibUVSourceEnableState::Disabled) { - return; - } - auto loop = loop_.lock(); - if (!loop) { - return; - } - init(*loop); - } - -protected: - void setState(LibUVSourceEnableState state) { - if (state_ != state) { - state_ = state; - resetEvent(); - } - } - - std::weak_ptr loop_; - uv_handle_t *handle_ = nullptr; - LibUVSourceEnableState state_ = LibUVSourceEnableState::Disabled; -}; - UVLoop::~UVLoop() { // Close and detach all handle. uv_walk( @@ -125,212 +82,58 @@ UVLoop::~UVLoop() { FCITX_DEBUG() << "UVLoop close r2: " << r; } -template -struct LibUVSource : public Interface, public LibUVSourceBase { -public: - LibUVSource(std::shared_ptr loop) - : LibUVSourceBase(std::move(loop)) {} - - bool isEnabled() const override { - return state_ != LibUVSourceEnableState::Disabled; - } - void setEnabled(bool enabled) override { - auto newState = enabled ? LibUVSourceEnableState::Enabled - : LibUVSourceEnableState::Disabled; - setState(newState); - } - - void setOneShot() override { setState(LibUVSourceEnableState::Oneshot); } - - bool isOneShot() const override { - return state_ == LibUVSourceEnableState::Oneshot; - } - - inline HandleType *handle() { - return reinterpret_cast(handle_); - } - - void init(uv_loop_t *loop) override { - handle_ = static_cast(calloc(1, sizeof(HandleType))); - handle_->data = static_cast(this); - if (!setup(loop, handle())) { - free(handle_); - handle_ = nullptr; - } - } - - virtual bool setup(uv_loop_t *loop, HandleType *handle) = 0; -}; - -struct LibUVSourceIO final : public LibUVSource, - public TrackableObject { - LibUVSourceIO(IOCallback _callback, std::shared_ptr loop, int fd, - IOEventFlags flags) - : LibUVSource(loop), fd_(fd), flags_(flags), - callback_(std::make_shared(std::move(_callback))) { - setEnabled(true); - } - - virtual int fd() const override { return fd_; } - - virtual void setFd(int fd) override { - if (fd_ != fd) { - fd_ = fd; - resetEvent(); - } - } - - virtual IOEventFlags events() const override { return flags_; } - - void setEvents(IOEventFlags flags) override { - if (flags_ != flags) { - flags_ = flags; - resetEvent(); - } - } - - IOEventFlags revents() const override { return revents_; } - - bool setup(uv_loop_t *loop, uv_poll_t *poll) override { - if (int err = uv_poll_init(loop, poll, fd_); err < 0) { - FCITX_LIBUV_DEBUG() << "Failed to init poll for fd: " << fd_ - << " with error: " << err; - return false; - } - const auto flags = IOEventFlagsToLibUVFlags(flags_); - if (int err = uv_poll_start(poll, flags, &IOEventCallback); err < 0) { - FCITX_LIBUV_DEBUG() << "Failed to start poll with error: " << err; - return false; - } - return true; +bool LibUVSourceTime::setup(uv_loop_t *loop, uv_timer_t *timer) { + if (int err = uv_timer_init(loop, timer); err < 0) { + FCITX_LIBUV_DEBUG() << "Failed to init timer with error: " << err; + return false; } - - int fd_; - IOEventFlags flags_; - IOEventFlags revents_; - std::shared_ptr callback_; -}; - -struct LibUVSourceTime final : public LibUVSource, - public TrackableObject { - LibUVSourceTime(TimeCallback _callback, std::shared_ptr loop, - uint64_t time, clockid_t clockid, uint64_t accuracy) - : LibUVSource(std::move(loop)), time_(time), clock_(clockid), - accuracy_(accuracy), - callback_(std::make_shared(std::move(_callback))) { - setOneShot(); - } - - virtual uint64_t time() const override { return time_; } - - virtual void setTime(uint64_t time) override { - time_ = time; - resetEvent(); + auto curr = now(clock_); + uint64_t timeout = time_ > curr ? (time_ - curr) : 0; + // libuv is milliseconds + timeout /= 1000; + if (int err = uv_timer_start(timer, &TimeEventCallback, timeout, 0); + err < 0) { + FCITX_LIBUV_DEBUG() << "Failed to start timer with error: " << err; + return false; } - - virtual uint64_t accuracy() const override { return accuracy_; } - - virtual void setAccuracy(uint64_t time) override { accuracy_ = time; } - - void setClock(clockid_t clockid) { - clock_ = clockid; - resetEvent(); - } - - virtual clockid_t clock() const override { return clock_; } - - bool setup(uv_loop_t *loop, uv_timer_t *timer) override { - if (int err = uv_timer_init(loop, timer); err < 0) { - FCITX_LIBUV_DEBUG() << "Failed to init timer with error: " << err; - return false; - } - auto curr = now(clock_); - uint64_t timeout = time_ > curr ? (time_ - curr) : 0; - // libuv is milliseconds - timeout /= 1000; - if (int err = uv_timer_start(timer, &TimeEventCallback, timeout, 0); - err < 0) { - FCITX_LIBUV_DEBUG() << "Failed to start timer with error: " << err; - return false; - } - return true; - } - - uint64_t time_; - clockid_t clock_; - uint64_t accuracy_; - std::shared_ptr callback_; -}; - -struct LibUVSourcePost final : public LibUVSource, - public TrackableObject { - LibUVSourcePost(EventCallback callback, std::shared_ptr loop) - : LibUVSource(std::move(loop)), - callback_(std::make_shared(std::move(callback))) { - setEnabled(true); - } - - bool setup(uv_loop_t *loop, uv_prepare_t *prepare) override { - if (int err = uv_prepare_init(loop, prepare); err < 0) { - FCITX_LIBUV_DEBUG() << "Failed to init prepare with error: " << err; - return false; - } - if (int err = uv_prepare_start(prepare, &PostEventCallback); err < 0) { - FCITX_LIBUV_DEBUG() - << "Failed to start prepare with error: " << err; - return false; - } - return true; + return true; +} +bool LibUVSourcePost::setup(uv_loop_t *loop, uv_prepare_t *prepare) { + if (int err = uv_prepare_init(loop, prepare); err < 0) { + FCITX_LIBUV_DEBUG() << "Failed to init prepare with error: " << err; + return false; } - - std::shared_ptr callback_; -}; - -struct LibUVSourceExit final : public EventSource, - public TrackableObject { - LibUVSourceExit(EventCallback _callback) - : callback_(std::move(_callback)) {} - - bool isOneShot() const override { - return state_ == LibUVSourceEnableState::Oneshot; + if (int err = uv_prepare_start(prepare, &PostEventCallback); err < 0) { + FCITX_LIBUV_DEBUG() << "Failed to start prepare with error: " << err; + return false; } - bool isEnabled() const override { - return state_ != LibUVSourceEnableState::Disabled; + return true; +} +bool LibUVSourceIO::setup(uv_loop_t *loop, uv_poll_t *poll) { + if (int err = uv_poll_init(loop, poll, fd_); err < 0) { + FCITX_LIBUV_DEBUG() + << "Failed to init poll for fd: " << fd_ << " with error: " << err; + return false; } - void setEnabled(bool enabled) override { - state_ = enabled ? LibUVSourceEnableState::Enabled - : LibUVSourceEnableState::Disabled; + const auto flags = IOEventFlagsToLibUVFlags(flags_); + if (int err = uv_poll_start(poll, flags, &IOEventCallback); err < 0) { + FCITX_LIBUV_DEBUG() << "Failed to start poll with error: " << err; + return false; } + return true; +} - void setOneShot() override { state_ = LibUVSourceEnableState::Oneshot; } - - LibUVSourceEnableState state_ = LibUVSourceEnableState::Oneshot; - EventCallback callback_; -}; - -class EventLoopPrivate { -public: - EventLoopPrivate() : loop_(std::make_shared()) {} - - std::shared_ptr loop_; - std::vector> exitEvents_; -}; - -EventLoop::EventLoop() : d_ptr(std::make_unique()) {} - -EventLoop::~EventLoop() {} +EventLoopLibUV::EventLoopLibUV() : loop_(std::make_shared()) {} -const char *EventLoop::impl() { return "libuv"; } +const char *EventLoopLibUV::implementation() const { return "libuv"; } -void *EventLoop::nativeHandle() { - FCITX_D(); - return static_cast(*d->loop_); +void *EventLoopLibUV::nativeHandle() { + return static_cast(*loop_); } -bool EventLoop::exec() { - FCITX_D(); - int r = uv_run(*d->loop_, UV_RUN_DEFAULT); - for (auto iter = d->exitEvents_.begin(); iter != d->exitEvents_.end();) { +bool EventLoopLibUV::exec() { + int r = uv_run(*loop_, UV_RUN_DEFAULT); + for (auto iter = exitEvents_.begin(); iter != exitEvents_.end();) { if (auto *event = iter->get()) { if (event->isEnabled()) { try { @@ -345,7 +148,7 @@ bool EventLoop::exec() { } } if (!iter->isValid()) { - iter = d->exitEvents_.erase(iter); + iter = exitEvents_.erase(iter); } else { ++iter; } @@ -353,10 +156,7 @@ bool EventLoop::exec() { return r >= 0; } -void EventLoop::exit() { - FCITX_D(); - uv_stop(*d->loop_); -} +void EventLoopLibUV::exit() { uv_stop(*loop_); } void IOEventCallback(uv_poll_t *handle, int status, int events) { auto *source = static_cast( @@ -383,11 +183,10 @@ void IOEventCallback(uv_poll_t *handle, int status, int events) { } } -std::unique_ptr EventLoop::addIOEvent(int fd, IOEventFlags flags, - IOCallback callback) { - FCITX_D(); - auto source = std::make_unique(std::move(callback), d->loop_, - fd, flags); +std::unique_ptr +EventLoopLibUV::addIOEvent(int fd, IOEventFlags flags, IOCallback callback) { + auto source = + std::make_unique(std::move(callback), loop_, fd, flags); return source; } @@ -417,22 +216,22 @@ void TimeEventCallback(uv_timer_t *handle) { } std::unique_ptr -EventLoop::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, - TimeCallback callback) { - FCITX_D(); - auto source = std::make_unique( - std::move(callback), d->loop_, usec, clock, accuracy); +EventLoopLibUV::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) { + auto source = std::make_unique(std::move(callback), loop_, + usec, clock, accuracy); return source; } -std::unique_ptr EventLoop::addExitEvent(EventCallback callback) { - FCITX_D(); +std::unique_ptr +EventLoopLibUV::addExitEvent(EventCallback callback) { auto source = std::make_unique(std::move(callback)); - d->exitEvents_.push_back(source->watch()); + exitEvents_.push_back(source->watch()); return source; } -std::unique_ptr EventLoop::addDeferEvent(EventCallback callback) { +std::unique_ptr +EventLoopLibUV::addDeferEvent(EventCallback callback) { return addTimeEvent( CLOCK_MONOTONIC, 0, 0, [callback = std::move(callback)](EventSourceTime *source, uint64_t) { @@ -457,11 +256,9 @@ void PostEventCallback(uv_prepare_t *handle) { } } -std::unique_ptr EventLoop::addPostEvent(EventCallback callback) { - FCITX_D(); - auto source = - std::make_unique(std::move(callback), d->loop_); +std::unique_ptr +EventLoopLibUV::addPostEvent(EventCallback callback) { + auto source = std::make_unique(std::move(callback), loop_); return source; } - } // namespace fcitx diff --git a/src/lib/fcitx-utils/event_libuv.h b/src/lib/fcitx-utils/event_libuv.h new file mode 100644 index 00000000..d379b75a --- /dev/null +++ b/src/lib/fcitx-utils/event_libuv.h @@ -0,0 +1,249 @@ +/* + * SPDX-FileCopyrightText: 2020~2020 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#ifndef _FCITX_UTILS_EVENT_LIBUV_H_ +#define _FCITX_UTILS_EVENT_LIBUV_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace fcitx { + +struct UVLoop { + UVLoop() { uv_loop_init(&loop_); } + + ~UVLoop(); + + operator uv_loop_t *() { return &loop_; } + + uv_loop_t loop_; +}; + +enum class LibUVSourceEnableState { Disabled = 0, Oneshot = 1, Enabled = 2 }; + +struct LibUVSourceBase { +public: + LibUVSourceBase(const std::shared_ptr &loop) : loop_(loop) {} + + virtual ~LibUVSourceBase() { cleanup(); }; + void cleanup() { + if (!handle_) { + return; + } + auto *handle = handle_; + handle_->data = nullptr; + handle_ = nullptr; + uv_close(handle, [](uv_handle_t *handle) { free(handle); }); + } + + virtual void init(uv_loop_t *loop) = 0; + + void resetEvent() { + cleanup(); + if (state_ == LibUVSourceEnableState::Disabled) { + return; + } + auto loop = loop_.lock(); + if (!loop) { + return; + } + init(*loop); + } + +protected: + void setState(LibUVSourceEnableState state) { + if (state_ != state) { + state_ = state; + resetEvent(); + } + } + + std::weak_ptr loop_; + uv_handle_t *handle_ = nullptr; + LibUVSourceEnableState state_ = LibUVSourceEnableState::Disabled; +}; + +template +struct LibUVSource : public Interface, public LibUVSourceBase { +public: + LibUVSource(std::shared_ptr loop) + : LibUVSourceBase(std::move(loop)) {} + + bool isEnabled() const override { + return state_ != LibUVSourceEnableState::Disabled; + } + void setEnabled(bool enabled) override { + auto newState = enabled ? LibUVSourceEnableState::Enabled + : LibUVSourceEnableState::Disabled; + setState(newState); + } + + void setOneShot() override { setState(LibUVSourceEnableState::Oneshot); } + + bool isOneShot() const override { + return state_ == LibUVSourceEnableState::Oneshot; + } + + inline HandleType *handle() { + return reinterpret_cast(handle_); + } + + void init(uv_loop_t *loop) override { + handle_ = static_cast(calloc(1, sizeof(HandleType))); + handle_->data = static_cast(this); + if (!setup(loop, handle())) { + free(handle_); + handle_ = nullptr; + } + } + + virtual bool setup(uv_loop_t *loop, HandleType *handle) = 0; +}; + +struct LibUVSourceIO final : public LibUVSource, + public TrackableObject { + LibUVSourceIO(IOCallback _callback, std::shared_ptr loop, int fd, + IOEventFlags flags) + : LibUVSource(std::move(loop)), fd_(fd), flags_(flags), + callback_(std::make_shared(std::move(_callback))) { + setEnabled(true); + } + + virtual int fd() const override { return fd_; } + + virtual void setFd(int fd) override { + if (fd_ != fd) { + fd_ = fd; + resetEvent(); + } + } + + virtual IOEventFlags events() const override { return flags_; } + + void setEvents(IOEventFlags flags) override { + if (flags_ != flags) { + flags_ = flags; + resetEvent(); + } + } + + IOEventFlags revents() const override { return revents_; } + + bool setup(uv_loop_t *loop, uv_poll_t *poll) override; + + int fd_; + IOEventFlags flags_; + IOEventFlags revents_; + std::shared_ptr callback_; +}; + +struct LibUVSourceTime final : public LibUVSource, + public TrackableObject { + LibUVSourceTime(TimeCallback _callback, std::shared_ptr loop, + uint64_t time, clockid_t clockid, uint64_t accuracy) + : LibUVSource(std::move(loop)), time_(time), clock_(clockid), + accuracy_(accuracy), + callback_(std::make_shared(std::move(_callback))) { + setOneShot(); + } + + uint64_t time() const override { return time_; } + + void setTime(uint64_t time) override { + time_ = time; + resetEvent(); + } + + uint64_t accuracy() const override { return accuracy_; } + + void setAccuracy(uint64_t time) override { accuracy_ = time; } + + void setClock(clockid_t clockid) { + clock_ = clockid; + resetEvent(); + } + + clockid_t clock() const override { return clock_; } + + bool setup(uv_loop_t *loop, uv_timer_t *timer) override; + + uint64_t time_; + clockid_t clock_; + uint64_t accuracy_; + std::shared_ptr callback_; +}; + +struct LibUVSourcePost final : public LibUVSource, + public TrackableObject { + LibUVSourcePost(EventCallback callback, std::shared_ptr loop) + : LibUVSource(std::move(loop)), + callback_(std::make_shared(std::move(callback))) { + setEnabled(true); + } + + bool setup(uv_loop_t *loop, uv_prepare_t *prepare) override; + + std::shared_ptr callback_; +}; + +struct LibUVSourceExit final : public EventSource, + public TrackableObject { + LibUVSourceExit(EventCallback _callback) + : callback_(std::move(_callback)) {} + + bool isOneShot() const override { + return state_ == LibUVSourceEnableState::Oneshot; + } + bool isEnabled() const override { + return state_ != LibUVSourceEnableState::Disabled; + } + void setEnabled(bool enabled) override { + state_ = enabled ? LibUVSourceEnableState::Enabled + : LibUVSourceEnableState::Disabled; + } + + void setOneShot() override { state_ = LibUVSourceEnableState::Oneshot; } + + LibUVSourceEnableState state_ = LibUVSourceEnableState::Oneshot; + EventCallback callback_; +}; + +class EventLoopLibUV : public EventLoopInterface { +public: + EventLoopLibUV(); + bool exec() override; + void exit() override; + const char *implementation() const override; + void *nativeHandle() override; + + FCITX_NODISCARD std::unique_ptr + addIOEvent(int fd, IOEventFlags flags, IOCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addExitEvent(EventCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addDeferEvent(EventCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addPostEvent(EventCallback callback) override; + +private: + std::shared_ptr loop_; + std::vector> exitEvents_; +}; + +} // namespace fcitx + +#endif // _FCITX_UTILS_EVENT_LIBUV_H_ diff --git a/src/lib/fcitx-utils/event_p.h b/src/lib/fcitx-utils/event_p.h new file mode 100644 index 00000000..836a8a08 --- /dev/null +++ b/src/lib/fcitx-utils/event_p.h @@ -0,0 +1,21 @@ +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#ifndef _FCITX_UTILS_EVENT_P_H_ +#define _FCITX_UTILS_EVENT_P_H_ + +#include +#include + +namespace fcitx { + +std::unique_ptr createDefaultEventLoop(); + +const char *defaultEventLoopImplementation(); + +} // namespace fcitx + +#endif // _FCITX_UTILS_EVENT_P_H_ diff --git a/src/lib/fcitx-utils/event_sdevent.cpp b/src/lib/fcitx-utils/event_sdevent.cpp index 0994f5e6..77ba903d 100644 --- a/src/lib/fcitx-utils/event_sdevent.cpp +++ b/src/lib/fcitx-utils/event_sdevent.cpp @@ -14,15 +14,15 @@ #include #include #include +#include "fcitx-utils/macros.h" +#include "eventloopinterface.h" +#include "log.h" +#include "stringutils.h" #if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) #define __INCLUDE_LEVEL__ 2 #endif #include -#include "event.h" -#include "log.h" -#include "macros.h" -#include "stringutils.h" namespace fcitx { @@ -57,6 +57,38 @@ IOEventFlags EpollFlagsToIOEventFlags(uint32_t flags) { } // namespace +class EventLoopSDEvent : public EventLoopInterface { +public: + EventLoopSDEvent(); + ~EventLoopSDEvent(); + bool exec() override; + void exit() override; + const char *implementation() const override; + void *nativeHandle() override; + + FCITX_NODISCARD std::unique_ptr + addIOEvent(int fd, IOEventFlags flags, IOCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addExitEvent(EventCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addDeferEvent(EventCallback callback) override; + FCITX_NODISCARD std::unique_ptr + addPostEvent(EventCallback callback) override; + +private: + std::mutex mutex_; + sd_event *event_ = nullptr; +}; + +std::unique_ptr createDefaultEventLoop() { + return std::make_unique(); +} + +const char *defaultEventLoopImplementation() { return "sd-event"; } + template struct SDEventSourceBase : public Interface { public: @@ -204,42 +236,25 @@ struct SDEventSourceTime : public SDEventSourceBase { std::shared_ptr callback_; }; -class EventLoopPrivate { -public: - EventLoopPrivate() { - if (int rc = sd_event_new(&event_); rc < 0) { - throw std::runtime_error(stringutils::concat( - "Create sd_event failed. error code: ", rc)); - } +EventLoopSDEvent::EventLoopSDEvent() { + if (int rc = sd_event_new(&event_); rc < 0) { + throw std::runtime_error( + stringutils::concat("Create sd_event failed. error code: ", rc)); } +} - ~EventLoopPrivate() { sd_event_unref(event_); } - - std::mutex mutex_; - sd_event *event_ = nullptr; -}; - -EventLoop::EventLoop() : d_ptr(std::make_unique()) {} +EventLoopSDEvent::~EventLoopSDEvent() { sd_event_unref(event_); }; -EventLoop::~EventLoop() = default; +const char *EventLoopSDEvent::implementation() const { return "sd-event"; } -const char *EventLoop::impl() { return "sd-event"; } +void *EventLoopSDEvent::nativeHandle() { return event_; } -void *EventLoop::nativeHandle() { - FCITX_D(); - return d->event_; -} - -bool EventLoop::exec() { - FCITX_D(); - int r = sd_event_loop(d->event_); +bool EventLoopSDEvent::exec() { + int r = sd_event_loop(event_); return r >= 0; } -void EventLoop::exit() { - FCITX_D(); - sd_event_exit(d->event_, 0); -} +void EventLoopSDEvent::exit() { sd_event_exit(event_, 0); } int IOEventCallback(sd_event_source * /*unused*/, int fd, uint32_t revents, void *userdata) { @@ -258,12 +273,11 @@ int IOEventCallback(sd_event_source * /*unused*/, int fd, uint32_t revents, return -1; } -std::unique_ptr EventLoop::addIOEvent(int fd, IOEventFlags flags, - IOCallback callback) { - FCITX_D(); +std::unique_ptr +EventLoopSDEvent::addIOEvent(int fd, IOEventFlags flags, IOCallback callback) { auto source = std::make_unique(std::move(callback)); sd_event_source *sdEventSource; - if (int err = sd_event_add_io(d->event_, &sdEventSource, fd, + if (int err = sd_event_add_io(event_, &sdEventSource, fd, IOEventFlagsToEpollFlags(flags), IOEventCallback, source.get()); err < 0) { @@ -292,12 +306,11 @@ int TimeEventCallback(sd_event_source * /*unused*/, uint64_t usec, } std::unique_ptr -EventLoop::addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, - TimeCallback callback) { - FCITX_D(); +EventLoopSDEvent::addTimeEvent(clockid_t clock, uint64_t usec, + uint64_t accuracy, TimeCallback callback) { auto source = std::make_unique(std::move(callback)); sd_event_source *sdEventSource; - if (int err = sd_event_add_time(d->event_, &sdEventSource, clock, usec, + if (int err = sd_event_add_time(event_, &sdEventSource, clock, usec, accuracy, TimeEventCallback, source.get()); err < 0) { throw EventLoopException(err); @@ -323,12 +336,12 @@ int StaticEventCallback(sd_event_source * /*unused*/, void *userdata) { return -1; } -std::unique_ptr EventLoop::addExitEvent(EventCallback callback) { - FCITX_D(); +std::unique_ptr +EventLoopSDEvent::addExitEvent(EventCallback callback) { auto source = std::make_unique(std::move(callback)); sd_event_source *sdEventSource; - if (int err = sd_event_add_exit(d->event_, &sdEventSource, - StaticEventCallback, source.get()); + if (int err = sd_event_add_exit(event_, &sdEventSource, StaticEventCallback, + source.get()); err < 0) { throw EventLoopException(err); } @@ -336,11 +349,11 @@ std::unique_ptr EventLoop::addExitEvent(EventCallback callback) { return source; } -std::unique_ptr EventLoop::addDeferEvent(EventCallback callback) { - FCITX_D(); +std::unique_ptr +EventLoopSDEvent::addDeferEvent(EventCallback callback) { auto source = std::make_unique(std::move(callback)); sd_event_source *sdEventSource; - if (int err = sd_event_add_defer(d->event_, &sdEventSource, + if (int err = sd_event_add_defer(event_, &sdEventSource, StaticEventCallback, source.get()); err < 0) { throw EventLoopException(err); @@ -349,12 +362,12 @@ std::unique_ptr EventLoop::addDeferEvent(EventCallback callback) { return source; } -std::unique_ptr EventLoop::addPostEvent(EventCallback callback) { - FCITX_D(); +std::unique_ptr +EventLoopSDEvent::addPostEvent(EventCallback callback) { auto source = std::make_unique(std::move(callback)); sd_event_source *sdEventSource; - if (int err = sd_event_add_post(d->event_, &sdEventSource, - StaticEventCallback, source.get()); + if (int err = sd_event_add_post(event_, &sdEventSource, StaticEventCallback, + source.get()); err < 0) { throw EventLoopException(err); } diff --git a/src/lib/fcitx-utils/event_common.cpp b/src/lib/fcitx-utils/eventloopinterface.cpp similarity index 84% rename from src/lib/fcitx-utils/event_common.cpp rename to src/lib/fcitx-utils/eventloopinterface.cpp index ee5d7205..02f367b3 100644 --- a/src/lib/fcitx-utils/event_common.cpp +++ b/src/lib/fcitx-utils/eventloopinterface.cpp @@ -1,13 +1,14 @@ - /* - * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * SPDX-FileCopyrightText: 2015-2024 CSSlayer * * SPDX-License-Identifier: LGPL-2.1-or-later * */ - +#include "eventloopinterface.h" +#include #include -#include "event.h" +#include +#include namespace fcitx { @@ -49,4 +50,7 @@ void EventSourceTime::setNextInterval(uint64_t time) { } EventSource::~EventSource() = default; + +EventLoopInterface::~EventLoopInterface() = default; + } // namespace fcitx diff --git a/src/lib/fcitx-utils/eventloopinterface.h b/src/lib/fcitx-utils/eventloopinterface.h new file mode 100644 index 00000000..963f96ce --- /dev/null +++ b/src/lib/fcitx-utils/eventloopinterface.h @@ -0,0 +1,136 @@ +/* + * SPDX-FileCopyrightText: 2024-2024 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#ifndef _FCITX_UTILS_EVENTLOOPINTERFACE_H_ +#define _FCITX_UTILS_EVENTLOOPINTERFACE_H_ + +#include +#include +#include +#include +#include +#include +#include "fcitxutils_export.h" + +namespace fcitx { + +enum class IOEventFlag { + In = (1 << 0), + Out = (1 << 1), + Err = (1 << 2), + Hup = (1 << 3), + EdgeTrigger = (1 << 4), +}; + +using IOEventFlags = Flags; + +class FCITXUTILS_EXPORT EventLoopException : public std::runtime_error { +public: + EventLoopException(int error); + + FCITX_NODISCARD int error() const { return errno_; } + +private: + int errno_; +}; + +struct FCITXUTILS_EXPORT EventSource { + virtual ~EventSource(); + FCITX_NODISCARD virtual bool isEnabled() const = 0; + virtual void setEnabled(bool enabled) = 0; + FCITX_NODISCARD virtual bool isOneShot() const = 0; + virtual void setOneShot() = 0; +}; + +struct FCITXUTILS_EXPORT EventSourceIO : public EventSource { + FCITX_NODISCARD virtual int fd() const = 0; + virtual void setFd(int fd) = 0; + FCITX_NODISCARD virtual IOEventFlags events() const = 0; + virtual void setEvents(IOEventFlags flags) = 0; + FCITX_NODISCARD virtual IOEventFlags revents() const = 0; +}; + +struct FCITXUTILS_EXPORT EventSourceTime : public EventSource { + virtual void setNextInterval(uint64_t time); + FCITX_NODISCARD virtual uint64_t time() const = 0; + virtual void setTime(uint64_t time) = 0; + FCITX_NODISCARD virtual uint64_t accuracy() const = 0; + virtual void setAccuracy(uint64_t accuracy) = 0; + FCITX_NODISCARD virtual clockid_t clock() const = 0; +}; + +using IOCallback = + std::function; +using TimeCallback = std::function; +using EventCallback = std::function; + +FCITXUTILS_EXPORT uint64_t now(clockid_t clock); + +/** + * @brief Abstract Event Loop + * + * @since 5.1.12 + */ +class FCITXUTILS_EXPORT EventLoopInterface { +public: + virtual ~EventLoopInterface(); + + /** + * @brief Execute event loop + * + * @return true if event loop is exited successfully. + */ + virtual bool exec() = 0; + + /** + * @brief Quit event loop + * + * Request event loop to quit, pending event may still be executed before + * quit. Also execute exit event right before exiting. + * + * @see EventLoopInterface::addExitEvent + */ + virtual void exit() = 0; + + /** + * @brief Return a static implementation name of event loop + * + * Fcitx right now supports sd-event and libuv as implementation. + * The library being used is decided at build time. + * + * @return Name of event loop implementation + */ + virtual const char *implementation() const = 0; + + /** + * @brief Return the internal native handle to the event loop. + * + * This can be useful if you want to use the underlying API against + * event loop. + * + * For libuv, it will be uv_loop_t*. + * For sd-event, it will be sd_event*. + * + * @return internal implementation + * @see implementation + */ + virtual void *nativeHandle() = 0; + + FCITX_NODISCARD std::unique_ptr virtual addIOEvent( + int fd, IOEventFlags flags, IOCallback callback) = 0; + FCITX_NODISCARD std::unique_ptr virtual addTimeEvent( + clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) = 0; + FCITX_NODISCARD virtual std::unique_ptr + addExitEvent(EventCallback callback) = 0; + FCITX_NODISCARD virtual std::unique_ptr + addDeferEvent(EventCallback callback) = 0; + FCITX_NODISCARD virtual std::unique_ptr + addPostEvent(EventCallback callback) = 0; +}; +} // namespace fcitx + +#endif // _FCITX_UTILS_EVENTLOOPINTERFACE_H_ -- Gitee From 601e24a287f0fbdba14465d6751ce35748f9d11b Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 12 Nov 2024 07:51:06 -0800 Subject: [PATCH 09/69] Fix not installing eventloopinterface.h --- src/lib/fcitx/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt index df15dd57..1f62063e 100644 --- a/src/lib/fcitx/CMakeLists.txt +++ b/src/lib/fcitx/CMakeLists.txt @@ -51,6 +51,7 @@ set(FCITX_CORE_HEADERS globalconfig.h text.h event.h + eventloopinterface.h action.h menu.h userinterface.h -- Gitee From 58131c4d8e64f1ecc537b41bd6689659f6dfc83d Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 12 Nov 2024 07:57:46 -0800 Subject: [PATCH 10/69] Relevant file is in utils not core --- src/lib/fcitx-utils/CMakeLists.txt | 1 + src/lib/fcitx/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index 5276f535..e1498a14 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -71,6 +71,7 @@ set(FCITX_UTILS_HEADERS color.h i18nstring.h event.h + eventloopinterface.h eventdispatcher.h library.h cutf8.h diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt index 1f62063e..df15dd57 100644 --- a/src/lib/fcitx/CMakeLists.txt +++ b/src/lib/fcitx/CMakeLists.txt @@ -51,7 +51,6 @@ set(FCITX_CORE_HEADERS globalconfig.h text.h event.h - eventloopinterface.h action.h menu.h userinterface.h -- Gitee From 4598563b572db16f6affeada2fac022ef0c11709 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 17 Nov 2024 13:22:29 -0800 Subject: [PATCH 11/69] Make event loop implementation swappable. (#1183) --- CMakeLists.txt | 69 +++-- src/lib/fcitx-utils/CMakeLists.txt | 52 ++-- src/lib/fcitx-utils/dbus/sdbus/bus.cpp | 13 +- src/lib/fcitx-utils/event.cpp | 21 +- src/lib/fcitx-utils/event.h | 20 ++ src/lib/fcitx-utils/event_libuv.cpp | 7 +- src/lib/fcitx-utils/event_none.cpp | 16 ++ test/CMakeLists.txt | 7 +- test/eventlooptests.cpp | 192 +++++++++++++ test/eventlooptests.h | 13 + test/testcustomeventloop.cpp | 376 +++++++++++++++++++++++++ test/testevent.cpp | 182 +----------- 12 files changed, 734 insertions(+), 234 deletions(-) create mode 100644 src/lib/fcitx-utils/event_none.cpp create mode 100644 test/eventlooptests.cpp create mode 100644 test/eventlooptests.h create mode 100644 test/testcustomeventloop.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index aa90bad4..3c7bc877 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,13 +31,14 @@ option(ENABLE_DBUS "Enable DBus" On) option(ENABLE_DOC "Build doxygen" Off) option(ENABLE_SERVER "Build a fcitx as server, disable this option if you want to use fcitx as an embedded library." On) option(ENABLE_KEYBOARD "Enable key event translation with XKB and build keyboard engine" On) -option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libuv/libdbus if not found." On) +option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libuv/libdbus if not found. Only used when EVENT_LOOP_BACKEND is auto." On) option(ENABLE_XDGAUTOSTART "Enable xdg autostart desktop file installation" On) option(USE_FLATPAK_ICON "Use flatpak icon name for desktop files" Off) option(ENABLE_EMOJI "Enable emoji module" On) option(ENABLE_LIBUUID "Use libuuid for uuid generation" On) option(BUILD_SPELL_DICT "Build en_dict.fscd for English spell check" On) set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for follwing app by default.") +set(EVENT_LOOP_BACKEND "auto" CACHE STRING "Set the underlying event loop implementation, valid values are auto,systemd,libuv,none") if (ENABLE_EMOJI) find_package(ZLIB REQUIRED) @@ -47,35 +48,67 @@ if ((ENABLE_WAYLAND OR ENABLE_X11) AND NOT ENABLE_KEYBOARD) message(FATAL_ERROR "X11 and Wayland require ENABLE_KEYBOARD to be set to ON.") endif () - ####################################################################### # Find packages ####################################################################### find_package(PkgConfig REQUIRED) -if (USE_SYSTEMD) -find_package(Systemd) -endif () +set(CANDIDATE_EVENT_LOOP_BACKENDS) -if (USE_FLATPAK_ICON) - set(FCITX_ICON_NAME "org.fcitx.Fcitx5") -else() - set(FCITX_ICON_NAME "fcitx") +if (EVENT_LOOP_BACKEND STREQUAL "auto") + if (USE_SYSTEMD) + list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS systemd) + endif() + + list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS libuv) +elseif (EVENT_LOOP_BACKEND STREQUAL "systemd") + list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS systemd) +elseif (EVENT_LOOP_BACKEND STREQUAL "libuv") + list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS libuv) +elseif (EVENT_LOOP_BACKEND STREQUAL "none") + list(APPEND CANDIDATE_EVENT_LOOP_BACKENDS none) endif() -if (NOT TARGET Systemd::Systemd) - if (ENABLE_DBUS) - pkg_check_modules(DBus REQUIRED IMPORTED_TARGET "dbus-1") - pkg_get_variable(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "dbus-1" "system_bus_default_address") - endif() +set(FCITX_EVENT_LOOP_BACKEND "") +foreach(CANDIDATE_EVENT_LOOP_BACKEND IN LISTS CANDIDATE_EVENT_LOOP_BACKENDS) + if (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL systemd) + find_package(Systemd) + if (TARGET Systemd::Systemd) + set(FCITX_EVENT_LOOP_BACKEND "systemd") + break() + endif() + elseif (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL libuv) + if (NOT LIBUV_TARGET) + if (NOT (TARGET PkgConfig::LibUV)) + pkg_check_modules(LibUV IMPORTED_TARGET "libuv") + set(LIBUV_TARGET PkgConfig::LibUV) + endif() + endif() - if (NOT LIBUV_TARGET) - if (NOT (TARGET PkgConfig::LibUV)) - pkg_check_modules(LibUV REQUIRED IMPORTED_TARGET "libuv") + if (TARGET LIBUV_TARGET) + set(FCITX_EVENT_LOOP_BACKEND "libuv") + break() endif() - set(LIBUV_TARGET PkgConfig::LibUV) + elseif (CANDIDATE_EVENT_LOOP_BACKEND STREQUAL none) + set(FCITX_EVENT_LOOP_BACKEND "none") + break() endif() +endforeach() + +if (ENABLE_DBUS AND NOT (FCITX_EVENT_LOOP_BACKEND STREQUAL systemd)) + pkg_check_modules(DBus REQUIRED IMPORTED_TARGET "dbus-1") + pkg_get_variable(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "dbus-1" "system_bus_default_address") +endif() + +if (FCITX_EVENT_LOOP_BACKEND STREQUAL "") + message(FATAL_ERROR "Failed to find a valid event loop backend.") +endif() + +if (USE_FLATPAK_ICON) + set(FCITX_ICON_NAME "org.fcitx.Fcitx5") +else() + set(FCITX_ICON_NAME "fcitx") endif() if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index e1498a14..4fe67c8d 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -1,44 +1,42 @@ set(FCITX_UTILS_SOURCES) +set(FCITX_UTILS_DEPS) if (ENABLE_DBUS) - set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} + list(APPEND FCITX_UTILS_SOURCES dbus/servicewatcher.cpp dbus/matchrule.cpp dbus/variant.cpp dbus/objectvtable.cpp ) - if (NOT TARGET Systemd::Systemd) - set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} - dbus/libdbus/bus.cpp - dbus/libdbus/message.cpp - dbus/libdbus/objectvtable_libdbus.cpp - dbus/libdbus/servicenamecache.cpp) - else() - set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} + if (FCITX_EVENT_LOOP_BACKEND STREQUAL "systemd") + list(APPEND FCITX_UTILS_SOURCES dbus/sdbus/bus.cpp dbus/sdbus/message.cpp dbus/sdbus/objectvtablewrapper.c dbus/sdbus/objectvtable_sdbus.cpp) + else() + list(APPEND FCITX_UTILS_SOURCES + dbus/libdbus/bus.cpp + dbus/libdbus/message.cpp + dbus/libdbus/objectvtable_libdbus.cpp + dbus/libdbus/servicenamecache.cpp) + list(APPEND FCITX_UTILS_DEPS PkgConfig::DBus) endif() endif() -if (NOT TARGET Systemd::Systemd) - set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} - event_libuv.cpp) -else() - set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} - event_sdevent.cpp) +if (FCITX_EVENT_LOOP_BACKEND STREQUAL "libuv") + list(APPEND FCITX_UTILS_SOURCES event_libuv.cpp) + list(APPEND FCITX_UTILS_DEPS "${LIBUV_TARGET}") +elseif (FCITX_EVENT_LOOP_BACKEND STREQUAL "systemd") + list(APPEND FCITX_UTILS_SOURCES event_sdevent.cpp) + list(APPEND FCITX_UTILS_DEPS Systemd::Systemd) +elseif (FCITX_EVENT_LOOP_BACKEND STREQUAL "none") + list(APPEND FCITX_UTILS_SOURCES event_none.cpp) endif() -set(FCITX_UTILS_SOURCES - ${FCITX_UTILS_SOURCES} +list(APPEND FCITX_UTILS_SOURCES stringutils.cpp testing.cpp key.cpp @@ -135,15 +133,7 @@ target_link_libraries(Fcitx5Utils PRIVATE DL::DL LibIntl::LibIntl Pthread::Pthre if(LIBKVM_FOUND) target_link_libraries(Fcitx5Utils PRIVATE LibKVM::LibKVM) endif() - -if (NOT TARGET Systemd::Systemd) - target_link_libraries(Fcitx5Utils PRIVATE ${LIBUV_TARGET}) - if (ENABLE_DBUS) - target_link_libraries(Fcitx5Utils PRIVATE PkgConfig::DBus) - endif() -else() - target_link_libraries(Fcitx5Utils PRIVATE Systemd::Systemd) -endif() +target_link_libraries(Fcitx5Utils PRIVATE ${FCITX_UTILS_DEPS}) configure_file(Fcitx5Utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5Utils.pc @ONLY) diff --git a/src/lib/fcitx-utils/dbus/sdbus/bus.cpp b/src/lib/fcitx-utils/dbus/sdbus/bus.cpp index 768d044e..d125b454 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/bus.cpp +++ b/src/lib/fcitx-utils/dbus/sdbus/bus.cpp @@ -6,6 +6,7 @@ */ #include +#include #include "../../log.h" #include "bus_p.h" #include "message_p.h" @@ -117,9 +118,15 @@ void Bus::attachEventLoop(EventLoop *loop) { if (d->eventLoop_) { return; } - sd_event *event = static_cast(loop->nativeHandle()); - if (sd_bus_attach_event(d->bus_, event, 0) >= 0) { - d->eventLoop_ = loop; + if (loop->implementation() == std::string_view("sd-event")) { + sd_event *event = static_cast(loop->nativeHandle()); + if (sd_bus_attach_event(d->bus_, event, 0) >= 0) { + d->eventLoop_ = loop; + } + } else { + // TODO: support sd-bus + generic event loop implementation. + throw std::invalid_argument( + "not support sd-bus with non-sdevent implementation."); } } diff --git a/src/lib/fcitx-utils/event.cpp b/src/lib/fcitx-utils/event.cpp index ce11aebf..bdbd5f44 100644 --- a/src/lib/fcitx-utils/event.cpp +++ b/src/lib/fcitx-utils/event.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "event_p.h" #include "eventloopinterface.h" @@ -21,12 +22,28 @@ namespace fcitx { class EventLoopPrivate { public: EventLoopPrivate(std::unique_ptr impl) - : impl_(std::move(impl)) {} + : impl_(std::move(impl)) { + if (!impl_) { + throw std::runtime_error("No available event loop implementation."); + } + } std::unique_ptr impl_; + + static EventLoopFactory factory_; }; -EventLoop::EventLoop() : EventLoop(createDefaultEventLoop()) {} +EventLoopFactory EventLoopPrivate::factory_ = createDefaultEventLoop; + +void EventLoop::setEventLoopFactory(EventLoopFactory factory) { + if (factory) { + EventLoopPrivate::factory_ = std::move(factory); + } else { + EventLoopPrivate::factory_ = createDefaultEventLoop; + } +} + +EventLoop::EventLoop() : EventLoop(EventLoopPrivate::factory_()) {} EventLoop::EventLoop(std::unique_ptr impl) : d_ptr(std::make_unique(std::move(impl))) {} diff --git a/src/lib/fcitx-utils/event.h b/src/lib/fcitx-utils/event.h index 11b4e8ac..5c24cb87 100644 --- a/src/lib/fcitx-utils/event.h +++ b/src/lib/fcitx-utils/event.h @@ -16,6 +16,8 @@ namespace fcitx { +using EventLoopFactory = std::function()>; + class EventLoopPrivate; class FCITXUTILS_EXPORT EventLoop { public: @@ -27,9 +29,18 @@ public: /** * Return the default implementation name. + * + * This will only return the default implementation name. + * Do not rely on this value. + * + * @see EventLoop::implementation */ FCITXUTILS_DEPRECATED static const char *impl(); + /** + * Return the name of implementation of event loop. + * @since 5.1.12 + */ const char *implementation() const; void *nativeHandle(); @@ -45,6 +56,15 @@ public: FCITX_NODISCARD std::unique_ptr addPostEvent(EventCallback callback); + /** + * Set an external event loop implementation. + * + * This is useful if you need to integrate fcitx with another event loop. + * + * @since 5.1.12 + */ + static void setEventLoopFactory(EventLoopFactory factory); + private: const std::unique_ptr d_ptr; FCITX_DECLARE_PRIVATE(EventLoop); diff --git a/src/lib/fcitx-utils/event_libuv.cpp b/src/lib/fcitx-utils/event_libuv.cpp index 6e6580cb..1719584b 100644 --- a/src/lib/fcitx-utils/event_libuv.cpp +++ b/src/lib/fcitx-utils/event_libuv.cpp @@ -249,7 +249,12 @@ void PostEventCallback(uv_prepare_t *handle) { source->setEnabled(false); } auto callback = source->callback_; - (*callback)(source); + auto ret = (*callback)(source); + if (sourceRef.isValid()) { + if (!ret) { + source->setEnabled(false); + } + } } catch (const std::exception &e) { // some abnormal things threw{ FCITX_FATAL() << e.what(); diff --git a/src/lib/fcitx-utils/event_none.cpp b/src/lib/fcitx-utils/event_none.cpp new file mode 100644 index 00000000..a0ea0d50 --- /dev/null +++ b/src/lib/fcitx-utils/event_none.cpp @@ -0,0 +1,16 @@ + +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#include "event_p.h" + +namespace fcitx { + +std::unique_ptr createDefaultEventLoop() { return nullptr; } + +const char *defaultEventLoopImplementation() { return "none"; } + +} // namespace fcitx \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bed8e37c..2eab7798 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,6 +3,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(addon) +add_library(eventlooptests STATIC eventlooptests.cpp) +target_link_libraries(eventlooptests Fcitx5::Utils) + set(FCITX_UTILS_TEST testflags teststringutils @@ -11,6 +14,7 @@ set(FCITX_UTILS_TEST testcolor testi18nstring testevent + testcustomeventloop testlist testfs testlibrary @@ -33,7 +37,8 @@ set(FCITX_UTILS_DBUS_TEST set(testdbus_LIBS Pthread::Pthread) set(testeventdispatcher_LIBS Pthread::Pthread) -set(testevent_LIBS Pthread::Pthread) +set(testevent_LIBS Pthread::Pthread eventlooptests) +set(testcustomeventloop_LIBS Pthread::Pthread eventlooptests) find_program(XVFB_BIN Xvfb) diff --git a/test/eventlooptests.cpp b/test/eventlooptests.cpp new file mode 100644 index 00000000..6f3b0df8 --- /dev/null +++ b/test/eventlooptests.cpp @@ -0,0 +1,192 @@ +/* + * SPDX-FileCopyrightText: 2024-2024 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#include "eventlooptests.h" +#include +#include +#include +#include +#include +#include "fcitx-utils/event.h" +#include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/log.h" + +using namespace fcitx; + +void test_basic() { + FCITX_INFO() << __func__; + EventLoop e; + + int pipefd[2]; + int r = pipe(pipefd); + FCITX_ASSERT(r == 0); + + std::unique_ptr source( + e.addIOEvent(pipefd[0], IOEventFlag::In, + [&e, pipefd](EventSource *, int fd, IOEventFlags flags) { + FCITX_ASSERT(pipefd[0] == fd); + if (flags & IOEventFlag::Hup) { + e.exit(); + } + + if (flags & IOEventFlag::In) { + char buf[20]; + auto size = read(fd, buf, 20); + if (size == 0) { + e.exit(); + } else { + FCITX_INFO() << "QUIT" << flags; + FCITX_ASSERT(size == 1); + FCITX_ASSERT(buf[0] == 'a'); + } + } + return true; + })); + + std::unique_ptr source4(e.addDeferEvent([](EventSource *) { + FCITX_INFO() << "DEFER"; + return true; + })); + + std::unique_ptr source5(e.addExitEvent([](EventSource *) { + FCITX_INFO() << "EXIT"; + return true; + })); + + int times = 10; + std::unique_ptr sourceX( + e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000UL, 1, + [×](EventSource *source, uint64_t) { + FCITX_INFO() << "Recur:" << times; + times--; + if (times < 0) { + source->setEnabled(false); + } + return true; + })); + sourceX->setEnabled(true); + + int times2 = 10; + std::unique_ptr sourceX2( + e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000UL, 1, + [×2](EventSourceTime *source, uint64_t t) { + FCITX_INFO() << "Recur 2:" << times2 << " " << t; + times2--; + if (times2 > 0) { + source->setNextInterval(100000); + source->setOneShot(); + } + return true; + })); + + std::unique_ptr source2( + e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000UL, 0, + [pipefd](EventSource *, uint64_t) { + FCITX_INFO() << "WRITE"; + auto r = write(pipefd[1], "a", 1); + FCITX_ASSERT(r == 1); + return true; + })); + + std::unique_ptr source3( + e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 2000000UL, 0, + [pipefd](EventSource *, uint64_t) { + FCITX_INFO() << "CLOSE"; + close(pipefd[1]); + return true; + })); + + e.exec(); +} + +void test_source_deleted() { + FCITX_INFO() << __func__; + EventLoop e; + + int pipefd[2]; + int r = pipe(pipefd); + FCITX_ASSERT(r == 0); + + std::unique_ptr source( + e.addIOEvent(pipefd[0], IOEventFlag::In, + [&source](EventSource *, int, IOEventFlags flags) { + if (flags & IOEventFlag::In) { + FCITX_INFO() << "RESET"; + source.reset(); + } + return true; + })); + + std::unique_ptr source2( + e.addDeferEvent([pipefd](EventSource *) { + FCITX_INFO() << "WRITE"; + auto r = write(pipefd[1], "a", 1); + FCITX_ASSERT(r == 1); + return true; + })); + + std::unique_ptr source3( + e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 2000000UL, 0, + [&e](EventSource *, uint64_t) { + FCITX_INFO() << "EXIT"; + e.exit(); + return true; + })); + + e.exec(); +} + +void test_post_time() { + FCITX_INFO() << __func__; + EventLoop e; + bool ready = false; + auto post = e.addPostEvent([&ready, &e](EventSource *) { + FCITX_INFO() << "POST"; + if (ready) { + e.exit(); + } + return true; + }); + auto time = e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000, + 0, [&ready](EventSource *, uint64_t) { + FCITX_INFO() << "TIME"; + ready = true; + return true; + }); + e.exec(); +} + +void test_post_io() { + FCITX_INFO() << __func__; + EventLoop e; + EventDispatcher dispatcher; + bool ready = false; + auto post = e.addPostEvent([&ready, &e](EventSource *) { + FCITX_INFO() << "POST"; + if (ready) { + e.exit(); + } + return true; + }); + dispatcher.attach(&e); + std::thread thread([&dispatcher, &ready]() { + sleep(2); + dispatcher.schedule([&ready]() { + FCITX_INFO() << "DISPATCHER"; + ready = true; + }); + }); + e.exec(); + thread.join(); +} + +void runAllEventLoopTests() { + test_basic(); + test_source_deleted(); + test_post_time(); + test_post_io(); +} diff --git a/test/eventlooptests.h b/test/eventlooptests.h new file mode 100644 index 00000000..0b17d8b8 --- /dev/null +++ b/test/eventlooptests.h @@ -0,0 +1,13 @@ +/* + * SPDX-FileCopyrightText: 2024-2024 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ + +#ifndef _TEST_EVENTLOOPTESTS_H_ +#define _TEST_EVENTLOOPTESTS_H_ + +void runAllEventLoopTests(); + +#endif \ No newline at end of file diff --git a/test/testcustomeventloop.cpp b/test/testcustomeventloop.cpp new file mode 100644 index 00000000..1a2c9b1f --- /dev/null +++ b/test/testcustomeventloop.cpp @@ -0,0 +1,376 @@ +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "fcitx-utils/event.h" +#include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/intrusivelist.h" +#include "fcitx-utils/macros.h" +#include "fcitx-utils/trackableobject.h" +#include "eventlooptests.h" + +using namespace fcitx; + +// Following is also an example of poll() based event loop +// It only serves purpose for testing. +enum class PollSourceEnableState { Disabled = 0, Oneshot = 1, Enabled = 2 }; + +class PollEventLoop; + +template +class PollEventBase : public T, public TrackableObject> { +public: + using Ref = TrackableObjectReference>; + + PollEventBase(PollEventLoop *loop, PollSourceEnableState state, C callback); + + ~PollEventBase(); + + bool isEnabled() const override { + return state_ != PollSourceEnableState::Disabled; + } + void setEnabled(bool enabled) override { + auto newState = enabled ? PollSourceEnableState::Enabled + : PollSourceEnableState::Disabled; + setState(newState); + } + + void setOneShot() override { setState(PollSourceEnableState::Oneshot); } + + bool isOneShot() const override { + return state_ == PollSourceEnableState::Oneshot; + } + + template + auto trigger(Args &&...args) { + auto ref = this->watch(); + if (isOneShot()) { + setEnabled(false); + } + auto result = callback_(this, std::forward(args)...); + if (ref.isValid()) { + if (!result) { + setEnabled(false); + } + } + return result; + } + +private: + void setState(PollSourceEnableState state) { state_ = state; } + PollSourceEnableState state_; + C callback_; + TrackableObjectReference loop_; +}; + +class PollEventSourceIO : public PollEventBase, + public IntrusiveListNode { +public: + PollEventSourceIO(PollEventLoop *loop, int fd, IOEventFlags flags, + IOCallback callback) + : PollEventBase(loop, PollSourceEnableState::Enabled, + std::move(callback)), + fd_(fd), flags_(flags) {} + + int fd() const override { return fd_; } + + void setFd(int fd) override { fd_ = fd; } + + IOEventFlags events() const override { return flags_; } + + void setEvents(IOEventFlags flags) override { flags_ = flags; } + + IOEventFlags revents() const override { return revents_; } + +private: + int fd_; + IOEventFlags flags_; + IOEventFlags revents_; +}; + +class PollEventSourceTime : public PollEventBase, + public IntrusiveListNode { +public: + PollEventSourceTime(PollEventLoop *loop, clockid_t clock, uint64_t time, + uint64_t accuracy, TimeCallback callback) + : PollEventBase(loop, PollSourceEnableState::Oneshot, + std::move(callback)), + clock_(clock), time_(time), accuracy_(accuracy) {} + + uint64_t time() const override { return time_; } + void setTime(uint64_t time) override { time_ = time; } + uint64_t accuracy() const override { return accuracy_; } + void setAccuracy(uint64_t accuracy) override { accuracy_ = accuracy; } + FCITX_NODISCARD clockid_t clock() const override { return clock_; } + +private: + clockid_t clock_; + uint64_t time_, accuracy_; +}; + +class PollEventSource : public PollEventBase, + public IntrusiveListNode { +public: + PollEventSource(PollEventLoop *loop, PollSourceEnableState state, + EventCallback callback) + : PollEventBase(loop, state, std::move(callback)) {} +}; + +short IOEventFlagsToPoll(IOEventFlags flags) { + short result = 0; + if (flags.test(IOEventFlag::In)) { + result |= POLLIN; + } + if (flags.test(IOEventFlag::Out)) { + result |= POLLOUT; + } + return result; +} + +IOEventFlags PollToIOEventFlags(short revent) { + IOEventFlags result; + if (revent & POLLIN) { + result |= IOEventFlag::In; + } + if (revent & POLLOUT) { + result |= IOEventFlag::Out; + } + if (revent & POLLERR) { + result |= IOEventFlag::Err; + } + if (revent & POLLHUP) { + result |= IOEventFlag::Hup; + } + return result; +} + +class PollEventLoop : public EventLoopInterface, + public TrackableObject { + struct Recheck {}; + +public: + bool exec() override { + exit_ = false; + std::vector fds; + auto ref = this->watch(); + + std::vector timeView; + std::vector ioView; + std::vector postView; + + auto handleTimeout = [this, &timeView, ref]() { + timeView.clear(); + timeView.reserve(timeEvents_.size()); + for (PollEventSourceTime &time : timeEvents_) { + if (time.isEnabled()) { + timeView.push_back(time.watch()); + } + } + for (auto &timeRef : timeView) { + if (!ref.isValid()) { + break; + } + auto *time = timeRef.get(); + if (!time || !time->isEnabled()) { + continue; + } + auto current = now(time->clock()); + if (time->time() <= current) { + time->trigger(current); + } + } + }; + + auto collectTimeout = [this, &timeView, ref]() { + uint64_t timeout = std::numeric_limits::max(); + timeView.clear(); + timeView.reserve(timeEvents_.size()); + for (PollEventSourceTime &time : timeEvents_) { + if (!time.isEnabled()) { + continue; + } + auto current = now(time.clock()); + uint64_t diff = + (time.time() > current) ? (time.time() - current) : 0; + timeout = std::min(timeout, diff); + } + return timeout; + }; + + auto handleIO = [this, &ioView, &fds, &ref](uint64_t timeout) { + timeout = timeout / 1000 + ((timeout % 1000) ? 1 : 0); + int pollTimeout = -1; + if (timeout < std::numeric_limits::max()) { + pollTimeout = timeout; + } + fds.clear(); + fds.reserve(ioEvents_.size()); + ioView.clear(); + ioView.reserve(ioEvents_.size()); + for (PollEventSourceIO &event : ioEvents_) { + if (event.isEnabled()) { + auto pollevent = IOEventFlagsToPoll(event.events()); + if (pollevent) { + ioView.push_back(event.watch()); + fds.push_back(pollfd{.fd = event.fd(), + .events = pollevent, + .revents = 0}); + } + } + } + + assert(ioView.size() == fds.size()); + + auto r = poll(fds.data(), fds.size(), pollTimeout); + if (r < 0) { + return false; + } + if (r > 0) { + for (size_t i = 0; i < fds.size(); i++) { + auto &ioRef = ioView[i]; + if (!ref.isValid()) { + break; + } + auto *io = ioRef.get(); + if (!io) { + continue; + } + if (!io->isEnabled()) { + continue; + } + if (fds[i].revents) { + io->trigger(io->fd(), + PollToIOEventFlags(fds[i].revents)); + break; + } + } + } + return true; + }; + + auto handlePost = [this, &postView, + ref](IntrusiveList &events) { + postView.clear(); + postView.reserve(postEvents_.size()); + for (PollEventSource &event : events) { + postView.push_back(event.watch()); + } + for (auto &postRef : postView) { + if (!ref.isValid()) { + break; + } + auto *post = postRef.get(); + if (!post) { + continue; + } + if (!post->isEnabled()) { + continue; + } + post->trigger(); + } + }; + + while (ref.isValid() && !exit_) { + handleTimeout(); + if (!ref.isValid() || exit_) { + break; + } + + handlePost(postEvents_); + if (!ref.isValid() || exit_) { + break; + } + auto timeout = collectTimeout(); + if (!handleIO(timeout)) { + break; + } + } + + if (ref.isValid()) { + handlePost(exitEvents_); + } + + return true; + } + void exit() override { exit_ = true; } + + const char *implementation() const override { return "poll"; } + + void *nativeHandle() override { return nullptr; } + + std::unique_ptr addIOEvent(int fd, IOEventFlags flags, + IOCallback callback) override { + auto event = std::make_unique(this, fd, flags, + std::move(callback)); + ioEvents_.push_back(*event); + return event; + } + std::unique_ptr + addTimeEvent(clockid_t clock, uint64_t usec, uint64_t accuracy, + TimeCallback callback) override { + auto event = std::make_unique( + this, clock, usec, accuracy, std::move(callback)); + timeEvents_.push_back(*event); + return event; + } + std::unique_ptr + addDeferEvent(EventCallback callback) override { + return addTimeEvent( + CLOCK_MONOTONIC, 0, 0, + [callback = std::move(callback)](EventSourceTime *event, + uint64_t /*usec*/) -> bool { + return callback(event); + }); + } + std::unique_ptr addPostEvent(EventCallback callback) override { + auto event = std::make_unique( + this, PollSourceEnableState::Enabled, std::move(callback)); + postEvents_.push_back(*event); + return event; + } + std::unique_ptr addExitEvent(EventCallback callback) override { + auto event = std::make_unique( + this, PollSourceEnableState::Enabled, std::move(callback)); + exitEvents_.push_back(*event); + return event; + } + +private: + IntrusiveList ioEvents_; + IntrusiveList timeEvents_; + IntrusiveList postEvents_; + IntrusiveList exitEvents_; + bool exit_ = false; +}; + +template +PollEventBase::PollEventBase(PollEventLoop *loop, + PollSourceEnableState state, C callback) + : state_(state), callback_(std::move(callback)), loop_(loop->watch()) {} + +template +PollEventBase::~PollEventBase() {} + +std::unique_ptr pollEventLoopFactory() { + return std::make_unique(); +} + +int main() { + EventLoop::setEventLoopFactory(pollEventLoopFactory); + runAllEventLoopTests(); + return 0; +} diff --git a/test/testevent.cpp b/test/testevent.cpp index 6750bdff..35384a81 100644 --- a/test/testevent.cpp +++ b/test/testevent.cpp @@ -1,186 +1,12 @@ /* - * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * SPDX-FileCopyrightText: 2015-2024 CSSlayer * * SPDX-License-Identifier: LGPL-2.1-or-later * */ - -#include -#include -#include -#include -#include "fcitx-utils/eventdispatcher.h" -#include "fcitx-utils/log.h" - -using namespace fcitx; - -void test_basic() { - EventLoop e; - - int pipefd[2]; - int r = pipe(pipefd); - FCITX_ASSERT(r == 0); - - std::unique_ptr source( - e.addIOEvent(pipefd[0], IOEventFlag::In, - [&e, pipefd](EventSource *, int fd, IOEventFlags flags) { - FCITX_ASSERT(pipefd[0] == fd); - if (flags & IOEventFlag::Hup) { - e.exit(); - } - - if (flags & IOEventFlag::In) { - char buf[20]; - auto size = read(fd, buf, 20); - if (size == 0) { - e.exit(); - } else { - FCITX_INFO() << "QUIT" << flags; - FCITX_ASSERT(size == 1); - FCITX_ASSERT(buf[0] == 'a'); - } - } - return true; - })); - - std::unique_ptr source4(e.addDeferEvent([](EventSource *) { - FCITX_INFO() << "DEFER"; - return true; - })); - - std::unique_ptr source5(e.addExitEvent([](EventSource *) { - FCITX_INFO() << "EXIT"; - return true; - })); - - int times = 10; - std::unique_ptr sourceX( - e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000ul, 1, - [×](EventSource *source, uint64_t) { - FCITX_INFO() << "Recur:" << times; - times--; - if (times < 0) { - source->setEnabled(false); - } - return true; - })); - sourceX->setEnabled(true); - - int times2 = 10; - std::unique_ptr sourceX2( - e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000ul, 1, - [×2](EventSourceTime *source, uint64_t t) { - FCITX_INFO() << "Recur 2:" << times2 << " " << t; - times2--; - if (times2 > 0) { - source->setNextInterval(100000); - source->setOneShot(); - } - return true; - })); - - std::unique_ptr source2( - e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000ul, 0, - [pipefd](EventSource *, uint64_t) { - FCITX_INFO() << "WRITE"; - auto r = write(pipefd[1], "a", 1); - FCITX_ASSERT(r == 1); - return true; - })); - - std::unique_ptr source3( - e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 2000000ul, 0, - [pipefd](EventSource *, uint64_t) { - FCITX_INFO() << "CLOSE"; - close(pipefd[1]); - return true; - })); - - e.exec(); -} - -void test_source_deleted() { - EventLoop e; - - int pipefd[2]; - int r = pipe(pipefd); - FCITX_ASSERT(r == 0); - - std::unique_ptr source( - e.addIOEvent(pipefd[0], IOEventFlag::In, - [&source](EventSource *, int, IOEventFlags flags) { - if (flags & IOEventFlag::In) { - FCITX_INFO() << "RESET"; - source.reset(); - } - return true; - })); - - std::unique_ptr source2( - e.addDeferEvent([pipefd](EventSource *) { - FCITX_INFO() << "WRITE"; - auto r = write(pipefd[1], "a", 1); - FCITX_ASSERT(r == 1); - return true; - })); - - std::unique_ptr source3( - e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 2000000ul, 0, - [&e](EventSource *, uint64_t) { - FCITX_INFO() << "EXIT"; - e.exit(); - return true; - })); - - e.exec(); -} - -void test_post_time() { - EventLoop e; - bool ready = false; - auto post = e.addPostEvent([&ready, &e](EventSource *) { - FCITX_INFO() << "POST"; - if (ready) { - e.exit(); - } - return true; - }); - auto time = e.addTimeEvent(CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 1000000, - 0, [&ready](EventSource *, uint64_t) { - FCITX_INFO() << "TIME"; - ready = true; - return true; - }); - e.exec(); -} - -void test_post_io() { - EventLoop e; - EventDispatcher dispatcher; - bool ready = false; - auto post = e.addPostEvent([&ready, &e](EventSource *) { - FCITX_INFO() << "POST"; - if (ready) { - e.exit(); - } - return true; - }); - dispatcher.attach(&e); - std::thread thread([&dispatcher, &ready]() { - sleep(2); - dispatcher.schedule([&ready]() { - FCITX_INFO() << "DISPATCHER"; - ready = true; - }); - }); - e.exec(); - thread.join(); -} +#include "eventlooptests.h" int main() { - test_basic(); - test_source_deleted(); - test_post_time(); - test_post_io(); + runAllEventLoopTests(); return 0; -} +} \ No newline at end of file -- Gitee From ed335d8a3a122dab8e8ee003884da1866734e125 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 17 Nov 2024 19:26:02 -0800 Subject: [PATCH 12/69] Fix build when USE_SYSTEMD=Off --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7bc877..4d47006f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ foreach(CANDIDATE_EVENT_LOOP_BACKEND IN LISTS CANDIDATE_EVENT_LOOP_BACKENDS) endif() endif() - if (TARGET LIBUV_TARGET) + if (TARGET "${LIBUV_TARGET}") set(FCITX_EVENT_LOOP_BACKEND "libuv") break() endif() @@ -102,7 +102,7 @@ if (ENABLE_DBUS AND NOT (FCITX_EVENT_LOOP_BACKEND STREQUAL systemd)) endif() if (FCITX_EVENT_LOOP_BACKEND STREQUAL "") - message(FATAL_ERROR "Failed to find a valid event loop backend.") + message(FATAL_ERROR "Failed to find a valid event loop backend. Backends checked: ${CANDIDATE_EVENT_LOOP_BACKENDS}") endif() if (USE_FLATPAK_ICON) -- Gitee From 5e4813433ec52572cf32cef0723140401526db46 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 17 Nov 2024 19:26:26 -0800 Subject: [PATCH 13/69] Do ceil(timeout/1000) when convert us timestamp to libuv timestamp. --- src/lib/fcitx-utils/event_libuv.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/fcitx-utils/event_libuv.cpp b/src/lib/fcitx-utils/event_libuv.cpp index 1719584b..8af3222b 100644 --- a/src/lib/fcitx-utils/event_libuv.cpp +++ b/src/lib/fcitx-utils/event_libuv.cpp @@ -89,8 +89,8 @@ bool LibUVSourceTime::setup(uv_loop_t *loop, uv_timer_t *timer) { } auto curr = now(clock_); uint64_t timeout = time_ > curr ? (time_ - curr) : 0; - // libuv is milliseconds - timeout /= 1000; + // libuv is milliseconds, ceil towards 1ms. + timeout = timeout / 1000 + (timeout % 1000 != 0); if (int err = uv_timer_start(timer, &TimeEventCallback, timeout, 0); err < 0) { FCITX_LIBUV_DEBUG() << "Failed to start timer with error: " << err; -- Gitee From a8ac93057a9a99a7bbd0a475abb0d34605afa1ea Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 18 Nov 2024 14:37:35 -0800 Subject: [PATCH 14/69] Introduce FCITX_ADDON_FACTORY_V2 and FCITX_IMPORT_ADDON_FACTORY (#1185) FCITX_ADDON_FACTORY_V2 will generate an entry based on addon name, so it will be unique and can be referenced more easily with static addon loader. --- .../dbusfrontend/dbusfrontend.conf.in.in | 4 +-- src/frontend/dbusfrontend/dbusfrontend.cpp | 2 +- .../fcitx4frontend/fcitx4frontend.conf.in.in | 3 ++- .../fcitx4frontend/fcitx4frontend.cpp | 2 +- .../ibusfrontend/ibusfrontend.conf.in.in | 3 ++- src/frontend/ibusfrontend/ibusfrontend.cpp | 2 +- src/frontend/waylandim/waylandim.conf.in.in | 3 ++- src/frontend/waylandim/waylandim.cpp | 2 +- src/frontend/xim/xim.conf.in.in | 3 ++- src/frontend/xim/xim.cpp | 2 +- src/im/keyboard/CMakeLists.txt | 1 - src/im/keyboard/keyboard.conf.in.in | 3 +++ src/im/keyboard/keyboard.cpp | 3 +++ src/lib/fcitx/addoninstance.h | 27 +++++++++++++++++++ src/lib/fcitx/addonloader.cpp | 16 ++++++++--- src/lib/fcitx/addonloader.h | 8 +++--- src/lib/fcitx/addonloader_p.h | 20 ++++++++++++-- src/modules/clipboard/clipboard.conf.in.in | 5 ++-- src/modules/clipboard/clipboard.cpp | 2 +- src/modules/dbus/dbus.conf.in.in | 3 ++- src/modules/dbus/dbusmodule.cpp | 2 +- src/modules/emoji/emoji.conf.in.in | 3 +++ src/modules/emoji/emoji.cpp | 2 +- src/modules/imselector/imselector.conf.in.in | 3 +++ src/modules/imselector/imselector.cpp | 2 +- .../notificationitem.conf.in.in | 4 +-- .../notificationitem/notificationitem.cpp | 3 ++- .../notifications/notifications.conf.in.in | 3 ++- src/modules/notifications/notifications.cpp | 2 +- src/modules/quickphrase/quickphrase.cpp | 2 +- src/modules/spell/spell.conf.in.in | 3 +++ src/modules/spell/spell.cpp | 2 +- src/modules/unicode/unicode.conf.in.in | 3 +++ src/modules/unicode/unicode.cpp | 2 +- src/modules/wayland/wayland.conf.in.in | 3 +++ src/modules/wayland/waylandmodule.cpp | 2 +- src/modules/xcb/xcb.conf.in.in | 3 +++ src/modules/xcb/xcbmodule.cpp | 2 +- src/server/main.cpp | 14 +++------- src/ui/classic/classicui.cpp | 2 +- src/ui/kimpanel/kimpanel.cpp | 2 +- src/ui/virtualkeyboard/virtualkeyboard.cpp | 4 ++- test/addon/dummyaddon.cpp | 2 +- test/addon/fcitx5/addon/testfrontend.conf | 3 +++ test/addon/fcitx5/addon/testim.conf | 3 +++ test/testcompose.cpp | 16 ++++++++--- test/testspell.cpp | 17 +++++++----- testing/testfrontend/testfrontend.conf | 2 ++ testing/testfrontend/testfrontend.cpp | 2 +- testing/testim/testim.conf | 3 ++- testing/testim/testim.cpp | 2 +- testing/testui/testui.conf | 3 +++ testing/testui/testui.cpp | 3 ++- 53 files changed, 170 insertions(+), 68 deletions(-) diff --git a/src/frontend/dbusfrontend/dbusfrontend.conf.in.in b/src/frontend/dbusfrontend/dbusfrontend.conf.in.in index 0a5e626d..bf93102f 100644 --- a/src/frontend/dbusfrontend/dbusfrontend.conf.in.in +++ b/src/frontend/dbusfrontend/dbusfrontend.conf.in.in @@ -6,5 +6,5 @@ Category=Frontend Version=@PROJECT_VERSION@ [Addon/Dependencies] -0=dbus - +0=core:@PROJECT_VERSION@ +1=dbus diff --git a/src/frontend/dbusfrontend/dbusfrontend.cpp b/src/frontend/dbusfrontend/dbusfrontend.cpp index 20c04fff..73f9dd80 100644 --- a/src/frontend/dbusfrontend/dbusfrontend.cpp +++ b/src/frontend/dbusfrontend/dbusfrontend.cpp @@ -610,4 +610,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::DBusFrontendModuleFactory); +FCITX_ADDON_FACTORY_V2(dbusfrontend, fcitx::DBusFrontendModuleFactory); diff --git a/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in b/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in index 07919a3c..a5470192 100644 --- a/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in +++ b/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in @@ -6,7 +6,8 @@ Category=Frontend Version=@PROJECT_VERSION@ [Addon/Dependencies] -0=dbus +0=core:@PROJECT_VERSION@ +1=dbus [Addon/OptionalDependencies] 0=xcb diff --git a/src/frontend/fcitx4frontend/fcitx4frontend.cpp b/src/frontend/fcitx4frontend/fcitx4frontend.cpp index e1b48947..62b40ca6 100644 --- a/src/frontend/fcitx4frontend/fcitx4frontend.cpp +++ b/src/frontend/fcitx4frontend/fcitx4frontend.cpp @@ -366,4 +366,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::Fcitx4FrontendModuleFactory); +FCITX_ADDON_FACTORY_V2(fcitx4frontend, fcitx::Fcitx4FrontendModuleFactory); diff --git a/src/frontend/ibusfrontend/ibusfrontend.conf.in.in b/src/frontend/ibusfrontend/ibusfrontend.conf.in.in index aed719b0..7827f820 100644 --- a/src/frontend/ibusfrontend/ibusfrontend.conf.in.in +++ b/src/frontend/ibusfrontend/ibusfrontend.conf.in.in @@ -6,5 +6,6 @@ Category=Frontend Version=@PROJECT_VERSION@ [Addon/Dependencies] -0=dbus +0=core:@PROJECT_VERSION@ +1=dbus diff --git a/src/frontend/ibusfrontend/ibusfrontend.cpp b/src/frontend/ibusfrontend/ibusfrontend.cpp index f3df669e..39f1a309 100644 --- a/src/frontend/ibusfrontend/ibusfrontend.cpp +++ b/src/frontend/ibusfrontend/ibusfrontend.cpp @@ -1010,4 +1010,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::IBusFrontendModuleFactory); +FCITX_ADDON_FACTORY_V2(ibusfrontend, fcitx::IBusFrontendModuleFactory); diff --git a/src/frontend/waylandim/waylandim.conf.in.in b/src/frontend/waylandim/waylandim.conf.in.in index e70467d1..d1ba18fd 100644 --- a/src/frontend/waylandim/waylandim.conf.in.in +++ b/src/frontend/waylandim/waylandim.conf.in.in @@ -7,5 +7,6 @@ Version=@PROJECT_VERSION@ Configurable=True [Addon/Dependencies] -0=wayland:@PROJECT_VERSION@ +0=core:@PROJECT_VERSION@ +1=wayland:@PROJECT_VERSION@ diff --git a/src/frontend/waylandim/waylandim.cpp b/src/frontend/waylandim/waylandim.cpp index bc4e6085..78f01fa4 100644 --- a/src/frontend/waylandim/waylandim.cpp +++ b/src/frontend/waylandim/waylandim.cpp @@ -111,4 +111,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::WaylandIMModuleFactory); +FCITX_ADDON_FACTORY_V2(waylandim, fcitx::WaylandIMModuleFactory); diff --git a/src/frontend/xim/xim.conf.in.in b/src/frontend/xim/xim.conf.in.in index dd1fbcff..133654de 100644 --- a/src/frontend/xim/xim.conf.in.in +++ b/src/frontend/xim/xim.conf.in.in @@ -7,7 +7,8 @@ Version=@PROJECT_VERSION@ Configurable=True [Addon/Dependencies] -0=xcb +0=core:@PROJECT_VERSION@ +1=xcb # This intends to load xim after dbus & ibusfrontend, so xim is released before dbus. # This helps new fcitx server to become xim server properly when replacing. diff --git a/src/frontend/xim/xim.cpp b/src/frontend/xim/xim.cpp index c9b81a0b..2dc18d7c 100644 --- a/src/frontend/xim/xim.cpp +++ b/src/frontend/xim/xim.cpp @@ -705,4 +705,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::XIMModuleFactory); +FCITX_ADDON_FACTORY_V2(xim, fcitx::XIMModuleFactory); diff --git a/src/im/keyboard/CMakeLists.txt b/src/im/keyboard/CMakeLists.txt index ae7691ad..f898c6b3 100644 --- a/src/im/keyboard/CMakeLists.txt +++ b/src/im/keyboard/CMakeLists.txt @@ -6,7 +6,6 @@ endif() if (TARGET Fcitx5::Module::Emoji) target_link_libraries(keyboard Fcitx5::Module::Emoji) endif() -target_include_directories(keyboard PUBLIC "$") configure_file(keyboard.conf.in.in keyboard.conf.in @ONLY) fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/keyboard.conf.in keyboard.conf) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/keyboard.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" diff --git a/src/im/keyboard/keyboard.conf.in.in b/src/im/keyboard/keyboard.conf.in.in index 434cdf3f..c9954dd4 100644 --- a/src/im/keyboard/keyboard.conf.in.in +++ b/src/im/keyboard/keyboard.conf.in.in @@ -6,6 +6,9 @@ Category=InputMethod Version=@PROJECT_VERSION@ Configurable=True +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ + [Addon/OptionalDependencies] 0=xcb 1=spell diff --git a/src/im/keyboard/keyboard.cpp b/src/im/keyboard/keyboard.cpp index 9b10efa4..d09bac57 100644 --- a/src/im/keyboard/keyboard.cpp +++ b/src/im/keyboard/keyboard.cpp @@ -35,6 +35,7 @@ #include "fcitx-utils/stringutils.h" #include "fcitx-utils/textformatflags.h" #include "fcitx-utils/utf8.h" +#include "fcitx/addoninstance.h" #include "fcitx/candidatelist.h" #include "fcitx/event.h" #include "fcitx/inputcontext.h" @@ -940,3 +941,5 @@ bool KeyboardEngineState::handleBackspace(const InputMethodEntry &entry) { } } // namespace fcitx + +FCITX_ADDON_FACTORY_V2(keyboard, fcitx::KeyboardEngineFactory); diff --git a/src/lib/fcitx/addoninstance.h b/src/lib/fcitx/addoninstance.h index 30d311fc..f4d58a95 100644 --- a/src/lib/fcitx/addoninstance.h +++ b/src/lib/fcitx/addoninstance.h @@ -199,6 +199,33 @@ private: } \ } +#define FCITX_ADDON_FACTORY_V2(AddonName, ClassName) \ + extern "C" { \ + FCITXCORE_EXPORT \ + ::fcitx::AddonFactory *fcitx_addon_factory_instance_##AddonName() { \ + static ClassName factory; \ + return &factory; \ + } \ + } + +#define FCITX_ADDON_FACTORY_V2_BACKWARDS(AddonName, ClassName) \ + FCITX_ADDON_FACTORY_V2(AddonName, ClassName) \ + FCITX_ADDON_FACTORY(ClassName) + +#define FCITX_IMPORT_ADDON_FACTORY(StaticRegistry, AddonName) \ + extern "C" { \ + ::fcitx::AddonFactory *fcitx_addon_factory_instance_##AddonName(); \ + } \ + class StaticAddonRegistrar_##AddonName { \ + public: \ + StaticAddonRegistrar_##AddonName() { \ + (StaticRegistry) \ + .emplace(FCITX_STRINGIFY(AddonName), \ + fcitx_addon_factory_instance_##AddonName()); \ + } \ + }; \ + StaticAddonRegistrar_##AddonName staticAddonRegistrar_##AddonName + /// A convenient macro to obtain the addon pointer of another addon. #define FCITX_ADDON_DEPENDENCY_LOADER(NAME, ADDONMANAGER) \ auto NAME() { \ diff --git a/src/lib/fcitx/addonloader.cpp b/src/lib/fcitx/addonloader.cpp index efa9515c..1270059c 100644 --- a/src/lib/fcitx/addonloader.cpp +++ b/src/lib/fcitx/addonloader.cpp @@ -5,8 +5,18 @@ * */ +#include "fcitx/addonloader.h" +#include +#include +#include +#include +#include "fcitx-utils/flags.h" #include "fcitx-utils/library.h" #include "fcitx-utils/log.h" +#include "fcitx-utils/standardpath.h" +#include "fcitx-utils/stringutils.h" +#include "fcitx/addoninfo.h" +#include "fcitx/addoninstance.h" #include "addonloader_p.h" #include "config.h" @@ -41,9 +51,9 @@ AddonInstance *SharedLibraryLoader::load(const AddonInfo &info, continue; } try { - registry_.emplace( - info.uniqueName(), - std::make_unique(std::move(lib))); + registry_.emplace(info.uniqueName(), + std::make_unique( + info, std::move(lib))); } catch (const std::exception &e) { FCITX_ERROR() << "Failed to initialize addon factory for addon " << info.uniqueName() << ". Error: " << e.what(); diff --git a/src/lib/fcitx/addonloader.h b/src/lib/fcitx/addonloader.h index aa7fba88..e7ebf6b8 100644 --- a/src/lib/fcitx/addonloader.h +++ b/src/lib/fcitx/addonloader.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ -#ifndef _FCITX_ADDONRESOLVER_H_ -#define _FCITX_ADDONRESOLVER_H_ +#ifndef _FCITX_ADDONLOADER_H_ +#define _FCITX_ADDONLOADER_H_ #include #include @@ -18,7 +18,7 @@ namespace fcitx { class AddonFactory; class AddonManager; -typedef std::unordered_map StaticAddonRegistry; +using StaticAddonRegistry = std::unordered_map; class FCITXCORE_EXPORT AddonLoader { public: @@ -29,4 +29,4 @@ public: }; } // namespace fcitx -#endif // _FCITX_ADDONRESOLVER_H_ +#endif // _FCITX_ADDONLOADER_H_ diff --git a/src/lib/fcitx/addonloader_p.h b/src/lib/fcitx/addonloader_p.h index f07a6aa7..e466f245 100644 --- a/src/lib/fcitx/addonloader_p.h +++ b/src/lib/fcitx/addonloader_p.h @@ -7,9 +7,15 @@ #ifndef _FCITX_ADDONLOADER_P_H_ #define _FCITX_ADDONLOADER_P_H_ +#include #include +#include +#include +#include +#include #include "fcitx-utils/library.h" #include "fcitx-utils/standardpath.h" +#include "fcitx-utils/stringutils.h" #include "addonfactory.h" #include "addoninfo.h" #include "addoninstance.h" @@ -17,10 +23,20 @@ namespace fcitx { +namespace { +constexpr char FCITX_ADDON_FACTORY_ENTRY[] = "fcitx_addon_factory_instance"; +} + class SharedLibraryFactory { public: - SharedLibraryFactory(Library lib) : library_(std::move(lib)) { - auto *funcPtr = library_.resolve("fcitx_addon_factory_instance"); + SharedLibraryFactory(const AddonInfo &info, Library lib) + : library_(std::move(lib)) { + std::string v2Name = stringutils::concat(FCITX_ADDON_FACTORY_ENTRY, "_", + info.uniqueName()); + auto *funcPtr = library_.resolve(v2Name.data()); + if (!funcPtr) { + funcPtr = library_.resolve(FCITX_ADDON_FACTORY_ENTRY); + } if (!funcPtr) { throw std::runtime_error(library_.error()); } diff --git a/src/modules/clipboard/clipboard.conf.in.in b/src/modules/clipboard/clipboard.conf.in.in index 25086531..46463dc9 100644 --- a/src/modules/clipboard/clipboard.conf.in.in +++ b/src/modules/clipboard/clipboard.conf.in.in @@ -8,5 +8,6 @@ OnDemand=False Configurable=True [Addon/OptionalDependencies] -0=xcb:@PROJECT_VERSION@ -1=wayland:@PROJECT_VERSION@ +0=core:@PROJECT_VERSION@ +1=xcb:@PROJECT_VERSION@ +2=wayland:@PROJECT_VERSION@ diff --git a/src/modules/clipboard/clipboard.cpp b/src/modules/clipboard/clipboard.cpp index 9ba49799..27443de6 100644 --- a/src/modules/clipboard/clipboard.cpp +++ b/src/modules/clipboard/clipboard.cpp @@ -498,4 +498,4 @@ class ClipboardModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::ClipboardModuleFactory); +FCITX_ADDON_FACTORY_V2(clipboard, fcitx::ClipboardModuleFactory); diff --git a/src/modules/dbus/dbus.conf.in.in b/src/modules/dbus/dbus.conf.in.in index 1b0c65fb..5889e0d9 100644 --- a/src/modules/dbus/dbus.conf.in.in +++ b/src/modules/dbus/dbus.conf.in.in @@ -6,7 +6,8 @@ Category=Module Version=@PROJECT_VERSION@ [Addon/Dependencies] -0=keyboard +0=core:@PROJECT_VERSION@ +1=keyboard [Addon/OptionalDependencies] 0=xcb diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp index 23e69bfd..bb46e993 100644 --- a/src/modules/dbus/dbusmodule.cpp +++ b/src/modules/dbus/dbusmodule.cpp @@ -854,4 +854,4 @@ class DBusModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::DBusModuleFactory) +FCITX_ADDON_FACTORY_V2(dbus, fcitx::DBusModuleFactory) diff --git a/src/modules/emoji/emoji.conf.in.in b/src/modules/emoji/emoji.conf.in.in index ba9078a3..c5cddde3 100644 --- a/src/modules/emoji/emoji.conf.in.in +++ b/src/modules/emoji/emoji.conf.in.in @@ -5,3 +5,6 @@ Library=libemoji Category=Module Version=@PROJECT_VERSION@ OnDemand=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/emoji/emoji.cpp b/src/modules/emoji/emoji.cpp index 4c6aa6b9..9dbf57af 100644 --- a/src/modules/emoji/emoji.cpp +++ b/src/modules/emoji/emoji.cpp @@ -241,4 +241,4 @@ class EmojiModuleFactory : public AddonFactory { } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::EmojiModuleFactory); +FCITX_ADDON_FACTORY_V2(emoji, fcitx::EmojiModuleFactory); diff --git a/src/modules/imselector/imselector.conf.in.in b/src/modules/imselector/imselector.conf.in.in index a935dd85..cfa9f6e1 100644 --- a/src/modules/imselector/imselector.conf.in.in +++ b/src/modules/imselector/imselector.conf.in.in @@ -7,3 +7,6 @@ Library=libimselector Type=SharedLibrary OnDemand=False Configurable=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/imselector/imselector.cpp b/src/modules/imselector/imselector.cpp index 092a32d4..858d145a 100644 --- a/src/modules/imselector/imselector.cpp +++ b/src/modules/imselector/imselector.cpp @@ -271,4 +271,4 @@ public: } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::IMSelectorFactory); +FCITX_ADDON_FACTORY_V2(imselector, fcitx::IMSelectorFactory); diff --git a/src/modules/notificationitem/notificationitem.conf.in.in b/src/modules/notificationitem/notificationitem.conf.in.in index 9e14810d..19e45cf7 100644 --- a/src/modules/notificationitem/notificationitem.conf.in.in +++ b/src/modules/notificationitem/notificationitem.conf.in.in @@ -8,5 +8,5 @@ Version=@PROJECT_VERSION@ OnDemand=True [Addon/Dependencies] -0=dbus - +0=core:@PROJECT_VERSION@ +1=dbus diff --git a/src/modules/notificationitem/notificationitem.cpp b/src/modules/notificationitem/notificationitem.cpp index 1182d32c..19500701 100644 --- a/src/modules/notificationitem/notificationitem.cpp +++ b/src/modules/notificationitem/notificationitem.cpp @@ -13,6 +13,7 @@ #include "fcitx-utils/endian_p.h" #include "fcitx-utils/i18n.h" #include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/addonmanager.h" #include "fcitx/misc_p.h" #include "classicui_public.h" @@ -423,4 +424,4 @@ class NotificationItemFactory : public AddonFactory { } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::NotificationItemFactory) +FCITX_ADDON_FACTORY_V2(notificationitem, fcitx::NotificationItemFactory) diff --git a/src/modules/notifications/notifications.conf.in.in b/src/modules/notifications/notifications.conf.in.in index 3c962a3b..87aea826 100644 --- a/src/modules/notifications/notifications.conf.in.in +++ b/src/modules/notifications/notifications.conf.in.in @@ -9,4 +9,5 @@ OnDemand=True Configurable=True [Addon/Dependencies] -0=dbus +0=core:@PROJECT_VERSION@ +1=dbus diff --git a/src/modules/notifications/notifications.cpp b/src/modules/notifications/notifications.cpp index 7e072846..b1d707cc 100644 --- a/src/modules/notifications/notifications.cpp +++ b/src/modules/notifications/notifications.cpp @@ -222,4 +222,4 @@ class NotificationsModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::NotificationsModuleFactory) +FCITX_ADDON_FACTORY_V2(notifications, fcitx::NotificationsModuleFactory) diff --git a/src/modules/quickphrase/quickphrase.cpp b/src/modules/quickphrase/quickphrase.cpp index d1d1979c..e7f8a11b 100644 --- a/src/modules/quickphrase/quickphrase.cpp +++ b/src/modules/quickphrase/quickphrase.cpp @@ -546,4 +546,4 @@ class QuickPhraseModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::QuickPhraseModuleFactory) +FCITX_ADDON_FACTORY_V2(quickphrase, fcitx::QuickPhraseModuleFactory) diff --git a/src/modules/spell/spell.conf.in.in b/src/modules/spell/spell.conf.in.in index 0d8969ee..96f9ff90 100644 --- a/src/modules/spell/spell.conf.in.in +++ b/src/modules/spell/spell.conf.in.in @@ -6,3 +6,6 @@ Category=Module Version=@PROJECT_VERSION@ OnDemand=True Configurable=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/spell/spell.cpp b/src/modules/spell/spell.cpp index a4229234..6044c935 100644 --- a/src/modules/spell/spell.cpp +++ b/src/modules/spell/spell.cpp @@ -111,4 +111,4 @@ Spell::hintForDisplay(const std::string &language, SpellProvider provider, } } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::SpellModuleFactory) +FCITX_ADDON_FACTORY_V2(spell, fcitx::SpellModuleFactory) diff --git a/src/modules/unicode/unicode.conf.in.in b/src/modules/unicode/unicode.conf.in.in index 28cbe3f7..fddc5b4c 100644 --- a/src/modules/unicode/unicode.conf.in.in +++ b/src/modules/unicode/unicode.conf.in.in @@ -8,5 +8,8 @@ Version=@PROJECT_VERSION@ OnDemand=False Configurable=True +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ + [Addon/OptionalDependencies] 0=clipboard diff --git a/src/modules/unicode/unicode.cpp b/src/modules/unicode/unicode.cpp index 9f6c1eb6..d5b00f8b 100644 --- a/src/modules/unicode/unicode.cpp +++ b/src/modules/unicode/unicode.cpp @@ -471,4 +471,4 @@ class UnicodeModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::UnicodeModuleFactory); +FCITX_ADDON_FACTORY_V2(unicode, fcitx::UnicodeModuleFactory); diff --git a/src/modules/wayland/wayland.conf.in.in b/src/modules/wayland/wayland.conf.in.in index 88fa87e3..b771071b 100644 --- a/src/modules/wayland/wayland.conf.in.in +++ b/src/modules/wayland/wayland.conf.in.in @@ -5,3 +5,6 @@ Library=libwayland Category=Module Version=@PROJECT_VERSION@ Configurable=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/wayland/waylandmodule.cpp b/src/modules/wayland/waylandmodule.cpp index d619e46f..8595defb 100644 --- a/src/modules/wayland/waylandmodule.cpp +++ b/src/modules/wayland/waylandmodule.cpp @@ -702,4 +702,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::WaylandModuleFactory); +FCITX_ADDON_FACTORY_V2(wayland, fcitx::WaylandModuleFactory); diff --git a/src/modules/xcb/xcb.conf.in.in b/src/modules/xcb/xcb.conf.in.in index feda5536..a1014ea7 100644 --- a/src/modules/xcb/xcb.conf.in.in +++ b/src/modules/xcb/xcb.conf.in.in @@ -5,3 +5,6 @@ Library=libxcb Category=Module Version=@PROJECT_VERSION@ Configurable=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/xcb/xcbmodule.cpp b/src/modules/xcb/xcbmodule.cpp index b30c7a75..5c9c8a05 100644 --- a/src/modules/xcb/xcbmodule.cpp +++ b/src/modules/xcb/xcbmodule.cpp @@ -208,4 +208,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::XCBModuleFactory); +FCITX_ADDON_FACTORY_V2(xcb, fcitx::XCBModuleFactory); diff --git a/src/server/main.cpp b/src/server/main.cpp index 3e95c8c2..70fa7880 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -21,28 +21,20 @@ #include "fcitx-utils/standardpath.h" #include "fcitx-utils/stringutils.h" #include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/addonloader.h" #include "fcitx/addonmanager.h" #include "fcitx/instance.h" #include "errorhandler.h" -#ifdef ENABLE_KEYBOARD -#include "keyboard.h" -#endif - using namespace fcitx; int selfpipe[2]; std::string crashlog; +StaticAddonRegistry staticAddon; #ifdef ENABLE_KEYBOARD -static KeyboardEngineFactory keyboardFactory; -#endif - -StaticAddonRegistry staticAddon = { -#ifdef ENABLE_KEYBOARD - std::make_pair("keyboard", &keyboardFactory) +FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); #endif -}; int main(int argc, char *argv[]) { umask(077); diff --git a/src/ui/classic/classicui.cpp b/src/ui/classic/classicui.cpp index 9655ac5c..1a90d0eb 100644 --- a/src/ui/classic/classicui.cpp +++ b/src/ui/classic/classicui.cpp @@ -508,4 +508,4 @@ bool ClassicUI::showLayoutNameInIcon() const { } // namespace fcitx::classicui -FCITX_ADDON_FACTORY(fcitx::classicui::ClassicUIFactory); +FCITX_ADDON_FACTORY_V2(classicui, fcitx::classicui::ClassicUIFactory); diff --git a/src/ui/kimpanel/kimpanel.cpp b/src/ui/kimpanel/kimpanel.cpp index 76b20afb..bac72b00 100644 --- a/src/ui/kimpanel/kimpanel.cpp +++ b/src/ui/kimpanel/kimpanel.cpp @@ -591,4 +591,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::KimpanelFactory); +FCITX_ADDON_FACTORY_V2(kimpanel, fcitx::KimpanelFactory); diff --git a/src/ui/virtualkeyboard/virtualkeyboard.cpp b/src/ui/virtualkeyboard/virtualkeyboard.cpp index 787ba438..01f72b2f 100644 --- a/src/ui/virtualkeyboard/virtualkeyboard.cpp +++ b/src/ui/virtualkeyboard/virtualkeyboard.cpp @@ -12,6 +12,8 @@ #include "fcitx-utils/key.h" #include "fcitx-utils/log.h" #include "fcitx-utils/utf8.h" +#include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/addonmanager.h" #include "fcitx/candidatelist.h" #include "fcitx/inputcontext.h" @@ -535,4 +537,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::VirtualKeyboardFactory); +FCITX_ADDON_FACTORY_V2(virtualkeyboard, fcitx::VirtualKeyboardFactory); diff --git a/test/addon/dummyaddon.cpp b/test/addon/dummyaddon.cpp index a6f75211..41d807fc 100644 --- a/test/addon/dummyaddon.cpp +++ b/test/addon/dummyaddon.cpp @@ -29,4 +29,4 @@ class DummyAddonFactory : public fcitx::AddonFactory { } }; -FCITX_ADDON_FACTORY(DummyAddonFactory) +FCITX_ADDON_FACTORY_V2_BACKWARDS(dummyaddon, DummyAddonFactory) diff --git a/test/addon/fcitx5/addon/testfrontend.conf b/test/addon/fcitx5/addon/testfrontend.conf index 927f0aad..55ac86e3 100644 --- a/test/addon/fcitx5/addon/testfrontend.conf +++ b/test/addon/fcitx5/addon/testfrontend.conf @@ -3,3 +3,6 @@ Name=testfrontend Type=SharedLibrary Library=libtestfrontend Category=Frontend + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/test/addon/fcitx5/addon/testim.conf b/test/addon/fcitx5/addon/testim.conf index f4cf40a1..737e4fdf 100644 --- a/test/addon/fcitx5/addon/testim.conf +++ b/test/addon/fcitx5/addon/testim.conf @@ -2,3 +2,6 @@ Name=testim Type=StaticLibrary Category=InputMethod + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/test/testcompose.cpp b/test/testcompose.cpp index 2e47c116..cb9f3f63 100644 --- a/test/testcompose.cpp +++ b/test/testcompose.cpp @@ -4,19 +4,27 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ +#include +#include +#include #include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" +#include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/testing.h" +#include "fcitx/addoninstance.h" +#include "fcitx/addonloader.h" +#include "fcitx/instance.h" #include "fcitx/instance_p.h" -#include "keyboard.h" #include "testdir.h" #include "testfrontend_public.h" using namespace fcitx; -static KeyboardEngineFactory keyboardFactory; +StaticAddonRegistry staticAddon; +FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); -StaticAddonRegistry staticAddon = { - std::make_pair("keyboard", &keyboardFactory)}; void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { dispatcher->schedule([instance]() { auto *keyboard = instance->addonManager().addon("keyboard", true); diff --git a/test/testspell.cpp b/test/testspell.cpp index 2cc8f18a..b6a74df2 100644 --- a/test/testspell.cpp +++ b/test/testspell.cpp @@ -5,16 +5,25 @@ * */ #include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" +#include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/testing.h" +#include "fcitx/addoninstance.h" +#include "fcitx/addonloader.h" #include "fcitx/addonmanager.h" +#include "fcitx/inputmethodgroup.h" #include "fcitx/inputmethodmanager.h" #include "fcitx/instance.h" -#include "keyboard.h" #include "testdir.h" #include "testfrontend_public.h" using namespace fcitx; +StaticAddonRegistry staticAddon; +FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); + void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { dispatcher->schedule([instance]() { auto *spell = instance->addonManager().addon("spell", true); @@ -64,12 +73,6 @@ int main() { "testing/testim"}, {"test", "src/modules", FCITX5_SOURCE_DIR "/src/modules"}); - static KeyboardEngineFactory keyboardFactory; - - StaticAddonRegistry staticAddon = { - std::make_pair("keyboard", - &keyboardFactory)}; - char arg0[] = "testspell"; char arg1[] = "--disable=all"; char arg2[] = "--enable=keyboard,testfrontend,spell,testui"; diff --git a/testing/testfrontend/testfrontend.conf b/testing/testfrontend/testfrontend.conf index c3120973..55ac86e3 100644 --- a/testing/testfrontend/testfrontend.conf +++ b/testing/testfrontend/testfrontend.conf @@ -4,3 +4,5 @@ Type=SharedLibrary Library=libtestfrontend Category=Frontend +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/testing/testfrontend/testfrontend.cpp b/testing/testfrontend/testfrontend.cpp index ae1ab750..afb30056 100644 --- a/testing/testfrontend/testfrontend.cpp +++ b/testing/testfrontend/testfrontend.cpp @@ -106,4 +106,4 @@ public: } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::TestFrontendFactory); +FCITX_ADDON_FACTORY_V2(testfrontend, fcitx::TestFrontendFactory); diff --git a/testing/testim/testim.conf b/testing/testim/testim.conf index 0a7046dd..3aff9ccc 100644 --- a/testing/testim/testim.conf +++ b/testing/testim/testim.conf @@ -4,4 +4,5 @@ Type=SharedLibrary Library=libtestim Category=InputMethod - +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/testing/testim/testim.cpp b/testing/testim/testim.cpp index 5a65634e..8895867d 100644 --- a/testing/testim/testim.cpp +++ b/testing/testim/testim.cpp @@ -32,4 +32,4 @@ public: } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::TestIMFactory); +FCITX_ADDON_FACTORY_V2(testim, fcitx::TestIMFactory); diff --git a/testing/testui/testui.conf b/testing/testui/testui.conf index e6d684c9..67ec5937 100644 --- a/testing/testui/testui.conf +++ b/testing/testui/testui.conf @@ -3,3 +3,6 @@ Name=Simple UI for testing Type=SharedLibrary Library=libtestui Category=UI + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/testing/testui/testui.cpp b/testing/testui/testui.cpp index 1c2e1c01..7d22baec 100644 --- a/testing/testui/testui.cpp +++ b/testing/testui/testui.cpp @@ -10,6 +10,7 @@ #include "fcitx-utils/utf8.h" #include "fcitx/action.h" #include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/addonmanager.h" #include "fcitx/candidatelist.h" #include "fcitx/inputcontext.h" @@ -89,4 +90,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::TestUIFactory); +FCITX_ADDON_FACTORY_V2(testui, fcitx::TestUIFactory); -- Gitee From bac0557041f4ebf1c4ff52fd6f760190f26744d1 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 18 Nov 2024 14:38:31 -0800 Subject: [PATCH 15/69] Bump version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d47006f..0d219a51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6.0) -project(fcitx VERSION 5.1.11) +project(fcitx VERSION 5.1.12) set(FCITX_VERSION ${PROJECT_VERSION}) find_package(ECM REQUIRED 1.0.0) -- Gitee From c2d8c0fd56c12cfe560ac6b9f337c5cf3233f790 Mon Sep 17 00:00:00 2001 From: rocka Date: Fri, 22 Nov 2024 03:21:50 +0800 Subject: [PATCH 16/69] Set CMake policy CMP0067 to NEW. (#1186) --- cmake/Fcitx5CompilerSettings.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Fcitx5CompilerSettings.cmake b/cmake/Fcitx5CompilerSettings.cmake index 5e766d30..54409704 100644 --- a/cmake/Fcitx5CompilerSettings.cmake +++ b/cmake/Fcitx5CompilerSettings.cmake @@ -23,6 +23,11 @@ if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() +if (POLICY CMP0067) + # make check_cxx_source_compiles honors CMAKE_CXX_STANDARD + cmake_policy(SET CMP0067 NEW) +endif() + if(ENABLE_COVERAGE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") -- Gitee From a85665a9cc54604648f606e389569ed6b6f53949 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sun, 24 Nov 2024 14:55:02 -0500 Subject: [PATCH 17/69] Add isEmscripten helper function (#1189) --- src/lib/fcitx-utils/misc.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/lib/fcitx-utils/misc.h b/src/lib/fcitx-utils/misc.h index 2c506fb6..a51f6b61 100644 --- a/src/lib/fcitx-utils/misc.h +++ b/src/lib/fcitx-utils/misc.h @@ -169,6 +169,19 @@ FCITXUTILS_EXPORT constexpr inline bool isApple() { #endif } +/** + * Util function that returns whether it is compile against emscripten. + * + * @since 5.1.12 + */ +FCITXUTILS_EXPORT constexpr inline bool isEmscripten() { +#if defined(__EMSCRIPTEN__) + return true; +#else + return false; +#endif +} + } // namespace fcitx #endif // _FCITX_UTILS_MISC_H_ -- Gitee From 0833bbe8ca0e0dea181050f162e7ac5f72c9fa3e Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 2 Dec 2024 11:41:06 -0800 Subject: [PATCH 18/69] Add consumePrefix to stringutils --- src/lib/fcitx-utils/stringutils.cpp | 9 +++++++++ src/lib/fcitx-utils/stringutils.h | 12 ++++++++++++ test/teststringutils.cpp | 8 ++++++++ 3 files changed, 29 insertions(+) diff --git a/src/lib/fcitx-utils/stringutils.cpp b/src/lib/fcitx-utils/stringutils.cpp index c2f7dfe3..4bdfa26d 100644 --- a/src/lib/fcitx-utils/stringutils.cpp +++ b/src/lib/fcitx-utils/stringutils.cpp @@ -407,4 +407,13 @@ std::string escapeForValue(std::string_view str) { return value; } + +bool consumePrefix(std::string_view &str, std::string_view prefix) { + if (stringutils::startsWith(str, prefix)) { + str = str.substr(prefix.size()); + return true; + } + return false; +} + } // namespace fcitx::stringutils diff --git a/src/lib/fcitx-utils/stringutils.h b/src/lib/fcitx-utils/stringutils.h index fc8888f3..59307054 100644 --- a/src/lib/fcitx-utils/stringutils.h +++ b/src/lib/fcitx-utils/stringutils.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include "fcitxutils_export.h" @@ -182,6 +183,17 @@ unescapeForValue(std::string_view str); */ FCITXUTILS_EXPORT std::string escapeForValue(std::string_view str); +/** + * Return a substring of input str if str starts with given prefix. + * + * \param str input string + * \param prefix to check + * \see startsWith + * \since 5.1.12 + */ +FCITXUTILS_EXPORT bool consumePrefix(std::string_view &str, + std::string_view prefix); + } // namespace fcitx::stringutils #endif // _FCITX_UTILS_STRINGUTILS_H_ diff --git a/test/teststringutils.cpp b/test/teststringutils.cpp index 831545bd..6503e0a6 100644 --- a/test/teststringutils.cpp +++ b/test/teststringutils.cpp @@ -16,6 +16,7 @@ int main() { FCITX_ASSERT(stringutils::startsWith("abc", "ab")); FCITX_ASSERT(!stringutils::startsWith("abc", "abd")); FCITX_ASSERT(!stringutils::startsWith("abc", "abcd")); + FCITX_ASSERT(stringutils::startsWith("abc", "")); FCITX_ASSERT(!stringutils::endsWith("abc", "ab")); FCITX_ASSERT(stringutils::endsWith("abc", "abc")); FCITX_ASSERT(!stringutils::endsWith("abc", "eabc")); @@ -128,5 +129,12 @@ int main() { FCITX_ASSERT(charutils::toHex(i) == i - 10 + 'a'); } } + + std::string_view str = "abc"; + FCITX_ASSERT(!stringutils::consumePrefix(str, "ae")); + FCITX_ASSERT(str == "abc"); + FCITX_ASSERT(stringutils::consumePrefix(str, "ab")); + FCITX_ASSERT(str == "c"); + return 0; } -- Gitee From ee2fd466413e9a96c992d1fbbbd3e8e8b8df7a29 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 3 Dec 2024 07:50:27 -0800 Subject: [PATCH 19/69] Add support for shared addon loader to load multiple libraries (#1195) In general this is not very useful on linux, but for android where LD_LIBRARY_PATH doesn't work, it can be used as an built-in linker to load depenedency libraries. --- src/lib/fcitx/addonloader.cpp | 64 +++++++++++++++-------- src/lib/fcitx/addonloader_p.h | 18 ++++--- test/addon/CMakeLists.txt | 3 ++ test/addon/dummyaddondeps.cpp | 8 +++ test/addon2/fcitx5/addon/dummyaddon2.conf | 2 +- test/testaddon.cpp | 7 +++ 6 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 test/addon/dummyaddondeps.cpp diff --git a/src/lib/fcitx/addonloader.cpp b/src/lib/fcitx/addonloader.cpp index 1270059c..a069b6a1 100644 --- a/src/lib/fcitx/addonloader.cpp +++ b/src/lib/fcitx/addonloader.cpp @@ -30,37 +30,59 @@ AddonInstance *SharedLibraryLoader::load(const AddonInfo &info, AddonManager *manager) { auto iter = registry_.find(info.uniqueName()); if (iter == registry_.end()) { - std::string libname = info.library(); - Flags flag = LibraryLoadHint::DefaultHint; - if (stringutils::startsWith(libname, "export:")) { - libname = libname.substr(7); - flag |= LibraryLoadHint::ExportExternalSymbolsHint; - } - auto file = libname + FCITX_LIBRARY_SUFFIX; - auto libs = standardPath_.locateAll(StandardPath::Type::Addon, file); - if (libs.empty()) { - FCITX_ERROR() << "Could not locate library " << file - << " for addon " << info.uniqueName() << "."; + std::vector libnames = + stringutils::split(info.library(), ";"); + + if (libnames.empty()) { + FCITX_ERROR() << "Failed to parse Library field: " << info.library() + << " for addon " << info.uniqueName(); + return nullptr; } - for (const auto &libraryPath : libs) { - Library lib(libraryPath); - if (!lib.load(flag)) { - FCITX_ERROR() - << "Failed to load library for addon " << info.uniqueName() - << " on " << libraryPath << ". Error: " << lib.error(); - continue; + + std::vector libraries; + for (std::string_view libname : libnames) { + Flags flag = LibraryLoadHint::DefaultHint; + if (stringutils::consumePrefix(libname, "export:")) { + flag |= LibraryLoadHint::ExportExternalSymbolsHint; + } + const auto file = + stringutils::concat(libname, FCITX_LIBRARY_SUFFIX); + const auto libraryPaths = + standardPath_.locateAll(StandardPath::Type::Addon, file); + if (libraryPaths.empty()) { + FCITX_ERROR() << "Could not locate library " << file + << " for addon " << info.uniqueName() << "."; } + bool loaded = false; + ; + for (const auto &libraryPath : libraryPaths) { + Library library(libraryPath); + if (library.load(flag)) { + libraries.push_back(std::move(library)); + loaded = true; + break; + } else { + FCITX_ERROR() << "Failed to load library for addon " + << info.uniqueName() << " on " << libraryPath + << ". Error: " << library.error(); + } + } + if (!loaded) { + break; + } + } + + if (libraries.size() == libnames.size()) { try { registry_.emplace(info.uniqueName(), std::make_unique( - info, std::move(lib))); + info, std::move(libraries))); } catch (const std::exception &e) { FCITX_ERROR() << "Failed to initialize addon factory for addon " << info.uniqueName() << ". Error: " << e.what(); } - break; + iter = registry_.find(info.uniqueName()); } - iter = registry_.find(info.uniqueName()); } if (iter == registry_.end()) { diff --git a/src/lib/fcitx/addonloader_p.h b/src/lib/fcitx/addonloader_p.h index e466f245..66f1d63e 100644 --- a/src/lib/fcitx/addonloader_p.h +++ b/src/lib/fcitx/addonloader_p.h @@ -29,16 +29,22 @@ constexpr char FCITX_ADDON_FACTORY_ENTRY[] = "fcitx_addon_factory_instance"; class SharedLibraryFactory { public: - SharedLibraryFactory(const AddonInfo &info, Library lib) - : library_(std::move(lib)) { + SharedLibraryFactory(const AddonInfo &info, std::vector libraries) + : libraries_(std::move(libraries)) { std::string v2Name = stringutils::concat(FCITX_ADDON_FACTORY_ENTRY, "_", info.uniqueName()); - auto *funcPtr = library_.resolve(v2Name.data()); + if (libraries_.empty()) { + throw std::runtime_error("Got empty libraries."); + } + + // Only resolve with last library. + auto &library = libraries_.back(); + auto *funcPtr = library.resolve(v2Name.data()); if (!funcPtr) { - funcPtr = library_.resolve(FCITX_ADDON_FACTORY_ENTRY); + funcPtr = library.resolve(FCITX_ADDON_FACTORY_ENTRY); } if (!funcPtr) { - throw std::runtime_error(library_.error()); + throw std::runtime_error(library.error()); } auto func = Library::toFunction(funcPtr); factory_ = func(); @@ -50,7 +56,7 @@ public: AddonFactory *factory() { return factory_; } private: - Library library_; + std::vector libraries_; AddonFactory *factory_; }; diff --git a/test/addon/CMakeLists.txt b/test/addon/CMakeLists.txt index ed4ce32f..ba0c0b09 100644 --- a/test/addon/CMakeLists.txt +++ b/test/addon/CMakeLists.txt @@ -1,6 +1,9 @@ add_library(dummyaddon MODULE dummyaddon.cpp) target_link_libraries(dummyaddon Fcitx5::Core) +add_library(dummyaddondeps MODULE dummyaddondeps.cpp) +target_link_libraries(dummyaddondeps Fcitx5::Utils) + set(COPY_ADDON_DEPENDS unicode.conf.in-fmt quickphrase.conf.in-fmt xcb.conf.in-fmt spell.conf.in-fmt) if (ENABLE_KEYBOARD) diff --git a/test/addon/dummyaddondeps.cpp b/test/addon/dummyaddondeps.cpp new file mode 100644 index 00000000..f702003e --- /dev/null +++ b/test/addon/dummyaddondeps.cpp @@ -0,0 +1,8 @@ +#include + +FCITX_DEFINE_LOG_CATEGORY(dummyaddondeps, "dummyaddondeps"); + +static int init = []() { + fcitx::Log::setLogRule("default=3"); + return 0; +}(); \ No newline at end of file diff --git a/test/addon2/fcitx5/addon/dummyaddon2.conf b/test/addon2/fcitx5/addon/dummyaddon2.conf index 643d23e8..8c9a42af 100644 --- a/test/addon2/fcitx5/addon/dummyaddon2.conf +++ b/test/addon2/fcitx5/addon/dummyaddon2.conf @@ -1,7 +1,7 @@ [Addon] Name=dummyaddon2 Type=SharedLibrary -Library=libdummyaddon +Library=libdummyaddondeps;libdummyaddon Category=Module [Addon/Dependencies] diff --git a/test/testaddon.cpp b/test/testaddon.cpp index daa141b9..5c847949 100644 --- a/test/testaddon.cpp +++ b/test/testaddon.cpp @@ -41,5 +41,12 @@ int main() { FCITX_ASSERT(addon2); auto *addon3 = manager.addon("dummyaddon3"); FCITX_ASSERT(!addon3); + // loading dummyaddondeps will change log rule level to 3. + FCITX_ASSERT( + !fcitx::Log::defaultCategory().checkLogLevel(fcitx::LogLevel::Info)); + FCITX_ASSERT( + fcitx::Log::defaultCategory().checkLogLevel(fcitx::LogLevel::Warn)); + fcitx::Log::setLogRule("default=5"); + return 0; } -- Gitee From 63dfcfeb01f1640d7877e9a471640569af58c199 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Tue, 3 Dec 2024 21:41:09 -0500 Subject: [PATCH 20/69] no default dot in candidate label on macOS (#1193) --- src/lib/fcitx/candidatelist.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/fcitx/candidatelist.cpp b/src/lib/fcitx/candidatelist.cpp index 4d1950ed..dc8dcc32 100644 --- a/src/lib/fcitx/candidatelist.cpp +++ b/src/lib/fcitx/candidatelist.cpp @@ -431,8 +431,10 @@ std::string keyToLabel(const Key &key) { } else { result = Key::keySymToString(key.sym(), KeyStringFormat::Localized); } - // add a dot as separator - result += ". "; + if (!isApple()) { + // add a dot as separator + result += ". "; + } return result; } -- Gitee From 39b2d94596bfe1356cbb127031e257cc1eac9f95 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Tue, 3 Dec 2024 21:41:37 -0500 Subject: [PATCH 21/69] make testing addons optional (#1188) --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d219a51..ec6f47c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,8 @@ include(CheckSymbolExists) ####################################################################### # Options ####################################################################### -option(ENABLE_TEST "Build Test" On) +option(ENABLE_TESTING_ADDONS "Build testing frontend, im and ui addons" On) +option(ENABLE_TEST "Build Test (Need ENABLE_TESTING_ADDONS=On)" On) option(ENABLE_COVERAGE "Build the project with gcov support (Need ENABLE_TEST=On)" Off) set(GCOV_TOOL "gcov" CACHE STRING "Path to gcov tool used by coverage.") set(DEFAULT_XKB_RULES "evdev" CACHE STRING "Xkb rules name") @@ -226,7 +227,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(src) add_subdirectory(data) add_subdirectory(po) -add_subdirectory(testing) + +if (ENABLE_TESTING_ADDONS) + add_subdirectory(testing) +endif() ####################################################################### # Test features -- Gitee From 552f7d13df51cb8e96ec9010dede40ec6ecc955f Mon Sep 17 00:00:00 2001 From: liulinsong Date: Wed, 4 Dec 2024 10:50:08 +0800 Subject: [PATCH 22/69] The virtual keyboard should show or hide automatically if enabled (#1086) 1. When the user interacts with some applications rather than the virtual keyboard itself, the virtual keyboard should show or hide if it is enabled. 2. For example, if the user clicks a window and the window has a text input control which has the focus and accepts the input from the keyboard, then the virtual keyboard should show automatically if the auto show switch is enabled. 3. Then, if the window loses the focus, the virtual keyboard should hide automatically if the auto hide switch is enabled. --- src/lib/fcitx/instance.cpp | 17 +++++++---------- src/lib/fcitx/instance_p.h | 4 ++-- src/lib/fcitx/userinterfacemanager.cpp | 10 ++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp index d2e9aa23..4215bf3f 100644 --- a/src/lib/fcitx/instance.cpp +++ b/src/lib/fcitx/instance.cpp @@ -1042,11 +1042,9 @@ Instance::Instance(int argc, char **argv) { activateInputMethod(icEvent); - if (virtualKeyboardAutoShow()) { - auto *inputContext = icEvent.inputContext(); - if (!inputContext->clientControlVirtualkeyboardShow()) { - inputContext->showVirtualKeyboard(); - } + auto *inputContext = icEvent.inputContext(); + if (!inputContext->clientControlVirtualkeyboardShow()) { + inputContext->showVirtualKeyboard(); } if (!d->globalConfig_.showInputMethodInformationWhenFocusIn() || @@ -1091,11 +1089,10 @@ Instance::Instance(int argc, char **argv) { d->lastUnFocusedProgram_ = icEvent.inputContext()->program(); d->lastUnFocusedIc_ = icEvent.inputContext()->watch(); deactivateInputMethod(icEvent); - if (virtualKeyboardAutoHide()) { - auto *inputContext = icEvent.inputContext(); - if (!inputContext->clientControlVirtualkeyboardHide()) { - inputContext->hideVirtualKeyboard(); - } + + auto *inputContext = icEvent.inputContext(); + if (!inputContext->clientControlVirtualkeyboardHide()) { + inputContext->hideVirtualKeyboard(); } })); d->eventWatchers_.emplace_back(d->watchEvent( diff --git a/src/lib/fcitx/instance_p.h b/src/lib/fcitx/instance_p.h index 4676d89a..541a976c 100644 --- a/src/lib/fcitx/instance_p.h +++ b/src/lib/fcitx/instance_p.h @@ -219,9 +219,9 @@ public: std::string lastGroup_; - bool virtualKeyboardAutoShow_ = true; + bool virtualKeyboardAutoShow_ = false; - bool virtualKeyboardAutoHide_ = true; + bool virtualKeyboardAutoHide_ = false; VirtualKeyboardFunctionMode virtualKeyboardFunctionMode_ = VirtualKeyboardFunctionMode::Full; diff --git a/src/lib/fcitx/userinterfacemanager.cpp b/src/lib/fcitx/userinterfacemanager.cpp index fa9e2698..19178b09 100644 --- a/src/lib/fcitx/userinterfacemanager.cpp +++ b/src/lib/fcitx/userinterfacemanager.cpp @@ -333,6 +333,11 @@ bool UserInterfaceManager::isVirtualKeyboardVisible() const { void UserInterfaceManager::showVirtualKeyboard() const { FCITX_D(); + auto *instance = d->addonManager_->instance(); + if (!instance->virtualKeyboardAutoShow()) { + return; + } + auto *ui = d->ui_; if (ui == nullptr || ui->addonInfo() == nullptr || ui->addonInfo()->uiType() != UIType::OnScreenKeyboard) { @@ -346,6 +351,11 @@ void UserInterfaceManager::showVirtualKeyboard() const { void UserInterfaceManager::hideVirtualKeyboard() const { FCITX_D(); + auto *instance = d->addonManager_->instance(); + if (!instance->virtualKeyboardAutoHide()) { + return; + } + auto *ui = d->ui_; if (ui == nullptr || ui->addonInfo() == nullptr || ui->addonInfo()->uiType() != UIType::OnScreenKeyboard) { -- Gitee From 389f3d7507d6a77e988964c2f78eb2d70d5e8c84 Mon Sep 17 00:00:00 2001 From: liulinsong Date: Wed, 4 Dec 2024 11:39:19 +0800 Subject: [PATCH 23/69] The input method mode should be set physical keyboard when necessary (#1087) If the virtual keyboard should not show automatically, then the input method mode should be set physical keyboard when the user closes the virtual keyboard by interacting with the virtual keyboard itself. For example, if the user clicks a close button in the virtual keyboard or clicks an icon in the task bar or a float button on the desktop which can close the virtual keyboard, then the virtual keyboard will be closed and the input method mode should be set physical keyboard. --- src/ui/virtualkeyboard/virtualkeyboard.cpp | 16 ++++++++++++++-- src/ui/virtualkeyboard/virtualkeyboard.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ui/virtualkeyboard/virtualkeyboard.cpp b/src/ui/virtualkeyboard/virtualkeyboard.cpp index 01f72b2f..6f3c0583 100644 --- a/src/ui/virtualkeyboard/virtualkeyboard.cpp +++ b/src/ui/virtualkeyboard/virtualkeyboard.cpp @@ -34,7 +34,7 @@ public: void showVirtualKeyboard() { parent_->showVirtualKeyboardForcibly(); } - void hideVirtualKeyboard() { parent_->hideVirtualKeyboard(); } + void hideVirtualKeyboard() { parent_->hideVirtualKeyboardForcibly(); } void toggleVirtualKeyboard() { parent_->toggleVirtualKeyboard(); } @@ -325,13 +325,25 @@ void VirtualKeyboard::showVirtualKeyboardForcibly() { showVirtualKeyboard(); } +void VirtualKeyboard::hideVirtualKeyboardForcibly() { + if (!available_) { + return; + } + + hideVirtualKeyboard(); + + if (!instance_->virtualKeyboardAutoShow()) { + instance_->setInputMethodMode(InputMethodMode::PhysicalKeyboard); + } +} + void VirtualKeyboard::toggleVirtualKeyboard() { if (!available_) { return; } if (visible_) { - hideVirtualKeyboard(); + hideVirtualKeyboardForcibly(); } else { showVirtualKeyboardForcibly(); } diff --git a/src/ui/virtualkeyboard/virtualkeyboard.h b/src/ui/virtualkeyboard/virtualkeyboard.h index 92bff2f0..a94e096a 100644 --- a/src/ui/virtualkeyboard/virtualkeyboard.h +++ b/src/ui/virtualkeyboard/virtualkeyboard.h @@ -40,6 +40,7 @@ public: void hideVirtualKeyboard() override; void showVirtualKeyboardForcibly(); + void hideVirtualKeyboardForcibly(); void toggleVirtualKeyboard(); void updateInputPanel(InputContext *inputContext); -- Gitee From f5f8d6c22016381f936aa2b24f82f54553177332 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 6 Dec 2024 10:45:47 -0800 Subject: [PATCH 24/69] Add new macro and option to allow easy static build --- CMakeLists.txt | 3 +- src/CMakeLists.txt | 16 ++++- src/frontend/dbusfrontend/CMakeLists.txt | 2 +- .../dbusfrontend/dbusfrontend.conf.in.in | 2 +- src/frontend/fcitx4frontend/CMakeLists.txt | 2 +- .../fcitx4frontend/fcitx4frontend.conf.in.in | 2 +- src/frontend/ibusfrontend/CMakeLists.txt | 2 +- .../ibusfrontend/ibusfrontend.conf.in.in | 2 +- src/frontend/waylandim/CMakeLists.txt | 2 +- src/frontend/waylandim/waylandim.conf.in.in | 2 +- src/frontend/xim/CMakeLists.txt | 2 +- src/frontend/xim/xim.conf.in.in | 2 +- src/lib/fcitx-config/CMakeLists.txt | 2 +- src/lib/fcitx-utils/CMakeLists.txt | 2 +- src/lib/fcitx-utils/Fcitx5Macros.cmake | 60 +++++++++++++++++++ src/lib/fcitx/CMakeLists.txt | 2 +- src/modules/clipboard/CMakeLists.txt | 2 +- src/modules/clipboard/clipboard.conf.in.in | 2 +- src/modules/dbus/CMakeLists.txt | 2 +- src/modules/dbus/dbus.conf.in.in | 2 +- src/modules/emoji/CMakeLists.txt | 2 +- src/modules/emoji/emoji.conf.in.in | 2 +- src/modules/imselector/CMakeLists.txt | 2 +- src/modules/imselector/imselector.conf.in.in | 2 +- src/modules/notificationitem/CMakeLists.txt | 2 +- .../notificationitem.conf.in.in | 2 +- src/modules/notifications/CMakeLists.txt | 2 +- .../notifications/notifications.conf.in.in | 2 +- src/modules/quickphrase/CMakeLists.txt | 2 +- .../quickphrase/quickphrase.conf.in.in | 2 +- src/modules/spell/CMakeLists.txt | 2 +- src/modules/spell/spell.conf.in.in | 2 +- src/modules/unicode/CMakeLists.txt | 2 +- src/modules/unicode/unicode.conf.in.in | 2 +- src/modules/wayland/CMakeLists.txt | 2 +- src/modules/wayland/wayland.conf.in.in | 2 +- src/modules/xcb/CMakeLists.txt | 2 +- src/modules/xcb/xcb.conf.in.in | 2 +- src/server/CMakeLists.txt | 1 + src/ui/classic/CMakeLists.txt | 2 +- src/ui/classic/classicui.conf.in.in | 2 +- src/ui/kimpanel/CMakeLists.txt | 2 +- src/ui/kimpanel/kimpanel.conf.in.in | 2 +- src/ui/virtualkeyboard/CMakeLists.txt | 2 +- .../virtualkeyboard.conf.in.in | 2 +- test/addon/CMakeLists.txt | 4 +- testing/testfrontend/CMakeLists.txt | 2 +- testing/testim/CMakeLists.txt | 2 +- testing/testui/CMakeLists.txt | 2 +- 49 files changed, 122 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec6f47c3..d3ab20d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6.0) +cmake_minimum_required(VERSION 3.13) project(fcitx VERSION 5.1.12) set(FCITX_VERSION ${PROJECT_VERSION}) @@ -38,6 +38,7 @@ option(USE_FLATPAK_ICON "Use flatpak icon name for desktop files" Off) option(ENABLE_EMOJI "Enable emoji module" On) option(ENABLE_LIBUUID "Use libuuid for uuid generation" On) option(BUILD_SPELL_DICT "Build en_dict.fscd for English spell check" On) +option(BUILD_SHARED_LIBS "Build library as shared libs" On) set(NO_PREEDIT_APPS "gvim.*,wps.*,wpp.*,et.*" CACHE STRING "Disable preedit for follwing app by default.") set(EVENT_LOOP_BACKEND "auto" CACHE STRING "Set the underlying event loop implementation, valid values are auto,systemd,libuv,none") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f24f0f1d..a9746a36 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,11 +3,21 @@ add_definitions("-DFCITX_GETTEXT_DOMAIN=\"fcitx5\"") add_subdirectory(lib) add_subdirectory(modules) add_subdirectory(frontend) +add_subdirectory(im) +add_subdirectory(ui) + if (ENABLE_SERVER) -add_subdirectory(server) + add_subdirectory(server) + + if (NOT BUILD_SHARED_FCITX_ADDON) + fcitx5_get_addon_targets(ADDON_TARGETS modules frontend im ui) + + fcitx5_import_addons(fcitx5 + REGISTRY_VARNAME staticAddon + ADDONS ${ADDON_TARGETS} + ) + endif() endif() -add_subdirectory(im) -add_subdirectory(ui) add_subdirectory(tools) diff --git a/src/frontend/dbusfrontend/CMakeLists.txt b/src/frontend/dbusfrontend/CMakeLists.txt index 723be2ec..e148b320 100644 --- a/src/frontend/dbusfrontend/CMakeLists.txt +++ b/src/frontend/dbusfrontend/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(dbusfrontend MODULE dbusfrontend.cpp) +add_fcitx5_addon(dbusfrontend dbusfrontend.cpp) target_link_libraries(dbusfrontend Fcitx5::Core Fcitx5::Module::DBus) install(TARGETS dbusfrontend DESTINATION "${FCITX_INSTALL_ADDONDIR}") configure_file(dbusfrontend.conf.in.in dbusfrontend.conf.in @ONLY) diff --git a/src/frontend/dbusfrontend/dbusfrontend.conf.in.in b/src/frontend/dbusfrontend/dbusfrontend.conf.in.in index bf93102f..41d122ac 100644 --- a/src/frontend/dbusfrontend/dbusfrontend.conf.in.in +++ b/src/frontend/dbusfrontend/dbusfrontend.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=DBus Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libdbusfrontend Category=Frontend Version=@PROJECT_VERSION@ diff --git a/src/frontend/fcitx4frontend/CMakeLists.txt b/src/frontend/fcitx4frontend/CMakeLists.txt index eeb55ce5..788088e3 100644 --- a/src/frontend/fcitx4frontend/CMakeLists.txt +++ b/src/frontend/fcitx4frontend/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(fcitx4frontend MODULE fcitx4frontend.cpp) +add_fcitx5_addon(fcitx4frontend fcitx4frontend.cpp) target_link_libraries(fcitx4frontend Fcitx5::Core Fcitx5::Module::DBus) if (ENABLE_X11) target_link_libraries(fcitx4frontend Fcitx5::Module::XCB XCB::XCB) diff --git a/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in b/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in index a5470192..39e6a10f 100644 --- a/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in +++ b/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Fcitx4 Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libfcitx4frontend Category=Frontend Version=@PROJECT_VERSION@ diff --git a/src/frontend/ibusfrontend/CMakeLists.txt b/src/frontend/ibusfrontend/CMakeLists.txt index 4b113bc6..43308f17 100644 --- a/src/frontend/ibusfrontend/CMakeLists.txt +++ b/src/frontend/ibusfrontend/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(ibusfrontend MODULE ibusfrontend.cpp) +add_fcitx5_addon(ibusfrontend ibusfrontend.cpp) target_link_libraries(ibusfrontend Fcitx5::Core Fcitx5::Module::DBus ${FMT_TARGET}) install(TARGETS ibusfrontend DESTINATION "${FCITX_INSTALL_ADDONDIR}") configure_file(ibusfrontend.conf.in.in ibusfrontend.conf.in @ONLY) diff --git a/src/frontend/ibusfrontend/ibusfrontend.conf.in.in b/src/frontend/ibusfrontend/ibusfrontend.conf.in.in index 7827f820..c834dbf6 100644 --- a/src/frontend/ibusfrontend/ibusfrontend.conf.in.in +++ b/src/frontend/ibusfrontend/ibusfrontend.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=IBus Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libibusfrontend Category=Frontend Version=@PROJECT_VERSION@ diff --git a/src/frontend/waylandim/CMakeLists.txt b/src/frontend/waylandim/CMakeLists.txt index f462c7da..fc4d2b4c 100644 --- a/src/frontend/waylandim/CMakeLists.txt +++ b/src/frontend/waylandim/CMakeLists.txt @@ -8,7 +8,7 @@ ecm_add_wayland_client_protocol(WAYLAND_IM_PROTOCOL_SRCS PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/text-input/text-input-unstable-v3.xml BASENAME text-input-unstable-v3) -add_library(waylandim MODULE +add_fcitx5_addon(waylandim waylandim.cpp waylandimserverbase.cpp waylandimserver.cpp diff --git a/src/frontend/waylandim/waylandim.conf.in.in b/src/frontend/waylandim/waylandim.conf.in.in index d1ba18fd..6c72dea8 100644 --- a/src/frontend/waylandim/waylandim.conf.in.in +++ b/src/frontend/waylandim/waylandim.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Wayland Input method frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libwaylandim Category=Frontend Version=@PROJECT_VERSION@ diff --git a/src/frontend/xim/CMakeLists.txt b/src/frontend/xim/CMakeLists.txt index 7d063357..b637d9f5 100644 --- a/src/frontend/xim/CMakeLists.txt +++ b/src/frontend/xim/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(xim MODULE xim.cpp) +add_fcitx5_addon(xim xim.cpp) target_link_libraries(xim Fcitx5::Core XCBImdkit::XCBImdkit XCB::XCB XCB::AUX XCB::EWMH XKBCommon::XKBCommon Fcitx5::Module::XCB) target_compile_definitions(xim PRIVATE -DFCITX_XCB_EWMH) install(TARGETS xim DESTINATION "${FCITX_INSTALL_ADDONDIR}") diff --git a/src/frontend/xim/xim.conf.in.in b/src/frontend/xim/xim.conf.in.in index 133654de..46fd266f 100644 --- a/src/frontend/xim/xim.conf.in.in +++ b/src/frontend/xim/xim.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=X Input Method Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libxim Category=Frontend Version=@PROJECT_VERSION@ diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt index 85c9865b..63759f5d 100644 --- a/src/lib/fcitx-config/CMakeLists.txt +++ b/src/lib/fcitx-config/CMakeLists.txt @@ -28,7 +28,7 @@ ecm_setup_version(PROJECT PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5ConfigConfigVersion.cmake" SOVERSION 6) -add_library(Fcitx5Config SHARED ${FCITX_CONFIG_SOURCES}) +add_library(Fcitx5Config ${FCITX_CONFIG_SOURCES}) set_target_properties(Fcitx5Config PROPERTIES VERSION ${Fcitx5Config_VERSION} SOVERSION ${Fcitx5Config_SOVERSION} diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index 4fe67c8d..86819ec6 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -119,7 +119,7 @@ ecm_setup_version(PROJECT PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5UtilsConfigVersion.cmake" SOVERSION 2) -add_library(Fcitx5Utils SHARED ${FCITX_UTILS_SOURCES}) +add_library(Fcitx5Utils ${FCITX_UTILS_SOURCES}) set_target_properties(Fcitx5Utils PROPERTIES VERSION ${Fcitx5Utils_VERSION} SOVERSION ${Fcitx5Utils_SOVERSION} diff --git a/src/lib/fcitx-utils/Fcitx5Macros.cmake b/src/lib/fcitx-utils/Fcitx5Macros.cmake index eefc0b2b..41769e08 100644 --- a/src/lib/fcitx-utils/Fcitx5Macros.cmake +++ b/src/lib/fcitx-utils/Fcitx5Macros.cmake @@ -1,8 +1,60 @@ set(_Fcitx5Macro_SELF "${CMAKE_CURRENT_LIST_FILE}") get_filename_component(_Fcitx5Macro_SELF_DIR "${_Fcitx5Macro_SELF}" PATH) +option(BUILD_SHARED_FCITX_ADDON "Build addon as shared library" On) + +if (BUILD_SHARED_FCITX_ADDON) + set(FCITX_ADDON_CMAKE_LIBRARY_TYPE MODULE) + set(FCITX_ADDON_TYPE "SharedLibrary") +else() + set(FCITX_ADDON_CMAKE_LIBRARY_TYPE STATIC) + set(FCITX_ADDON_TYPE "StaticLibrary") +endif() + include(WriteBasicConfigVersionFile) +function(fcitx5_import_addons target) + set(options) + set(one_value_args REGISTRY_VARNAME) + set(multi_value_args ADDONS) + cmake_parse_arguments(FCITX5_IMPORT + "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN}) + + foreach(addon IN LISTS FCITX5_IMPORT_ADDONS) + set(filename "${CMAKE_CURRENT_BINARY_DIR}/${target}-${addon}-import-addon.cpp") + file(WRITE "${filename}" " +#include +extern fcitx::StaticAddonRegistry ${FCITX5_IMPORT_REGISTRY_VARNAME}; +FCITX_IMPORT_ADDON_FACTORY(${FCITX5_IMPORT_REGISTRY_VARNAME}, ${addon}); +") + target_sources(${target} PRIVATE ${filename}) + target_link_libraries(${target} ${addon}) + endforeach() + +endfunction() + +function(fcitx5_get_addon_targets OUT) + cmake_parse_arguments(ARG "" "" "" ${ARGN}) + set(dirs ${ARG_UNPARSED_ARGUMENTS}) + set(_addon_targets) + foreach(dir IN LISTS dirs) + get_property(targets DIRECTORY "${dir}" PROPERTY BUILDSYSTEM_TARGETS) + foreach(target IN LISTS targets) + get_target_property(is_fcitx_addon ${target} FCITX_ADDON) + if (is_fcitx_addon) + list(APPEND _addon_targets ${target}) + endif() + endforeach() + + get_property(subdirs DIRECTORY "${dir}" PROPERTY SUBDIRECTORIES) + + fcitx5_get_addon_targets(_subdir_addon_targets ${subdirs}) + list(APPEND _addon_targets ${_subdir_addon_targets}) + endforeach() + + set(${OUT} ${_addon_targets} PARENT_SCOPE) +endfunction() + function(fcitx5_download tgt_name url output sha256sum) get_filename_component(output "${output}" ABSOLUTE) set(FCITX5_DOWNLOAD_URL "${url}") @@ -206,3 +258,11 @@ endif() if (NOT TARGET translation-file) add_custom_target(translation-file) endif() + +function(add_fcitx5_addon target_name) + cmake_parse_arguments(ARG "" "" "" ${ARGN}) + set(srcs ${ARG_UNPARSED_ARGUMENTS}) + + add_library(${target_name} ${FCITX_ADDON_CMAKE_LIBRARY_TYPE} ${srcs} ) + set_target_properties(${target_name} PROPERTIES FCITX_ADDON TRUE) +endfunction() diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt index df15dd57..56314e75 100644 --- a/src/lib/fcitx/CMakeLists.txt +++ b/src/lib/fcitx/CMakeLists.txt @@ -65,7 +65,7 @@ ecm_setup_version(PROJECT PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5CoreConfigVersion.cmake" SOVERSION 7) -add_library(Fcitx5Core SHARED ${FCITX_CORE_SOURCES}) +add_library(Fcitx5Core ${FCITX_CORE_SOURCES}) set_target_properties(Fcitx5Core PROPERTIES VERSION ${Fcitx5Core_VERSION} SOVERSION ${Fcitx5Core_SOVERSION} diff --git a/src/modules/clipboard/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt index d00d281a..997c4e3e 100644 --- a/src/modules/clipboard/CMakeLists.txt +++ b/src/modules/clipboard/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(clipboard MODULE) +add_fcitx5_addon(clipboard) target_sources(clipboard PRIVATE clipboard.cpp) target_link_libraries(clipboard Fcitx5::Core) diff --git a/src/modules/clipboard/clipboard.conf.in.in b/src/modules/clipboard/clipboard.conf.in.in index 46463dc9..286ed32f 100644 --- a/src/modules/clipboard/clipboard.conf.in.in +++ b/src/modules/clipboard/clipboard.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Clipboard -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libclipboard Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/dbus/CMakeLists.txt b/src/modules/dbus/CMakeLists.txt index b311b1ef..349309ae 100644 --- a/src/modules/dbus/CMakeLists.txt +++ b/src/modules/dbus/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(dbus MODULE dbusmodule.cpp) +add_fcitx5_addon(dbus dbusmodule.cpp) target_link_libraries(dbus Fcitx5::Core Fcitx5::Module::Keyboard ${FMT_TARGET}) if (ENABLE_X11) target_link_libraries(dbus Fcitx5::Module::XCB XCB::XCB) diff --git a/src/modules/dbus/dbus.conf.in.in b/src/modules/dbus/dbus.conf.in.in index 5889e0d9..9d365ab7 100644 --- a/src/modules/dbus/dbus.conf.in.in +++ b/src/modules/dbus/dbus.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=DBus -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libdbus Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/emoji/CMakeLists.txt b/src/modules/emoji/CMakeLists.txt index 2cfd65a0..cd7c3d90 100644 --- a/src/modules/emoji/CMakeLists.txt +++ b/src/modules/emoji/CMakeLists.txt @@ -1,5 +1,5 @@ if (ENABLE_EMOJI) - add_library(emoji MODULE emoji.cpp) + add_fcitx5_addon(emoji emoji.cpp) target_link_libraries(emoji Fcitx5::Core ZLIB::ZLIB) install(TARGETS emoji DESTINATION "${FCITX_INSTALL_ADDONDIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/emoji.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" diff --git a/src/modules/emoji/emoji.conf.in.in b/src/modules/emoji/emoji.conf.in.in index c5cddde3..9be23ef8 100644 --- a/src/modules/emoji/emoji.conf.in.in +++ b/src/modules/emoji/emoji.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Emoji -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libemoji Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/imselector/CMakeLists.txt b/src/modules/imselector/CMakeLists.txt index 5b399854..f8d5e8d3 100644 --- a/src/modules/imselector/CMakeLists.txt +++ b/src/modules/imselector/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(imselector MODULE imselector.cpp) +add_fcitx5_addon(imselector imselector.cpp) target_link_libraries(imselector Fcitx5::Core) install(TARGETS imselector DESTINATION "${FCITX_INSTALL_ADDONDIR}") configure_file(imselector.conf.in.in imselector.conf.in @ONLY) diff --git a/src/modules/imselector/imselector.conf.in.in b/src/modules/imselector/imselector.conf.in.in index cfa9f6e1..8d4365ee 100644 --- a/src/modules/imselector/imselector.conf.in.in +++ b/src/modules/imselector/imselector.conf.in.in @@ -4,7 +4,7 @@ Comment=Select specific input method via keyboard Category=Module Version=@PROJECT_VERSION@ Library=libimselector -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ OnDemand=False Configurable=True diff --git a/src/modules/notificationitem/CMakeLists.txt b/src/modules/notificationitem/CMakeLists.txt index e6ee3aeb..d164b290 100644 --- a/src/modules/notificationitem/CMakeLists.txt +++ b/src/modules/notificationitem/CMakeLists.txt @@ -1,5 +1,5 @@ if (ENABLE_DBUS) - add_library(notificationitem MODULE notificationitem.cpp dbusmenu.cpp) + add_fcitx5_addon(notificationitem notificationitem.cpp dbusmenu.cpp) target_link_libraries(notificationitem Fcitx5::Core Fcitx5::Module::DBus ${FMT_TARGET} Fcitx5::Module::ClassicUI ) install(TARGETS notificationitem DESTINATION "${FCITX_INSTALL_ADDONDIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/notificationitem.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" diff --git a/src/modules/notificationitem/notificationitem.conf.in.in b/src/modules/notificationitem/notificationitem.conf.in.in index 19e45cf7..5899a4f4 100644 --- a/src/modules/notificationitem/notificationitem.conf.in.in +++ b/src/modules/notificationitem/notificationitem.conf.in.in @@ -1,7 +1,7 @@ [Addon] Name=Status Notifier Comment=DBus based new Freedesktop.org tray icon -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libnotificationitem Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/notifications/CMakeLists.txt b/src/modules/notifications/CMakeLists.txt index 6da46600..2b1a7b0c 100644 --- a/src/modules/notifications/CMakeLists.txt +++ b/src/modules/notifications/CMakeLists.txt @@ -1,5 +1,5 @@ if (ENABLE_DBUS) - add_library(notifications MODULE notifications.cpp) + add_fcitx5_addon(notifications notifications.cpp) target_link_libraries(notifications Fcitx5::Core Fcitx5::Module::DBus) install(TARGETS notifications DESTINATION "${FCITX_INSTALL_ADDONDIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/notifications.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" diff --git a/src/modules/notifications/notifications.conf.in.in b/src/modules/notifications/notifications.conf.in.in index 87aea826..539f03f3 100644 --- a/src/modules/notifications/notifications.conf.in.in +++ b/src/modules/notifications/notifications.conf.in.in @@ -1,7 +1,7 @@ [Addon] Name=Notification Comment=Freedesktop.org Notification Support -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libnotifications Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/quickphrase/CMakeLists.txt b/src/modules/quickphrase/CMakeLists.txt index 2b0458f6..b5bc37ac 100644 --- a/src/modules/quickphrase/CMakeLists.txt +++ b/src/modules/quickphrase/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(quickphrase MODULE quickphrase.cpp quickphraseprovider.cpp) +add_fcitx5_addon(quickphrase quickphrase.cpp quickphraseprovider.cpp) target_link_libraries(quickphrase Fcitx5::Core Fcitx5::Module::Spell) install(TARGETS quickphrase DESTINATION "${FCITX_INSTALL_ADDONDIR}") configure_file(quickphrase.conf.in.in quickphrase.conf.in @ONLY) diff --git a/src/modules/quickphrase/quickphrase.conf.in.in b/src/modules/quickphrase/quickphrase.conf.in.in index 672ef21a..7f63d8d7 100644 --- a/src/modules/quickphrase/quickphrase.conf.in.in +++ b/src/modules/quickphrase/quickphrase.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Quick Phrase -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libquickphrase Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/spell/CMakeLists.txt b/src/modules/spell/CMakeLists.txt index ab1ce4df..acdbb2b1 100644 --- a/src/modules/spell/CMakeLists.txt +++ b/src/modules/spell/CMakeLists.txt @@ -5,7 +5,7 @@ if (TARGET PkgConfig::Enchant) set(SPELL_SOURCES ${SPELL_SOURCES} spell-enchant.cpp) endif() -add_library(spell MODULE ${SPELL_SOURCES}) +add_fcitx5_addon(spell ${SPELL_SOURCES}) target_link_libraries(spell Fcitx5::Core) if (TARGET PkgConfig::Enchant) target_link_libraries(spell PkgConfig::Enchant) diff --git a/src/modules/spell/spell.conf.in.in b/src/modules/spell/spell.conf.in.in index 96f9ff90..8beb2546 100644 --- a/src/modules/spell/spell.conf.in.in +++ b/src/modules/spell/spell.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Spell -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libspell Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt index 9534f078..73f7e064 100644 --- a/src/modules/unicode/CMakeLists.txt +++ b/src/modules/unicode/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(unicode MODULE unicode.cpp charselectdata.cpp) +add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp) target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET}) install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}") configure_file(unicode.conf.in.in unicode.conf.in @ONLY) diff --git a/src/modules/unicode/unicode.conf.in.in b/src/modules/unicode/unicode.conf.in.in index fddc5b4c..ec89658a 100644 --- a/src/modules/unicode/unicode.conf.in.in +++ b/src/modules/unicode/unicode.conf.in.in @@ -1,7 +1,7 @@ [Addon] Name=Unicode Comment=Add Unicode Typing Support -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libunicode Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/wayland/CMakeLists.txt b/src/modules/wayland/CMakeLists.txt index 09edc0d9..98716280 100644 --- a/src/modules/wayland/CMakeLists.txt +++ b/src/modules/wayland/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(wayland MODULE waylandmodule.cpp waylandeventreader.cpp) +add_fcitx5_addon(wayland waylandmodule.cpp waylandeventreader.cpp) target_link_libraries(wayland Fcitx5::Core Wayland::Client Fcitx5::Wayland::Core PkgConfig::Gio Pthread::Pthread) if (ENABLE_DBUS) diff --git a/src/modules/wayland/wayland.conf.in.in b/src/modules/wayland/wayland.conf.in.in index b771071b..027a6cf3 100644 --- a/src/modules/wayland/wayland.conf.in.in +++ b/src/modules/wayland/wayland.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Wayland -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libwayland Category=Module Version=@PROJECT_VERSION@ diff --git a/src/modules/xcb/CMakeLists.txt b/src/modules/xcb/CMakeLists.txt index 3b9988d1..e00e25f1 100644 --- a/src/modules/xcb/CMakeLists.txt +++ b/src/modules/xcb/CMakeLists.txt @@ -1,5 +1,5 @@ if (ENABLE_X11) -add_library(xcb MODULE xcbmodule.cpp xcbconnection.cpp xcbconvertselection.cpp xcbkeyboard.cpp +add_fcitx5_addon(xcb xcbmodule.cpp xcbconnection.cpp xcbconvertselection.cpp xcbkeyboard.cpp xcbeventreader.cpp) target_compile_definitions(xcb PRIVATE -DFCITX_XCB_EWMH) target_link_libraries(xcb Fcitx5::Core XCB::XCB XCB::AUX XCB::XKB XCB::XFIXES XCB::EWMH XCB::RANDR XCB::KEYSYMS XKBCommon::XKBCommon XKBCommon::X11 PkgConfig::XkbFile Pthread::Pthread ${FMT_TARGET} Fcitx5::Module::Notifications) diff --git a/src/modules/xcb/xcb.conf.in.in b/src/modules/xcb/xcb.conf.in.in index a1014ea7..37df9ded 100644 --- a/src/modules/xcb/xcb.conf.in.in +++ b/src/modules/xcb/xcb.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=XCB -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libxcb Category=Module Version=@PROJECT_VERSION@ diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 0ae3628b..25feb052 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -6,4 +6,5 @@ endif() if (EXECINFO_FOUND) target_link_libraries(fcitx5 Execinfo::Execinfo) endif() + install(TARGETS fcitx5 DESTINATION "${FCITX_INSTALL_BINDIR}") diff --git a/src/ui/classic/CMakeLists.txt b/src/ui/classic/CMakeLists.txt index ceda3207..fb1d87f0 100644 --- a/src/ui/classic/CMakeLists.txt +++ b/src/ui/classic/CMakeLists.txt @@ -31,7 +31,7 @@ if (ENABLE_DBUS) set(CLASSICUI_LIBS ${CLASSICUI_LIBS} Fcitx5::Module::DBus) endif() -add_library(classicui MODULE +add_fcitx5_addon(classicui classicui.cpp window.cpp theme.cpp inputwindow.cpp plasmathemewatchdog.cpp colorhelper.cpp ${CLASSICUI_SRCS} ) diff --git a/src/ui/classic/classicui.conf.in.in b/src/ui/classic/classicui.conf.in.in index 1c96fa1e..0c79a09b 100644 --- a/src/ui/classic/classicui.conf.in.in +++ b/src/ui/classic/classicui.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=Classic User Interface -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libclassicui Category=UI Version=@PROJECT_VERSION@ diff --git a/src/ui/kimpanel/CMakeLists.txt b/src/ui/kimpanel/CMakeLists.txt index 12c9c926..91ed5e0d 100644 --- a/src/ui/kimpanel/CMakeLists.txt +++ b/src/ui/kimpanel/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(kimpanel MODULE kimpanel.cpp) +add_fcitx5_addon(kimpanel kimpanel.cpp) target_link_libraries(kimpanel Fcitx5::Core Fcitx5::Module::DBus Fcitx5::Module::XCB) diff --git a/src/ui/kimpanel/kimpanel.conf.in.in b/src/ui/kimpanel/kimpanel.conf.in.in index 105ffbf7..0956b07e 100644 --- a/src/ui/kimpanel/kimpanel.conf.in.in +++ b/src/ui/kimpanel/kimpanel.conf.in.in @@ -1,6 +1,6 @@ [Addon] Name=KDE Input Method Panel -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libkimpanel Category=UI Version=@PROJECT_VERSION@ diff --git a/src/ui/virtualkeyboard/CMakeLists.txt b/src/ui/virtualkeyboard/CMakeLists.txt index ab59334b..180d762d 100644 --- a/src/ui/virtualkeyboard/CMakeLists.txt +++ b/src/ui/virtualkeyboard/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(virtualkeyboard MODULE virtualkeyboard.cpp) +add_fcitx5_addon(virtualkeyboard virtualkeyboard.cpp) target_link_libraries(virtualkeyboard Fcitx5::Core Fcitx5::Module::DBus Fcitx5::Module::NotificationItem) diff --git a/src/ui/virtualkeyboard/virtualkeyboard.conf.in.in b/src/ui/virtualkeyboard/virtualkeyboard.conf.in.in index 7d3d22df..4e7fe063 100644 --- a/src/ui/virtualkeyboard/virtualkeyboard.conf.in.in +++ b/src/ui/virtualkeyboard/virtualkeyboard.conf.in.in @@ -1,7 +1,7 @@ [Addon] Name=DBus Virtual Keyboard Comment=A virtual keyboard backend based on DBus -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libvirtualkeyboard Category=UI Version=@PROJECT_VERSION@ diff --git a/test/addon/CMakeLists.txt b/test/addon/CMakeLists.txt index ba0c0b09..a47d99d7 100644 --- a/test/addon/CMakeLists.txt +++ b/test/addon/CMakeLists.txt @@ -1,7 +1,7 @@ -add_library(dummyaddon MODULE dummyaddon.cpp) +add_fcitx5_addon(dummyaddon dummyaddon.cpp) target_link_libraries(dummyaddon Fcitx5::Core) -add_library(dummyaddondeps MODULE dummyaddondeps.cpp) +add_fcitx5_addon(dummyaddondeps dummyaddondeps.cpp) target_link_libraries(dummyaddondeps Fcitx5::Utils) set(COPY_ADDON_DEPENDS unicode.conf.in-fmt quickphrase.conf.in-fmt xcb.conf.in-fmt spell.conf.in-fmt) diff --git a/testing/testfrontend/CMakeLists.txt b/testing/testfrontend/CMakeLists.txt index bbe1bded..fe61cb50 100644 --- a/testing/testfrontend/CMakeLists.txt +++ b/testing/testfrontend/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(testfrontend MODULE testfrontend.cpp) +add_fcitx5_addon(testfrontend testfrontend.cpp) target_link_libraries(testfrontend Fcitx5::Core) diff --git a/testing/testim/CMakeLists.txt b/testing/testim/CMakeLists.txt index 6970603e..c6327e7f 100644 --- a/testing/testim/CMakeLists.txt +++ b/testing/testim/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(testim MODULE testim.cpp) +add_fcitx5_addon(testim testim.cpp) target_link_libraries(testim Fcitx5::Core) diff --git a/testing/testui/CMakeLists.txt b/testing/testui/CMakeLists.txt index 3f8d2bc6..dfb4c5d6 100644 --- a/testing/testui/CMakeLists.txt +++ b/testing/testui/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(testui MODULE testui.cpp) +add_fcitx5_addon(testui testui.cpp) target_link_libraries(testui Fcitx5::Core) -- Gitee From 916f46e409a1515f193d1fc0411826a69e2ac03b Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 6 Dec 2024 14:18:58 -0800 Subject: [PATCH 25/69] Put notifications addon's class into its own namespace to avoid symbol collision when linked statically. --- src/modules/notifications/notifications.cpp | 7 ++++--- src/modules/notifications/notifications.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/notifications/notifications.cpp b/src/modules/notifications/notifications.cpp index b1d707cc..4dc6a831 100644 --- a/src/modules/notifications/notifications.cpp +++ b/src/modules/notifications/notifications.cpp @@ -18,7 +18,7 @@ #define NOTIFICATIONS_INTERFACE_NAME "org.freedesktop.Notifications" #define NOTIFICATIONS_PATH "/org/freedesktop/Notifications" -namespace fcitx { +namespace fcitx::notifications { Notifications::Notifications(Instance *instance) : instance_(instance), dbus_(instance_->addonManager().addon("dbus")), @@ -220,6 +220,7 @@ class NotificationsModuleFactory : public AddonFactory { return new Notifications(manager->instance()); } }; -} // namespace fcitx +} // namespace fcitx::notifications -FCITX_ADDON_FACTORY_V2(notifications, fcitx::NotificationsModuleFactory) +FCITX_ADDON_FACTORY_V2(notifications, + fcitx::notifications::NotificationsModuleFactory) diff --git a/src/modules/notifications/notifications.h b/src/modules/notifications/notifications.h index 6ee3c869..2ec3b477 100644 --- a/src/modules/notifications/notifications.h +++ b/src/modules/notifications/notifications.h @@ -18,7 +18,7 @@ #include "fcitx/instance.h" #include "notifications_public.h" -namespace fcitx { +namespace fcitx::notifications { FCITX_CONFIGURATION(NotificationsConfig, fcitx::Option> hiddenNotifications{ @@ -113,6 +113,7 @@ private: std::unordered_map items_; std::unordered_map globalToInternalId_; }; -} // namespace fcitx + +} // namespace fcitx::notifications #endif // _FCITX_MODULES_NOTIFICATIONS_NOTIFICATIONS_H_ -- Gitee From 02407585c5b93c11727d761fb58ac618b2490b89 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sat, 7 Dec 2024 09:05:25 -0800 Subject: [PATCH 26/69] Enforce static registry to be a function, not a variable. --- src/CMakeLists.txt | 2 +- src/lib/fcitx-utils/Fcitx5Macros.cmake | 2 +- src/lib/fcitx/addoninstance.h | 14 ++++++++++---- src/server/main.cpp | 6 +++--- test/testcompose.cpp | 4 ++-- test/testspell.cpp | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a9746a36..faba3aa2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ if (ENABLE_SERVER) fcitx5_get_addon_targets(ADDON_TARGETS modules frontend im ui) fcitx5_import_addons(fcitx5 - REGISTRY_VARNAME staticAddon + REGISTRY_VARNAME getStaticAddon ADDONS ${ADDON_TARGETS} ) endif() diff --git a/src/lib/fcitx-utils/Fcitx5Macros.cmake b/src/lib/fcitx-utils/Fcitx5Macros.cmake index 41769e08..fb0bafce 100644 --- a/src/lib/fcitx-utils/Fcitx5Macros.cmake +++ b/src/lib/fcitx-utils/Fcitx5Macros.cmake @@ -24,7 +24,7 @@ function(fcitx5_import_addons target) set(filename "${CMAKE_CURRENT_BINARY_DIR}/${target}-${addon}-import-addon.cpp") file(WRITE "${filename}" " #include -extern fcitx::StaticAddonRegistry ${FCITX5_IMPORT_REGISTRY_VARNAME}; +extern fcitx::StaticAddonRegistry ${FCITX5_IMPORT_REGISTRY_VARNAME}(); FCITX_IMPORT_ADDON_FACTORY(${FCITX5_IMPORT_REGISTRY_VARNAME}, ${addon}); ") target_sources(${target} PRIVATE ${filename}) diff --git a/src/lib/fcitx/addoninstance.h b/src/lib/fcitx/addoninstance.h index f4d58a95..8e3cb4c3 100644 --- a/src/lib/fcitx/addoninstance.h +++ b/src/lib/fcitx/addoninstance.h @@ -208,20 +208,26 @@ private: } \ } +#define FCITX_DEFINE_STATIC_ADDON_REGISTRY(Name, ...) \ + ::fcitx::StaticAddonRegistry &Name() { \ + static ::fcitx::StaticAddonRegistry registry{__VA_ARGS__}; \ + return registry; \ + } + #define FCITX_ADDON_FACTORY_V2_BACKWARDS(AddonName, ClassName) \ FCITX_ADDON_FACTORY_V2(AddonName, ClassName) \ FCITX_ADDON_FACTORY(ClassName) -#define FCITX_IMPORT_ADDON_FACTORY(StaticRegistry, AddonName) \ +#define FCITX_IMPORT_ADDON_FACTORY(StaticRegistryGetter, AddonName) \ extern "C" { \ ::fcitx::AddonFactory *fcitx_addon_factory_instance_##AddonName(); \ } \ class StaticAddonRegistrar_##AddonName { \ public: \ StaticAddonRegistrar_##AddonName() { \ - (StaticRegistry) \ - .emplace(FCITX_STRINGIFY(AddonName), \ - fcitx_addon_factory_instance_##AddonName()); \ + (StaticRegistryGetter)().emplace( \ + FCITX_STRINGIFY(AddonName), \ + fcitx_addon_factory_instance_##AddonName()); \ } \ }; \ StaticAddonRegistrar_##AddonName staticAddonRegistrar_##AddonName diff --git a/src/server/main.cpp b/src/server/main.cpp index 70fa7880..abc17ebc 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -31,9 +31,9 @@ using namespace fcitx; int selfpipe[2]; std::string crashlog; -StaticAddonRegistry staticAddon; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon) #ifdef ENABLE_KEYBOARD -FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); +FCITX_IMPORT_ADDON_FACTORY(getStaticAddon, keyboard); #endif int main(int argc, char *argv[]) { @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) { Instance instance(argc, argv); instance.setBinaryMode(); instance.setSignalPipe(selfpipe[0]); - instance.addonManager().registerDefaultLoader(&staticAddon); + instance.addonManager().registerDefaultLoader(&getStaticAddon()); ret = instance.exec(); restart = instance.isRestartRequested(); diff --git a/test/testcompose.cpp b/test/testcompose.cpp index cb9f3f63..7645920c 100644 --- a/test/testcompose.cpp +++ b/test/testcompose.cpp @@ -22,7 +22,7 @@ using namespace fcitx; -StaticAddonRegistry staticAddon; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(staticAddon); FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { @@ -96,7 +96,7 @@ int main() { instance.privateData()->xkbContext_.get(), testCompose, FCITX_ARRAY_SIZE(testCompose), "", XKB_COMPOSE_FORMAT_TEXT_V1, XKB_COMPOSE_COMPILE_NO_FLAGS)); - instance.addonManager().registerDefaultLoader(&staticAddon); + instance.addonManager().registerDefaultLoader(&staticAddon()); EventDispatcher dispatcher; dispatcher.attach(&instance.eventLoop()); scheduleEvent(&dispatcher, &instance); diff --git a/test/testspell.cpp b/test/testspell.cpp index b6a74df2..a67deab1 100644 --- a/test/testspell.cpp +++ b/test/testspell.cpp @@ -21,7 +21,7 @@ using namespace fcitx; -StaticAddonRegistry staticAddon; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(staticAddon); FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { @@ -78,7 +78,7 @@ int main() { char arg2[] = "--enable=keyboard,testfrontend,spell,testui"; char *argv[] = {arg0, arg1, arg2}; Instance instance(FCITX_ARRAY_SIZE(argv), argv); - instance.addonManager().registerDefaultLoader(&staticAddon); + instance.addonManager().registerDefaultLoader(&staticAddon()); EventDispatcher dispatcher; dispatcher.attach(&instance.eventLoop()); scheduleEvent(&dispatcher, &instance); -- Gitee From e6c6bd67d322754140468179e9b0ca7f508a6a5f Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sat, 7 Dec 2024 12:32:08 -0800 Subject: [PATCH 27/69] Make virtual keyboard auto show/hide default true again. --- src/lib/fcitx/instance_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/fcitx/instance_p.h b/src/lib/fcitx/instance_p.h index 541a976c..4676d89a 100644 --- a/src/lib/fcitx/instance_p.h +++ b/src/lib/fcitx/instance_p.h @@ -219,9 +219,9 @@ public: std::string lastGroup_; - bool virtualKeyboardAutoShow_ = false; + bool virtualKeyboardAutoShow_ = true; - bool virtualKeyboardAutoHide_ = false; + bool virtualKeyboardAutoHide_ = true; VirtualKeyboardFunctionMode virtualKeyboardFunctionMode_ = VirtualKeyboardFunctionMode::Full; -- Gitee From 10f481a41c2a52e8199d4a31a8460e907c734068 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sun, 8 Dec 2024 00:03:53 -0500 Subject: [PATCH 28/69] fix function type in fcitx5_import_addons --- src/lib/fcitx-utils/Fcitx5Macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/fcitx-utils/Fcitx5Macros.cmake b/src/lib/fcitx-utils/Fcitx5Macros.cmake index fb0bafce..9c94dee1 100644 --- a/src/lib/fcitx-utils/Fcitx5Macros.cmake +++ b/src/lib/fcitx-utils/Fcitx5Macros.cmake @@ -24,7 +24,7 @@ function(fcitx5_import_addons target) set(filename "${CMAKE_CURRENT_BINARY_DIR}/${target}-${addon}-import-addon.cpp") file(WRITE "${filename}" " #include -extern fcitx::StaticAddonRegistry ${FCITX5_IMPORT_REGISTRY_VARNAME}(); +extern fcitx::StaticAddonRegistry &${FCITX5_IMPORT_REGISTRY_VARNAME}(); FCITX_IMPORT_ADDON_FACTORY(${FCITX5_IMPORT_REGISTRY_VARNAME}, ${addon}); ") target_sources(${target} PRIVATE ${filename}) -- Gitee From 0a34458f45aa79ced4395344ebdf32b9490515b5 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 10 Dec 2024 10:55:31 -0800 Subject: [PATCH 29/69] Add new global option to allow change the time limit on modifier only key triggering This is intended to solve some issue when user have other intentions. For example, user may press "Shift" to do some text selection with mouse. However, input method may not be capable (theoratically possible on certain platform, but it's not implemented and not possible on all platform) to detect user actually want to use mouse. If application does not send "reset()", input method may wrongly trigger the action. Some other cases include: - Ctrl and scroll mouse - user wants to type Shift+A, but regrets after press shift. So user release all key but accidentally triggers "Shift" to switch input method. This is not perfect but should help solve some unintended action. --- src/lib/fcitx/globalconfig.cpp | 32 +++++++++++++++++++++++++++++++- src/lib/fcitx/globalconfig.h | 26 ++++++++++++++++++++++++++ src/lib/fcitx/instance.cpp | 11 ++++++++++- src/lib/fcitx/instance_p.h | 1 + 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/lib/fcitx/globalconfig.cpp b/src/lib/fcitx/globalconfig.cpp index 763e7282..5e58bc12 100644 --- a/src/lib/fcitx/globalconfig.cpp +++ b/src/lib/fcitx/globalconfig.cpp @@ -6,11 +6,14 @@ */ #include "globalconfig.h" +#include #include "fcitx-config/configuration.h" #include "fcitx-config/enum.h" #include "fcitx-config/iniparser.h" #include "fcitx-config/option.h" +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/i18n.h" +#include "fcitx-utils/macros.h" #include "config.h" #include "inputcontextmanager.h" @@ -133,7 +136,19 @@ FCITX_CONFIGURATION( "TogglePreedit", _("Toggle embedded preedit"), {Key("Control+Alt+P")}, - KeyListConstrain()};); + KeyListConstrain()}; + Option, ToolTipAnnotation> + modifierOnlyKeyTimeout{ + this, + "ModifierOnlyKeyTimeout", + _("Modifier Only Hotkey Timeout in Milliseconds"), + 500, + IntConstrain{-1, 5000}, + {}, + ToolTipAnnotation{ + _("When using modifier only hotkey, the action may " + "only be triggered if it is released within the timeout. -1 " + "means there is no timeout.")}};); FCITX_CONFIGURATION( BehaviorConfig, Option activeByDefault{this, "ActiveByDefault", @@ -401,8 +416,23 @@ int GlobalConfig::autoSavePeriod() const { return *d->behavior->autoSavePeriod; } +int GlobalConfig::modifierOnlyKeyTimeout() const { + FCITX_D(); + return *d->hotkey->modifierOnlyKeyTimeout; +} + +bool GlobalConfig::checkModifierOnlyKeyTimeout(uint64_t lastPressedTime) const { + const auto timeout = modifierOnlyKeyTimeout(); + if (timeout < 0) { + return true; + } + return now(CLOCK_MONOTONIC) <= + (lastPressedTime + static_cast(timeout) * 1000ULL); +} + const Configuration &GlobalConfig::config() const { FCITX_D(); return *d; } + } // namespace fcitx diff --git a/src/lib/fcitx/globalconfig.h b/src/lib/fcitx/globalconfig.h index b1daee3e..096cc09b 100644 --- a/src/lib/fcitx/globalconfig.h +++ b/src/lib/fcitx/globalconfig.h @@ -7,8 +7,11 @@ #ifndef _FCITX_GLOBALCONFIG_H_ #define _FCITX_GLOBALCONFIG_H_ +#include #include +#include #include +#include #include #include #include @@ -109,6 +112,29 @@ public: */ int autoSavePeriod() const; + /** + * Number of milliseconds that modifier only key can be triggered with key + * release. + * + * @return timeout + * @since 5.1.12 + */ + int modifierOnlyKeyTimeout() const; + + /** + * Helper function to check whether the modifier only key should be + * triggered. + * + * The user may need to record the time when the corresponding modifier only + * key is pressed. The input time should use CLOCK_MONOTONIC. + * + * If timeout < 0, always return true. + * Otherwise, check if it should be triggered based on current time. + * + * @return should trigger modifier only key + */ + bool checkModifierOnlyKeyTimeout(uint64_t lastPressedTime) const; + const std::vector &enabledAddons() const; const std::vector &disabledAddons() const; diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp index 4215bf3f..939403ca 100644 --- a/src/lib/fcitx/instance.cpp +++ b/src/lib/fcitx/instance.cpp @@ -23,6 +23,7 @@ #include "fcitx-utils/capabilityflags.h" #include "fcitx-utils/event.h" #include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/i18n.h" #include "fcitx-utils/log.h" #include "fcitx-utils/macros.h" @@ -580,6 +581,7 @@ void InputState::reset() { pendingGroupIndex_ = 0; keyReleased_ = -1; lastKeyPressed_ = Key(); + lastKeyPressedTime_ = 0; totallyReleased_ = true; } @@ -787,7 +789,12 @@ Instance::Instance(int argc, char **argv) { origKey.isReleaseOfModifier(lastKeyPressed) && keyHandler.check()) { if (isModifier) { - keyHandler.trigger(inputState->totallyReleased_); + if (d->globalConfig_.checkModifierOnlyKeyTimeout( + inputState->lastKeyPressedTime_)) { + keyHandler.trigger( + inputState->totallyReleased_); + } + inputState->lastKeyPressedTime_ = 0; if (origKey.hasModifier()) { inputState->totallyReleased_ = false; } @@ -820,6 +827,8 @@ Instance::Instance(int argc, char **argv) { inputState->keyReleased_ = idx; inputState->lastKeyPressed_ = origKey; if (isModifier) { + inputState->lastKeyPressedTime_ = + now(CLOCK_MONOTONIC); // don't forward to input method, but make it pass // through to client. return keyEvent.filter(); diff --git a/src/lib/fcitx/instance_p.h b/src/lib/fcitx/instance_p.h index 4676d89a..314fdeac 100644 --- a/src/lib/fcitx/instance_p.h +++ b/src/lib/fcitx/instance_p.h @@ -56,6 +56,7 @@ struct InputState : public InputContextProperty { CheckInputMethodChanged *imChanged_ = nullptr; int keyReleased_ = -1; Key lastKeyPressed_; + uint64_t lastKeyPressedTime_ = 0; bool totallyReleased_ = true; bool firstTrigger_ = false; size_t pendingGroupIndex_ = 0; -- Gitee From 124cad3efb18d46170f4b36395efd430740b74cd Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Thu, 12 Dec 2024 11:30:33 -0800 Subject: [PATCH 30/69] Set default timeout to 250ms and add test for this timeout behavior. --- src/lib/fcitx/globalconfig.cpp | 2 +- src/lib/fcitx/instance.cpp | 2 + test/CMakeLists.txt | 1 + test/testinstance.cpp | 126 ++++++++++++++++++++++++++------- 4 files changed, 104 insertions(+), 27 deletions(-) diff --git a/src/lib/fcitx/globalconfig.cpp b/src/lib/fcitx/globalconfig.cpp index 5e58bc12..2c800f5e 100644 --- a/src/lib/fcitx/globalconfig.cpp +++ b/src/lib/fcitx/globalconfig.cpp @@ -142,7 +142,7 @@ FCITX_CONFIGURATION( this, "ModifierOnlyKeyTimeout", _("Modifier Only Hotkey Timeout in Milliseconds"), - 500, + 250, IntConstrain{-1, 5000}, {}, ToolTipAnnotation{ diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp index 939403ca..de27cd9b 100644 --- a/src/lib/fcitx/instance.cpp +++ b/src/lib/fcitx/instance.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,7 @@ #include "fcitx-utils/eventdispatcher.h" #include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/i18n.h" +#include "fcitx-utils/key.h" #include "fcitx-utils/log.h" #include "fcitx-utils/macros.h" #include "fcitx-utils/misc.h" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2eab7798..25bf4d23 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -84,6 +84,7 @@ foreach(TESTCASE ${FCITX_CONFIG_TEST}) endforeach() set(testinputcontext_LIBS Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM) +set(testinstance_LIBS Fcitx5::Module::TestFrontend) set(FCITX_CORE_TEST testinputcontext diff --git a/test/testinstance.cpp b/test/testinstance.cpp index 65743cba..ce8e2353 100644 --- a/test/testinstance.cpp +++ b/test/testinstance.cpp @@ -4,51 +4,125 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ +#include +#include +#include +#include +#include #include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/testing.h" #include "fcitx/addonmanager.h" +#include "fcitx/event.h" +#include "fcitx/inputmethodgroup.h" +#include "fcitx/inputmethodmanager.h" #include "fcitx/instance.h" #include "testdir.h" +#include "testfrontend_public.h" using namespace fcitx; -void testCheckUpdate(EventDispatcher *dispatcher, Instance *instance) { - dispatcher->schedule([instance]() { - FCITX_ASSERT(!instance->checkUpdate()); +void testCheckUpdate(Instance &instance) { + instance.eventDispatcher().schedule([&instance]() { + FCITX_ASSERT(!instance.checkUpdate()); auto hasUpdateTrue = - instance->watchEvent(EventType::CheckUpdate, - EventWatcherPhase::Default, [](Event &event) { - auto &checkUpdate = - static_cast(event); - checkUpdate.setHasUpdate(); - }); - FCITX_ASSERT(instance->checkUpdate()); + instance.watchEvent(EventType::CheckUpdate, + EventWatcherPhase::Default, [](Event &event) { + auto &checkUpdate = + static_cast(event); + checkUpdate.setHasUpdate(); + }); + FCITX_ASSERT(instance.checkUpdate()); hasUpdateTrue.reset(); - FCITX_ASSERT(!instance->checkUpdate()); + FCITX_ASSERT(!instance.checkUpdate()); }); } -void testReloadGlobalConfig(EventDispatcher *dispatcher, Instance *instance) { - dispatcher->schedule([instance]() { +void testReloadGlobalConfig(Instance &instance) { + instance.eventDispatcher().schedule([&instance]() { bool globalConfigReloadedEventFired = false; auto reloadConfigEventWatcher = - instance->watchEvent(EventType::GlobalConfigReloaded, - EventWatcherPhase::Default, [&](Event &) { - globalConfigReloadedEventFired = true; - FCITX_INFO() << "Global config reloaded"; - }); - instance->reloadConfig(); + instance.watchEvent(EventType::GlobalConfigReloaded, + EventWatcherPhase::Default, [&](Event &) { + globalConfigReloadedEventFired = true; + FCITX_INFO() << "Global config reloaded"; + }); + instance.reloadConfig(); FCITX_ASSERT(globalConfigReloadedEventFired); - instance->exit(); + }); +} + +void testModifierOnlyHotkey(Instance &instance) { + instance.eventDispatcher().schedule([&instance]() { + auto defaultGroup = instance.inputMethodManager().currentGroup(); + defaultGroup.inputMethodList().clear(); + defaultGroup.inputMethodList().push_back( + InputMethodGroupItem("keyboard-us")); + defaultGroup.inputMethodList().push_back( + InputMethodGroupItem("testim")); + instance.inputMethodManager().setGroup(std::move(defaultGroup)); + + auto *testfrontend = instance.addonManager().addon("testfrontend"); + auto uuid = + testfrontend->call("testapp"); + auto *ic = instance.inputContextManager().findByUUID(uuid); + FCITX_ASSERT(ic); + + FCITX_ASSERT(instance.inputMethod(ic) == "keyboard-us"); + // Alt trigger doesn't work since we are at first im. + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift_L"), false)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+Shift_L"), true)); + FCITX_ASSERT(instance.inputMethod(ic) == "keyboard-us"); + + FCITX_ASSERT(instance.inputMethod(ic) == "keyboard-us"); + FCITX_ASSERT(testfrontend->call( + uuid, Key("Control+space"), false)); + FCITX_ASSERT(instance.inputMethod(ic) == "testim"); + + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift_L"), false)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+Shift_L"), true)); + FCITX_ASSERT(instance.inputMethod(ic) == "keyboard-us"); + + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift_L"), false)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+Shift_L"), true)); + FCITX_ASSERT(instance.inputMethod(ic) == "testim"); + + // Sleep 1 sec between press and release, should not trigger based on + // default 250ms. + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift_L"), false)); + std::this_thread::sleep_until(std::chrono::steady_clock::now() + + std::chrono::seconds(1)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+Shift_L"), true)); + FCITX_ASSERT(instance.inputMethod(ic) == "testim"); + + // Some other key pressed between shift, should not trigger. + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift_L"), false)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+A"), false)); + FCITX_ASSERT(!testfrontend->call( + uuid, Key("Shift+Shift_L"), true)); + FCITX_ASSERT(instance.inputMethod(ic) == "testim"); }); } int main() { - setupTestingEnvironment(FCITX5_BINARY_DIR, {"testing/testim"}, {}); + setupTestingEnvironment(FCITX5_BINARY_DIR, + {"testing/testim", "testing/testfrontend"}, {}); char arg0[] = "testinstance"; char arg1[] = "--disable=all"; - char arg2[] = "--enable=testim"; + char arg2[] = "--enable=testim,testfrontend"; char arg3[] = "--option=name1=opt1a:opt1b,name2=opt2a:opt2b"; char *argv[] = {arg0, arg1, arg2, arg3}; Instance instance(FCITX_ARRAY_SIZE(argv), argv); @@ -59,10 +133,10 @@ int main() { std::vector{"opt2a", "opt2b"}); FCITX_ASSERT(instance.addonManager().addonOptions("name3") == std::vector{}); - EventDispatcher dispatcher; - dispatcher.attach(&instance.eventLoop()); - testCheckUpdate(&dispatcher, &instance); - testReloadGlobalConfig(&dispatcher, &instance); + testCheckUpdate(instance); + testReloadGlobalConfig(instance); + testModifierOnlyHotkey(instance); + instance.eventDispatcher().schedule([&instance]() { instance.exit(); }); instance.exec(); return 0; } -- Gitee From d1a74d2e4c3ac0269c9195ba495048842a152475 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Sat, 14 Dec 2024 20:24:03 +0000 Subject: [PATCH 31/69] [trans] Update Translation --- po/ca.po | 182 +++++++++++++++++++++++++----------------------- po/da.po | 182 +++++++++++++++++++++++++----------------------- po/de.po | 182 +++++++++++++++++++++++++----------------------- po/es.po | 182 +++++++++++++++++++++++++----------------------- po/fcitx5.pot | 182 +++++++++++++++++++++++++----------------------- po/fr.po | 182 +++++++++++++++++++++++++----------------------- po/he.po | 182 +++++++++++++++++++++++++----------------------- po/ja.po | 182 +++++++++++++++++++++++++----------------------- po/ko.po | 186 ++++++++++++++++++++++++++------------------------ po/ru.po | 162 ++++++++++++++++++++++--------------------- po/vi.po | 182 +++++++++++++++++++++++++----------------------- po/zh_CN.po | 182 +++++++++++++++++++++++++----------------------- po/zh_TW.po | 162 ++++++++++++++++++++++--------------------- 13 files changed, 1230 insertions(+), 1100 deletions(-) diff --git a/po/ca.po b/po/ca.po index 532d4d24..f8d05fed 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch , 2020\n" "Language-Team: Catalan (https://app.transifex.com/fcitx/teams/12005/ca/)\n" @@ -48,7 +48,7 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(no disponible)" @@ -112,11 +112,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Activa el mètode d'entrada" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Activa per defecte" @@ -146,7 +146,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajusta la brillantor" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "" @@ -170,15 +170,15 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -197,7 +197,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "" @@ -235,7 +235,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "" @@ -265,7 +265,7 @@ msgstr "Bateria" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Comportament" @@ -443,7 +443,7 @@ msgstr "" msgid "Check box" msgstr "" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "Escolliu el modificador de tecla" @@ -487,19 +487,19 @@ msgctxt "Key name" msgid "Community" msgstr "Comunitat" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "" @@ -536,11 +536,11 @@ msgstr "" msgid "Configure" msgstr "Configura" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control" @@ -566,11 +566,11 @@ msgstr "" msgid "Current value of ${1} is ${2} (${3})." msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Personalitzat" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "" @@ -608,7 +608,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Desactiva el mètode d'entrada" @@ -616,7 +616,7 @@ msgstr "Desactiva el mètode d'entrada" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "Per defecte" @@ -625,23 +625,23 @@ msgstr "Per defecte" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Av Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Re Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Mida de pàgina predeterminada" @@ -708,7 +708,7 @@ msgctxt "Key name" msgid "Down" msgstr "Avall" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "" @@ -739,7 +739,7 @@ msgstr "" msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "" @@ -759,7 +759,7 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -772,23 +772,23 @@ msgstr "Fi" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -841,7 +841,7 @@ msgstr "" msgid "Failed to find ${1} in the output of ${2}" msgstr "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "" @@ -1056,12 +1056,12 @@ msgstr "Verd" msgid "Group" msgstr "Grup" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Grup {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "" @@ -1228,7 +1228,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Drecera de teclat" @@ -1241,7 +1241,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1250,7 +1250,7 @@ msgstr "" msgid "IBus Frontend" msgstr "Frontal DBus" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1274,11 +1274,11 @@ msgstr "" msgid "Image" msgstr "" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1324,7 +1324,7 @@ msgstr "" msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1335,7 +1335,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1390,16 +1390,16 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Teclat" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Teclat - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Teclat - {0} - {1}" @@ -1744,7 +1744,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1888,6 +1888,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Silencia el micròfon" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1940,7 +1944,7 @@ msgstr "Següent candidat" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1948,7 +1952,7 @@ msgstr "" msgid "No clipboard history." msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "Cap" @@ -1984,7 +1988,7 @@ msgstr "Bloq Núm" msgid "Number of entries" msgstr "" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2025,7 +2029,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2105,15 +2109,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "Apaga" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2121,7 +2125,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2143,7 +2147,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Impr Pant" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2155,7 +2159,7 @@ msgstr "" msgid "Quick Phrase" msgstr "Frase ràpida" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "Frase ràpida:" @@ -2184,7 +2188,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Respon" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2317,11 +2321,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Majúscules" @@ -2331,11 +2335,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2343,11 +2347,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2357,11 +2361,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2371,7 +2375,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2436,11 +2440,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "Subtítol" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "" @@ -2455,17 +2459,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "Suspèn" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "" @@ -2489,7 +2493,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Tauler de tasques" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2561,7 +2565,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2628,12 +2632,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "Activa el mètode d'entrada" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "" @@ -2805,7 +2809,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2971,17 +2981,17 @@ msgstr "" msgid "version:" msgstr "" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (no disponible)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/da.po b/po/da.po index 7a87e1ed..297361a3 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://app.transifex.com/fcitx/teams/12005/da/)\n" @@ -48,7 +48,7 @@ msgstr "${1} ikke fundet." msgid "${1} works properly." msgstr "${1} virker korrekt." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(ikke tilgængelig)" @@ -112,11 +112,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Aktivér inputmetode" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Aktivér som standard" @@ -146,7 +146,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Juster lysstyrke" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "" @@ -170,15 +170,15 @@ msgstr "Tillad tilsidesættelse af systemets XKB-indstillinger" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -197,7 +197,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "Program højre" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "Programmer deaktiveret for langt tryk" @@ -235,7 +235,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Tilbage fremad" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "" @@ -265,7 +265,7 @@ msgstr "Batteri" msgid "Beginner's Guide" msgstr "Begyndervejledning" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Opførsel" @@ -448,7 +448,7 @@ msgstr "Skift Fcitx 5-konfiguration" msgid "Check box" msgstr "Afkrydsningsboks" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "Vælg ændringstast" @@ -492,19 +492,19 @@ msgctxt "Key name" msgid "Community" msgstr "Fællesskab" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "Fuldførsel" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "Fuldførsel er deaktiveret." -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "Fuldførsel er aktiveret." @@ -541,11 +541,11 @@ msgstr "Konfiguration:" msgid "Configure" msgstr "Konfigurer" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Styring" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Styring" @@ -571,11 +571,11 @@ msgstr "Nuværende bruger:" msgid "Current value of ${1} is ${2} (${3})." msgstr "Nuværende værdi af ${1} er ${2} (${3})." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Tilpasset" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "" @@ -613,7 +613,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Deaktivér inputmetode" @@ -621,7 +621,7 @@ msgstr "Deaktivér inputmetode" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "Standard" @@ -630,23 +630,23 @@ msgstr "Standard" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "Standard næste kandidat" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Standard-næste side" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "Standard forrige kandidat" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Standard-forrige side" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Standardsidestørrelse" @@ -713,7 +713,7 @@ msgctxt "Key name" msgid "Down" msgstr "Ned" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "Redigering" @@ -744,7 +744,7 @@ msgstr "Aktivér" msgid "Enable Blur on KWin" msgstr "Aktivér sløring i KWin" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Aktivér stavekontrol" @@ -764,7 +764,7 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -777,23 +777,23 @@ msgstr "End" msgid "Entries" msgstr "Poster" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "Gennemløb inputmetode baglæns" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "Gennemløb inputmetode forlæns" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "Gennemløb inputmetode-gruppe baglæns" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "Gennemløb inputmetode-gruppe forlæns" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "Gennemløb når der trykkes på udløsertast gentagne gange" @@ -850,7 +850,7 @@ msgstr "Kunne ikke finde ${1} i im-modul mellemlager ved ${2}" msgid "Failed to find ${1} in the output of ${2}" msgstr "Kunne ikke finde ${1} i outputtet af ${2}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "Reserve sprog for stavekontrol" @@ -1068,12 +1068,12 @@ msgstr "Grøn" msgid "Group" msgstr "Gruppe" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Gruppe {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "Gruppe {}" @@ -1240,7 +1240,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Hotlinks" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Hottast" @@ -1255,7 +1255,7 @@ msgstr "" "Hottast til at skifte til den niende inputmetode kun til nuværende " "inputkontekst" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1264,7 +1264,7 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus-frontend" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1294,11 +1294,11 @@ msgstr "" msgid "Image" msgstr "Billede" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1344,7 +1344,7 @@ msgstr "" msgid "Input method selector" msgstr "Valg af inputmetode" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1355,7 +1355,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Indsæt" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1410,16 +1410,16 @@ msgstr "Katakana" msgid "Key" msgstr "Tast" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Tastatur" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Tastatur - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Tastatur - {0} - {1}" @@ -1764,7 +1764,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "Log ud" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "Opførsel for langt tryk" @@ -1908,6 +1908,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon mute" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1960,7 +1964,7 @@ msgstr "Næste kandidat" msgid "Next Page Button" msgstr "Knap for næste side" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1968,7 +1972,7 @@ msgstr "" msgid "No clipboard history." msgstr "Ingen udklipsholderhistorik." -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "Ingen" @@ -2004,7 +2008,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "Antal poster" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2047,7 +2051,7 @@ msgstr "Y-forskydning for overlægning" msgid "Overlay position" msgstr "Placering for overlægning" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2132,15 +2136,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "Sluk" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "Preedit" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "Preedit deaktiveret" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "Preedit aktiveret" @@ -2148,7 +2152,7 @@ msgstr "Preedit aktiveret" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Varsel" @@ -2170,7 +2174,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Print Screen" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2182,7 +2186,7 @@ msgstr "Filer for Qt IM-modul:" msgid "Quick Phrase" msgstr "Hurtigfrase" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "Hurtigfrase: " @@ -2211,7 +2215,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Svar" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2344,11 +2348,11 @@ msgstr "Baggrund for separator" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "Del inputtilstand" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Skift" @@ -2358,11 +2362,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Butik" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "Vis information om inputmetode når der skiftes fokus" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "Vis information om inputmetode når der skiftes inputmetode" @@ -2370,11 +2374,11 @@ msgstr "Vis information om inputmetode når der skiftes inputmetode" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "Vis kompakt information om inputmetode" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "Vis første information om inputmetode" @@ -2384,11 +2388,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "Vis preedit i program" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2398,7 +2402,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "Spring over første inputmetode under gennemløb" @@ -2463,11 +2467,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "Undertekst" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2482,17 +2486,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "Hvile" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "Skift gruppe" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "Skift gruppe til {0}" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "Skiftede gruppe til {0}" @@ -2516,7 +2520,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Opgavepanel" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "Skift midlertidigt mellem første og nuværende inputmetode" @@ -2591,7 +2595,7 @@ msgstr "" "når du bruger xim. Se ${link2}, for andre generelle problemer med at bruge " "XIM, inklusiv programfrysninger." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "Indlejret preedit til/fra" @@ -2658,12 +2662,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "Udløs inputmetode" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "Tast til at udløse" @@ -2835,7 +2839,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3014,17 +3024,17 @@ msgstr "sudo-miljøvariabler" msgid "version:" msgstr "version:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (ikke tilgængelig)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (ikke tilgængelig)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/de.po b/po/de.po index 6a4c30c5..d54c2fb1 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: mar well , 2023\n" "Language-Team: German (https://app.transifex.com/fcitx/teams/12005/de/)\n" @@ -50,7 +50,7 @@ msgstr "${1} nicht gefunden." msgid "${1} works properly." msgstr "${1} funktioniert ordnungsgemäß." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(nicht vorhanden)" @@ -114,11 +114,11 @@ msgstr "Eine virtuelle Tastatur basierend auf DBus" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Eingabemethode aktivieren" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Per Voreinstellung aktiviert" @@ -148,7 +148,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Helligkeit einstellen" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "Alle" @@ -172,15 +172,15 @@ msgstr "Erlauben, die XKB-Einstellungen außer Kraft zu setzen" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "Übergehen der XKB-Einstellungen erlauben (nur für KDE5 unterstützt)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -199,7 +199,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "Anwendung Rechts" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "" @@ -237,7 +237,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Zurück vorwärts" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "Backends" @@ -267,7 +267,7 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Anleitung für Anfänger" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Verhalten" @@ -450,7 +450,7 @@ msgstr "Fcitx 5 Konfiguration ändern" msgid "Check box" msgstr "Checkbox" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "Funktionstaste wählen" @@ -494,19 +494,19 @@ msgctxt "Key name" msgid "Community" msgstr "Gemeinschaft" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "Vervollständigung" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "Vervollständigung ist deaktiviert." -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "Vervollständigung ist vorübergehend aktiviert." -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "Vervollständigung ist aktiviert." @@ -543,11 +543,11 @@ msgstr "Konfiguration:" msgid "Configure" msgstr "Konfigurieren" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Kontrolle" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Kontrolle" @@ -573,11 +573,11 @@ msgstr "Aktueller Benutzer:" msgid "Current value of ${1} is ${2} (${3})." msgstr "Aktueller Wert von ${1} ist ${2} (${3})." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Anwenderspezifisch" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "Benutzerdefinierte xkb Option" @@ -615,7 +615,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Dunkles Thema" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Eingabemethode deaktivieren" @@ -623,7 +623,7 @@ msgstr "Eingabemethode deaktivieren" msgid "Debug information from dbus:" msgstr "Debug Informationen vom dbus:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "Standard" @@ -632,23 +632,23 @@ msgstr "Standard" msgid "Default Dark" msgstr "Standard Dunkel" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "Nächster Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Vorgabe für nächste Seite" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "Vorheriger Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Vorgabe für vorherige Seite" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Standard Seitengröße" @@ -715,7 +715,7 @@ msgctxt "Key name" msgid "Down" msgstr "Runter" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "Editor" @@ -746,7 +746,7 @@ msgstr "Aktivieren" msgid "Enable Blur on KWin" msgstr "Unschärfe für KWin einschalten" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Rechtschreibprüfung aktivieren" @@ -766,7 +766,7 @@ msgstr "" msgid "Enable hint by default" msgstr "Hinweise standardmäßig einschalten" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -779,23 +779,23 @@ msgstr "Ende" msgid "Entries" msgstr "Einträge" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "Eingabemethoden umgekehrt nummerieren" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -850,7 +850,7 @@ msgstr "Kann ${1} im Eingabemethoden-Cache bei ${2} nicht finden" msgid "Failed to find ${1} in the output of ${2}" msgstr "Finde ${1} nicht in der Ausgabe von ${2}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "Fallback Rechtschreibprüfungssprache" @@ -1068,12 +1068,12 @@ msgstr "Grün" msgid "Group" msgstr "Gruppe" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Gruppe {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "Gruppe {}" @@ -1240,7 +1240,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Wichtige Links" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Kurzbefehl" @@ -1253,7 +1253,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1262,7 +1262,7 @@ msgstr "" msgid "IBus Frontend" msgstr "IBus Schnittstelle" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1286,11 +1286,11 @@ msgstr "" msgid "Image" msgstr "Bild" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1336,7 +1336,7 @@ msgstr "" msgid "Input method selector" msgstr "Auswahl Eingabemethode" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1347,7 +1347,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Einfügen" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1402,16 +1402,16 @@ msgstr "Katakana" msgid "Key" msgstr "Taste" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Tastatur" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Tastatur - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Tastatur - {0} - {1}" @@ -1756,7 +1756,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "Ausloggen" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1900,6 +1900,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon Mute" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1952,7 +1956,7 @@ msgstr "Nächster Kandidat" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "Nein" @@ -1960,7 +1964,7 @@ msgstr "Nein" msgid "No clipboard history." msgstr "Kein Zwischenablageverlauf" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "Nicht beibehalten" @@ -1999,7 +2003,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "Anzahl der Einträge" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2040,7 +2044,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2120,15 +2124,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "Ausschalten" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2136,7 +2140,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Vorhersage" @@ -2158,7 +2162,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Bildschirm drucken" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "Programm" @@ -2170,7 +2174,7 @@ msgstr "Qt-IM-Moduldateien:" msgid "Quick Phrase" msgstr "Quick Phrase" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "Quick Phrase: " @@ -2199,7 +2203,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Antworten" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2332,11 +2336,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Shift" @@ -2346,11 +2350,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Shop" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "Hinweis zur Eingabemethode zeigen, nachdem sie gewechselt wurde" @@ -2358,11 +2362,11 @@ msgstr "Hinweis zur Eingabemethode zeigen, nachdem sie gewechselt wurde" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2372,11 +2376,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2386,7 +2390,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2451,11 +2455,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "Untertitel" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2470,17 +2474,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "Suspend" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "Gruppe umschalten" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "Gruppe auf {0} umschalten" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "Gruppe auf {0} umgeschaltet" @@ -2504,7 +2508,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2576,7 +2580,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2643,12 +2647,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "Eingabemethode aktivieren" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "Auslösetaste" @@ -2820,7 +2824,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2986,17 +2996,17 @@ msgstr "" msgid "version:" msgstr "Version:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (Nicht verfügbar)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (Nicht verfügbar)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/es.po b/po/es.po index 075c9a1d..372b85e3 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:22+0000\n" +"POT-Creation-Date: 2024-12-14 20:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: csslayer , 2017\n" "Language-Team: Spanish (https://www.transifex.com/fcitx/teams/12005/es/)\n" @@ -46,7 +46,7 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "" @@ -144,7 +144,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "" @@ -168,15 +168,15 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "" @@ -195,7 +195,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "" @@ -233,7 +233,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "" @@ -263,7 +263,7 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "" @@ -441,7 +441,7 @@ msgstr "" msgid "Check box" msgstr "" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "" @@ -485,19 +485,19 @@ msgctxt "Key name" msgid "Community" msgstr "" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "" @@ -535,11 +535,11 @@ msgstr "Configurar" msgid "Configure" msgstr "Configurar" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "" @@ -565,11 +565,11 @@ msgstr "" msgid "Current value of ${1} is ${2} (${3})." msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "" @@ -607,7 +607,7 @@ msgstr "" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "" @@ -615,7 +615,7 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "" @@ -624,23 +624,23 @@ msgstr "" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "" @@ -707,7 +707,7 @@ msgctxt "Key name" msgid "Down" msgstr "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "" @@ -758,7 +758,7 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" @@ -771,23 +771,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Failed to find ${1} in the output of ${2}" msgstr "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "" @@ -1056,12 +1056,12 @@ msgstr "" msgid "Group" msgstr "" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "" @@ -1228,7 +1228,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "" @@ -1241,7 +1241,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1250,7 +1250,7 @@ msgstr "" msgid "IBus Frontend" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1274,11 +1274,11 @@ msgstr "" msgid "Image" msgstr "" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1324,7 +1324,7 @@ msgstr "" msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1335,7 +1335,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1390,16 +1390,16 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "" @@ -1744,7 +1744,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1888,6 +1888,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1940,7 +1944,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1948,7 +1952,7 @@ msgstr "" msgid "No clipboard history." msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "" @@ -1984,7 +1988,7 @@ msgstr "" msgid "Number of entries" msgstr "" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2025,7 +2029,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2105,15 +2109,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2121,7 +2125,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2143,7 +2147,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2155,7 +2159,7 @@ msgstr "" msgid "Quick Phrase" msgstr "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "" @@ -2184,7 +2188,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2317,11 +2321,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "" @@ -2331,11 +2335,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2343,11 +2347,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2357,11 +2361,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2371,7 +2375,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2436,11 +2440,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "" @@ -2455,17 +2459,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "" @@ -2489,7 +2493,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2561,7 +2565,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2628,12 +2632,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "" @@ -2805,7 +2809,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2971,17 +2981,17 @@ msgstr "" msgid "version:" msgstr "" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "" diff --git a/po/fcitx5.pot b/po/fcitx5.pot index 9b3b71b7..0e7ef745 100644 --- a/po/fcitx5.pot +++ b/po/fcitx5.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,7 +43,7 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "" @@ -107,11 +107,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "" @@ -141,7 +141,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "" @@ -165,15 +165,15 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "" @@ -192,7 +192,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "" @@ -230,7 +230,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "" @@ -260,7 +260,7 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "" @@ -438,7 +438,7 @@ msgstr "" msgid "Check box" msgstr "" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "" @@ -482,19 +482,19 @@ msgctxt "Key name" msgid "Community" msgstr "" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "" @@ -531,11 +531,11 @@ msgstr "" msgid "Configure" msgstr "" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "" @@ -561,11 +561,11 @@ msgstr "" msgid "Current value of ${1} is ${2} (${3})." msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "" @@ -603,7 +603,7 @@ msgstr "" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "" @@ -611,7 +611,7 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "" @@ -620,23 +620,23 @@ msgstr "" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "" @@ -703,7 +703,7 @@ msgctxt "Key name" msgid "Down" msgstr "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "" @@ -734,7 +734,7 @@ msgstr "" msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "" @@ -754,7 +754,7 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" @@ -767,23 +767,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -836,7 +836,7 @@ msgstr "" msgid "Failed to find ${1} in the output of ${2}" msgstr "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "" @@ -1051,12 +1051,12 @@ msgstr "" msgid "Group" msgstr "" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "" @@ -1223,7 +1223,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "" @@ -1236,7 +1236,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1245,7 +1245,7 @@ msgstr "" msgid "IBus Frontend" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1269,11 +1269,11 @@ msgstr "" msgid "Image" msgstr "" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1319,7 +1319,7 @@ msgstr "" msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1330,7 +1330,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1385,16 +1385,16 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "" @@ -1739,7 +1739,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1883,6 +1883,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1935,7 +1939,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1943,7 +1947,7 @@ msgstr "" msgid "No clipboard history." msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "" @@ -1979,7 +1983,7 @@ msgstr "" msgid "Number of entries" msgstr "" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2020,7 +2024,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2100,15 +2104,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2116,7 +2120,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2138,7 +2142,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2150,7 +2154,7 @@ msgstr "" msgid "Quick Phrase" msgstr "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "" @@ -2179,7 +2183,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2312,11 +2316,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "" @@ -2326,11 +2330,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2338,11 +2342,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2352,11 +2356,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2366,7 +2370,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2431,11 +2435,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "" @@ -2450,17 +2454,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "" @@ -2484,7 +2488,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2556,7 +2560,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2623,12 +2627,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "" @@ -2800,7 +2804,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2966,17 +2976,17 @@ msgstr "" msgid "version:" msgstr "" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "" diff --git a/po/fr.po b/po/fr.po index c631b02e..0e8eb8e9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: csslayer , 2022\n" "Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" @@ -49,7 +49,7 @@ msgstr "${1} introuvable." msgid "${1} works properly." msgstr "${1} fonctionne correctement." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(Non disponible)" @@ -113,11 +113,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Activer la méthode de saisie" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Actif par défaut" @@ -147,7 +147,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajuster la luminosité" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "Tout" @@ -173,15 +173,15 @@ msgstr "" "Autoriser le remplacement des paramètres système XKB (uniquement compatible " "avec KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -202,7 +202,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "Droit d'application" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "Applications désactivées pour un appui long" @@ -240,7 +240,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Retour Suivant" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "Backends" @@ -270,7 +270,7 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Guide du débutant" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Comportement" @@ -455,7 +455,7 @@ msgstr "Modifier la configuration de Fcitx 5" msgid "Check box" msgstr "Case à cocher" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "Choisir le modificateur de clé" @@ -500,19 +500,19 @@ msgctxt "Key name" msgid "Community" msgstr "Communauté" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "Achèvement" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "La complétion est désactivée." -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "La complétion est activée temporairement." -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "La complétion est activée." @@ -549,11 +549,11 @@ msgstr "Configuration :" msgid "Configure" msgstr "Configurer" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Contrôle" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Contrôle" @@ -579,11 +579,11 @@ msgstr "Utilisateur actuel :" msgid "Current value of ${1} is ${2} (${3})." msgstr "La valeur actuelle de ${1} est ${2} (${3})." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Personnalisé" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "Option Xkb personnalisée" @@ -622,7 +622,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Désactiver la méthode de saisie" @@ -630,7 +630,7 @@ msgstr "Désactiver la méthode de saisie" msgid "Debug information from dbus:" msgstr "Informations de débogage de dbus :" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "Par défaut" @@ -639,23 +639,23 @@ msgstr "Par défaut" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "Candidat suivant par défaut" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Page suivante par défaut" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "Candidat précédent par défaut" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Page précédente par défaut" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Taille de page par défaut" @@ -722,7 +722,7 @@ msgctxt "Key name" msgid "Down" msgstr "En bas" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "Éditeur" @@ -753,7 +753,7 @@ msgstr "Activer" msgid "Enable Blur on KWin" msgstr "Activer le flou sur KWin" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Activer la vérification orthographique" @@ -773,7 +773,7 @@ msgstr "" msgid "Enable hint by default" msgstr "Activer l'indice par défaut" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchanter" @@ -786,23 +786,23 @@ msgstr "Fin" msgid "Entries" msgstr "Entrées" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "Énumérer la méthode d'entrée vers l'arrière" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "Énumérer la méthode d'entrée vers l'avant" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "Énumérer le groupe de méthodes d'entrée vers l'arrière" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "Énumérer le groupe de méthodes d'entrée vers l'avant" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" "Énumérer lorsque vous appuyez plusieurs fois sur la touche de déclenchement" @@ -862,7 +862,7 @@ msgstr "Impossible de trouver ${1} dans le cache immodule à ${2}" msgid "Failed to find ${1} in the output of ${2}" msgstr "Impossible de trouver ${1} dans la sortie de ${2}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "Langue de vérification orthographique de secours" @@ -1084,12 +1084,12 @@ msgstr "Vert" msgid "Group" msgstr "Groupe" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Groupe {0} : {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "Groupe {}" @@ -1256,7 +1256,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Liens dynamiques" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Raccourci clavier" @@ -1271,7 +1271,7 @@ msgstr "" "Touche de raccourci pour passer à la N-ième méthode de saisie uniquement " "pour le contexte de saisie actuel" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1280,7 +1280,7 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "Interface IBus" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1311,11 +1311,11 @@ msgstr "" msgid "Image" msgstr "Image" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1361,7 +1361,7 @@ msgstr "" msgid "Input method selector" msgstr "Sélecteur de méthode d'entrée" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1375,7 +1375,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Insérer" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1430,16 +1430,16 @@ msgstr "Katakana" msgid "Key" msgstr "Clé" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Clavier" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Clavier - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Clavier - {0} - {1}" @@ -1784,7 +1784,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "Déconnexion" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "Comportement d'appui long" @@ -1928,6 +1928,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Microphone muet" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1980,7 +1984,7 @@ msgstr "Candidat suivant" msgid "Next Page Button" msgstr "Bouton de page suivante" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "Non" @@ -1988,7 +1992,7 @@ msgstr "Non" msgid "No clipboard history." msgstr "Aucun historique du presse-papiers." -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "Aucun" @@ -2024,7 +2028,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "Nombre d'entrées" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2068,7 +2072,7 @@ msgstr "Superposer le décalage Y" msgid "Overlay position" msgstr "Position de superposition" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "Ignorer l'option Xkb" @@ -2153,15 +2157,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "Éteindre" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "Pré-éditer" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "Pré-édition désactivée" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "Pré-édition activée" @@ -2169,7 +2173,7 @@ msgstr "Pré-édition activée" msgid "Prefer Text Icon" msgstr "Préférer l'icône de texte" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Présage" @@ -2191,7 +2195,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Impression d'écran" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "Programme" @@ -2203,7 +2207,7 @@ msgstr "Fichiers du module Qt IM :" msgid "Quick Phrase" msgstr "Expression rapide" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "Expression rapide  : " @@ -2232,7 +2236,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Répondre" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2365,11 +2369,11 @@ msgstr "Arrière-plan du séparateur" msgid "Shadow Margin" msgstr "Marge d'ombre" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "Partager l'état de l'entrée" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Maj" @@ -2379,12 +2383,12 @@ msgctxt "Key name" msgid "Shop" msgstr "Boutique" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" "Afficher les informations sur la méthode d'entrée lors du changement de focus" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" "Afficher les informations sur la méthode d'entrée lors du changement de " @@ -2394,11 +2398,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "Afficher le nom de la mise en page dans l'icône" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "Afficher les informations sur la méthode d'entrée compacte" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "Afficher les informations de la première méthode d'entrée" @@ -2411,11 +2415,11 @@ msgstr "" "page active. Si l'icône de texte préféré est définie sur true, cette option " "sera ignorée." -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "Afficher la pré-édition dans l'application" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2427,7 +2431,7 @@ msgstr "" "Afficher la pré-édition lors de la composition et valider la clé morte s'il " "n'y a pas de séquence correspondante." -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "Ignorer la première méthode de saisie lors de l'énumération" @@ -2492,11 +2496,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "Sous-titre" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2511,17 +2515,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "Suspendre" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "Changer de groupe" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "Basculer le groupe vers {0}" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "Groupe basculé vers {0}" @@ -2545,7 +2549,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Panneau de tâches" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" "Basculer temporairement entre la première méthode de saisie et la méthode de " @@ -2628,7 +2632,7 @@ msgstr "" "problèmes plus généraux liés à l'utilisation de XIM, notamment le gel des " "applications, consultez ${link2}." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "Basculer la pré-édition intégrée" @@ -2695,12 +2699,12 @@ msgstr "Couleur du contour de l'étiquette du plateau" msgid "Tray Label Text Color" msgstr "Couleur du texte de l'étiquette du plateau" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "Méthode d'entrée du déclencheur" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "Clé de déclenchement" @@ -2878,7 +2882,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3064,17 +3074,17 @@ msgstr "variables d'environnement sudo" msgid "version:" msgstr "version :" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (Non disponible)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (Non disponible)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/he.po b/po/he.po index 8105f385..1784281f 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e " ", 2021\n" @@ -49,7 +49,7 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "" @@ -147,7 +147,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "" @@ -171,15 +171,15 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -198,7 +198,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "" @@ -236,7 +236,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "" @@ -266,7 +266,7 @@ msgstr "סוללה" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "" @@ -444,7 +444,7 @@ msgstr "" msgid "Check box" msgstr "" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "" @@ -488,19 +488,19 @@ msgctxt "Key name" msgid "Community" msgstr "" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "" @@ -537,11 +537,11 @@ msgstr "" msgid "Configure" msgstr "הגדרה" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "" @@ -567,11 +567,11 @@ msgstr "" msgid "Current value of ${1} is ${2} (${3})." msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "" @@ -609,7 +609,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "" @@ -617,7 +617,7 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "" @@ -626,23 +626,23 @@ msgstr "" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "" @@ -709,7 +709,7 @@ msgctxt "Key name" msgid "Down" msgstr "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "" @@ -760,7 +760,7 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" @@ -773,23 +773,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -842,7 +842,7 @@ msgstr "" msgid "Failed to find ${1} in the output of ${2}" msgstr "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "" @@ -1057,12 +1057,12 @@ msgstr "" msgid "Group" msgstr "" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "" @@ -1229,7 +1229,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "" @@ -1242,7 +1242,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1251,7 +1251,7 @@ msgstr "" msgid "IBus Frontend" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1275,11 +1275,11 @@ msgstr "" msgid "Image" msgstr "" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1325,7 +1325,7 @@ msgstr "" msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1336,7 +1336,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1391,16 +1391,16 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "" @@ -1745,7 +1745,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1889,6 +1889,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1941,7 +1945,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1949,7 +1953,7 @@ msgstr "" msgid "No clipboard history." msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "" @@ -1985,7 +1989,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2026,7 +2030,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2106,15 +2110,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "כיבוי" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2122,7 +2126,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2144,7 +2148,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2156,7 +2160,7 @@ msgstr "" msgid "Quick Phrase" msgstr "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "" @@ -2185,7 +2189,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2318,11 +2322,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "" @@ -2332,11 +2336,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2344,11 +2348,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2358,11 +2362,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2372,7 +2376,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2437,11 +2441,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "" @@ -2456,17 +2460,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "השהיה" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "" @@ -2490,7 +2494,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2562,7 +2566,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2629,12 +2633,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "" @@ -2806,7 +2810,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2972,17 +2982,17 @@ msgstr "" msgid "version:" msgstr "" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "" diff --git a/po/ja.po b/po/ja.po index 876f0bfe..39108d73 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-12 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -50,7 +50,7 @@ msgstr "${1} は見つかりません" msgid "${1} works properly." msgstr "${1} は正常に動作しています。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(使用不可)" @@ -114,11 +114,11 @@ msgstr "DBus ベースの仮想キーボードバックエンド" msgid "Accent Colors" msgstr "アクセントカラー" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "入力メソッドを有効にする" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "デフォルトで有効にする" @@ -148,7 +148,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "明るさ調整" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "すべて" @@ -172,15 +172,15 @@ msgstr "システム XKB 設定のオーバーライドを許可する" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "システムの XKB 設定より優先する (KDE 5 のみサポート)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "パスワード欄に入力メソッドを許可する" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -199,7 +199,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "右側のアプリケーション" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "長押しを無効にするアプリケーション" @@ -237,7 +237,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Back Forward" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "バックエンド" @@ -267,7 +267,7 @@ msgstr "バッテリー" msgid "Beginner's Guide" msgstr "ビギナーズガイド" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "動作" @@ -448,7 +448,7 @@ msgstr "Fcitx5 設定を変更" msgid "Check box" msgstr "チェックボックス" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "キーモディファイアーを選択" @@ -492,19 +492,19 @@ msgctxt "Key name" msgid "Community" msgstr "コミュニティ" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "補完" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "補完は無効です。" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "補完は一時的に有効です。" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "補完は有効です。" @@ -541,11 +541,11 @@ msgstr "設定:" msgid "Configure" msgstr "設定" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control" @@ -571,11 +571,11 @@ msgstr "現在のユーザー:" msgid "Current value of ${1} is ${2} (${3})." msgstr "現在の ${1} の値は ${2} (${3}) です。" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "カスタム" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "カスタム XKB オプション" @@ -613,7 +613,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "ダークテーマ" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "入力メソッドをオフにする" @@ -621,7 +621,7 @@ msgstr "入力メソッドをオフにする" msgid "Debug information from dbus:" msgstr "dbus からのデバッグ情報:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "デフォルト" @@ -630,23 +630,23 @@ msgstr "デフォルト" msgid "Default Dark" msgstr "デフォルトのダーク" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "デフォルトの次候補" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "デフォルトの次ページ" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "デフォルトの前候補" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "デフォルトの前ページ" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "デフォルトのページサイズ" @@ -721,7 +721,7 @@ msgctxt "Key name" msgid "Down" msgstr "下" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "エディタ" @@ -752,7 +752,7 @@ msgstr "有効" msgid "Enable Blur on KWin" msgstr "KWin でブラーを有効にする" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "スペルチェックを有効にする" @@ -772,7 +772,7 @@ msgstr "Wayland で分数スケールを有効にする" msgid "Enable hint by default" msgstr "デフォルトでヒントを有効にする" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -785,23 +785,23 @@ msgstr "End" msgid "Entries" msgstr "エントリー" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "前の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "次の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "前の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "次の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "トリガーキーを押すたびに切り替える" @@ -856,7 +856,7 @@ msgstr "${1} の immodule キャッシュに ${2} が見つかりません。" msgid "Failed to find ${1} in the output of ${2}" msgstr "${1} の出力に ${2} が見つかりません。" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "フォールバック時のスペルチェック言語" @@ -1094,12 +1094,12 @@ msgstr "Green" msgid "Group" msgstr "グループ" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "グループ {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "グループ {}" @@ -1266,7 +1266,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "ホットリンク" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "ホットキー" @@ -1279,7 +1279,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "現在の入力コンテキストのみをN番目の入力メソッドに切り替えるホットキー" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1288,7 +1288,7 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus フロントエンド" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1321,11 +1321,11 @@ msgstr "" msgid "Image" msgstr "画像" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1371,7 +1371,7 @@ msgstr "入力パネルのハイライト候補の枠線" msgid "Input method selector" msgstr "入力メソッドセレクター" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1384,7 +1384,7 @@ msgctxt "Key name" msgid "Insert" msgstr "挿入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "ユーザーデータを保存する間隔（分）" @@ -1447,16 +1447,16 @@ msgstr "カタカナ" msgid "Key" msgstr "キー" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "キーボード" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "キーボード - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "キーボード - {0} - {1}" @@ -1801,7 +1801,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "ログオフ" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "長押し時の動作" @@ -1945,6 +1945,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "マイクミュート" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1997,7 +2001,7 @@ msgstr "次の候補" msgid "Next Page Button" msgstr "次ページボタン" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "いいえ" @@ -2005,7 +2009,7 @@ msgstr "いいえ" msgid "No clipboard history." msgstr "クリップボード履歴がありません。" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "なし" @@ -2044,7 +2048,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "エントリー数" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2087,7 +2091,7 @@ msgstr "Yオフセットのオーバーレイ" msgid "Overlay position" msgstr "オーバーレイの位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "XKB オプションより優先する" @@ -2172,15 +2176,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "電源オフ" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "プリエディット" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "プリエディット無効" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "プリエディット有効" @@ -2188,7 +2192,7 @@ msgstr "プリエディット有効" msgid "Prefer Text Icon" msgstr "テキストアイコンを優先する" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2210,7 +2214,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "プリントスクリーン" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "プログラム" @@ -2222,7 +2226,7 @@ msgstr "Qt IM モジュールファイル:" msgid "Quick Phrase" msgstr "クイックフレーズ" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "クイックフレーズ:" @@ -2251,7 +2255,7 @@ msgctxt "Key name" msgid "Reply" msgstr "リプライ" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "フォーカス時に状態をリセット" @@ -2388,11 +2392,11 @@ msgstr "セパレーターの背景" msgid "Shadow Margin" msgstr "影のマージン" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "入力状態を共有する" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "シフト" @@ -2402,11 +2406,11 @@ msgctxt "Key name" msgid "Shop" msgstr "ショップ" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "フォーカスを変更する際に入力メソッドの情報を表示する" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "入力メソッドを切り替える際に入力メソッドの情報を表示する" @@ -2414,11 +2418,11 @@ msgstr "入力メソッドを切り替える際に入力メソッドの情報を msgid "Show Layout Name In Icon" msgstr "アイコンにレイアウト名を表示する" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "入力メソッドの情報をコンパクトに表示する" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "第1入力メソッドの情報を表示する" @@ -2430,11 +2434,11 @@ msgstr "" "アクティブなレイアウトが複数ある場合はアイコンにレイアウト名を表示します。オ" "プションでテキストアイコンを優先している場合はこのオプションを無視します。" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "アプリケーションにプリエディットを表示する" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "パスワード入力時にプリエディットテキストを表示する" @@ -2446,7 +2450,7 @@ msgstr "" "入力時にプリエディットを表示し、一致するシーケンスがない場合はデッドキーをコ" "ミットします。" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "切り替え時は第1入力メソッドをスキップする" @@ -2511,11 +2515,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "サブタイトル" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2530,17 +2534,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "サスペンド" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "グループの切り替え" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "{0} にグループを切り替える" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "{0} にグループを切り替えました" @@ -2564,7 +2568,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "タスクパネル" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "一時的に第1入力メソッドに切り替える" @@ -2645,7 +2649,7 @@ msgstr "" "あります。 ${link1} を参照してください。 アプリケーションのフリーズを含むXIM" "による一般的な問題については ${link2} を参照してください。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "埋め込みプリエディットの切り替え" @@ -2712,12 +2716,12 @@ msgstr "トレイラベルのアウトライン色" msgid "Tray Label Text Color" msgstr "トレイラベルのテキスト色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "入力メソッドの切り替え" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "トリガーキー" @@ -2894,7 +2898,13 @@ msgstr "" "ジャーがクリップボードの内容をパスワードとしてマークした場合は、クリップボー" "ドの更新が無視されます。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3079,17 +3089,17 @@ msgstr "sudo の環境変数" msgid "version:" msgstr "バージョン:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (利用できません)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (使用不可)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/ko.po b/po/ko.po index 75b37814..3e1b8356 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,15 +7,15 @@ # heavyuser , 2018 # Bon Keun Seo , 2021 # perillamint , 2022 -# Junghee Lee , 2023 +# JungHee Lee , 2023 # msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" -"Last-Translator: Junghee Lee , 2023\n" +"Last-Translator: JungHee Lee , 2023\n" "Language-Team: Korean (https://app.transifex.com/fcitx/teams/12005/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "${1}을(를) 찾을 수 없습니다." msgid "${1} works properly." msgstr "${1}이(가) 제대로 작동합니다." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(사용할 수 없음)" @@ -115,11 +115,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "입력기 활성화" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "기본적으로 활성화" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "밝기 조절" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "모두" @@ -173,15 +173,15 @@ msgstr "시스템 XKB 설정을 덮어쓰도록 허용" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "시스템 XKB 설정 무시 허용(KDE 5만 지원)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -200,7 +200,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "오른쪽 응용 프로그램" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "길게 누르면 응용프로그램이 비활성화됨" @@ -238,7 +238,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "뒤로 앞으로" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "백엔드" @@ -268,7 +268,7 @@ msgstr "배터리" msgid "Beginner's Guide" msgstr "초보자 가이드" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "동작방식" @@ -448,7 +448,7 @@ msgstr "Fcitx5 구성 변경" msgid "Check box" msgstr "체크 박스" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "변환 키 선택" @@ -492,19 +492,19 @@ msgctxt "Key name" msgid "Community" msgstr "커뮤니티" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "완성" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "완성이 비활성화되었습니다." -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "완성이 일시적으로 활성화되었습니다." -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "완성이 활성화되었습니다." @@ -541,11 +541,11 @@ msgstr "구성:" msgid "Configure" msgstr "구성하기" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control" @@ -571,11 +571,11 @@ msgstr "현재 사용자:" msgid "Current value of ${1} is ${2} (${3})." msgstr "${1}의 현재 값은 ${2}(${3})입니다." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "사용자 지정" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "사용자 지정 Xkb 옵션" @@ -613,7 +613,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "입력기 비활성화" @@ -621,7 +621,7 @@ msgstr "입력기 비활성화" msgid "Debug information from dbus:" msgstr "dbus의 디버그 정보:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "기본값" @@ -630,23 +630,23 @@ msgstr "기본값" msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "기본 다음 후보" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "기본 다음 페이지" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "기본 이전 후보" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "기본 이전 페이지" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "페이지 크기 기본값" @@ -713,7 +713,7 @@ msgctxt "Key name" msgid "Down" msgstr "아래쪽" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "편집기" @@ -744,7 +744,7 @@ msgstr "활성화" msgid "Enable Blur on KWin" msgstr "KWin에서 블러 활성화" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "철자 검사 활성화" @@ -764,7 +764,7 @@ msgstr "" msgid "Enable hint by default" msgstr "기본적으로 힌트 사용" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "인챈트" @@ -777,23 +777,23 @@ msgstr "종료" msgid "Entries" msgstr "항목" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "입력기 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "입력기 전환" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "입력기 그룹 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "입력기 그룹 전환" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "트리거 키를 반복해서 누를 때 열거하기" @@ -848,7 +848,7 @@ msgstr "${2}의 입력기모듈 캐시에서 ${1}를 찾지 못했습니다" msgid "Failed to find ${1} in the output of ${2}" msgstr "${1}을 ${2}의 출력 내용에서 찾을 수 없음" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "예비 맞춤법 검사 언어" @@ -1068,12 +1068,12 @@ msgstr "녹색" msgid "Group" msgstr "그룹" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "그룹 {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "그룹 {}" @@ -1240,7 +1240,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "핫 링크" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "단축키" @@ -1253,7 +1253,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "현재 입력 컨텍스트에 대해서만 N번째 입력기로 전환하기 위한 단축키" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "하이퍼" @@ -1262,7 +1262,7 @@ msgstr "하이퍼" msgid "IBus Frontend" msgstr "IBus 전처리기" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1291,11 +1291,11 @@ msgstr "" msgid "Image" msgstr "이미지" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1341,7 +1341,7 @@ msgstr "" msgid "Input method selector" msgstr "입력기 선택" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1354,7 +1354,7 @@ msgctxt "Key name" msgid "Insert" msgstr "삽입" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1409,16 +1409,16 @@ msgstr "가타카나" msgid "Key" msgstr "키" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "키보드" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "키보드 - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "키보드 - {0} - {1}" @@ -1763,7 +1763,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "로그오프" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "길게 누르기 동작" @@ -1907,6 +1907,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "마이크 끄기" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1959,7 +1963,7 @@ msgstr "다음 후보" msgid "Next Page Button" msgstr "다음 페이지 버튼" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "아니오" @@ -1967,7 +1971,7 @@ msgstr "아니오" msgid "No clipboard history." msgstr "클립보드 기록이 없습니다." -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "없음" @@ -2003,7 +2007,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "항목 수" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2046,7 +2050,7 @@ msgstr "오버레이 Y 오프셋" msgid "Overlay position" msgstr "오버레이 위치" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "Xkb 옵션 재정의" @@ -2129,15 +2133,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "전원 끄기" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "사전편집" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "사전편집 비활성화" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "사전편집 활성화" @@ -2145,7 +2149,7 @@ msgstr "사전편집 활성화" msgid "Prefer Text Icon" msgstr "텍스트 아이콘 선호" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "사전 설정" @@ -2167,7 +2171,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "화면 출력" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "프로그램" @@ -2179,7 +2183,7 @@ msgstr "Qt 입력기 모듈 파일:" msgid "Quick Phrase" msgstr "상용구" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "상용구:" @@ -2208,7 +2212,7 @@ msgctxt "Key name" msgid "Reply" msgstr "답장" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2341,11 +2345,11 @@ msgstr "구분자 배경" msgid "Shadow Margin" msgstr "그림자 여백" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "입력 상태 공유" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Shift" @@ -2355,11 +2359,11 @@ msgctxt "Key name" msgid "Shop" msgstr "숍" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "포커스를 변경할 때 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "입력기 변경시 입력기 정보 표시" @@ -2367,11 +2371,11 @@ msgstr "입력기 변경시 입력기 정보 표시" msgid "Show Layout Name In Icon" msgstr "아이콘에 자판 이름 표시" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "간결한 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "첫 번째 입력기 정보 표시" @@ -2383,11 +2387,11 @@ msgstr "" "활성 자판이 두 개 이상 있는 경우, 아이콘에 자판 이름을 표시합니다. 텍스트 선" "호 아이콘이 참으로 설정된 경우, 이 옵션은 무시됩니다." -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "응용프로그램에서 사전편집 표시" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2397,7 +2401,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "열거하는 동안 첫 번째 입력기 건너뛰기" @@ -2462,11 +2466,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "부제" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2481,17 +2485,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "중단" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "그룹 전환" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "{0}(으)로 그룹 전환" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "{0}(으)로 그룹 전환됨" @@ -2515,7 +2519,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "작업 패널" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "첫 번째 입력기와 현재 입력기 사이의 임시 전환" @@ -2592,7 +2596,7 @@ msgstr "" "확인합니다. 응용 프로그램 멈춤을 포함하여 XIM을 사용하는 다른 일반적인 문제" "는 ${link2}를 참조합니다." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "내장된 사전편집 전환" @@ -2659,12 +2663,12 @@ msgstr "트레이 라벨 윤곽선 색상" msgid "Tray Label Text Color" msgstr "트레이 레이블 텍스트 색상" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "트리거 입력기" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "트리거 키" @@ -2838,7 +2842,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3017,17 +3027,17 @@ msgstr "sudo 환경 변수" msgid "version:" msgstr "버전:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (사용할 수 없음)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (사용할 수 없음)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/ru.po b/po/ru.po index f508af00..b53ab477 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-07-26 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -51,7 +51,7 @@ msgstr "${1} не найден." msgid "${1} works properly." msgstr "${1} работает правильно." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(Недоступно)" @@ -115,11 +115,11 @@ msgstr "Серверная часть виртуальной клавиатур msgid "Accent Colors" msgstr "Акцентные цвета" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Активировать метод ввода" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Активен по умолчанию" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Отрегулировать яркость" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "Все" @@ -175,7 +175,7 @@ msgstr "" "Разрешить переопределение системных настроек XKB (поддерживается только KDE " "5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "Разрешить метод ввода в поле пароля" @@ -183,7 +183,7 @@ msgstr "Разрешить метод ввода в поле пароля" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -202,7 +202,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "Приложение справа" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "Отключение приложений при длительном нажатии" @@ -240,7 +240,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Переслать Обратно" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "Бэкенды" @@ -270,7 +270,7 @@ msgstr "Аккумулятор" msgid "Beginner's Guide" msgstr "Руководство для начинающих" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Поведение" @@ -497,19 +497,19 @@ msgctxt "Key name" msgid "Community" msgstr "Сообщество" -#: src/im/keyboard/keyboard.cpp:708 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "Завершение" -#: src/im/keyboard/keyboard.cpp:699 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "Завершение отключено." -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "Завершение временно включено." -#: src/im/keyboard/keyboard.cpp:704 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "Завершение включено." @@ -550,7 +550,7 @@ msgstr "Настроить" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control" @@ -576,11 +576,11 @@ msgstr "Текущий пользователь:" msgid "Current value of ${1} is ${2} (${3})." msgstr "Текущее значение ${1}: ${2} (${3})." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Пользовательский" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "Пользовательский вариант Xkb" @@ -618,7 +618,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Тёмная тема" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Деактивация метода ввода" @@ -626,7 +626,7 @@ msgstr "Деактивация метода ввода" msgid "Debug information from dbus:" msgstr "Отладочная информация от dbus:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "По умолчанию" @@ -635,23 +635,23 @@ msgstr "По умолчанию" msgid "Default Dark" msgstr "Тёмная по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "Следующее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Следующая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "Предыдущее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Предыдущая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Размер страницы по умолчанию" @@ -777,7 +777,7 @@ msgstr "Включить дробную шкалу в Wayland" msgid "Enable hint by default" msgstr "Включить подсказку по умолчанию" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -790,23 +790,23 @@ msgstr "Окончание" msgid "Entries" msgstr "Записи" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "Перечислить методы ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "Перечислить методы ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "Перечислить группы методов ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "Перечислить группы методов ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "Перечислять при повторном нажатии клавиши-триггера" @@ -1101,12 +1101,12 @@ msgstr "Зеленый" msgid "Group" msgstr "Группа" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Группа {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "Группа {}" @@ -1273,7 +1273,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Горячие ссылки" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Горячая клавиша" @@ -1288,7 +1288,7 @@ msgstr "" "Горячая клавиша для переключения на определённый метод ввода только для " "текущего контекста ввода" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1297,7 +1297,7 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "Интерфейс IBus" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1331,11 +1331,11 @@ msgstr "" msgid "Image" msgstr "Изображение" -#: src/im/keyboard/keyboard.cpp:707 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1381,7 +1381,7 @@ msgstr "Выделение границы слова-кандидата в по msgid "Input method selector" msgstr "Выбор метода ввода" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1395,7 +1395,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Вставка" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "Интервал сохранения пользовательских данных в минутах" @@ -1457,16 +1457,16 @@ msgstr "Катакана" msgid "Key" msgstr "Клавиша" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Клавиатура" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Клавиатура - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Клавиатура - {0} - {1}" @@ -1811,7 +1811,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "Выйти" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "Поведение при длительном нажатии" @@ -1955,6 +1955,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Отключение микрофона" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -2007,7 +2011,7 @@ msgstr "Следующее слово-кандидат" msgid "Next Page Button" msgstr "Кнопка следующей страницы" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "Нет" @@ -2054,7 +2058,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "Количество входов" -#: src/im/keyboard/keyboard.cpp:693 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2097,7 +2101,7 @@ msgstr "Смещение Y" msgid "Overlay position" msgstr "Позиция наложения" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "Переопределить параметр Xkb" @@ -2182,15 +2186,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "Выключение" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "Предварительное редактирование" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "Предварительное редактирование отключено" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "Предварительное редактирование включено" @@ -2198,7 +2202,7 @@ msgstr "Предварительное редактирование включе msgid "Prefer Text Icon" msgstr "Иконка предпочтительного текста" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2220,7 +2224,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Снимок экрана" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "Программа" @@ -2261,7 +2265,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Ответить" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "Сбросить состояние при фокусировке" @@ -2398,11 +2402,11 @@ msgstr "Фон разделителя" msgid "Shadow Margin" msgstr "Затенённое поле" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "Поделиться состоянием ввода" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Shift" @@ -2412,11 +2416,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Магазин" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "Показывать информацию о способе ввода при изменении фокуса" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "Показывать информацию о методе ввода при переключении" @@ -2424,11 +2428,11 @@ msgstr "Показывать информацию о методе ввода п msgid "Show Layout Name In Icon" msgstr "Показать имя раскладки в значке" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "Показать информацию о компактном методе ввода" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "Показать информацию о первом методе ввода" @@ -2441,11 +2445,11 @@ msgstr "" "для значка предпочтительного текста установлено значение true, этот параметр " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "Показать предварительное редактирование в приложении" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "Показывать предварительно редактируемый текст при вводе пароля" @@ -2457,7 +2461,7 @@ msgstr "" "Показывать предварительное редактирование при составлении и фиксировать " "мертвую клавишу, если нет подходящей последовательности." -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "Пропустить первый метод ввода при перечислении" @@ -2526,7 +2530,7 @@ msgstr "Подзаголовок" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2541,17 +2545,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "Приостановить" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "Сменить группу" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "Переключить группу на {0}" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "Группа переключена на {0}" @@ -2575,7 +2579,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Панель задач" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "Временное переключение между основным и текущим методом ввода" @@ -2662,7 +2666,7 @@ msgstr "" "Для других более общих проблем, связанных с использованием XIM, включая " "замораживание приложений, см. ${link2}." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "Переключение встроенного предварительного редактирования" @@ -2729,7 +2733,7 @@ msgstr "Цвет контура лейбла лотка" msgid "Tray Label Text Color" msgstr "Цвет текста лейбла лотка" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "Активация метода ввода" @@ -2916,7 +2920,13 @@ msgstr "" "пометку содержимого буфера обмена как пароля, это обновление буфера обмена " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3107,17 +3117,17 @@ msgstr "переменные окружения sudo" msgid "version:" msgstr "версия:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (Недоступно)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (Недоступно)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/vi.po b/po/vi.po index 6b9b63c5..3c884c1f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-11 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: zenfas, 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" @@ -47,7 +47,7 @@ msgstr "${1}không tìm thấy." msgid "${1} works properly." msgstr "${1} chạy bình thường." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(Không khả dụng)" @@ -111,11 +111,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "Kích hoạt kiểu gõ" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "Kích hoạt mặc định" @@ -145,7 +145,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Điều chỉnh độ sáng" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "Tất cả" @@ -169,15 +169,15 @@ msgstr "Cho phép ghi đè cài đặt hệ thống XKB" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "Cho phép ghi đè cài đặt hệ thống XKB (chỉ hỗ trợ KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -196,7 +196,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "Quyền ứng dụng" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "Các ứng dụng bị vô hiệu hóa khi nhấn lâu" @@ -234,7 +234,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "Lùi về trước" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "Phụ trợ" @@ -264,7 +264,7 @@ msgstr "Pin" msgid "Beginner's Guide" msgstr "Hướng dẫn sử dụng cho người mới" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "Hành vi" @@ -445,7 +445,7 @@ msgstr "Thay đổi cấu hình Fctix 5" msgid "Check box" msgstr "Hộp kiểm" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "Chọn phím để sửa đổi" @@ -489,19 +489,19 @@ msgctxt "Key name" msgid "Community" msgstr "Cộng đồng" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "Hoàn thành" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "Hoàn thành bị vô hiệu hóa." -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "Hoàn thành tạm thời được kích hoạt." -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "Hoàn thành được kích hoạt." @@ -538,11 +538,11 @@ msgstr "Cấu hình:" msgid "Configure" msgstr "Cấu hình" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Điều khiển" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Điều khiển" @@ -568,11 +568,11 @@ msgstr "Người dùng hiện tại:" msgid "Current value of ${1} is ${2} (${3})." msgstr "Giá trị hiện tại của ${1} là ${2} (${3})." -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "Tùy chỉnh" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "Tùy chỉnh Xkb" @@ -610,7 +610,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Chủ đề tối" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "Vô hiệu hóa bộ gõ" @@ -618,7 +618,7 @@ msgstr "Vô hiệu hóa bộ gõ" msgid "Debug information from dbus:" msgstr "Thông tin gỡ lỗi từ dbus:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "Mặc định" @@ -627,23 +627,23 @@ msgstr "Mặc định" msgid "Default Dark" msgstr "Mặc định tối" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "Ứng viên mặc định tiếp theo" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "Trang mặc định tiếp theo" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "Ứng viên mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "Trang mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "Kích thướng trang mặc định" @@ -710,7 +710,7 @@ msgctxt "Key name" msgid "Down" msgstr "Xuống" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "Biên tập" @@ -741,7 +741,7 @@ msgstr "Cho phép" msgid "Enable Blur on KWin" msgstr "Cho phép mờ trên KWin" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Bật kiểm tra chính tả" @@ -761,7 +761,7 @@ msgstr "" msgid "Enable hint by default" msgstr "Bật gợi ý mặc định" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Làm vui thích" @@ -774,23 +774,23 @@ msgstr "Kết thúc" msgid "Entries" msgstr "Các mục" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "Liệt kê phương thức nhập liệu trước" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "Liệt kê phương thức nhập sau" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "Liệt kê nhóm phương thức nhập liệu trước" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "Liệt kê nhóm phương thức nhập liệu sau" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "Liệt kê khi nhấn phím kích hoạt nhiều lần" @@ -843,7 +843,7 @@ msgstr "Không thể tìm ${1} trong cache immodule tại ${2}" msgid "Failed to find ${1} in the output of ${2}" msgstr "Không thể tìm ${1} trong đầu ra của ${2}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "Kiểm tra chính tả ngôn ngữ dự phòng" @@ -1068,12 +1068,12 @@ msgstr "Xanh lá" msgid "Group" msgstr "Nhóm" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "Nhóm {0}: {1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "Nhóm {}" @@ -1240,7 +1240,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "Phím tắt" @@ -1254,7 +1254,7 @@ msgid "" msgstr "" "Phím tắt để chuyển sang phương thức nhập thứ N chỉ cho ngữ cảnh nhập hiện tại" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1263,7 +1263,7 @@ msgstr "" msgid "IBus Frontend" msgstr "IBus Frontend" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1287,11 +1287,11 @@ msgstr "" msgid "Image" msgstr "Hình ảnh" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1337,7 +1337,7 @@ msgstr "" msgid "Input method selector" msgstr "Chọn kiểu gõ" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1351,7 +1351,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Chèn" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "" @@ -1406,16 +1406,16 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "Bàn phím" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "Bàn phím - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "Bàn phím - {0} - {1}" @@ -1760,7 +1760,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "" @@ -1904,6 +1904,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1956,7 +1960,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "" @@ -1964,7 +1968,7 @@ msgstr "" msgid "No clipboard history." msgstr "" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "" @@ -2000,7 +2004,7 @@ msgstr "NumLock" msgid "Number of entries" msgstr "" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2041,7 +2045,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "" @@ -2121,15 +2125,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "" @@ -2137,7 +2141,7 @@ msgstr "" msgid "Prefer Text Icon" msgstr "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2159,7 +2163,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "" @@ -2171,7 +2175,7 @@ msgstr "" msgid "Quick Phrase" msgstr "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "" @@ -2200,7 +2204,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "" @@ -2333,11 +2337,11 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "" @@ -2347,11 +2351,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2359,11 +2363,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "" @@ -2373,11 +2377,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "" @@ -2387,7 +2391,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "" @@ -2452,11 +2456,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "" @@ -2471,17 +2475,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "" @@ -2505,7 +2509,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2577,7 +2581,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "" @@ -2644,12 +2648,12 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "" @@ -2821,7 +2825,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2987,17 +2997,17 @@ msgstr "" msgid "version:" msgstr "phiên bản:" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (Không khả dụng)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (Không khả dụng)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/zh_CN.po b/po/zh_CN.po index 672a6acf..cb47619d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-06-13 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Yiyu Liu, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/fcitx/teams/12005/" @@ -51,7 +51,7 @@ msgstr "${1} 未找到." msgid "${1} works properly." msgstr "${1} 工作正常。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "(不可用)" @@ -115,11 +115,11 @@ msgstr "一个基于 DBus 的虚拟键盘后端" msgid "Accent Colors" msgstr "重点色" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "激活输入法" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "默认状态为激活" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "调整亮度" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "所有" @@ -173,15 +173,15 @@ msgstr "允许重写系统 XKB 设置" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "允许重写系统 XKB 设置 (仅支持 KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "允许在密码框中使用输入法" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:31 msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -200,7 +200,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "应用程序右" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "禁用长按的程序" @@ -238,7 +238,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "向后" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "后端" @@ -268,7 +268,7 @@ msgstr "电池" msgid "Beginner's Guide" msgstr "入门指南" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "行为" @@ -446,7 +446,7 @@ msgstr "修改 Fcitx 5 配置" msgid "Check box" msgstr "复选框" -#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:37 +#: src/im/keyboard/keyboard.h:68 src/modules/quickphrase/quickphrase.h:43 msgid "Choose key modifier" msgstr "选词修饰键" @@ -490,19 +490,19 @@ msgctxt "Key name" msgid "Community" msgstr "社区" -#: src/im/keyboard/keyboard.cpp:706 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "补全" -#: src/im/keyboard/keyboard.cpp:697 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "补全已禁用。" -#: src/im/keyboard/keyboard.cpp:700 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "已暂时启用补全。" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "已启用补全。" @@ -539,11 +539,11 @@ msgstr "配置:" msgid "Configure" msgstr "配置" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control" @@ -569,11 +569,11 @@ msgstr "当前用户：" msgid "Current value of ${1} is ${2} (${3})." msgstr "${1} 的当前值是 ${2} (${3})。" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "自定义" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "自定义 Xkb 选项" @@ -611,7 +611,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "深色主题" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "取消激活输入法" @@ -619,7 +619,7 @@ msgstr "取消激活输入法" msgid "Debug information from dbus:" msgstr "来自 dbus 的调试信息：" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "默认" @@ -628,23 +628,23 @@ msgstr "默认" msgid "Default Dark" msgstr "默认深色" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "默认跳转下一个候选词" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "默认下一页" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "默认跳转前一个候选词" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "默认上一页" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "默认页大小" @@ -716,7 +716,7 @@ msgctxt "Key name" msgid "Down" msgstr "下" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 msgid "Editor" msgstr "编辑器" @@ -747,7 +747,7 @@ msgstr "启用" msgid "Enable Blur on KWin" msgstr "KWin 下启用模糊" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "启用拼写检查" @@ -767,7 +767,7 @@ msgstr "在 Wayland 下启用分数缩放" msgid "Enable hint by default" msgstr "默认启用提示" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -780,23 +780,23 @@ msgstr "行尾" msgid "Entries" msgstr "项目" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "向后切换输入法" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "向前切换输入法" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "向后切换输入法分组" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "向前切换输入分组" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "反复按切换键时进行轮换" @@ -851,7 +851,7 @@ msgstr "无法输入法模块缓存 ${2} 中找到 ${1}" msgid "Failed to find ${1} in the output of ${2}" msgstr "无法在 ${2} 的输出中找到 ${1}。" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 msgid "Fallback Spell check language" msgstr "备选拼写检查语言" @@ -1078,12 +1078,12 @@ msgstr "绿" msgid "Group" msgstr "分组" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "分组 {0}：{1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "分组 {}" @@ -1250,7 +1250,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "热门链接" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "快捷键" @@ -1263,7 +1263,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "切换到当前局部输入法到第...个输入法的按键" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1272,7 +1272,7 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus 前端" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1301,11 +1301,11 @@ msgstr "" msgid "Image" msgstr "图片" -#: src/im/keyboard/keyboard.cpp:705 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1351,7 +1351,7 @@ msgstr "输入框高亮候选词边框" msgid "Input method selector" msgstr "输入法选择器" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1364,7 +1364,7 @@ msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "保存用户数据的时间间隔（以分钟为单位）" @@ -1424,16 +1424,16 @@ msgstr "片假名" msgid "Key" msgstr "按键" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "键盘" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "键盘 - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "键盘 - {0} - {1}" @@ -1778,7 +1778,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "注销" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "长按行为" @@ -1922,6 +1922,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "麦克风静音" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1974,7 +1978,7 @@ msgstr "下一个候选词" msgid "Next Page Button" msgstr "下一页按钮" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "否" @@ -1982,7 +1986,7 @@ msgstr "否" msgid "No clipboard history." msgstr "无剪贴板历史。" -#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:24 +#: src/im/keyboard/keyboard.h:44 src/modules/quickphrase/quickphrase.h:30 msgid "None" msgstr "无" @@ -2020,7 +2024,7 @@ msgstr "数字锁定" msgid "Number of entries" msgstr "项目个数" -#: src/im/keyboard/keyboard.cpp:691 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2062,7 +2066,7 @@ msgstr "覆盖图片 Y 偏移" msgid "Overlay position" msgstr "覆盖图片位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "覆盖 Xkb 选项" @@ -2144,15 +2148,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "关机" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "预编辑" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "预编辑已禁用" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "预编辑已启用" @@ -2160,7 +2164,7 @@ msgstr "预编辑已启用" msgid "Prefer Text Icon" msgstr "优先使用文字图标" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2182,7 +2186,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "截屏" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "程序" @@ -2194,7 +2198,7 @@ msgstr "Qt 输入法模块文件：" msgid "Quick Phrase" msgstr "快速输入" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 msgid "Quick Phrase: " msgstr "快速输入: " @@ -2223,7 +2227,7 @@ msgctxt "Key name" msgid "Reply" msgstr "回复" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "重新聚焦时重置状态" @@ -2358,11 +2362,11 @@ msgstr "分隔符背景" msgid "Shadow Margin" msgstr "阴影边距" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "共享输入状态" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Shift" @@ -2372,11 +2376,11 @@ msgctxt "Key name" msgid "Shop" msgstr "购物" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "在焦点更改时显示输入法信息" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "切换输入法时显示输入法信息" @@ -2384,11 +2388,11 @@ msgstr "切换输入法时显示输入法信息" msgid "Show Layout Name In Icon" msgstr "在图标中显示布局名称" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "显示紧凑的输入法信息" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "显示第一个输入法的信息" @@ -2400,11 +2404,11 @@ msgstr "" "如果有超过一个活动布局，则在图标中显示布局名称。如果优先使用文字图标已启用，" "这个选项将会被忽略" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "在程序中显示预编辑文本" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "输入密码时显示预编辑文本" @@ -2414,7 +2418,7 @@ msgid "" "sequence." msgstr "使用组合键时显示预编辑，并且在没有匹配序列时提交死键对应符号" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "轮换输入法时跳过第一个输入法" @@ -2479,11 +2483,11 @@ msgctxt "Key name" msgid "Subtitle" msgstr "副标题" -#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:25 +#: src/im/keyboard/keyboard.h:45 src/modules/quickphrase/quickphrase.h:31 msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super" @@ -2498,17 +2502,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "睡眠" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "切换分组" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "切换到分组 {0}" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "已切换到分组 {0}" @@ -2532,7 +2536,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "任务栏" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "临时在当前和第一个输入法之间切换" @@ -2611,7 +2615,7 @@ msgstr "" "您可以在 ${link1} 找到一些会在使用 xim 时出现问题的应用程序。包括应用程序卡死" "在内的更多使用 xim 可能出现的普遍问题请参见 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "切换是否使用嵌入预编辑" @@ -2678,12 +2682,12 @@ msgstr "托盘标签轮廓颜色" msgid "Tray Label Text Color" msgstr "托盘标签文本颜色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "切换启用/禁用输入法" #: src/modules/imselector/imselector.h:28 -#: src/modules/quickphrase/quickphrase.h:32 src/modules/unicode/unicode.h:28 +#: src/modules/quickphrase/quickphrase.h:38 src/modules/unicode/unicode.h:28 #: src/modules/clipboard/clipboard.h:48 msgid "Trigger Key" msgstr "触发键" @@ -2857,7 +2861,13 @@ msgid "" "will be ignored." msgstr "如果密码管理工具支持，那么剪贴板会忽略从密码管理工具复制的密码。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3037,17 +3047,17 @@ msgstr "sudo 的环境变量" msgid "version:" msgstr "版本：" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (不可用)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0} (不可用)" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5549c28f..3f706368 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-07-08 20:24+0000\n" +"POT-Creation-Date: 2024-12-14 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Kisaragi Hiu , 2024\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/fcitx/teams/12005/" @@ -57,7 +57,7 @@ msgstr "找不到 ${1}。" msgid "${1} works properly." msgstr "${1} 運作正常。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 msgid "(Not available)" msgstr "（無法使用）" @@ -121,11 +121,11 @@ msgstr "一個基於 DBus 的虛擬鍵盤後端" msgid "Accent Colors" msgstr "強調色" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:87 msgid "Activate Input Method" msgstr "啟用輸入法" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:155 msgid "Active By Default" msgstr "預設啟用" @@ -155,7 +155,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "調整亮度" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:30 msgid "All" msgstr "全部" @@ -179,7 +179,7 @@ msgstr "允許覆寫系統 XKB 設定" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "允許覆寫系統 XKB 設定 (僅支援 KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:208 msgid "Allow input method in the password field" msgstr "允許在密碼輸入框中使用輸入法" @@ -187,7 +187,7 @@ msgstr "允許在密碼輸入框中使用輸入法" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:561 +#: src/lib/fcitx-utils/key.cpp:563 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -206,7 +206,7 @@ msgctxt "Key name" msgid "Application Right" msgstr "應用程式右" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 msgid "Applications disabled for long press" msgstr "禁用長按的應用程式" @@ -244,7 +244,7 @@ msgctxt "Key name" msgid "Back Forward" msgstr "往後" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 msgid "Backends" msgstr "後端" @@ -274,7 +274,7 @@ msgstr "電池" msgid "Beginner's Guide" msgstr "新手指南" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:225 msgid "Behavior" msgstr "行為" @@ -496,19 +496,19 @@ msgctxt "Key name" msgid "Community" msgstr "社群" -#: src/im/keyboard/keyboard.cpp:708 +#: src/im/keyboard/keyboard.cpp:709 msgid "Completion" msgstr "補全" -#: src/im/keyboard/keyboard.cpp:699 +#: src/im/keyboard/keyboard.cpp:700 msgid "Completion is disabled." msgstr "補全已停用。" -#: src/im/keyboard/keyboard.cpp:702 +#: src/im/keyboard/keyboard.cpp:703 msgid "Completion is enabled temporarily." msgstr "補全暫時啟用。" -#: src/im/keyboard/keyboard.cpp:704 +#: src/im/keyboard/keyboard.cpp:705 msgid "Completion is enabled." msgstr "已啟用補全。" @@ -549,7 +549,7 @@ msgstr "設定" msgid "Control" msgstr "控制" -#: src/lib/fcitx-utils/key.cpp:560 +#: src/lib/fcitx-utils/key.cpp:562 msgctxt "Key name" msgid "Control" msgstr "Control 鍵" @@ -575,11 +575,11 @@ msgstr "目前使用者：" msgid "Current value of ${1} is ${2} (${3})." msgstr "${1} 目前的值為 ${2} (${3})。" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Custom" msgstr "自訂" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:198 msgid "Custom Xkb Option" msgstr "自定 Xkb 選項" @@ -617,7 +617,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "深色模式" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:96 msgid "Deactivate Input Method" msgstr "停用輸入法" @@ -625,7 +625,7 @@ msgstr "停用輸入法" msgid "Debug information from dbus:" msgstr "來自 dbus 的除錯訊息：" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 #: src/ui/classic/themes/default/theme.conf.in:3 msgid "Default" msgstr "預設" @@ -634,23 +634,23 @@ msgstr "預設" msgid "Default Dark" msgstr "預設深色" -#: src/lib/fcitx/globalconfig.cpp:128 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Next Candidate" msgstr "預設下一個候選字" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:116 msgid "Default Next page" msgstr "預設下一頁" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:126 msgid "Default Previous Candidate" msgstr "預設上一個候選字" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:104 msgid "Default Previous page" msgstr "預設上一頁" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:182 msgid "Default page size" msgstr "預設頁面大小" @@ -775,7 +775,7 @@ msgstr "在 Wayland 下啟用分數縮放" msgid "Enable hint by default" msgstr "預設啟用提示" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" @@ -788,23 +788,23 @@ msgstr "End 鍵" msgid "Entries" msgstr "項目" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:63 msgid "Enumerate Input Method Backward" msgstr "枚舉輸入法向後" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:56 msgid "Enumerate Input Method Forward" msgstr "枚舉輸入法向前" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:80 msgid "Enumerate Input Method Group Backward" msgstr "枚舉輸入法群組向後" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:73 msgid "Enumerate Input Method Group Forward" msgstr "枚舉輸入法群組向前" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:45 msgid "Enumerate when press trigger key repeatedly" msgstr "重複觸發鍵時枚舉輸入法" @@ -1086,12 +1086,12 @@ msgstr "綠色" msgid "Group" msgstr "群組" -#: src/lib/fcitx/instance.cpp:423 +#: src/lib/fcitx/instance.cpp:426 #, c++-format msgid "Group {0}: {1}" msgstr "群組 {0}：{1}" -#: src/lib/fcitx/instance.cpp:368 +#: src/lib/fcitx/instance.cpp:371 #, c++-format msgid "Group {}" msgstr "群組 {}" @@ -1258,7 +1258,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "熱門連結" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:223 msgid "Hotkey" msgstr "快捷鍵" @@ -1271,7 +1271,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "僅用於目前輸入上下文切換到第 N 種輸入法的快捷鍵" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:567 msgctxt "Key name" msgid "Hyper" msgstr "Hyper 鍵" @@ -1280,7 +1280,7 @@ msgstr "Hyper 鍵" msgid "IBus Frontend" msgstr "IBus 前端" -#: src/lib/fcitx/globalconfig.cpp:203 +#: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1309,11 +1309,11 @@ msgstr "" msgid "Image" msgstr "圖片" -#: src/im/keyboard/keyboard.cpp:707 src/lib/fcitx/instance.cpp:458 -#: src/lib/fcitx/instance.cpp:686 src/lib/fcitx/instance.cpp:848 -#: src/modules/notificationitem/notificationitem.cpp:142 -#: src/modules/notificationitem/notificationitem.cpp:230 -#: src/modules/xcb/xcbconnection.cpp:555 data/org.fcitx.Fcitx5.desktop.in.in:4 +#: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 +#: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 +#: src/modules/notificationitem/notificationitem.cpp:144 +#: src/modules/notificationitem/notificationitem.cpp:232 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 #: data/fcitx5-wayland-launcher.desktop.in.in:4 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" @@ -1359,7 +1359,7 @@ msgstr "輸入框高亮候選詞邊框" msgid "Input method selector" msgstr "輸入法選擇器" -#: src/lib/fcitx/globalconfig.cpp:104 src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1372,7 +1372,7 @@ msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Interval of saving user data in minutes" msgstr "儲存使用者數據的時間間隔（以分鐘為單位）" @@ -1433,16 +1433,16 @@ msgstr "片假名" msgid "Key" msgstr "按鍵" -#: src/im/keyboard/keyboard.cpp:335 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 msgid "Keyboard" msgstr "鍵盤" -#: src/im/keyboard/keyboard.cpp:251 +#: src/im/keyboard/keyboard.cpp:252 #, c++-format msgid "Keyboard - {0}" msgstr "鍵盤 - {0}" -#: src/im/keyboard/keyboard.cpp:270 +#: src/im/keyboard/keyboard.cpp:271 #, c++-format msgid "Keyboard - {0} - {1}" msgstr "鍵盤 - {0} - {1}" @@ -1787,7 +1787,7 @@ msgctxt "Key name" msgid "Logoff" msgstr "登出" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 msgid "Long Press behavior" msgstr "長按行為" @@ -1931,6 +1931,10 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "靜音麥克風" +#: src/lib/fcitx/globalconfig.cpp:144 +msgid "Modifier Only Hotkey Timeout in Milliseconds" +msgstr "" + #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1983,7 +1987,7 @@ msgstr "下一個候選字" msgid "Next Page Button" msgstr "下一頁按鈕" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "No" msgstr "否" @@ -2029,7 +2033,7 @@ msgstr "數字鎖定 (NumLock)" msgid "Number of entries" msgstr "項目數" -#: src/im/keyboard/keyboard.cpp:693 +#: src/im/keyboard/keyboard.cpp:694 msgid "" "Only emoji support is found. To enable spell checking, you may need to " "install spell check data for the language." @@ -2070,7 +2074,7 @@ msgstr "覆蓋 Y 位移" msgid "Overlay position" msgstr "覆蓋圖片位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Override Xkb Option" msgstr "覆蓋 Xkb 選項" @@ -2152,15 +2156,15 @@ msgctxt "Key name" msgid "Power Off" msgstr "關機" -#: src/lib/fcitx/instance.cpp:848 +#: src/lib/fcitx/instance.cpp:859 msgid "Preedit" msgstr "預編輯" -#: src/lib/fcitx/instance.cpp:850 +#: src/lib/fcitx/instance.cpp:861 msgid "Preedit disabled" msgstr "預編輯已停用" -#: src/lib/fcitx/instance.cpp:849 +#: src/lib/fcitx/instance.cpp:860 msgid "Preedit enabled" msgstr "預編輯已啟用" @@ -2168,7 +2172,7 @@ msgstr "預編輯已啟用" msgid "Prefer Text Icon" msgstr "首選文字圖示" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2190,7 +2194,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "截圖 (PrtSc)" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:31 msgid "Program" msgstr "程式" @@ -2231,7 +2235,7 @@ msgctxt "Key name" msgid "Reply" msgstr "回覆" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:159 msgid "Reset state on Focus In" msgstr "重新聚焦時重設狀態" @@ -2366,11 +2370,11 @@ msgstr "分隔符背景" msgid "Shadow Margin" msgstr "陰影邊緣" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:163 msgid "Share Input State" msgstr "共享輸入法狀態" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:564 msgctxt "Key name" msgid "Shift" msgstr "Shift 鍵" @@ -2380,11 +2384,11 @@ msgctxt "Key name" msgid "Shop" msgstr "商店" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show Input Method Information when changing focus" msgstr "當切換輸入焦點時顯示輸入法資訊" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:171 msgid "Show Input Method Information when switch input method" msgstr "當切換輸入法時顯示輸入法資訊" @@ -2392,11 +2396,11 @@ msgstr "當切換輸入法時顯示輸入法資訊" msgid "Show Layout Name In Icon" msgstr "在圖示顯示佈局名稱" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:177 msgid "Show compact input method information" msgstr "顯示緊湊的輸入法訊息" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:180 msgid "Show first input method information" msgstr "顯示第一個輸入法資訊" @@ -2408,11 +2412,11 @@ msgstr "" "如果有多個活動佈局，則在圖示中顯示佈局名稱。如果首選文字圖示設定為 true，則此" "選項將被忽略。" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:167 msgid "Show preedit in application" msgstr "在應用程式中顯示預編輯" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:211 msgid "Show preedit text when typing password" msgstr "輸入密碼時顯示預編輯文本" @@ -2422,7 +2426,7 @@ msgid "" "sequence." msgstr "使用組合鍵時顯示預編輯，並且在沒有匹配序列時提交死鍵對應符號" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Skip first input method while enumerating" msgstr "枚舉時略過第一個輸入法" @@ -2491,7 +2495,7 @@ msgstr "副標題" msgid "Super" msgstr "超級" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:565 msgctxt "Key name" msgid "Super" msgstr "Super 鍵" @@ -2506,17 +2510,17 @@ msgctxt "Key name" msgid "Suspend" msgstr "暫停" -#: src/lib/fcitx/instance.cpp:459 src/lib/fcitx/instance.cpp:687 -#: src/modules/xcb/xcbconnection.cpp:556 +#: src/lib/fcitx/instance.cpp:462 src/lib/fcitx/instance.cpp:691 +#: src/modules/xcb/xcbconnection.cpp:566 msgid "Switch group" msgstr "切換分組" -#: src/lib/fcitx/instance.cpp:460 src/modules/xcb/xcbconnection.cpp:557 +#: src/lib/fcitx/instance.cpp:463 src/modules/xcb/xcbconnection.cpp:567 #, c++-format msgid "Switch group to {0}" msgstr "切換分組到 {0}" -#: src/lib/fcitx/instance.cpp:688 +#: src/lib/fcitx/instance.cpp:692 #, c++-format msgid "Switched group to {0}" msgstr "已切換分組到 {0}" @@ -2540,7 +2544,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "工作列" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:49 msgid "Temporally switch between first and current Input Method" msgstr "臨時在第一個與當前輸入法中切換" @@ -2619,7 +2623,7 @@ msgstr "" "若要查看您在使用 xim 時，一些應用程式的特定問題，請檢查 ${link1}。使用 XIM 的" "其他一般性的問題包括應用程式凍結，請參閱 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:137 msgid "Toggle embedded preedit" msgstr "切換內嵌預編輯區域" @@ -2686,7 +2690,7 @@ msgstr "托盤標簽輪廓顏色" msgid "Tray Label Text Color" msgstr "托盤標簽文字顏色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:38 msgid "Trigger Input Method" msgstr "切換啟用或非啟用輸入法" @@ -2865,7 +2869,13 @@ msgid "" "will be ignored." msgstr "密碼管理員支援時，讓剪貼簿忽略從密碼管理員複製的密碼。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:149 +msgid "" +"When using modifier only hotkey, the action may only be triggered if it is " +"released within the timeout. -1 means there is no timeout." +msgstr "" + +#: src/lib/fcitx/globalconfig.cpp:193 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -3044,17 +3054,17 @@ msgstr "sudo 的環境變數" msgid "version:" msgstr "版本：" -#: src/im/keyboard/keyboard.cpp:312 +#: src/im/keyboard/keyboard.cpp:313 #, c++-format msgid "{0} (Not Available)" msgstr "{0} (無法使用)" -#: src/lib/fcitx/instance.cpp:417 +#: src/lib/fcitx/instance.cpp:420 #, c++-format msgid "{0} (Not available)" msgstr "{0}（不可用）" -#: src/lib/fcitx/instance.cpp:414 +#: src/lib/fcitx/instance.cpp:417 #, c++-format msgid "{0} ({1})" msgstr "{0} ({1})" -- Gitee From 22593601ad9877b84cbb1cc68f85879d75bc0f78 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Sun, 15 Dec 2024 20:24:08 +0000 Subject: [PATCH 32/69] [trans] Update Translation --- po/ja.po | 6 ++++-- po/ru.po | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index 39108d73..2edfd998 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-15 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -1947,7 +1947,7 @@ msgstr "マイクミュート" #: src/lib/fcitx/globalconfig.cpp:144 msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" +msgstr "修飾子のみのホットキーのタイムアウト（ミリ秒）" #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" @@ -2903,6 +2903,8 @@ msgid "" "When using modifier only hotkey, the action may only be triggered if it is " "released within the timeout. -1 means there is no timeout." msgstr "" +"修飾子のみのホットキーを使用する場合、タイムアウト内にリリースされた場合のみ" +"アクションがトリガーされます。-1 はタイムアウトなしを意味します。" #: src/lib/fcitx/globalconfig.cpp:193 msgid "" diff --git a/po/ru.po b/po/ru.po index b53ab477..760eb0ed 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-15 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -1957,7 +1957,7 @@ msgstr "Отключение микрофона" #: src/lib/fcitx/globalconfig.cpp:144 msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" +msgstr "Тайм-аут только горячей клавиши-модификатора в миллисекундах" #: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" @@ -2925,6 +2925,9 @@ msgid "" "When using modifier only hotkey, the action may only be triggered if it is " "released within the timeout. -1 means there is no timeout." msgstr "" +"При использовании только горячей клавиши-модификатора действие может быть " +"инициировано только в том случае, если она будет отпущена в течение тайм-" +"аута. -1 означает, что тайм-аут отсутствует." #: src/lib/fcitx/globalconfig.cpp:193 msgid "" -- Gitee From d9ea016728b95f8652ce8d483cb3bbd71f619715 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 13 Dec 2024 16:48:54 -0800 Subject: [PATCH 33/69] Reapply "Destroy virtual keyboard when it is not activated." This reverts commit 45c024abc26dcfe07fc688a6b022e484b8275117. --- src/frontend/waylandim/waylandimserverv2.cpp | 20 ++++++++++++-------- src/frontend/waylandim/waylandimserverv2.h | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/frontend/waylandim/waylandimserverv2.cpp b/src/frontend/waylandim/waylandimserverv2.cpp index a057fd1d..dbbe85d2 100644 --- a/src/frontend/waylandim/waylandimserverv2.cpp +++ b/src/frontend/waylandim/waylandimserverv2.cpp @@ -100,9 +100,8 @@ void WaylandIMServerV2::refreshSeat() { if (icMap_.count(seat.get())) { continue; } - auto *ic = new WaylandIMInputContextV2( - inputContextManager(), this, seat, - virtualKeyboardManagerV1_->createVirtualKeyboard(seat.get())); + auto *ic = + new WaylandIMInputContextV2(inputContextManager(), this, seat); ic->setFocusGroup(group_); ic->setCapabilityFlags(baseFlags); } @@ -122,11 +121,10 @@ void WaylandIMServerV2::remove(wayland::WlSeat *seat) { WaylandIMInputContextV2::WaylandIMInputContextV2( InputContextManager &inputContextManager, WaylandIMServerV2 *server, - std::shared_ptr seat, wayland::ZwpVirtualKeyboardV1 *vk) + std::shared_ptr seat) : VirtualInputContextGlue(inputContextManager), server_(server), seat_(std::move(seat)), - ic_(server->inputMethodManagerV2()->getInputMethod(seat_.get())), - vk_(vk) { + ic_(server->inputMethodManagerV2()->getInputMethod(seat_.get())) { server->add(this, seat_.get()); ic_->surroundingText().connect( [this](const char *text, uint32_t cursor, uint32_t anchor) { @@ -164,13 +162,19 @@ WaylandIMInputContextV2::WaylandIMInputContextV2( Key(FcitxKey_None, KeyStates(), vkkey + 8), WL_KEYBOARD_KEY_STATE_RELEASED); } - vk_->modifiers(0, 0, 0, 0); } focusOutWrapper(); } + vk_.reset(); + vkReady_ = false; } if (pendingActivate_) { pendingActivate_ = false; + vk_.reset(); + vkReady_ = false; + vk_.reset( + server_->virtualKeyboardManagerV1()->createVirtualKeyboard( + seat_.get())); // There can be only one grab. Always release old grab first. // It is possible when switching between two client, there will be // two activate. In that case we will have already one grab. The @@ -420,7 +424,7 @@ void WaylandIMInputContextV2::keymapCallback(uint32_t format, int32_t fd, server_->stateMask_.mod5_mask = 1 << xkb_keymap_mod_get_index(server_->keymap_.get(), "Mod5"); - if (keymapChanged) { + if (keymapChanged || !vkReady_) { vk_->keymap(format, scopeFD.fd(), size); vkReady_ = true; } diff --git a/src/frontend/waylandim/waylandimserverv2.h b/src/frontend/waylandim/waylandimserverv2.h index 9fdf2601..733474bf 100644 --- a/src/frontend/waylandim/waylandimserverv2.h +++ b/src/frontend/waylandim/waylandimserverv2.h @@ -41,6 +41,7 @@ public: FocusGroup *group() { return group_; } auto *xkbState() { return state_.get(); } auto *inputMethodManagerV2() { return inputMethodManagerV2_.get(); } + auto *virtualKeyboardManagerV1() { return virtualKeyboardManagerV1_.get(); } bool hasKeyboardGrab() const; @@ -72,8 +73,7 @@ class WaylandIMInputContextV2 : public VirtualInputContextGlue { public: WaylandIMInputContextV2(InputContextManager &inputContextManager, WaylandIMServerV2 *server, - std::shared_ptr seat, - wayland::ZwpVirtualKeyboardV1 *vk); + std::shared_ptr seat); ~WaylandIMInputContextV2() override; const char *frontend() const override { return "wayland_v2"; } -- Gitee From c5bb5a259beb4e8f18ec88b01823d448f0547365 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 16 Dec 2024 18:41:17 -0800 Subject: [PATCH 34/69] Remove unused font in theme config --- src/ui/classic/themes/default-dark/theme-dark.conf.in | 1 - src/ui/classic/themes/default/theme.conf.in | 1 - 2 files changed, 2 deletions(-) diff --git a/src/ui/classic/themes/default-dark/theme-dark.conf.in b/src/ui/classic/themes/default-dark/theme-dark.conf.in index f08a64d9..682e14e2 100644 --- a/src/ui/classic/themes/default-dark/theme-dark.conf.in +++ b/src/ui/classic/themes/default-dark/theme-dark.conf.in @@ -6,7 +6,6 @@ Description=Default Dark Theme ScaleWithDPI=True [InputPanel] -Font=Sans 10 NormalColor=#e0e0e0 HighlightCandidateColor=#e0e0e0 HighlightColor=#e0e0e0 diff --git a/src/ui/classic/themes/default/theme.conf.in b/src/ui/classic/themes/default/theme.conf.in index 77c086c8..0a6fd6a5 100644 --- a/src/ui/classic/themes/default/theme.conf.in +++ b/src/ui/classic/themes/default/theme.conf.in @@ -6,7 +6,6 @@ Description=Default Theme ScaleWithDPI=True [InputPanel] -Font=Sans 10 NormalColor=#000000 HighlightColor=#ffffff PageButtonAlignment=Last Candidate -- Gitee From 319ca2a2106841e757c48f2178584703938fcc6a Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 16 Dec 2024 22:22:57 -0800 Subject: [PATCH 35/69] Clang-tidy clean up for waylandim --- src/frontend/waylandim/appmonitor.cpp | 5 ++++ src/frontend/waylandim/appmonitor.h | 3 +++ src/frontend/waylandim/plasmaappmonitor.cpp | 7 +++++ src/frontend/waylandim/plasmaappmonitor.h | 2 ++ .../waylandim/virtualinputcontext.cpp | 7 +++++ src/frontend/waylandim/virtualinputcontext.h | 6 ++++- src/frontend/waylandim/waylandim.cpp | 14 ++++++++-- src/frontend/waylandim/waylandim.h | 19 ++++++++----- src/frontend/waylandim/waylandim_public.h | 3 +-- src/frontend/waylandim/waylandimserver.cpp | 23 ++++++++++++++++ src/frontend/waylandim/waylandimserver.h | 14 ++++++++-- .../waylandim/waylandimserverbase.cpp | 10 ++++++- src/frontend/waylandim/waylandimserverbase.h | 6 +++++ src/frontend/waylandim/waylandimserverv2.cpp | 27 ++++++++++++++++--- src/frontend/waylandim/waylandimserverv2.h | 16 ++++++++++- src/frontend/waylandim/wlrappmonitor.cpp | 10 ++++++- src/frontend/waylandim/wlrappmonitor.h | 8 ++++-- 17 files changed, 159 insertions(+), 21 deletions(-) diff --git a/src/frontend/waylandim/appmonitor.cpp b/src/frontend/waylandim/appmonitor.cpp index a5969394..bca0ba09 100644 --- a/src/frontend/waylandim/appmonitor.cpp +++ b/src/frontend/waylandim/appmonitor.cpp @@ -6,6 +6,11 @@ */ #include "appmonitor.h" #include +#include +#include +#include +#include +#include namespace fcitx { diff --git a/src/frontend/waylandim/appmonitor.h b/src/frontend/waylandim/appmonitor.h index 3b56423a..a5c0be3c 100644 --- a/src/frontend/waylandim/appmonitor.h +++ b/src/frontend/waylandim/appmonitor.h @@ -7,8 +7,11 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_APPMONITOR_H_ #define _FCITX5_FRONTEND_WAYLANDIM_APPMONITOR_H_ +#include #include #include +#include +#include #include "fcitx-utils/signals.h" namespace fcitx { diff --git a/src/frontend/waylandim/plasmaappmonitor.cpp b/src/frontend/waylandim/plasmaappmonitor.cpp index 38bb7fa7..8c1f2064 100644 --- a/src/frontend/waylandim/plasmaappmonitor.cpp +++ b/src/frontend/waylandim/plasmaappmonitor.cpp @@ -5,7 +5,14 @@ * */ #include "plasmaappmonitor.h" +#include +#include +#include +#include #include +#include +#include "fcitx-utils/signals.h" +#include "display.h" #include "plasma-window-management/org_kde_plasma_window.h" #include "plasma-window-management/org_kde_plasma_window_management.h" diff --git a/src/frontend/waylandim/plasmaappmonitor.h b/src/frontend/waylandim/plasmaappmonitor.h index eccdd40d..32b107d7 100644 --- a/src/frontend/waylandim/plasmaappmonitor.h +++ b/src/frontend/waylandim/plasmaappmonitor.h @@ -7,6 +7,8 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_PLASMAAPPMONITOR_H_ #define _FCITX5_FRONTEND_WAYLANDIM_PLASMAAPPMONITOR_H_ +#include +#include #include "fcitx-utils/signals.h" #include "fcitx-wayland/core/display.h" #include "appmonitor.h" diff --git a/src/frontend/waylandim/virtualinputcontext.cpp b/src/frontend/waylandim/virtualinputcontext.cpp index 3e89e3c3..a2366e63 100644 --- a/src/frontend/waylandim/virtualinputcontext.cpp +++ b/src/frontend/waylandim/virtualinputcontext.cpp @@ -5,9 +5,16 @@ * */ #include "virtualinputcontext.h" +#include +#include +#include #include +#include +#include +#include "fcitx-utils/capabilityflags.h" #include "fcitx-utils/misc_p.h" #include "fcitx/inputcontext.h" +#include "appmonitor.h" namespace fcitx { diff --git a/src/frontend/waylandim/virtualinputcontext.h b/src/frontend/waylandim/virtualinputcontext.h index f72931e7..7d187717 100644 --- a/src/frontend/waylandim/virtualinputcontext.h +++ b/src/frontend/waylandim/virtualinputcontext.h @@ -7,10 +7,14 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_VIRTUALINPUTCONTEXT_H_ #define _FCITX5_FRONTEND_WAYLANDIM_VIRTUALINPUTCONTEXT_H_ +#include #include -#include +#include +#include #include "fcitx-utils/capabilityflags.h" #include "fcitx-utils/signals.h" +#include "fcitx/event.h" +#include "fcitx/inputcontext.h" #include "appmonitor.h" namespace fcitx { diff --git a/src/frontend/waylandim/waylandim.cpp b/src/frontend/waylandim/waylandim.cpp index 78f01fa4..6bfc4744 100644 --- a/src/frontend/waylandim/waylandim.cpp +++ b/src/frontend/waylandim/waylandim.cpp @@ -6,16 +6,25 @@ */ #include "waylandim.h" #include +#include +#include +#include "fcitx-utils/log.h" #include "fcitx-utils/misc_p.h" +#include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" +#include "fcitx/addonmanager.h" #include "fcitx/inputcontext.h" +#include "fcitx/instance.h" #include "fcitx/misc_p.h" #include "appmonitor.h" +#include "display.h" #include "plasmaappmonitor.h" #include "virtualinputcontext.h" #include "wayland_public.h" #include "waylandimserver.h" #include "waylandimserverv2.h" #include "wlrappmonitor.h" +#include "zwp_input_method_v2.h" FCITX_DEFINE_LOG_CATEGORY(waylandim, "waylandim") @@ -61,12 +70,13 @@ wayland::ZwpInputMethodV2 *WaylandIMModule::getInputMethodV2(InputContext *ic) { } bool WaylandIMModule::hasKeyboardGrab(const std::string &display) const { - if (auto server = findValue(servers_, display); server && *server) { + if (const auto *server = findValue(servers_, display); server && *server) { if (server->get()->hasKeyboardGrab()) { return true; } } - if (auto serverV2 = findValue(serversV2_, display); serverV2 && *serverV2) { + if (const auto *serverV2 = findValue(serversV2_, display); + serverV2 && *serverV2) { if (serverV2->get()->hasKeyboardGrab()) { return true; } diff --git a/src/frontend/waylandim/waylandim.h b/src/frontend/waylandim/waylandim.h index d512a927..78218dcb 100644 --- a/src/frontend/waylandim/waylandim.h +++ b/src/frontend/waylandim/waylandim.h @@ -7,14 +7,21 @@ #ifndef _FCITX_FRONTEND_WAYLANDIM_WAYLANDIM_H_ #define _FCITX_FRONTEND_WAYLANDIM_WAYLANDIM_H_ +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include "fcitx-config/configuration.h" +#include "fcitx-config/iniparser.h" +#include "fcitx-config/option.h" +#include "fcitx-config/rawconfig.h" +#include "fcitx-utils/handlertable.h" +#include "fcitx-utils/i18n.h" +#include "fcitx-utils/log.h" +#include "fcitx/addoninstance.h" +#include "fcitx/addonmanager.h" +#include "fcitx/instance.h" #include "appmonitor.h" #include "wayland_public.h" #include "waylandim_public.h" diff --git a/src/frontend/waylandim/waylandim_public.h b/src/frontend/waylandim/waylandim_public.h index 8a7b5a82..5e182dbf 100644 --- a/src/frontend/waylandim/waylandim_public.h +++ b/src/frontend/waylandim/waylandim_public.h @@ -7,8 +7,7 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIM_PUBLIC_H_ #define _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIM_PUBLIC_H_ -#include -#include +#include #include #include #include diff --git a/src/frontend/waylandim/waylandimserver.cpp b/src/frontend/waylandim/waylandimserver.cpp index c277a1fa..0bd37b19 100644 --- a/src/frontend/waylandim/waylandimserver.cpp +++ b/src/frontend/waylandim/waylandimserver.cpp @@ -6,15 +6,38 @@ */ #include "waylandimserver.h" #include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include "fcitx-utils/capabilityflags.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" #include "fcitx-utils/macros.h" +#include "fcitx-utils/textformatflags.h" #include "fcitx-utils/utf8.h" +#include "fcitx/event.h" +#include "fcitx/focusgroup.h" +#include "fcitx/inputcontext.h" +#include "fcitx/inputcontextmanager.h" +#include "fcitx/instance.h" #include "virtualinputcontext.h" #include "wayland-text-input-unstable-v1-client-protocol.h" #include "wayland_public.h" #include "waylandim.h" +#include "waylandimserverbase.h" #include "wl_seat.h" +#include "zwp_input_method_context_v1.h" +#include "zwp_input_method_v1.h" #ifdef __linux__ #include diff --git a/src/frontend/waylandim/waylandimserver.h b/src/frontend/waylandim/waylandimserver.h index 40f581ef..408baba8 100644 --- a/src/frontend/waylandim/waylandimserver.h +++ b/src/frontend/waylandim/waylandimserver.h @@ -7,12 +7,22 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIMSERVER_H_ #define _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIMSERVER_H_ +#include #include -#include "fcitx-utils/event.h" +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/key.h" -#include "fcitx-utils/keysymgen.h" +#include "fcitx-utils/keysym.h" #include "fcitx-utils/macros.h" #include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" +#include "fcitx/event.h" +#include "fcitx/focusgroup.h" +#include "fcitx/inputcontext.h" +#include "fcitx/inputcontextmanager.h" +#include "fcitx/instance.h" #include "virtualinputcontext.h" #include "waylandimserverbase.h" #include "wl_keyboard.h" diff --git a/src/frontend/waylandim/waylandimserverbase.cpp b/src/frontend/waylandim/waylandimserverbase.cpp index 726da797..5c8a2a25 100644 --- a/src/frontend/waylandim/waylandimserverbase.cpp +++ b/src/frontend/waylandim/waylandimserverbase.cpp @@ -5,10 +5,18 @@ */ #include "waylandimserverbase.h" +#include +#include #include #include -#include +#include +#include +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" #include "fcitx-utils/utf8.h" +#include "fcitx/focusgroup.h" +#include "display.h" +#include "wayland_public.h" #include "waylandim.h" #include "wl_seat.h" diff --git a/src/frontend/waylandim/waylandimserverbase.h b/src/frontend/waylandim/waylandimserverbase.h index 4a1183e5..f9297871 100644 --- a/src/frontend/waylandim/waylandimserverbase.h +++ b/src/frontend/waylandim/waylandimserverbase.h @@ -7,9 +7,15 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIMSERVERBASE_H_ #define _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIMSERVERBASE_H_ +#include +#include +#include #include +#include #include +#include "fcitx-utils/key.h" #include "fcitx-utils/misc.h" +#include "fcitx/focusgroup.h" #include "display.h" #include "waylandim.h" #include "wl_seat.h" diff --git a/src/frontend/waylandim/waylandimserverv2.cpp b/src/frontend/waylandim/waylandimserverv2.cpp index dbbe85d2..d7a24f5d 100644 --- a/src/frontend/waylandim/waylandimserverv2.cpp +++ b/src/frontend/waylandim/waylandimserverv2.cpp @@ -6,15 +6,35 @@ */ #include "waylandimserverv2.h" #include +#include +#include +#include +#include #include -#include "fcitx-utils/keysymgen.h" +#include +#include +#include +#include +#include +#include "fcitx-utils/capabilityflags.h" +#include "fcitx-utils/event.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" +#include "fcitx-utils/macros.h" +#include "fcitx-utils/textformatflags.h" #include "fcitx-utils/unixfd.h" #include "fcitx-utils/utf8.h" +#include "fcitx/event.h" #include "fcitx/inputcontext.h" +#include "fcitx/instance.h" #include "virtualinputcontext.h" #include "wayland-text-input-unstable-v3-client-protocol.h" #include "waylandim.h" +#include "waylandimserverbase.h" #include "wl_seat.h" +#include "zwp_input_method_manager_v2.h" +#include "zwp_virtual_keyboard_manager_v1.h" namespace fcitx { @@ -505,8 +525,9 @@ void WaylandIMInputContextV2::modifiersCallback(uint32_t /*serial*/, server_->instance()->updateXkbStateMask( server_->group()->display(), mods_depressed, mods_latched, mods_locked); mask = xkb_state_serialize_mods( - server_->state_.get(), static_cast( - XKB_STATE_DEPRESSED | XKB_STATE_LATCHED)); + server_->state_.get(), + static_cast(XKB_STATE_MODS_DEPRESSED | + XKB_STATE_MODS_LATCHED)); server_->modifiers_ = 0; if (mask & server_->stateMask_.shift_mask) { diff --git a/src/frontend/waylandim/waylandimserverv2.h b/src/frontend/waylandim/waylandimserverv2.h index 733474bf..43e5fe0c 100644 --- a/src/frontend/waylandim/waylandimserverv2.h +++ b/src/frontend/waylandim/waylandimserverv2.h @@ -8,8 +8,22 @@ #define _FCITX5_FRONTEND_WAYLANDIM_WAYLANDIMSERVERV2_H_ #include -#include "fcitx-utils/event.h" +#include +#include +#include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysymgen.h" #include "fcitx-utils/misc_p.h" +#include "fcitx-utils/signals.h" +#include "fcitx/event.h" +#include "fcitx/focusgroup.h" +#include "fcitx/inputcontext.h" +#include "fcitx/inputcontextmanager.h" +#include "fcitx/instance.h" #include "virtualinputcontext.h" #include "waylandimserverbase.h" #include "zwp_input_method_keyboard_grab_v2.h" diff --git a/src/frontend/waylandim/wlrappmonitor.cpp b/src/frontend/waylandim/wlrappmonitor.cpp index dc987a29..0a28ece5 100644 --- a/src/frontend/waylandim/wlrappmonitor.cpp +++ b/src/frontend/waylandim/wlrappmonitor.cpp @@ -5,7 +5,15 @@ * */ #include "wlrappmonitor.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include "fcitx-utils/signals.h" +#include "display.h" #include "zwlr_foreign_toplevel_handle_v1.h" #include "zwlr_foreign_toplevel_manager_v1.h" diff --git a/src/frontend/waylandim/wlrappmonitor.h b/src/frontend/waylandim/wlrappmonitor.h index a0a0242a..d25fbb49 100644 --- a/src/frontend/waylandim/wlrappmonitor.h +++ b/src/frontend/waylandim/wlrappmonitor.h @@ -7,6 +7,10 @@ #ifndef _FCITX5_FRONTEND_WAYLANDIM_WLRAPPMONITOR_H_ #define _FCITX5_FRONTEND_WAYLANDIM_WLRAPPMONITOR_H_ +#include +#include +#include +#include #include "fcitx-utils/signals.h" #include "fcitx-wayland/core/display.h" #include "appmonitor.h" @@ -20,13 +24,13 @@ class WlrWindow; class WlrAppMonitor : public AppMonitor { public: - WlrAppMonitor(wayland::Display *wayland); + WlrAppMonitor(wayland::Display *display); ~WlrAppMonitor() override; bool isAvailable() const override; void setup(wayland::ZwlrForeignToplevelManagerV1 *management); - void remove(wayland::ZwlrForeignToplevelHandleV1 *window); + void remove(wayland::ZwlrForeignToplevelHandleV1 *handle); void refresh(); private: -- Gitee From 05f5f823cdcad30ea1368d6cd7d82c1557754f79 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 16 Dec 2024 22:44:24 -0800 Subject: [PATCH 36/69] Add a workaround for older compositor to restore the old behavior via an option. Fix #1202 --- src/frontend/waylandim/waylandim.cpp | 1 + src/frontend/waylandim/waylandim.h | 18 +++++++++++- src/frontend/waylandim/waylandimserverv2.cpp | 29 ++++++++++++++------ 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/frontend/waylandim/waylandim.cpp b/src/frontend/waylandim/waylandim.cpp index 6bfc4744..f8a09517 100644 --- a/src/frontend/waylandim/waylandim.cpp +++ b/src/frontend/waylandim/waylandim.cpp @@ -32,6 +32,7 @@ namespace fcitx { WaylandIMModule::WaylandIMModule(Instance *instance) : instance_(instance) { reloadConfig(); + persistentVirtualKeyboard_ = *config_.persistentVirtualKeyboard; createdCallback_ = wayland()->call( [this](const std::string &name, wl_display *display, diff --git a/src/frontend/waylandim/waylandim.h b/src/frontend/waylandim/waylandim.h index 78218dcb..de2884dc 100644 --- a/src/frontend/waylandim/waylandim.h +++ b/src/frontend/waylandim/waylandim.h @@ -36,7 +36,18 @@ FCITX_CONFIGURATION( Option preferKeyEvent{ this, "PreferKeyEvent", _("Forward key event instead of commiting text if it is not handled"), - true};); + true}; + OptionWithAnnotation persistentVirtualKeyboard{ + this, + "PersistentVirtualKeyboard", + _("Keep virtual keyboard object for V2 Protocol (Need restart)"), + false, + {}, + {}, + {_("If enabled, when using zwp_input_method_v2, do not create and " + "destroy zwp_virtual_keyboard_v1 on activate and deactivate. This " + "may workaround some bug in certain Compositor, including " + "Sway<=1.9, RiverWM<=0.3.0.")}};); constexpr int32_t repeatHackDelay = 3000; class WaylandIMServer; @@ -67,6 +78,10 @@ public: AggregatedAppMonitor *appMonitor(const std::string &display); + bool persistentVirtualKeyboard() const { + return persistentVirtualKeyboard_; + } + private: Instance *instance_; WaylandIMConfig config_; @@ -79,6 +94,7 @@ private: std::unique_ptr> createdCallback_; std::unique_ptr> closedCallback_; + bool persistentVirtualKeyboard_ = false; }; } // namespace fcitx diff --git a/src/frontend/waylandim/waylandimserverv2.cpp b/src/frontend/waylandim/waylandimserverv2.cpp index d7a24f5d..ea0be8cc 100644 --- a/src/frontend/waylandim/waylandimserverv2.cpp +++ b/src/frontend/waylandim/waylandimserverv2.cpp @@ -30,6 +30,7 @@ #include "fcitx/instance.h" #include "virtualinputcontext.h" #include "wayland-text-input-unstable-v3-client-protocol.h" +#include "wayland_public.h" #include "waylandim.h" #include "waylandimserverbase.h" #include "wl_seat.h" @@ -145,6 +146,10 @@ WaylandIMInputContextV2::WaylandIMInputContextV2( : VirtualInputContextGlue(inputContextManager), server_(server), seat_(std::move(seat)), ic_(server->inputMethodManagerV2()->getInputMethod(seat_.get())) { + if (server_->parent()->persistentVirtualKeyboard()) { + vk_.reset(server_->virtualKeyboardManagerV1()->createVirtualKeyboard( + seat_.get())); + } server->add(this, seat_.get()); ic_->surroundingText().connect( [this](const char *text, uint32_t cursor, uint32_t anchor) { @@ -185,16 +190,20 @@ WaylandIMInputContextV2::WaylandIMInputContextV2( } focusOutWrapper(); } - vk_.reset(); - vkReady_ = false; + if (!server_->parent()->persistentVirtualKeyboard()) { + vk_.reset(); + vkReady_ = false; + } } if (pendingActivate_) { pendingActivate_ = false; - vk_.reset(); - vkReady_ = false; - vk_.reset( - server_->virtualKeyboardManagerV1()->createVirtualKeyboard( - seat_.get())); + if (!server_->parent()->persistentVirtualKeyboard()) { + vk_.reset(); + vkReady_ = false; + vk_.reset( + server_->virtualKeyboardManagerV1()->createVirtualKeyboard( + seat_.get())); + } // There can be only one grab. Always release old grab first. // It is possible when switching between two client, there will be // two activate. In that case we will have already one grab. The @@ -445,8 +454,10 @@ void WaylandIMInputContextV2::keymapCallback(uint32_t format, int32_t fd, 1 << xkb_keymap_mod_get_index(server_->keymap_.get(), "Mod5"); if (keymapChanged || !vkReady_) { - vk_->keymap(format, scopeFD.fd(), size); - vkReady_ = true; + if (vk_) { + vk_->keymap(format, scopeFD.fd(), size); + vkReady_ = true; + } } server_->parent_->wayland()->call(); -- Gitee From 1fa2b924e0465209e69f736152db2edf9d4ad5f7 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 16 Dec 2024 23:14:29 -0800 Subject: [PATCH 37/69] Fix missing include --- src/frontend/waylandim/waylandimserver.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/waylandim/waylandimserver.cpp b/src/frontend/waylandim/waylandimserver.cpp index 0bd37b19..6955f18b 100644 --- a/src/frontend/waylandim/waylandimserver.cpp +++ b/src/frontend/waylandim/waylandimserver.cpp @@ -19,6 +19,7 @@ #include #include #include "fcitx-utils/capabilityflags.h" +#include "fcitx-utils/event.h" #include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/key.h" #include "fcitx-utils/keysym.h" -- Gitee From 0cc48e3def2a1e34ea5cc20509811c1e036825e3 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Tue, 17 Dec 2024 20:24:10 +0000 Subject: [PATCH 38/69] [trans] Update Translation --- po/ca.po | 17 ++++++++++++++--- po/da.po | 17 ++++++++++++++--- po/de.po | 17 ++++++++++++++--- po/es.po | 17 ++++++++++++++--- po/fcitx5.pot | 17 ++++++++++++++--- po/fr.po | 17 ++++++++++++++--- po/he.po | 17 ++++++++++++++--- po/ja.po | 17 ++++++++++++++--- po/ko.po | 17 ++++++++++++++--- po/ru.po | 17 ++++++++++++++--- po/vi.po | 17 ++++++++++++++--- po/zh_CN.po | 17 ++++++++++++++--- po/zh_TW.po | 17 ++++++++++++++--- 13 files changed, 182 insertions(+), 39 deletions(-) diff --git a/po/ca.po b/po/ca.po index f8d05fed..0cacf082 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch , 2020\n" "Language-Team: Catalan (https://app.transifex.com/fcitx/teams/12005/ca/)\n" @@ -677,7 +677,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -959,7 +959,7 @@ msgctxt "Key name" msgid "Forward" msgstr "" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1250,6 +1250,13 @@ msgstr "" msgid "IBus Frontend" msgstr "Frontal DBus" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1386,6 +1393,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "" diff --git a/po/da.po b/po/da.po index 297361a3..f17384f7 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://app.transifex.com/fcitx/teams/12005/da/)\n" @@ -682,7 +682,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -971,7 +971,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Fremad" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1264,6 +1264,13 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus-frontend" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1406,6 +1413,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "Katakana" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "Tast" diff --git a/po/de.po b/po/de.po index d54c2fb1..1cb2cca0 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: mar well , 2023\n" "Language-Team: German (https://app.transifex.com/fcitx/teams/12005/de/)\n" @@ -684,7 +684,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "Aktuelles Programm erkennen (Benötigt Neustart)" @@ -971,7 +971,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Vorwärts" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1262,6 +1262,13 @@ msgstr "" msgid "IBus Frontend" msgstr "IBus Schnittstelle" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1398,6 +1405,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "Katakana" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "Taste" diff --git a/po/es.po b/po/es.po index 372b85e3..100530a5 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:22+0000\n" +"POT-Creation-Date: 2024-12-17 20:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: csslayer , 2017\n" "Language-Team: Spanish (https://www.transifex.com/fcitx/teams/12005/es/)\n" @@ -676,7 +676,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -959,7 +959,7 @@ msgctxt "Key name" msgid "Forward" msgstr "" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1250,6 +1250,13 @@ msgstr "" msgid "IBus Frontend" msgstr "" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1386,6 +1393,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "" diff --git a/po/fcitx5.pot b/po/fcitx5.pot index 0e7ef745..271c5891 100644 --- a/po/fcitx5.pot +++ b/po/fcitx5.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -672,7 +672,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -954,7 +954,7 @@ msgctxt "Key name" msgid "Forward" msgstr "" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1245,6 +1245,13 @@ msgstr "" msgid "IBus Frontend" msgstr "" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1381,6 +1388,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "" diff --git a/po/fr.po b/po/fr.po index 0e8eb8e9..07aa0c67 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: csslayer , 2022\n" "Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" @@ -691,7 +691,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -987,7 +987,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Transférer" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1280,6 +1280,13 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "Interface IBus" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1426,6 +1433,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "Katakana" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "Clé" diff --git a/po/he.po b/po/he.po index 1784281f..975f5d48 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e " ", 2021\n" @@ -678,7 +678,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -960,7 +960,7 @@ msgctxt "Key name" msgid "Forward" msgstr "" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1251,6 +1251,13 @@ msgstr "" msgid "IBus Frontend" msgstr "" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1387,6 +1394,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "" diff --git a/po/ja.po b/po/ja.po index 2edfd998..a3e44882 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-15 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -690,7 +690,7 @@ msgstr "" "とを検出しました。GTK_IM_MODULE の設定を解除し、代わりにWayland 入力メソッド" "フロントエンドを使用することを推奨します。" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "現在実行中のアプリケーションを検出する（再起動が必要）" @@ -995,7 +995,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Forward" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" "キーイベントが処理されない場合、テキストをコミットする代わりにキーイベントを" @@ -1288,6 +1288,13 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus フロントエンド" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1443,6 +1450,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "カタカナ" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "キー" diff --git a/po/ko.po b/po/ko.po index 3e1b8356..b6f15629 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: JungHee Lee , 2023\n" "Language-Team: Korean (https://app.transifex.com/fcitx/teams/12005/ko/)\n" @@ -682,7 +682,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "" @@ -971,7 +971,7 @@ msgctxt "Key name" msgid "Forward" msgstr "앞으로" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1262,6 +1262,13 @@ msgstr "하이퍼" msgid "IBus Frontend" msgstr "IBus 전처리기" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1405,6 +1412,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "가타카나" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "키" diff --git a/po/ru.po b/po/ru.po index 760eb0ed..89c735e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-15 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -695,7 +695,7 @@ msgstr "" "работает. Рекомендуется отключить GTK_IM_MODULE и вместо этого использовать " "интерфейс метода ввода Wayland." -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "Определить текущее запущенное приложение (требуется перезапуск)" @@ -1002,7 +1002,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Пересылать" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" "Пересылать ключевое событие вместо фиксации текста, если оно не " @@ -1297,6 +1297,13 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "Интерфейс IBus" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1453,6 +1460,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "Катакана" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "Клавиша" diff --git a/po/vi.po b/po/vi.po index 3c884c1f..25a295c3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: zenfas, 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" @@ -679,7 +679,7 @@ msgid "" "frontend instead." msgstr "" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "Xác định ứng dụng đang chạy (Cần khởi động lại)" @@ -971,7 +971,7 @@ msgctxt "Key name" msgid "Forward" msgstr "Tiếp theo" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "" @@ -1263,6 +1263,13 @@ msgstr "" msgid "IBus Frontend" msgstr "IBus Frontend" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1402,6 +1409,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index cb47619d..db59f5bb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Yiyu Liu, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/fcitx/teams/12005/" @@ -685,7 +685,7 @@ msgstr "" "检测到设置了 GTK_IM_MODULE，并且 Wayland 输入法前端可以正常工作。推荐取消设" "置 GTK_IM_MODULE 以使用 Wayland 输入法前端。" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "检测当前运行的程序 (需要重启)" @@ -981,7 +981,7 @@ msgctxt "Key name" msgid "Forward" msgstr "向前" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "按键事件未处理时转发按键而不是提交文本" @@ -1272,6 +1272,13 @@ msgstr "Hyper" msgid "IBus Frontend" msgstr "IBus 前端" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1420,6 +1427,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "片假名" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "按键" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3f706368..aac03a17 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-14 20:24+0000\n" +"POT-Creation-Date: 2024-12-17 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Kisaragi Hiu , 2024\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/fcitx/teams/12005/" @@ -693,7 +693,7 @@ msgstr "" "設定 GTK_IM_MODULE 環境變數，從而使用 Wayland 輸入法前端。更多信息請參見 " "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#KDE_Plasma" -#: src/frontend/waylandim/waylandim.h:28 +#: src/frontend/waylandim/waylandim.h:35 msgid "Detect current running application (Need restart)" msgstr "檢測當前運行的程式 (需要重新啟動)" @@ -989,7 +989,7 @@ msgctxt "Key name" msgid "Forward" msgstr "轉遞按鍵事件" -#: src/frontend/waylandim/waylandim.h:31 +#: src/frontend/waylandim/waylandim.h:38 msgid "Forward key event instead of commiting text if it is not handled" msgstr "在按鍵事件未處理時轉遞按鍵事件而非提交文本" @@ -1280,6 +1280,13 @@ msgstr "Hyper 鍵" msgid "IBus Frontend" msgstr "IBus 前端" +#: src/frontend/waylandim/waylandim.h:47 +msgid "" +"If enabled, when using zwp_input_method_v2, do not create and destroy " +"zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " +"bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." +msgstr "" + #: src/lib/fcitx/globalconfig.cpp:219 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " @@ -1429,6 +1436,10 @@ msgctxt "Key name" msgid "Katakana" msgstr "片假名" +#: src/frontend/waylandim/waylandim.h:43 +msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" +msgstr "" + #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "按鍵" -- Gitee From 7368a9571973c7215672aaec63988863b6d44dc7 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Wed, 18 Dec 2024 20:24:05 +0000 Subject: [PATCH 39/69] [trans] Update Translation --- po/ja.po | 7 +++++-- po/ru.po | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index a3e44882..29a3af09 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-18 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -1294,6 +1294,9 @@ msgid "" "zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" +"有効にすると、zwp_input_method_v2 でアクティブ化・非アクティブ化を行ったとき" +"に、zwp_virtual_keyboard_v1 の作成・破棄を行いません。これにより、Sway<=1.9、" +"RiverWM<=0.3.0 を含む特定のコンポジターのバグを回避できる可能性があります。" #: src/lib/fcitx/globalconfig.cpp:219 msgid "" @@ -1452,7 +1455,7 @@ msgstr "カタカナ" #: src/frontend/waylandim/waylandim.h:43 msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" -msgstr "" +msgstr "V2 プロトコルの仮想キーボードオブジェクトを維持する (再起動が必要)" #: src/im/keyboard/longpress.h:20 msgid "Key" diff --git a/po/ru.po b/po/ru.po index 89c735e7..e682402e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-18 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -1303,6 +1303,10 @@ msgid "" "zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" +"Если включено, то при использовании zwp_input_method_v2 не создавать и не " +"уничтожать zwp_virtual_keyboard_v1 при активации и деактивации. Это поможет " +"обойти некоторые ошибки в определенных Compositor, включая Sway<=1.9, " +"RiverWM<=0.3.0." #: src/lib/fcitx/globalconfig.cpp:219 msgid "" @@ -1463,6 +1467,8 @@ msgstr "Катакана" #: src/frontend/waylandim/waylandim.h:43 msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" msgstr "" +"Сохранить объект виртуальной клавиатуры для протокола V2 (требуется " +"перезапуск)" #: src/im/keyboard/longpress.h:20 msgid "Key" -- Gitee From c829acf10790135668e7a984f13f958542d9288c Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Thu, 19 Dec 2024 20:24:07 +0000 Subject: [PATCH 40/69] [trans] Update Translation --- po/ru.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index e682402e..7317d377 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-18 20:24+0000\n" +"POT-Creation-Date: 2024-12-19 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -1303,10 +1303,10 @@ msgid "" "zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -"Если включено, то при использовании zwp_input_method_v2 не создавать и не " -"уничтожать zwp_virtual_keyboard_v1 при активации и деактивации. Это поможет " -"обойти некоторые ошибки в определенных Compositor, включая Sway<=1.9, " -"RiverWM<=0.3.0." +"Если этот параметр включен, zwp_virtual_keyboard_v1 не будет создаваться или " +"уничтожаться при активации и деактивации с помощью zwp_input_method_v2. Это " +"может помочь обойти некоторые ошибки в определенных Compositor, включая " +"Sway<=1.9, RiverWM<=0.3.0." #: src/lib/fcitx/globalconfig.cpp:219 msgid "" @@ -1467,7 +1467,7 @@ msgstr "Катакана" #: src/frontend/waylandim/waylandim.h:43 msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" msgstr "" -"Сохранить объект виртуальной клавиатуры для протокола V2 (требуется " +"Поддерживать объект виртуальной клавиатуры для протокола V2 (Требуется " "перезапуск)" #: src/im/keyboard/longpress.h:20 -- Gitee From c0e1c7ed185ef26b61367e060bafcf52db9fcafb Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 17 Dec 2024 12:21:11 -0800 Subject: [PATCH 41/69] Use _NET_WM_WINDOW_TYPE_COMBO as input window type under X11. Pantheon has a bug that can't not display popup window under Xwayland twice. While the bug is reported, it's not clear when it may be fixed. Also, input method window is indeed more like a combo box and wmspec mentioned that it's also a common override redirect. So try to use that instead. Workaround #1209 --- src/ui/classic/xcbinputwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/classic/xcbinputwindow.cpp b/src/ui/classic/xcbinputwindow.cpp index ac5ef85e..03b8e28b 100644 --- a/src/ui/classic/xcbinputwindow.cpp +++ b/src/ui/classic/xcbinputwindow.cpp @@ -18,10 +18,10 @@ XCBInputWindow::XCBInputWindow(XCBUI *ui) ui_->displayName(), "_KDE_NET_WM_BLUR_BEHIND_REGION", false)) {} void XCBInputWindow::postCreateWindow() { - if (ui_->ewmh()->_NET_WM_WINDOW_TYPE_POPUP_MENU && + if (ui_->ewmh()->_NET_WM_WINDOW_TYPE_COMBO && ui_->ewmh()->_NET_WM_WINDOW_TYPE) { - xcb_ewmh_set_wm_window_type( - ui_->ewmh(), wid_, 1, &ui_->ewmh()->_NET_WM_WINDOW_TYPE_POPUP_MENU); + xcb_ewmh_set_wm_window_type(ui_->ewmh(), wid_, 1, + &ui_->ewmh()->_NET_WM_WINDOW_TYPE_COMBO); } if (ui_->ewmh()->_NET_WM_PID) { -- Gitee From e723881adf82e7eafa19dfc635eb929cdffc87e0 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Wed, 25 Dec 2024 20:22:52 -0800 Subject: [PATCH 42/69] Clang-tidy clean up for classic ui --- src/ui/classic/buffer.cpp | 11 +++-- src/ui/classic/buffer.h | 4 +- src/ui/classic/classicui.cpp | 32 +++++++++++-- src/ui/classic/classicui.h | 30 +++++++----- src/ui/classic/common.h | 8 ++-- src/ui/classic/inputwindow.cpp | 64 ++++++++++++++++++------- src/ui/classic/inputwindow.h | 24 +++++++--- src/ui/classic/plasmathemewatchdog.cpp | 1 + src/ui/classic/plasmathemewatchdog.h | 1 + src/ui/classic/portalsettingmonitor.cpp | 10 +++- src/ui/classic/portalsettingmonitor.h | 7 ++- src/ui/classic/theme.h | 2 +- src/ui/classic/waylandcursortheme.cpp | 8 +++- src/ui/classic/waylandcursortheme.h | 4 +- src/ui/classic/waylandinputwindow.cpp | 39 +++++++++------ src/ui/classic/waylandinputwindow.h | 9 ++-- src/ui/classic/waylandpointer.cpp | 3 ++ src/ui/classic/waylandpointer.h | 10 ++-- src/ui/classic/waylandshmwindow.cpp | 12 ++++- src/ui/classic/waylandshmwindow.h | 14 ++++-- src/ui/classic/waylandui.cpp | 7 ++- src/ui/classic/waylandui.h | 15 ++++-- src/ui/classic/waylandwindow.cpp | 3 ++ src/ui/classic/waylandwindow.h | 12 +++-- src/ui/classic/window.cpp | 2 +- src/ui/classic/window.h | 9 ++-- src/ui/classic/xcbinputwindow.cpp | 15 ++++++ src/ui/classic/xcbinputwindow.h | 12 +++-- src/ui/classic/xcbmenu.cpp | 24 +++++++++- src/ui/classic/xcbmenu.h | 21 ++++++-- src/ui/classic/xcbtraywindow.cpp | 28 +++++++++-- src/ui/classic/xcbtraywindow.h | 16 +++++-- src/ui/classic/xcbui.h | 20 ++++++-- src/ui/classic/xcbwindow.cpp | 7 +++ src/ui/classic/xcbwindow.h | 14 ++++-- 35 files changed, 373 insertions(+), 125 deletions(-) diff --git a/src/ui/classic/buffer.cpp b/src/ui/classic/buffer.cpp index 015d8570..025245d9 100644 --- a/src/ui/classic/buffer.cpp +++ b/src/ui/classic/buffer.cpp @@ -6,15 +6,20 @@ */ #include "buffer.h" #include -#include #include #include +#include +#include +#include #include +#include #include #include #include +#include +#include "fcitx-utils/fs.h" #include "fcitx-utils/stringutils.h" -#include "theme.h" +#include "fcitx-utils/unixfd.h" #include "wl_buffer.h" #include "wl_callback.h" #include "wl_shm.h" @@ -28,7 +33,7 @@ namespace fcitx::wayland { __VA_ARGS__; \ } while (ret < 0 && errno == EINTR) -UnixFD openShm(void) { +UnixFD openShm() { int ret; // We support multiple different methods, memfd / shm_open on BSD / // O_TMPFILE. While linux has shm_open, it doesn't have SHM_ANON extension diff --git a/src/ui/classic/buffer.h b/src/ui/classic/buffer.h index 749ea129..28ee1a31 100644 --- a/src/ui/classic/buffer.h +++ b/src/ui/classic/buffer.h @@ -7,10 +7,12 @@ #ifndef _FCITX_WAYLAND_CORE_BUFFER_H_ #define _FCITX_WAYLAND_CORE_BUFFER_H_ +#include #include #include -#include +#include #include +#include "fcitx-utils/misc.h" #include "fcitx-utils/signals.h" namespace fcitx { diff --git a/src/ui/classic/classicui.cpp b/src/ui/classic/classicui.cpp index 1a90d0eb..0dfa8e2e 100644 --- a/src/ui/classic/classicui.cpp +++ b/src/ui/classic/classicui.cpp @@ -7,24 +7,49 @@ #include "classicui.h" #include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include +#include +#include #include "fcitx-config/iniparser.h" +#include "fcitx-config/rawconfig.h" +#include "fcitx-utils/color.h" #include "fcitx-utils/dbus/message_details.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/fs.h" +#include "fcitx-utils/i18n.h" +#include "fcitx-utils/log.h" +#include "fcitx-utils/misc.h" #include "fcitx-utils/misc_p.h" #include "fcitx-utils/standardpath.h" +#include "fcitx-utils/stringutils.h" +#include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/event.h" #include "fcitx/inputcontext.h" #include "fcitx/inputcontextmanager.h" #include "fcitx/instance.h" +#include "fcitx/userinterface.h" #include "common.h" #include "notificationitem_public.h" #include "plasmathemewatchdog.h" +#include "theme.h" #ifdef ENABLE_X11 +#include "xcb_public.h" #include "xcbui.h" #endif #ifdef WAYLAND_FOUND +#include "wayland_public.h" #include "waylandui.h" #endif #ifdef ENABLE_DBUS @@ -40,9 +65,8 @@ FCITX_DEFINE_LOG_CATEGORY(classicui_logcategory, "classicui"); using AccentColorDBusType = FCITX_STRING_TO_DBUS_TYPE("(ddd)"); ClassicUI::ClassicUI(Instance *instance) : instance_(instance) { - #ifdef ENABLE_DBUS - if (auto dbusAddon = dbus()) { + if (auto *dbusAddon = dbus()) { dbus::VariantTypeRegistry::defaultRegistry() .registerType(); settingMonitor_ = std::make_unique( @@ -108,7 +132,7 @@ ClassicUI::ClassicUI(Instance *instance) : instance_(instance) { auto &focusEvent = static_cast(event); if (!focusEvent.newFocus()) { - if (auto ui = uiForDisplay(focusEvent.group()->display())) { + if (auto *ui = uiForDisplay(focusEvent.group()->display())) { ui->update(UserInterfaceComponent::InputPanel, nullptr); } } @@ -400,7 +424,7 @@ void ClassicUI::resume() { auto &focusEvent = static_cast(event); if (!focusEvent.newFocus()) { - if (auto ui = uiForDisplay(focusEvent.group()->display())) { + if (auto *ui = uiForDisplay(focusEvent.group()->display())) { ui->update(UserInterfaceComponent::InputPanel, nullptr); } } diff --git a/src/ui/classic/classicui.h b/src/ui/classic/classicui.h index 1aa4cccf..b79510b8 100644 --- a/src/ui/classic/classicui.h +++ b/src/ui/classic/classicui.h @@ -7,19 +7,30 @@ #ifndef _FCITX_UI_CLASSIC_CLASSICUI_H_ #define _FCITX_UI_CLASSIC_CLASSICUI_H_ +#include #include -#include "config.h" - +#include +#include +#include +#include +#include +#include #include "fcitx-config/configuration.h" #include "fcitx-config/iniparser.h" #include "fcitx-config/option.h" +#include "fcitx-config/rawconfig.h" +#include "fcitx-utils/color.h" +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/handlertable.h" #include "fcitx-utils/i18n.h" -#include "fcitx/addonfactory.h" +#include "fcitx-utils/stringutils.h" #include "fcitx/addoninstance.h" #include "fcitx/addonmanager.h" +#include "fcitx/event.h" #include "fcitx/instance.h" #include "fcitx/userinterface.h" #include "classicui_public.h" +#include "config.h" #include "plasmathemewatchdog.h" #include "portalsettingmonitor.h" #include "theme.h" @@ -30,11 +41,9 @@ #include "wayland_public.h" #endif #ifdef ENABLE_DBUS -#include "fcitx-utils/dbus/bus.h" #endif -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { inline constexpr std::string_view PlasmaThemeName = "plasma"; @@ -47,8 +56,8 @@ public: virtual ~UIInterface() {} virtual void update(UserInterfaceComponent component, InputContext *inputContext) = 0; - virtual void updateCursor(InputContext *) {} - virtual void updateCurrentInputMethod(InputContext *) {} + virtual void updateCursor(InputContext * /*unused*/) {} + virtual void updateCurrentInputMethod(InputContext * /*unused*/) {} virtual void suspend() = 0; virtual void resume() {} virtual void setEnableTray(bool) = 0; @@ -59,7 +68,7 @@ private: struct NotEmpty { bool check(const std::string &value) { return !value.empty(); } - void dumpDescription(RawConfig &) const {} + void dumpDescription(RawConfig & /*unused*/) const {} }; struct ThemeAnnotation : public EnumAnnotation { @@ -274,7 +283,6 @@ private: std::unique_ptr deferedEnableTray_; std::unique_ptr plasmaThemeWatchdog_; }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_CLASSICUI_H_ diff --git a/src/ui/classic/common.h b/src/ui/classic/common.h index 395a9183..61c93f1e 100644 --- a/src/ui/classic/common.h +++ b/src/ui/classic/common.h @@ -7,12 +7,11 @@ #ifndef _FCITX5_UI_CLASSIC_COMMON_H_ #define _FCITX5_UI_CLASSIC_COMMON_H_ -#include #include #include "fcitx-utils/log.h" +#include "fcitx-utils/misc.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { template using GObjectUniquePtr = UniqueCPtr; @@ -25,7 +24,6 @@ FCITX_DECLARE_LOG_CATEGORY(classicui_logcategory); #define CLASSICUI_INFO() \ FCITX_LOGC(::fcitx::classicui::classicui_logcategory, Info) -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX5_UI_CLASSIC_COMMON_H_ diff --git a/src/ui/classic/inputwindow.cpp b/src/ui/classic/inputwindow.cpp index f65c4841..2e19b10d 100644 --- a/src/ui/classic/inputwindow.cpp +++ b/src/ui/classic/inputwindow.cpp @@ -5,21 +5,38 @@ * */ #include "inputwindow.h" +#include #include +#include +#include #include #include #include +#include +#include +#include #include +#include #include #include +#include +#include #include +#include +#include #include #include "fcitx-utils/color.h" +#include "fcitx-utils/rect.h" +#include "fcitx-utils/textformatflags.h" +#include "fcitx/candidatelist.h" #include "fcitx/inputmethodentry.h" #include "fcitx/inputpanel.h" #include "fcitx/instance.h" #include "fcitx/misc_p.h" +#include "fcitx/text.h" +#include "fcitx/userinterface.h" #include "classicui.h" +#include "common.h" #include "theme.h" namespace fcitx::classicui { @@ -46,7 +63,7 @@ static void prepareLayout(cairo_t *cr, PangoLayout *layout) { } static void renderLayout(cairo_t *cr, PangoLayout *layout, int x, int y) { - auto context = pango_layout_get_context(layout); + auto *context = pango_layout_get_context(layout); auto *metrics = pango_context_get_metrics( context, pango_context_get_font_description(context), pango_context_get_language(context)); @@ -58,7 +75,10 @@ static void renderLayout(cairo_t *cr, PangoLayout *layout, int x, int y) { // Ensure the text are not painting on half pixel. cairo_move_to(cr, x, y + yOffset); - double dx, dy, odx, ody; + double dx; + double dy; + double odx; + double ody; cairo_get_current_point(cr, &dx, &dy); // Save old user value odx = dx; @@ -80,7 +100,8 @@ static void renderLayout(cairo_t *cr, PangoLayout *layout, int x, int y) { int MultilineLayout::width() const { int width = 0; for (const auto &layout : lines_) { - int w, h; + int w; + int h; pango_layout_get_pixel_size(layout.get(), &w, &h); width = std::max(width, w); } @@ -245,19 +266,19 @@ void InputWindow::setTextToLayout( appendText(line, newAttrList, newHighlightAttrList, text); } - auto entry = parent_->instance()->inputMethodEntry(inputContext); + const auto *entry = parent_->instance()->inputMethodEntry(inputContext); if (*parent_->config().useInputMethodLanguageToDisplayText && entry && !entry->languageCode().empty()) { - if (auto language = + if (auto *language = pango_language_from_string(entry->languageCode().c_str())) { if (newAttrList) { - auto attr = pango_attr_language_new(language); + auto *attr = pango_attr_language_new(language); attr->start_index = 0; attr->end_index = line.size(); pango_attr_list_insert(newAttrList, attr); } if (newHighlightAttrList) { - auto attr = pango_attr_language_new(language); + auto *attr = pango_attr_language_new(language); attr->start_index = 0; attr->end_index = line.size(); pango_attr_list_insert(newHighlightAttrList, attr); @@ -364,7 +385,8 @@ std::pair InputWindow::update(InputContext *inputContext) { visible_ = nCandidates_ || pango_layout_get_character_count(upperLayout_.get()) || pango_layout_get_character_count(lowerLayout_.get()); - int width = 0, height = 0; + int width = 0; + int height = 0; if (visible_) { std::tie(width, height) = sizeHint(); if (width <= 0 || height <= 0) { @@ -402,7 +424,8 @@ std::pair InputWindow::sizeHint() { m = n; } }; - int w, h; + int w; + int h; const auto &textMargin = *theme.inputPanel->textMargin; auto extraW = *textMargin.marginLeft + *textMargin.marginRight; @@ -425,9 +448,11 @@ std::pair InputWindow::sizeHint() { vertical = false; } - size_t wholeH = 0, wholeW = 0; + size_t wholeH = 0; + size_t wholeW = 0; for (size_t i = 0; i < nCandidates_; i++) { - size_t candidateW = 0, candidateH = 0; + size_t candidateW = 0; + size_t candidateH = 0; if (labelLayouts_[i].characterCount()) { candidateW += labelLayouts_[i].width(); updateIfLarger(candidateH, @@ -493,7 +518,8 @@ void InputWindow::paint(cairo_t *cr, unsigned int width, unsigned int height, fontHeight = PANGO_PIXELS(fontHeight); size_t currentHeight = 0; - int w, h; + int w; + int h; auto extraW = *textMargin.marginLeft + *textMargin.marginRight; auto extraH = *textMargin.marginTop + *textMargin.marginBottom; if (pango_layout_get_character_count(upperLayout_.get())) { @@ -533,14 +559,16 @@ void InputWindow::paint(cairo_t *cr, unsigned int width, unsigned int height, candidateRegions_.clear(); candidateRegions_.reserve(nCandidates_); - size_t wholeW = 0, wholeH = 0; + size_t wholeW = 0; + size_t wholeH = 0; // size of text = textMargin + actual text size. // HighLight = HighLight margin + TEXT. // Click region = HighLight - click for (size_t i = 0; i < nCandidates_; i++) { - int x, y; + int x; + int y; if (vertical) { x = 0; y = currentHeight + wholeH; @@ -550,7 +578,10 @@ void InputWindow::paint(cairo_t *cr, unsigned int width, unsigned int height, } x += *textMargin.marginLeft; y += *textMargin.marginTop; - int labelW = 0, labelH = 0, candidateW = 0, candidateH = 0; + int labelW = 0; + int labelH = 0; + int candidateW = 0; + int candidateH = 0; if (labelLayouts_[i].characterCount()) { labelW = labelLayouts_[i].width(); labelH = fontHeight * labelLayouts_[i].size(); @@ -620,7 +651,8 @@ void InputWindow::paint(cairo_t *cr, unsigned int width, unsigned int height, const auto &next = theme.loadAction(*theme.inputPanel->next); if (prev.valid() && next.valid()) { cairo_save(cr); - int prevY = 0, nextY = 0; + int prevY = 0; + int nextY = 0; switch (*theme.inputPanel->buttonAlignment) { case PageButtonAlignment::Top: prevY = *margin.marginTop; diff --git a/src/ui/classic/inputwindow.h b/src/ui/classic/inputwindow.h index d1c102e8..0ded731d 100644 --- a/src/ui/classic/inputwindow.h +++ b/src/ui/classic/inputwindow.h @@ -7,15 +7,28 @@ #ifndef _FCITX_UI_CLASSIC_INPUTWINDOW_H_ #define _FCITX_UI_CLASSIC_INPUTWINDOW_H_ +#include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include #include +#include "fcitx-utils/macros.h" +#include "fcitx-utils/misc.h" +#include "fcitx-utils/rect.h" +#include "fcitx-utils/textformatflags.h" +#include "fcitx-utils/trackableobject.h" #include "fcitx/candidatelist.h" #include "fcitx/inputcontext.h" +#include "fcitx/text.h" #include "common.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class ClassicUI; @@ -41,7 +54,7 @@ public: int width() const; - int size() { return lines_.size(); } + int size() const { return lines_.size(); } void render(cairo_t *cr, int x, int y, int lineHeight, bool highlight); std::vector> lines_; @@ -107,7 +120,6 @@ private: std::pair sizeHint(); }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_INPUTWINDOW_H_ diff --git a/src/ui/classic/plasmathemewatchdog.cpp b/src/ui/classic/plasmathemewatchdog.cpp index 098c7cd1..58909054 100644 --- a/src/ui/classic/plasmathemewatchdog.cpp +++ b/src/ui/classic/plasmathemewatchdog.cpp @@ -18,6 +18,7 @@ #include #include #include "fcitx-utils/event.h" +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/fs.h" #include "fcitx-utils/standardpath.h" #include "fcitx-utils/unixfd.h" diff --git a/src/ui/classic/plasmathemewatchdog.h b/src/ui/classic/plasmathemewatchdog.h index 64e4e0be..5b5b365c 100644 --- a/src/ui/classic/plasmathemewatchdog.h +++ b/src/ui/classic/plasmathemewatchdog.h @@ -12,6 +12,7 @@ #include #include #include "fcitx-utils/event.h" +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/unixfd.h" namespace fcitx::classicui { diff --git a/src/ui/classic/portalsettingmonitor.cpp b/src/ui/classic/portalsettingmonitor.cpp index 4999662c..623840f3 100644 --- a/src/ui/classic/portalsettingmonitor.cpp +++ b/src/ui/classic/portalsettingmonitor.cpp @@ -6,9 +6,14 @@ */ #include "portalsettingmonitor.h" +#include #include #include +#include +#include #include "fcitx-utils/dbus/bus.h" +#include "fcitx-utils/dbus/matchrule.h" +#include "fcitx-utils/dbus/message.h" #include "fcitx-utils/misc_p.h" #include "common.h" @@ -34,7 +39,8 @@ PortalSettingMonitor::PortalSettingMonitor(dbus::Bus &bus) XDG_PORTAL_DESKTOP_SETTINGS_INTERFACE, "SettingChanged", {key.interface, key.name}), [this, key](dbus::Message &msg) { - std::string interface, name; + std::string interface; + std::string name; msg >> interface >> name; if (interface != key.interface || name != key.name) { return true; @@ -104,7 +110,7 @@ PortalSettingMonitor::queryValue(const PortalSettingKey &key) { call << key.interface << key.name; return call.callAsync(5000000, [this, key](dbus::Message &msg) { // Key does not exist. - auto data = findValue(watcherData_, key); + auto *data = findValue(watcherData_, key); if (!data) { return true; } diff --git a/src/ui/classic/portalsettingmonitor.h b/src/ui/classic/portalsettingmonitor.h index 69e1a391..adf2be35 100644 --- a/src/ui/classic/portalsettingmonitor.h +++ b/src/ui/classic/portalsettingmonitor.h @@ -7,6 +7,8 @@ #ifndef _FCITX_UI_CLASSIC_PORTALSETTINGMONITOR_H_ #define _FCITX_UI_CLASSIC_PORTALSETTINGMONITOR_H_ +#include +#include #include #include #include @@ -14,6 +16,7 @@ #include "fcitx-utils/dbus/servicewatcher.h" #include "fcitx-utils/dbus/variant.h" #include "fcitx-utils/handlertable_details.h" +#include "fcitx-utils/macros.h" #include "fcitx/misc_p.h" namespace fcitx { @@ -41,8 +44,8 @@ struct std::hash { namespace fcitx { -typedef std::function PortalSettingCallback; -typedef HandlerTableEntry PortalSettingEntry; +using PortalSettingCallback = std::function; +using PortalSettingEntry = HandlerTableEntry; class PortalSettingMonitor { struct PortalSettingData { diff --git a/src/ui/classic/theme.h b/src/ui/classic/theme.h index fa9e3b4f..fc6524d8 100644 --- a/src/ui/classic/theme.h +++ b/src/ui/classic/theme.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "fcitx-config/configuration.h" #include "fcitx-config/enum.h" #include "fcitx-config/option.h" diff --git a/src/ui/classic/waylandcursortheme.cpp b/src/ui/classic/waylandcursortheme.cpp index a1299b4d..4788b871 100644 --- a/src/ui/classic/waylandcursortheme.cpp +++ b/src/ui/classic/waylandcursortheme.cpp @@ -1,6 +1,10 @@ #include "waylandcursortheme.h" +#include #include +#include +#include #include +#include "fcitx-utils/dbus/variant.h" #include "fcitx-utils/misc_p.h" #include "dbus_public.h" #include "portalsettingmonitor.h" @@ -28,7 +32,7 @@ WaylandCursorTheme::WaylandCursorTheme(WaylandUI *ui) } #ifdef ENABLE_DBUS - if (auto dbusAddon = ui->parent()->dbus()) { + if (auto *dbusAddon = ui->parent()->dbus()) { settingMonitor_ = std::make_unique( *dbusAddon->call()); cursorSizeWatcher_ = @@ -72,7 +76,7 @@ void WaylandCursorTheme::setTheme(const std::string &theme) { WaylandCursorInfo WaylandCursorTheme::loadCursorTheme(int scale) { auto size = cursorSize_ * scale; - if (auto theme = findValue(themes_, size)) { + if (auto *theme = findValue(themes_, size)) { return *theme; } WaylandCursorInfo info; diff --git a/src/ui/classic/waylandcursortheme.h b/src/ui/classic/waylandcursortheme.h index 7937d7f0..0e03429a 100644 --- a/src/ui/classic/waylandcursortheme.h +++ b/src/ui/classic/waylandcursortheme.h @@ -8,8 +8,10 @@ #define _FCITX_UI_CLASSIC_WAYLANDCURSORTHEME_H_ #include +#include #include #include +#include "fcitx-utils/signals.h" #include "config.h" #include "portalsettingmonitor.h" #include "wl_shm.h" @@ -29,7 +31,7 @@ public: auto &themeChanged() const { return themeChangedSignal_; } - WaylandCursorInfo loadCursorTheme(int size); + WaylandCursorInfo loadCursorTheme(int scale); auto cursorSize() const { return cursorSize_; } private: diff --git a/src/ui/classic/waylandinputwindow.cpp b/src/ui/classic/waylandinputwindow.cpp index 5b8bc950..bf0c63a3 100644 --- a/src/ui/classic/waylandinputwindow.cpp +++ b/src/ui/classic/waylandinputwindow.cpp @@ -5,7 +5,19 @@ * */ #include "waylandinputwindow.h" +#include +#include +#include +#include +#include +#include +#include +#include "fcitx-utils/rect.h" +#include "fcitx/inputcontext.h" #include "common.h" +#include "inputwindow.h" +#include "org_kde_kwin_blur_manager.h" +#include "theme.h" #include "waylandim_public.h" #include "waylandui.h" #include "waylandwindow.h" @@ -105,28 +117,27 @@ void WaylandInputWindow::updateBlur() { if (!compositor) { return; } - auto width = window_->width(), height = window_->height(); + auto width = window_->width(); + auto height = window_->height(); Rect rect(0, 0, width, height); shrink(rect, *ui_->parent()->theme().inputPanel->blurMargin); if (!*ui_->parent()->theme().inputPanel->enableBlur || rect.isEmpty()) { return; + } + std::vector data; + std::unique_ptr region(compositor->createRegion()); + if (ui_->parent()->theme().inputPanel->blurMask->empty()) { + region->add(rect.left(), rect.top(), rect.width(), rect.height()); } else { - std::vector data; - std::unique_ptr region(compositor->createRegion()); - if (ui_->parent()->theme().inputPanel->blurMask->empty()) { + auto regions = + parent_->theme().mask(parent_->theme().maskConfig(), width, height); + for (const auto &rect : regions) { region->add(rect.left(), rect.top(), rect.width(), rect.height()); - } else { - auto regions = parent_->theme().mask(parent_->theme().maskConfig(), - width, height); - for (const auto &rect : regions) { - region->add(rect.left(), rect.top(), rect.width(), - rect.height()); - } } - blur_.reset(blurManager_->create(window_->surface())); - blur_->setRegion(region.get()); - blur_->commit(); } + blur_.reset(blurManager_->create(window_->surface())); + blur_->setRegion(region.get()); + blur_->commit(); } void WaylandInputWindow::updateScale() { window_->updateScale(); } diff --git a/src/ui/classic/waylandinputwindow.h b/src/ui/classic/waylandinputwindow.h index 2d23a027..ddad6b52 100644 --- a/src/ui/classic/waylandinputwindow.h +++ b/src/ui/classic/waylandinputwindow.h @@ -8,14 +8,16 @@ #define _FCITX_UI_CLASSIC_WAYLANDINPUTWINDOW_H_ #include +#include +#include "fcitx-utils/trackableobject.h" +#include "fcitx/inputcontext.h" #include "inputwindow.h" #include "org_kde_kwin_blur.h" #include "org_kde_kwin_blur_manager.h" #include "zwp_input_panel_surface_v1.h" #include "zwp_input_popup_surface_v2.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class WaylandUI; class WaylandWindow; @@ -45,7 +47,6 @@ private: std::unique_ptr blur_; }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WAYLANDINPUTWINDOW_H_ diff --git a/src/ui/classic/waylandpointer.cpp b/src/ui/classic/waylandpointer.cpp index 94fd880c..68fc4e2a 100644 --- a/src/ui/classic/waylandpointer.cpp +++ b/src/ui/classic/waylandpointer.cpp @@ -6,7 +6,10 @@ */ #include "waylandpointer.h" +#include +#include #include "waylandwindow.h" +#include "wl_seat.h" #include "wl_surface.h" namespace fcitx::classicui { diff --git a/src/ui/classic/waylandpointer.h b/src/ui/classic/waylandpointer.h index c6925849..134f9934 100644 --- a/src/ui/classic/waylandpointer.h +++ b/src/ui/classic/waylandpointer.h @@ -7,14 +7,17 @@ #ifndef _FCITX_UI_CLASSIC_WAYLANDPOINTER_H_ #define _FCITX_UI_CLASSIC_WAYLANDPOINTER_H_ +#include #include +#include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" +#include "display.h" #include "waylandcursor.h" #include "wl_pointer.h" #include "wl_seat.h" #include "wl_touch.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class WaylandUI; class WaylandWindow; @@ -50,7 +53,6 @@ private: std::unique_ptr cursor_; }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WAYLANDPOINTER_H_ diff --git a/src/ui/classic/waylandshmwindow.cpp b/src/ui/classic/waylandshmwindow.cpp index 6c8d415f..194f2e25 100644 --- a/src/ui/classic/waylandshmwindow.cpp +++ b/src/ui/classic/waylandshmwindow.cpp @@ -6,7 +6,16 @@ */ #include "waylandshmwindow.h" +#include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" +#include "buffer.h" #include "common.h" +#include "waylandui.h" +#include "waylandwindow.h" +#include "wl_shm.h" namespace fcitx::classicui { @@ -68,7 +77,8 @@ cairo_surface_t *WaylandShmWindow::prerender() { } } - uint32_t bufferWidth = width_, bufferHeight = height_; + uint32_t bufferWidth = width_; + uint32_t bufferHeight = height_; surfaceToBufferSize(bufferScale(), &bufferWidth, &bufferHeight); if (iter != buffers_.end() && ((*iter)->width() != bufferWidth || diff --git a/src/ui/classic/waylandshmwindow.h b/src/ui/classic/waylandshmwindow.h index 1c7f6c68..933707ab 100644 --- a/src/ui/classic/waylandshmwindow.h +++ b/src/ui/classic/waylandshmwindow.h @@ -7,12 +7,16 @@ #ifndef _FCITX_UI_CLASSIC_WAYLANDSHMWINDOW_H_ #define _FCITX_UI_CLASSIC_WAYLANDSHMWINDOW_H_ -#include +#include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" #include "buffer.h" +#include "waylandui.h" #include "waylandwindow.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class WaylandShmWindow : public WaylandWindow { public: @@ -34,7 +38,7 @@ private: bool pending_ = false; std::unique_ptr deferEvent_; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WAYLANDSHMWINDOW_H_ diff --git a/src/ui/classic/waylandui.cpp b/src/ui/classic/waylandui.cpp index ea15c226..ac1e8173 100644 --- a/src/ui/classic/waylandui.cpp +++ b/src/ui/classic/waylandui.cpp @@ -6,11 +6,16 @@ */ #include "waylandui.h" -#include +#include +#include +#include "fcitx/userinterface.h" +#include "classicui.h" +#include "common.h" #include "display.h" #include "org_kde_kwin_blur_manager.h" #include "waylandcursortheme.h" #include "waylandinputwindow.h" +#include "waylandpointer.h" #include "waylandshmwindow.h" #include "wl_compositor.h" #include "wl_seat.h" diff --git a/src/ui/classic/waylandui.h b/src/ui/classic/waylandui.h index e979f0bd..48758b9c 100644 --- a/src/ui/classic/waylandui.h +++ b/src/ui/classic/waylandui.h @@ -7,12 +7,17 @@ #ifndef _FCITX_UI_CLASSIC_WAYLANDUI_H_ #define _FCITX_UI_CLASSIC_WAYLANDUI_H_ +#include +#include +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/signals.h" +#include "fcitx/userinterface.h" #include "classicui.h" +#include "display.h" #include "waylandcursortheme.h" #include "waylandpointer.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class WaylandWindow; class WaylandInputWindow; @@ -28,7 +33,7 @@ public: InputContext *inputContext) override; void suspend() override; void resume() override; - void setEnableTray(bool) override {} + void setEnableTray(bool /*unused*/) override {} std::unique_ptr newWindow(); @@ -45,7 +50,7 @@ private: std::unique_ptr inputWindow_; std::unique_ptr defer_; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WAYLANDUI_H_ diff --git a/src/ui/classic/waylandwindow.cpp b/src/ui/classic/waylandwindow.cpp index 378b4f5b..fe8ea752 100644 --- a/src/ui/classic/waylandwindow.cpp +++ b/src/ui/classic/waylandwindow.cpp @@ -6,6 +6,9 @@ */ #include "waylandwindow.h" +#include +#include "fcitx-utils/eventloopinterface.h" +#include "waylandui.h" #include "wl_compositor.h" #include "wl_output.h" #include "wl_surface.h" diff --git a/src/ui/classic/waylandwindow.h b/src/ui/classic/waylandwindow.h index 3f7a7160..cba0500a 100644 --- a/src/ui/classic/waylandwindow.h +++ b/src/ui/classic/waylandwindow.h @@ -8,7 +8,13 @@ #define _FCITX_UI_CLASSIC_WAYLANDWINDOW_H_ #include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/rect.h" +#include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" #include "waylandui.h" #include "window.h" #include "wp_fractional_scale_manager_v1.h" @@ -16,8 +22,7 @@ #include "wp_viewport.h" #include "wp_viewporter.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class WaylandWindow : public Window, public TrackableObject { public: @@ -95,7 +100,6 @@ private: void scheduleRepaint(); }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WAYLANDWINDOW_H_ diff --git a/src/ui/classic/window.cpp b/src/ui/classic/window.cpp index 6cb9f1d4..2dc494ab 100644 --- a/src/ui/classic/window.cpp +++ b/src/ui/classic/window.cpp @@ -9,7 +9,7 @@ namespace fcitx::classicui { -Window::Window() {} +Window::Window() = default; void Window::resize(unsigned int width, unsigned int height) { width_ = width; diff --git a/src/ui/classic/window.h b/src/ui/classic/window.h index ef951a5c..842f11bc 100644 --- a/src/ui/classic/window.h +++ b/src/ui/classic/window.h @@ -7,10 +7,9 @@ #ifndef _FCITX_UI_CLASSIC_WINDOW_H_ #define _FCITX_UI_CLASSIC_WINDOW_H_ -#include +#include -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class Window { public: @@ -28,7 +27,7 @@ protected: unsigned int width_ = 100; unsigned int height_ = 100; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_WINDOW_H_ diff --git a/src/ui/classic/xcbinputwindow.cpp b/src/ui/classic/xcbinputwindow.cpp index 03b8e28b..6923916b 100644 --- a/src/ui/classic/xcbinputwindow.cpp +++ b/src/ui/classic/xcbinputwindow.cpp @@ -6,9 +6,24 @@ */ #include "xcbinputwindow.h" +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include "fcitx-utils/rect.h" +#include "fcitx/inputcontext.h" +#include "inputwindow.h" +#include "theme.h" +#include "xcb_public.h" +#include "xcbui.h" +#include "xcbwindow.h" namespace fcitx::classicui { diff --git a/src/ui/classic/xcbinputwindow.h b/src/ui/classic/xcbinputwindow.h index 37fb9852..4f89d3f8 100644 --- a/src/ui/classic/xcbinputwindow.h +++ b/src/ui/classic/xcbinputwindow.h @@ -7,11 +7,15 @@ #ifndef _FCITX_UI_CLASSIC_XCBINPUTWINDOW_H_ #define _FCITX_UI_CLASSIC_XCBINPUTWINDOW_H_ +#include +#include +#include "fcitx-utils/rect.h" +#include "fcitx/inputcontext.h" #include "inputwindow.h" +#include "xcbui.h" #include "xcbwindow.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class XCBInputWindow : public XCBWindow, protected InputWindow { public: @@ -36,7 +40,7 @@ private: xcb_atom_t atomBlur_; int dpi_ = -1; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_XCBINPUTWINDOW_H_ diff --git a/src/ui/classic/xcbmenu.cpp b/src/ui/classic/xcbmenu.cpp index 7d45dfcd..83cea2ad 100644 --- a/src/ui/classic/xcbmenu.cpp +++ b/src/ui/classic/xcbmenu.cpp @@ -5,17 +5,39 @@ * */ #include "xcbmenu.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include #include +#include +#include "fcitx-utils/connectableobject.h" +#include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/log.h" +#include "fcitx-utils/rect.h" +#include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" +#include "fcitx/action.h" #include "fcitx/inputcontext.h" +#include "fcitx/menu.h" #include "fcitx/userinterfacemanager.h" #include "common.h" #include "theme.h" +#include "xcbui.h" +#include "xcbwindow.h" namespace fcitx::classicui { diff --git a/src/ui/classic/xcbmenu.h b/src/ui/classic/xcbmenu.h index f71b8ec6..297fd17d 100644 --- a/src/ui/classic/xcbmenu.h +++ b/src/ui/classic/xcbmenu.h @@ -7,12 +7,26 @@ #ifndef _FCITX_UI_CLASSIC_XCBMENU_H_ #define _FCITX_UI_CLASSIC_XCBMENU_H_ +#include +#include +#include +#include +#include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/rect.h" +#include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" +#include "fcitx/action.h" +#include "fcitx/inputcontext.h" #include "fcitx/menu.h" #include "common.h" +#include "xcbui.h" #include "xcbwindow.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class MenuPool; @@ -117,7 +131,6 @@ private: std::unique_ptr popupMenuTimer_; }; -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_XCBMENU_H_ diff --git a/src/ui/classic/xcbtraywindow.cpp b/src/ui/classic/xcbtraywindow.cpp index 3ad3d501..ea74ac6e 100644 --- a/src/ui/classic/xcbtraywindow.cpp +++ b/src/ui/classic/xcbtraywindow.cpp @@ -6,16 +6,33 @@ */ #include "xcbtraywindow.h" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include "fcitx-utils/i18n.h" +#include "fcitx-utils/misc.h" +#include "fcitx-utils/rect.h" +#include "fcitx/action.h" #include "fcitx/inputcontext.h" #include "fcitx/inputmethodentry.h" #include "fcitx/inputmethodmanager.h" #include "fcitx/statusarea.h" #include "fcitx/userinterfacemanager.h" #include "common.h" +#include "xcb_public.h" #include "xcbmenu.h" +#include "xcbui.h" +#include "xcbwindow.h" namespace fcitx::classicui { @@ -146,8 +163,9 @@ bool XCBTrayWindow::filterEvent(xcb_generic_event_t *event) { createTrayWindow(); findDock(); return true; - } else if (property->atom == atoms_[ATOM_ORIENTATION] && - property->window == dockWindow_) { + } + if (property->atom == atoms_[ATOM_ORIENTATION] && + property->window == dockWindow_) { isHorizontal_ = trayOrientation(); resizeTrayWindow(); return true; @@ -353,7 +371,8 @@ void XCBTrayWindow::paint(cairo_t *c) { cairo_save(c); cairo_set_operator(c, CAIRO_OPERATOR_SOURCE); - double scaleW = 1.0, scaleH = 1.0; + double scaleW = 1.0; + double scaleH = 1.0; if (image.width() != width() || image.height() != height()) { scaleW = static_cast(width()) / image.width(); scaleH = static_cast(height()) / image.height(); @@ -367,7 +386,8 @@ void XCBTrayWindow::paint(cairo_t *c) { int ah = scaleH * image.height(); cairo_scale(c, scaleW, scaleH); - cairo_set_source_surface(c, image, (width() - aw) / 2, (height() - ah) / 2); + cairo_set_source_surface(c, image, (width() - aw) / 2.0, + (height() - ah) / 2.0); cairo_paint(c); cairo_restore(c); } diff --git a/src/ui/classic/xcbtraywindow.h b/src/ui/classic/xcbtraywindow.h index d394a4ea..db4e45fc 100644 --- a/src/ui/classic/xcbtraywindow.h +++ b/src/ui/classic/xcbtraywindow.h @@ -7,12 +7,20 @@ #ifndef _FCITX_UI_CLASSIC_XCBTRAYWINDOW_H_ #define _FCITX_UI_CLASSIC_XCBTRAYWINDOW_H_ +#include +#include +#include +#include +#include +#include "fcitx-utils/handlertable.h" +#include "fcitx/action.h" #include "fcitx/menu.h" +#include "xcb_public.h" #include "xcbmenu.h" +#include "xcbui.h" #include "xcbwindow.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class XCBTrayWindow : public XCBWindow { public: @@ -76,7 +84,7 @@ private: std::list groupActions_; std::list inputMethodActions_; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_XCBTRAYWINDOW_H_ diff --git a/src/ui/classic/xcbui.h b/src/ui/classic/xcbui.h index b2e90eda..b78c414d 100644 --- a/src/ui/classic/xcbui.h +++ b/src/ui/classic/xcbui.h @@ -7,14 +7,25 @@ #ifndef _FCITX_UI_CLASSIC_XCBUI_H_ #define _FCITX_UI_CLASSIC_XCBUI_H_ +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include "fcitx-utils/eventloopinterface.h" +#include "fcitx-utils/handlertable_details.h" #include "fcitx-utils/misc.h" #include "fcitx-utils/rect.h" +#include "fcitx/userinterface.h" #include "classicui.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class XCBInputWindow; class XCBTrayWindow; @@ -56,7 +67,7 @@ public: void updateCurrentInputMethod(InputContext *inputContext) override; void suspend() override; void resume() override; - void setEnableTray(bool) override; + void setEnableTray(bool enable) override; void setCairoDevice(cairo_device_t *device); const auto &screenRects() { return rects_; } @@ -116,7 +127,6 @@ private: void addEventMaskToWindow(xcb_connection_t *conn, xcb_window_t wid, uint32_t mask); -} // namespace classicui -} // namespace fcitx +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_XCBUI_H_ diff --git a/src/ui/classic/xcbwindow.cpp b/src/ui/classic/xcbwindow.cpp index 0bf8dda0..1f5a386b 100644 --- a/src/ui/classic/xcbwindow.cpp +++ b/src/ui/classic/xcbwindow.cpp @@ -6,11 +6,18 @@ */ #include "xcbwindow.h" +#include +#include #include #include #include #include +#include +#include "fcitx-utils/misc.h" #include "common.h" +#include "window.h" +#include "xcb_public.h" +#include "xcbui.h" namespace fcitx::classicui { diff --git a/src/ui/classic/xcbwindow.h b/src/ui/classic/xcbwindow.h index 1fc89f63..2ff145cc 100644 --- a/src/ui/classic/xcbwindow.h +++ b/src/ui/classic/xcbwindow.h @@ -7,13 +7,17 @@ #ifndef _FCITX_UI_CLASSIC_XCBWINDOW_H_ #define _FCITX_UI_CLASSIC_XCBWINDOW_H_ -#include +#include +#include #include +#include +#include "fcitx-utils/handlertable.h" +#include "fcitx-utils/misc.h" #include "window.h" +#include "xcb_public.h" #include "xcbui.h" -namespace fcitx { -namespace classicui { +namespace fcitx::classicui { class XCBWindow : public Window { public: @@ -41,7 +45,7 @@ protected: UniqueCPtr surface_; UniqueCPtr contentSurface_; }; -} // namespace classicui -} // namespace fcitx + +} // namespace fcitx::classicui #endif // _FCITX_UI_CLASSIC_XCBWINDOW_H_ -- Gitee From 4a398b8200e43a76e06f6569ec980243934ede9c Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Thu, 26 Dec 2024 07:19:07 -0800 Subject: [PATCH 43/69] Further clang-tidy --- src/ui/classic/theme.cpp | 56 ++++++++++++++++++++++++++++++---------- src/ui/classic/theme.h | 8 ++++++ 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/ui/classic/theme.cpp b/src/ui/classic/theme.cpp index cb44bcac..c4bd03e6 100644 --- a/src/ui/classic/theme.cpp +++ b/src/ui/classic/theme.cpp @@ -7,22 +7,43 @@ #include "theme.h" #include +#include #include +#include +#include #include +#include +#include +#include #include #include +#include +#include #include #include #include +#include #include +#include +#include +#include +#include +#include +#include #include #include "fcitx-config/iniparser.h" +#include "fcitx-config/rawconfig.h" +#include "fcitx-utils/color.h" #include "fcitx-utils/fs.h" #include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/misc.h" +#include "fcitx-utils/misc_p.h" #include "fcitx-utils/rect.h" #include "fcitx-utils/standardpath.h" +#include "fcitx-utils/stringutils.h" #include "fcitx-utils/utf8.h" +#include "fcitx/icontheme.h" #include "fcitx/misc_p.h" #include "classicui.h" #include "colorhelper.h" @@ -92,9 +113,12 @@ cairo_surface_t *pixBufToCairoSurface(GdkPixbuf *image) { surface = cairo_image_surface_create(format, gdk_pixbuf_get_width(image), gdk_pixbuf_get_height(image)); - gint width, height; - guchar *gdk_pixels, *cairo_pixels; - int gdk_rowstride, cairo_stride; + gint width; + gint height; + guchar *gdk_pixels; + guchar *cairo_pixels; + int gdk_rowstride; + int cairo_stride; int n_channels; int j; @@ -118,7 +142,7 @@ cairo_surface_t *pixBufToCairoSurface(GdkPixbuf *image) { guchar *q = cairo_pixels; if (n_channels == 3) { - guchar *end = p + 3 * width; + guchar *end = p + static_cast(3) * width; while (p < end) { #if G_BYTE_ORDER == G_LITTLE_ENDIAN @@ -136,13 +160,15 @@ cairo_surface_t *pixBufToCairoSurface(GdkPixbuf *image) { q += 4; } } else { - guchar *end = p + 4 * width; - guint t1, t2, t3; + guchar *end = p + static_cast(4) * width; + guint t1; + guint t2; + guint t3; #define MULT(d, c, a, t) \ G_STMT_START { \ - t = c * a + 0x80; \ - d = ((t >> 8) + t) >> 8; \ + (t) = (c) * (a) + 0x80; \ + (d) = (((t) >> 8) + (t)) >> 8; \ } \ G_STMT_END @@ -399,7 +425,8 @@ const ThemeImage &Theme::loadBackground(const BackgroundImageConfig &cfg) { return *image; } - Color color, borderColor; + Color color; + Color borderColor; if (&cfg == &*inputPanel->background) { color = inputPanelBackground_; borderColor = inputPanelBorder_; @@ -592,7 +619,8 @@ void paintTile(cairo_t *c, int width, int height, double alpha, cairo_scale(c, scaleX, scaleY); cairo_set_source_surface(c, image, -marginLeft, -marginTop); cairo_pattern_set_filter(cairo_get_source(c), CAIRO_FILTER_NEAREST); - int w = resizeWidth, h = resizeHeight; + int w = resizeWidth; + int h = resizeHeight; cairo_rectangle(c, 0, 0, w, h); cairo_clip(c); @@ -647,7 +675,8 @@ void Theme::paint(cairo_t *c, const BackgroundImageConfig &cfg, int width, *cfg.overlayClipMargin->marginTop) .setSize(clipWidth, clipHeight); - int x = 0, y = 0; + int x = 0; + int y = 0; switch (*cfg.gravity) { case Gravity::TopLeft: case Gravity::CenterLeft: @@ -778,7 +807,7 @@ std::vector Theme::mask(const BackgroundImageConfig &cfg, int width, int height) { UniqueCPtr mask( cairo_image_surface_create(CAIRO_FORMAT_A1, width, height)); - auto c = cairo_create(mask.get()); + auto *c = cairo_create(mask.get()); cairo_set_operator(c, CAIRO_OPERATOR_SOURCE); paint(c, cfg, width, height, 1, 1); cairo_destroy(c); @@ -798,7 +827,8 @@ std::vector Theme::mask(const BackgroundImageConfig &cfg, int width, const auto *data = cairo_image_surface_get_data(mask.get()); auto cairo_stride = cairo_image_surface_get_stride(mask.get()); constexpr bool little = G_BYTE_ORDER == G_LITTLE_ENDIAN; - int x, y; + int x; + int y; for (y = 0; y < height; ++y) { uint8_t all = zero; int prev1 = -1; diff --git a/src/ui/classic/theme.h b/src/ui/classic/theme.h index fc6524d8..6e2b2396 100644 --- a/src/ui/classic/theme.h +++ b/src/ui/classic/theme.h @@ -8,13 +8,21 @@ #define _FCITX_UI_CLASSIC_THEME_H_ #include +#include +#include #include +#include +#include #include #include #include "fcitx-config/configuration.h" #include "fcitx-config/enum.h" #include "fcitx-config/option.h" +#include "fcitx-config/rawconfig.h" +#include "fcitx-utils/color.h" #include "fcitx-utils/i18n.h" +#include "fcitx-utils/i18nstring.h" +#include "fcitx-utils/misc.h" #include "fcitx-utils/rect.h" #include "fcitx/icontheme.h" -- Gitee From 63e28d4d857b8315b5d81b340611b933b9d571b3 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 06:45:57 -0800 Subject: [PATCH 44/69] Clang-tidy for fcitx-config/ --- src/lib/fcitx-config/dbushelper.cpp | 6 +++++- src/lib/fcitx-config/dbushelper.h | 1 + src/lib/fcitx-config/iniparser.cpp | 2 +- src/lib/fcitx-config/marshallfunction.cpp | 24 ++++++++++++++++------- src/lib/fcitx-config/marshallfunction.h | 4 ++++ src/lib/fcitx-config/option.cpp | 17 ++++++++++++---- src/lib/fcitx-config/option.h | 17 ++++++++++------ src/lib/fcitx-config/option_details.h | 4 +++- src/lib/fcitx-config/rawconfig.cpp | 11 +++++++++-- 9 files changed, 64 insertions(+), 22 deletions(-) diff --git a/src/lib/fcitx-config/dbushelper.cpp b/src/lib/fcitx-config/dbushelper.cpp index 4b6e58bc..3c2491df 100644 --- a/src/lib/fcitx-config/dbushelper.cpp +++ b/src/lib/fcitx-config/dbushelper.cpp @@ -6,7 +6,11 @@ */ #include "dbushelper.h" +#include +#include #include "fcitx-utils/dbus/variant.h" +#include "configuration.h" +#include "rawconfig.h" namespace fcitx { @@ -20,7 +24,7 @@ void variantFillRawConfig(const dbus::Variant &variant, RawConfig &config) { if (variant.signature() != "a{sv}") { return; } - const DBusVariantMap &map = variant.dataAs(); + const auto &map = variant.dataAs(); for (const auto &entry : map) { if (entry.key().empty()) { config = entry.value().dataAs(); diff --git a/src/lib/fcitx-config/dbushelper.h b/src/lib/fcitx-config/dbushelper.h index d75e2e7c..fae36fd4 100644 --- a/src/lib/fcitx-config/dbushelper.h +++ b/src/lib/fcitx-config/dbushelper.h @@ -7,6 +7,7 @@ #ifndef _FCITX_CONFIG_DBUSHELPER_H_ #define _FCITX_CONFIG_DBUSHELPER_H_ +#include #include #include #include diff --git a/src/lib/fcitx-config/iniparser.cpp b/src/lib/fcitx-config/iniparser.cpp index 849eb4c6..25be6b4b 100644 --- a/src/lib/fcitx-config/iniparser.cpp +++ b/src/lib/fcitx-config/iniparser.cpp @@ -10,7 +10,6 @@ #include #include #include -#include "fcitx-config/rawconfig.h" #include "fcitx-utils/fs.h" #include "fcitx-utils/macros.h" #include "fcitx-utils/misc.h" @@ -18,6 +17,7 @@ #include "fcitx-utils/stringutils.h" #include "fcitx-utils/unixfd.h" #include "configuration.h" +#include "rawconfig.h" namespace fcitx { diff --git a/src/lib/fcitx-config/marshallfunction.cpp b/src/lib/fcitx-config/marshallfunction.cpp index 020e419a..85ea630d 100644 --- a/src/lib/fcitx-config/marshallfunction.cpp +++ b/src/lib/fcitx-config/marshallfunction.cpp @@ -6,15 +6,22 @@ */ #include "marshallfunction.h" +#include +#include +#include "fcitx-utils/color.h" +#include "fcitx-utils/i18nstring.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/semver.h" #include "fcitx-utils/stringutils.h" #include "configuration.h" +#include "rawconfig.h" namespace fcitx { void marshallOption(RawConfig &config, bool value) { config = value ? "True" : "False"; } -bool unmarshallOption(bool &value, const RawConfig &config, bool) { +bool unmarshallOption(bool &value, const RawConfig &config, bool /*unused*/) { if (config.value() == "True" || config.value() == "False") { value = config.value() == "True"; return true; @@ -26,7 +33,7 @@ void marshallOption(RawConfig &config, int value) { config = std::to_string(value); } -bool unmarshallOption(int &value, const RawConfig &config, bool) { +bool unmarshallOption(int &value, const RawConfig &config, bool /*unused*/) { try { value = std::stoi(config.value()); } catch (const std::exception &) { @@ -40,7 +47,8 @@ void marshallOption(RawConfig &config, const std::string &value) { config = value; } -bool unmarshallOption(std::string &value, const RawConfig &config, bool) { +bool unmarshallOption(std::string &value, const RawConfig &config, + bool /*unused*/) { value = config.value(); return true; } @@ -49,7 +57,8 @@ void marshallOption(RawConfig &config, const SemanticVersion &value) { config = value.toString(); } -bool unmarshallOption(SemanticVersion &value, const RawConfig &config, bool) { +bool unmarshallOption(SemanticVersion &value, const RawConfig &config, + bool /*unused*/) { if (auto result = SemanticVersion::parse(config.value())) { value = result.value(); return true; @@ -61,7 +70,7 @@ void marshallOption(RawConfig &config, const Key &value) { config = value.toString(); } -bool unmarshallOption(Key &value, const RawConfig &config, bool) { +bool unmarshallOption(Key &value, const RawConfig &config, bool /*unused*/) { value = Key(config.value()); return true; } @@ -70,7 +79,7 @@ void marshallOption(RawConfig &config, const Color &value) { config = value.toString(); } -bool unmarshallOption(Color &value, const RawConfig &config, bool) { +bool unmarshallOption(Color &value, const RawConfig &config, bool /*unused*/) { try { value = Color(config.value()); } catch (const ColorParseException &) { @@ -87,7 +96,8 @@ void marshallOption(RawConfig &config, const I18NString &value) { } } -bool unmarshallOption(I18NString &value, const RawConfig &config, bool) { +bool unmarshallOption(I18NString &value, const RawConfig &config, + bool /*unused*/) { value.clear(); value.set(config.value()); if (!config.parent()) { diff --git a/src/lib/fcitx-config/marshallfunction.h b/src/lib/fcitx-config/marshallfunction.h index f371a801..ee4eb656 100644 --- a/src/lib/fcitx-config/marshallfunction.h +++ b/src/lib/fcitx-config/marshallfunction.h @@ -7,10 +7,14 @@ #ifndef _FCITX_CONFIG_INTOPTION_H_ #define _FCITX_CONFIG_INTOPTION_H_ +#include +#include #include #include #include #include +#include "fcitx-utils/key.h" +#include "fcitxconfig_export.h" #include "rawconfig.h" namespace fcitx { diff --git a/src/lib/fcitx-config/option.cpp b/src/lib/fcitx-config/option.cpp index 5b259a9d..be1db53a 100644 --- a/src/lib/fcitx-config/option.cpp +++ b/src/lib/fcitx-config/option.cpp @@ -6,8 +6,12 @@ */ #include "option.h" +#include #include +#include +#include #include "configuration.h" +#include "rawconfig.h" namespace fcitx { @@ -50,14 +54,19 @@ std::string ExternalOption::typeString() const { return "External"; } void ExternalOption::reset() {} bool ExternalOption::isDefault() const { return false; } -void ExternalOption::marshall(RawConfig &) const {} -bool ExternalOption::unmarshall(const RawConfig &, bool) { return true; } +void ExternalOption::marshall(RawConfig & /*config*/) const {} +bool ExternalOption::unmarshall(const RawConfig & /*config*/, + bool /*partial*/) { + return true; +} std::unique_ptr ExternalOption::subConfigSkeleton() const { return nullptr; } -bool ExternalOption::equalTo(const OptionBase &) const { return true; } -void ExternalOption::copyFrom(const OptionBase &) {} +bool ExternalOption::equalTo(const OptionBase & /*other*/) const { + return true; +} +void ExternalOption::copyFrom(const OptionBase & /*other*/) {} bool ExternalOption::skipDescription() const { return false; } bool ExternalOption::skipSave() const { return true; } diff --git a/src/lib/fcitx-config/option.h b/src/lib/fcitx-config/option.h index 57de8153..c1ad3d3e 100644 --- a/src/lib/fcitx-config/option.h +++ b/src/lib/fcitx-config/option.h @@ -7,15 +7,20 @@ #ifndef _FCITX_CONFIG_OPTION_H_ #define _FCITX_CONFIG_OPTION_H_ -#include "fcitxconfig_export.h" - #include +#include +#include #include #include +#include +#include #include #include // IWYU pragma: export #include #include +#include +#include "fcitx-utils/key.h" +#include "fcitxconfig_export.h" namespace fcitx { @@ -55,15 +60,15 @@ public: template struct NoConstrain { using Type = T; - bool check(const T &) const { return true; } - void dumpDescription(RawConfig &) const {} + bool check(const T & /*unused*/) const { return true; } + void dumpDescription(RawConfig & /*unused*/) const {} }; /// Default Annotation with no options. struct NoAnnotation { bool skipDescription() { return false; } bool skipSave() { return false; } - void dumpDescription(RawConfig &) const {} + void dumpDescription(RawConfig & /*unused*/) const {} }; /// Annotation to display a tooltip in configtool. @@ -130,7 +135,7 @@ struct EnumAnnotation { struct HideInDescription { bool skipDescription() { return true; } bool skipSave() { return false; } - void dumpDescription(RawConfig &) const {} + void dumpDescription(RawConfig & /*unused*/) const {} }; template diff --git a/src/lib/fcitx-config/option_details.h b/src/lib/fcitx-config/option_details.h index 666e794f..fb04a183 100644 --- a/src/lib/fcitx-config/option_details.h +++ b/src/lib/fcitx-config/option_details.h @@ -7,7 +7,9 @@ #ifndef _FCITX_CONFIG_OPTION_DETAILS_H_ #define _FCITX_CONFIG_OPTION_DETAILS_H_ +#include #include +#include #include #include "fcitxconfig_export.h" @@ -71,7 +73,7 @@ struct RemoveVector> { }; template -void dumpDescriptionHelper(RawConfig &, T *) {} +void dumpDescriptionHelper(RawConfig & /*unused*/, T * /*unused*/) {} } // namespace fcitx diff --git a/src/lib/fcitx-config/rawconfig.cpp b/src/lib/fcitx-config/rawconfig.cpp index 5c87fb42..d0f9d721 100644 --- a/src/lib/fcitx-config/rawconfig.cpp +++ b/src/lib/fcitx-config/rawconfig.cpp @@ -5,8 +5,14 @@ * */ #include "rawconfig.h" -#include +#include +#include +#include +#include #include +#include +#include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/misc_p.h" namespace fcitx { @@ -50,7 +56,8 @@ public: } static std::shared_ptr - getNonexistentRawConfig(const RawConfig *, const std::string &) { + getNonexistentRawConfig(const RawConfig * /*unused*/, + const std::string & /*unused*/) { return nullptr; } -- Gitee From 394c6870dca1ce1785a5bd21f25b9a82421097b7 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 06:50:03 -0800 Subject: [PATCH 45/69] Block spell mode candidate for certain character in quick phrase input. --- src/modules/quickphrase/quickphraseprovider.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/quickphrase/quickphraseprovider.cpp b/src/modules/quickphrase/quickphraseprovider.cpp index 6755db41..6544fd78 100644 --- a/src/modules/quickphrase/quickphraseprovider.cpp +++ b/src/modules/quickphrase/quickphraseprovider.cpp @@ -120,6 +120,12 @@ bool SpellQuickPhraseProvider::populate( return true; } } + + // Do not give spell hint if input contains url like character. + if (userInput.find_first_of(".@/+%") != std::string::npos) { + return true; + } + const auto result = spell->call( lang, userInput, instance_->globalConfig().defaultPageSize()); for (const auto &word : result) { -- Gitee From c0d5f4821f8d45c3eac449d353125f031f55d05f Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 09:48:58 -0800 Subject: [PATCH 46/69] Further clang-tidy clean up for fcitx-utils/ --- src/lib/fcitx-config/rawconfig.h | 6 +- src/lib/fcitx-utils/color.cpp | 2 + src/lib/fcitx-utils/color.h | 1 + src/lib/fcitx-utils/connectableobject.cpp | 6 + src/lib/fcitx-utils/connectableobject.h | 2 + src/lib/fcitx-utils/cutf8.cpp | 3 +- src/lib/fcitx-utils/dbus/bus.h | 9 +- src/lib/fcitx-utils/dbus/libdbus/bus.cpp | 96 +++++++---- src/lib/fcitx-utils/dbus/libdbus/bus_p.h | 26 ++- src/lib/fcitx-utils/dbus/libdbus/message.cpp | 19 ++- src/lib/fcitx-utils/dbus/libdbus/message_p.h | 17 +- .../dbus/libdbus/objectvtable_libdbus.cpp | 6 +- .../dbus/libdbus/objectvtable_p_libdbus.h | 11 +- .../dbus/libdbus/servicenamecache.cpp | 4 + .../dbus/libdbus/servicenamecache.h | 7 +- src/lib/fcitx-utils/dbus/matchrule.h | 6 +- src/lib/fcitx-utils/dbus/message.h | 49 +++--- src/lib/fcitx-utils/dbus/message_details.h | 158 ++++++++---------- src/lib/fcitx-utils/dbus/objectvtable.h | 27 +-- src/lib/fcitx-utils/dbus/objectvtable_p.h | 19 ++- src/lib/fcitx-utils/dbus/sdbus/bus.cpp | 24 ++- src/lib/fcitx-utils/dbus/sdbus/bus_p.h | 18 +- src/lib/fcitx-utils/dbus/sdbus/message.cpp | 20 ++- src/lib/fcitx-utils/dbus/sdbus/message_p.h | 8 +- .../dbus/sdbus/objectvtable_p_sdbus.h | 13 +- .../dbus/sdbus/objectvtable_sdbus.cpp | 35 ++-- .../dbus/sdbus/objectvtablewrapper.c | 2 + .../dbus/sdbus/objectvtablewrapper_p.h | 2 + src/lib/fcitx-utils/dbus/sdbus/sd-bus-wrap.h | 5 +- src/lib/fcitx-utils/dbus/servicewatcher.cpp | 14 +- src/lib/fcitx-utils/dbus/servicewatcher.h | 15 +- src/lib/fcitx-utils/dbus/utils_p.h | 6 +- src/lib/fcitx-utils/dbus/variant.cpp | 2 +- src/lib/fcitx-utils/dbus/variant.h | 14 +- src/lib/fcitx-utils/element.cpp | 5 +- src/lib/fcitx-utils/element.h | 3 + src/lib/fcitx-utils/endian_p.h | 6 +- src/lib/fcitx-utils/event.h | 1 + src/lib/fcitx-utils/event_libuv.cpp | 2 +- src/lib/fcitx-utils/event_none.cpp | 2 + src/lib/fcitx-utils/event_sdevent.cpp | 6 +- src/lib/fcitx-utils/eventdispatcher.cpp | 7 + src/lib/fcitx-utils/eventdispatcher.h | 1 + src/lib/fcitx-utils/flags.h | 2 +- src/lib/fcitx-utils/handlertable.h | 6 + src/lib/fcitx-utils/handlertable_details.h | 6 +- src/lib/fcitx-utils/i18n.cpp | 1 + src/lib/fcitx-utils/i18nstring.cpp | 5 +- src/lib/fcitx-utils/i18nstring.h | 1 - src/lib/fcitx-utils/inputbuffer.cpp | 12 +- src/lib/fcitx-utils/inputbuffer.h | 1 + src/lib/fcitx-utils/intrusivelist.h | 6 +- src/lib/fcitx-utils/key.cpp | 17 +- src/lib/fcitx-utils/key.h | 1 + src/lib/fcitx-utils/keydata.h | 2 +- src/lib/fcitx-utils/library.cpp | 6 + src/lib/fcitx-utils/library.h | 1 + src/lib/fcitx-utils/log.cpp | 10 ++ src/lib/fcitx-utils/log.h | 7 +- src/lib/fcitx-utils/macros.h | 2 - src/lib/fcitx-utils/misc.cpp | 7 +- src/lib/fcitx-utils/misc.h | 4 +- src/lib/fcitx-utils/misc_p.h | 7 +- src/lib/fcitx-utils/mtime_p.h | 2 +- src/lib/fcitx-utils/semver.cpp | 10 ++ src/lib/fcitx-utils/semver.h | 3 +- src/lib/fcitx-utils/signals.h | 4 +- src/lib/fcitx-utils/signals_details.h | 2 + src/lib/fcitx-utils/stringutils.cpp | 7 + src/lib/fcitx-utils/stringutils_details.h | 8 +- src/lib/fcitx-utils/testing.cpp | 2 + src/lib/fcitx-utils/trackableobject.h | 2 + src/lib/fcitx-utils/tuplehelpers.h | 4 +- src/lib/fcitx-utils/unixfd.cpp | 1 + src/lib/fcitx-utils/utf8.cpp | 2 + src/lib/fcitx-utils/utf8.h | 5 + src/lib/fcitx-utils/uuid_p.h | 3 +- 77 files changed, 531 insertions(+), 313 deletions(-) diff --git a/src/lib/fcitx-config/rawconfig.h b/src/lib/fcitx-config/rawconfig.h index b5dfc363..7b603702 100644 --- a/src/lib/fcitx-config/rawconfig.h +++ b/src/lib/fcitx-config/rawconfig.h @@ -7,9 +7,11 @@ #ifndef _FCITX_CONFIG_RAWCONFIG_H_ #define _FCITX_CONFIG_RAWCONFIG_H_ +#include #include #include #include +#include #include #include #include @@ -19,7 +21,7 @@ namespace fcitx { class RawConfig; -typedef std::shared_ptr RawConfigPtr; +using RawConfigPtr = std::shared_ptr; class RawConfigPrivate; class FCITXCONFIG_EXPORT RawConfig { @@ -106,7 +108,7 @@ private: std::unique_ptr d_ptr; }; -FCITXUTILS_EXPORT +FCITXCONFIG_EXPORT LogMessageBuilder &operator<<(LogMessageBuilder &log, const RawConfig &config); } // namespace fcitx diff --git a/src/lib/fcitx-utils/color.cpp b/src/lib/fcitx-utils/color.cpp index c933f472..5153349b 100644 --- a/src/lib/fcitx-utils/color.cpp +++ b/src/lib/fcitx-utils/color.cpp @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include "charutils.h" #include "stringutils.h" diff --git a/src/lib/fcitx-utils/color.h b/src/lib/fcitx-utils/color.h index b18d31f4..321c9b2a 100644 --- a/src/lib/fcitx-utils/color.h +++ b/src/lib/fcitx-utils/color.h @@ -8,6 +8,7 @@ #ifndef _FCITX_UTILS_COLOR_H_ #define _FCITX_UTILS_COLOR_H_ +#include #include #include #include diff --git a/src/lib/fcitx-utils/connectableobject.cpp b/src/lib/fcitx-utils/connectableobject.cpp index 4087c715..322e3779 100644 --- a/src/lib/fcitx-utils/connectableobject.cpp +++ b/src/lib/fcitx-utils/connectableobject.cpp @@ -6,6 +6,12 @@ */ #include "connectableobject.h" +#include +#include +#include +#include +#include "macros.h" +#include "signals.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/connectableobject.h b/src/lib/fcitx-utils/connectableobject.h index fac932e1..443a3060 100644 --- a/src/lib/fcitx-utils/connectableobject.h +++ b/src/lib/fcitx-utils/connectableobject.h @@ -7,9 +7,11 @@ #ifndef _FCITX_UTILS_CONNECTABLEOBJECT_H_ #define _FCITX_UTILS_CONNECTABLEOBJECT_H_ +#include #include #include #include +#include #include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/cutf8.cpp b/src/lib/fcitx-utils/cutf8.cpp index 9d54a8c7..5d30c0b0 100644 --- a/src/lib/fcitx-utils/cutf8.cpp +++ b/src/lib/fcitx-utils/cutf8.cpp @@ -204,7 +204,8 @@ char *fcitx_utf8_get_nth_char(const char *s, uint32_t n) { static uint32_t fcitx_utf8_get_char_extended(const char *s, int max_len, int *plen) { const auto *p = reinterpret_cast(s); - int i, len; + int i; + int len; uint32_t wc = static_cast(*p); if (wc < 0x80) { diff --git a/src/lib/fcitx-utils/dbus/bus.h b/src/lib/fcitx-utils/dbus/bus.h index b6885fdf..da8de850 100644 --- a/src/lib/fcitx-utils/dbus/bus.h +++ b/src/lib/fcitx-utils/dbus/bus.h @@ -7,13 +7,16 @@ #ifndef _FCITX_UTILS_DBUS_BUS_H_ #define _FCITX_UTILS_DBUS_BUS_H_ +#include +#include #include -#include #include #include #include #include -#include "fcitx-utils/macros.h" +#include +#include +#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ @@ -90,7 +93,7 @@ public: * @return registration succeeds or not. */ bool addObjectVTable(const std::string &path, const std::string &interface, - ObjectVTableBase &obj); + ObjectVTableBase &vtable); /// Create a new signal message Message createSignal(const char *path, const char *interface, diff --git a/src/lib/fcitx-utils/dbus/libdbus/bus.cpp b/src/lib/fcitx-utils/dbus/libdbus/bus.cpp index cb10c8bf..01410887 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/bus.cpp +++ b/src/lib/fcitx-utils/dbus/libdbus/bus.cpp @@ -4,18 +4,36 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ -#include "config.h" - +#include "../../dbus/bus.h" +#include #include +#include +#include +#include +#include #include #include +#include +#include #include -#include "fcitx-utils/event.h" -#include "fcitx-utils/misc_p.h" +#include +#include +#include +#include #include "../../charutils.h" +#include "../../dbus/matchrule.h" +#include "../../dbus/message.h" +#include "../../dbus/objectvtable.h" +#include "../../event.h" +#include "../../eventloopinterface.h" +#include "../../flags.h" #include "../../log.h" +#include "../../macros.h" +#include "../../misc_p.h" #include "../../stringutils.h" +#include "../../trackableobject.h" #include "bus_p.h" +#include "config.h" #include "message_p.h" #include "objectvtable_p_libdbus.h" @@ -27,7 +45,7 @@ class BusWatches : public std::enable_shared_from_this { struct Private {}; public: - BusWatches(BusPrivate &bus, Private) : bus_(bus.watch()) {} + BusWatches(BusPrivate &bus, Private /*unused*/) : bus_(bus.watch()) {} void addWatch(DBusWatch *watch) { watches_[watch] = std::make_shared(watch); @@ -46,7 +64,7 @@ public: int fd = dbus_watch_get_unix_fd(watches_.begin()->first); IOEventFlags flags; - for (auto [watch, _] : watches_) { + for (const auto &[watch, _] : watches_) { if (!dbus_watch_get_enabled(watch)) { continue; } @@ -76,16 +94,17 @@ public: // Create a copy of watcher pointers, so we can safely // remove the watcher during the loop. std::vector> watchesView; - for (auto [_, watchRef] : watches_) { + watchesView.reserve(watches_.size()); + for (const auto &[_, watchRef] : watches_) { watchesView.push_back(watchRef); } - for (auto watchRef : watchesView) { + for (const auto &watchRef : watchesView) { auto watchStrongRef = watchRef.lock(); if (!watchStrongRef) { continue; } - auto watch = *watchStrongRef; + auto *watch = *watchStrongRef; if (!dbus_watch_get_enabled(watch)) { continue; } @@ -135,8 +154,8 @@ private: std::unique_ptr ioEvent_; }; -DBusHandlerResult DBusMessageCallback(DBusConnection *, DBusMessage *message, - void *userdata) { +DBusHandlerResult DBusMessageCallback(DBusConnection * /*unused*/, + DBusMessage *message, void *userdata) { auto *bus = static_cast(userdata); if (!bus) { return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -173,7 +192,7 @@ DBusHandlerResult DBusMessageCallback(DBusConnection *, DBusMessage *message, } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -319,7 +338,8 @@ bool BusPrivate::objectVTableCallback(Message &message) { } if (message.interface() == "org.freedesktop.DBus.Properties") { if (message.member() == "Get" && message.signature() == "ss") { - std::string interfaceName, propertyName; + std::string interfaceName; + std::string propertyName; message >> interfaceName >> propertyName; if (auto *slot = findSlot(message.path(), interfaceName)) { auto *property = slot->obj_->findProperty(propertyName); @@ -338,7 +358,8 @@ bool BusPrivate::objectVTableCallback(Message &message) { return true; } } else if (message.member() == "Set" && message.signature() == "ssv") { - std::string interfaceName, propertyName; + std::string interfaceName; + std::string propertyName; message >> interfaceName >> propertyName; if (auto *slot = findSlot(message.path(), interfaceName)) { auto *property = slot->obj_->findProperty(propertyName); @@ -460,7 +481,8 @@ std::string addressByType(BusType type) { } { - uid_t uid = getuid(), euid = geteuid(); + uid_t uid = getuid(); + uid_t euid = geteuid(); if (uid != euid || euid != 0) { return addressByType(BusType::Session); } @@ -536,7 +558,7 @@ Message Bus::createSignal(const char *path, const char *interface, void DBusToggleWatch(DBusWatch *watch, void *data) { auto *bus = static_cast(data); - if (auto watchers = + if (auto *watchers = findValue(bus->ioWatchers_, dbus_watch_get_unix_fd(watch))) { watchers->get()->refreshWatch(); } @@ -564,7 +586,7 @@ void DBusRemoveWatch(DBusWatch *watch, void *data) { return; } - if (iter->second.get()->removeWatch(watch)) { + if (iter->second->removeWatch(watch)) { bus->ioWatchers_.erase(iter); } } @@ -581,12 +603,15 @@ dbus_bool_t DBusAddTimeout(DBusTimeout *timeout, void *data) { bus->timeWatchers_.emplace( timeout, bus->loop_->addTimeEvent( - CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + interval * 1000ull, 0, + CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + interval * 1000ULL, 0, [timeout, ref](EventSourceTime *event, uint64_t) { + // Copy is required since the lambda may be deleted. + // NOLINTBEGIN(performance-unnecessary-copy-initialization) const auto refPivot = ref; + // NOLINTEND(performance-unnecessary-copy-initialization) if (dbus_timeout_get_enabled(timeout)) { event->setNextInterval( - dbus_timeout_get_interval(timeout) * 1000ull); + dbus_timeout_get_interval(timeout) * 1000ULL); event->setOneShot(); } dbus_timeout_handle(timeout); @@ -611,8 +636,8 @@ void DBusToggleTimeout(DBusTimeout *timeout, void *data) { DBusAddTimeout(timeout, data); } -void DBusDispatchStatusCallback(DBusConnection *, DBusDispatchStatus status, - void *userdata) { +void DBusDispatchStatusCallback(DBusConnection * /*unused*/, + DBusDispatchStatus status, void *userdata) { auto *bus = static_cast(userdata); if (status == DBUS_DISPATCH_DATA_REMAINS) { bus->deferEvent_->setOneShot(); @@ -696,7 +721,7 @@ std::unique_ptr Bus::addFilter(MessageCallback callback) { return slot; } -DBusHandlerResult DBusObjectPathMessageCallback(DBusConnection *, +DBusHandlerResult DBusObjectPathMessageCallback(DBusConnection * /*unused*/, DBusMessage *message, void *userdata) { auto *slot = static_cast(userdata); @@ -727,9 +752,9 @@ std::unique_ptr Bus::addObject(const std::string &path, return slot; } -DBusHandlerResult DBusObjectPathVTableMessageCallback(DBusConnection *, - DBusMessage *message, - void *userdata) { +DBusHandlerResult +DBusObjectPathVTableMessageCallback(DBusConnection * /*unused*/, + DBusMessage *message, void *userdata) { auto *bus = static_cast(userdata); if (!bus) { return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -743,7 +768,7 @@ DBusHandlerResult DBusObjectPathVTableMessageCallback(DBusConnection *, } bool Bus::addObjectVTable(const std::string &path, const std::string &interface, - ObjectVTableBase &obj) { + ObjectVTableBase &vtable) { FCITX_D(); // Check if interface exists. for (auto &item : d->objectRegistration_.view(path)) { @@ -754,8 +779,8 @@ bool Bus::addObjectVTable(const std::string &path, const std::string &interface, } } - auto slot = std::make_unique(path, interface, &obj, - obj.d_func()); + auto slot = std::make_unique(path, interface, &vtable, + vtable.d_func()); auto handler = d->objectRegistration_.add(path, slot->watch()); if (!handler) { @@ -765,7 +790,7 @@ bool Bus::addObjectVTable(const std::string &path, const std::string &interface, slot->handler_ = std::move(handler); slot->bus_ = d->watch(); - obj.setSlot(slot.release()); + vtable.setSlot(slot.release()); return true; } @@ -788,14 +813,11 @@ bool Bus::requestName(const std::string &name, Flags flags) { ((flags & RequestNameFlag::Queue) ? 0 : DBUS_NAME_FLAG_DO_NOT_QUEUE); auto ret = dbus_bus_request_name(d->conn_.get(), name.c_str(), d_flags, nullptr); - if (ret == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER || - ret == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER || - ((ret == DBUS_REQUEST_NAME_REPLY_IN_QUEUE || - ret == DBUS_REQUEST_NAME_REPLY_EXISTS) && - (flags & RequestNameFlag::Queue))) { - return true; - } - return false; + return ret == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER || + ret == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER || + ((ret == DBUS_REQUEST_NAME_REPLY_IN_QUEUE || + ret == DBUS_REQUEST_NAME_REPLY_EXISTS) && + (flags & RequestNameFlag::Queue)); } bool Bus::releaseName(const std::string &name) { diff --git a/src/lib/fcitx-utils/dbus/libdbus/bus_p.h b/src/lib/fcitx-utils/dbus/libdbus/bus_p.h index 8fad9a26..bafdd34e 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/bus_p.h +++ b/src/lib/fcitx-utils/dbus/libdbus/bus_p.h @@ -7,14 +7,25 @@ #ifndef _FCITX_UTILS_DBUS_BUS_P_H_ #define _FCITX_UTILS_DBUS_BUS_P_H_ +#include +#include +#include +#include +#include #include -#include "fcitx-utils/event.h" +#include "../../event.h" +#include "../../eventloopinterface.h" +#include "../../handlertable.h" #include "../../log.h" +#include "../../misc.h" +#include "../../trackableobject.h" #include "../bus.h" +#include "../matchrule.h" +#include "../message.h" +#include "../objectvtable.h" #include "servicenamecache.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { FCITX_DECLARE_LOG_CATEGORY(libdbus_logcategory); @@ -39,11 +50,11 @@ private: class DBusObjectVTableSlot : public Slot, public TrackableObject { public: - DBusObjectVTableSlot(const std::string &path, const std::string &interface, + DBusObjectVTableSlot(std::string path, std::string interface, ObjectVTableBase *obj, ObjectVTableBasePrivate *objPriv) - : path_(path), interface_(interface), obj_(obj), objPriv_(objPriv), - xml_(getXml()) {} + : path_(std::move(path)), interface_(std::move(interface)), obj_(obj), + objPriv_(objPriv), xml_(getXml()) {} ~DBusObjectVTableSlot() {} @@ -170,7 +181,6 @@ public: DBusPendingCall *reply_ = nullptr; TrackableObjectReference bus_; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_BUS_P_H_ diff --git a/src/lib/fcitx-utils/dbus/libdbus/message.cpp b/src/lib/fcitx-utils/dbus/libdbus/message.cpp index 9443c6b3..98e939c5 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/message.cpp +++ b/src/lib/fcitx-utils/dbus/libdbus/message.cpp @@ -8,9 +8,16 @@ #include "../message.h" #include #include -#include +#include +#include +#include #include -#include "../../misc_p.h" +#include +#include +#include +#include +#include "../../macros.h" +#include "../../misc.h" #include "../../unixfd.h" #include "../variant.h" #include "bus_p.h" @@ -78,7 +85,7 @@ std::string Message::destination() const { if (!d->msg()) { return {}; } - auto result = dbus_message_get_destination(d->msg()); + const auto *result = dbus_message_get_destination(d->msg()); return result ? result : ""; } @@ -281,6 +288,7 @@ Message &Message::operator>>(bool &b) { return *this; } +// NOLINTBEGIN(bugprone-macro-parentheses) #define _MARSHALL_FUNC(TYPE, TYPE2) \ Message &Message::operator<<(TYPE v) { \ if (!(*this)) { \ @@ -305,6 +313,7 @@ Message &Message::operator>>(bool &b) { } \ return *this; \ } +// NOLINTEND(bugprone-macro-parentheses) _MARSHALL_FUNC(uint8_t, BYTE) _MARSHALL_FUNC(int16_t, INT16) @@ -460,7 +469,7 @@ Message &Message::operator>>(const Container &c) { return *this; } -Message &Message::operator<<(const ContainerEnd &) { +Message &Message::operator<<(const ContainerEnd & /*unused*/) { if (!(*this)) { return *this; } @@ -469,7 +478,7 @@ Message &Message::operator<<(const ContainerEnd &) { return *this; } -Message &Message::operator>>(const ContainerEnd &) { +Message &Message::operator>>(const ContainerEnd & /*unused*/) { if (!(*this)) { return *this; } diff --git a/src/lib/fcitx-utils/dbus/libdbus/message_p.h b/src/lib/fcitx-utils/dbus/libdbus/message_p.h index 9e04a11a..75ebe8a2 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/message_p.h +++ b/src/lib/fcitx-utils/dbus/libdbus/message_p.h @@ -7,13 +7,19 @@ #ifndef _FCITX_UTILS_DBUS_MESSAGE_P_H_ #define _FCITX_UTILS_DBUS_MESSAGE_P_H_ -#include - +#include +#include +#include +#include +#include #include +#include +#include +#include "../../trackableobject.h" +#include "../libdbus/bus_p.h" #include "../message.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class MessagePrivate { public: @@ -128,7 +134,6 @@ public: private: DBusMessage *msg_ = nullptr; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_MESSAGE_P_H_ diff --git a/src/lib/fcitx-utils/dbus/libdbus/objectvtable_libdbus.cpp b/src/lib/fcitx-utils/dbus/libdbus/objectvtable_libdbus.cpp index ea3934fb..0f4df5cc 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/objectvtable_libdbus.cpp +++ b/src/lib/fcitx-utils/dbus/libdbus/objectvtable_libdbus.cpp @@ -5,9 +5,11 @@ * */ -#include +#include +#include +#include #include -#include "../../log.h" +#include "../../macros.h" #include "../../stringutils.h" #include "../objectvtable.h" #include "../utils_p.h" diff --git a/src/lib/fcitx-utils/dbus/libdbus/objectvtable_p_libdbus.h b/src/lib/fcitx-utils/dbus/libdbus/objectvtable_p_libdbus.h index 8e88705d..d06703da 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/objectvtable_p_libdbus.h +++ b/src/lib/fcitx-utils/dbus/libdbus/objectvtable_p_libdbus.h @@ -8,17 +8,15 @@ #define _FCITX_UTILS_DBUS_OBJECTVTABLE_P_H_ #include -#include +#include +#include #include "../objectvtable.h" -#include "message_p.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class DBusObjectVTableSlot; class ObjectVTableBasePrivate { public: - ObjectVTableBasePrivate() {} ~ObjectVTableBasePrivate(); const std::string &getXml(ObjectVTableBase *q); @@ -29,7 +27,6 @@ public: std::unique_ptr slot_; Message *msg_ = nullptr; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_OBJECTVTABLE_P_H_ diff --git a/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.cpp b/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.cpp index 261579a7..56f0d018 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.cpp +++ b/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.cpp @@ -5,6 +5,10 @@ * */ #include "servicenamecache.h" +#include +#include +#include +#include #include "../servicewatcher.h" #include "bus_p.h" diff --git a/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.h b/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.h index cbf64277..8d24c5e9 100644 --- a/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.h +++ b/src/lib/fcitx-utils/dbus/libdbus/servicenamecache.h @@ -10,10 +10,10 @@ #include #include #include +#include #include "../../handlertable.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class Bus; class ServiceWatcher; @@ -34,7 +34,6 @@ private: watcherMap_; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_LIBDBUS_SERVICENAMECACHE_P_H_ diff --git a/src/lib/fcitx-utils/dbus/matchrule.h b/src/lib/fcitx-utils/dbus/matchrule.h index 2bb03fc3..bd0d8042 100644 --- a/src/lib/fcitx-utils/dbus/matchrule.h +++ b/src/lib/fcitx-utils/dbus/matchrule.h @@ -18,8 +18,7 @@ /// \file /// \brief API for DBus matching rule. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class MatchRulePrivate; class Message; @@ -71,8 +70,7 @@ private: FCITX_DECLARE_PRIVATE(MatchRule); }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus namespace std { diff --git a/src/lib/fcitx-utils/dbus/message.h b/src/lib/fcitx-utils/dbus/message.h index 5b7bbc4e..a02f6762 100644 --- a/src/lib/fcitx-utils/dbus/message.h +++ b/src/lib/fcitx-utils/dbus/message.h @@ -8,12 +8,14 @@ #define _FCITX_UTILS_DBUS_MESSAGE_H_ #include +#include #include #include #include #include #include #include +#include #include #include // IWYU pragma: export #include @@ -21,6 +23,7 @@ #include #include #include +#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ @@ -39,7 +42,7 @@ class Variant; */ template struct DBusStruct { - typedef std::tuple tuple_type; + using tuple_type = std::tuple; DBusStruct() = default; @@ -133,7 +136,7 @@ private: }; class Message; -typedef std::function MessageCallback; +using MessageCallback = std::function; class Slot; enum class MessageType { @@ -213,8 +216,8 @@ struct TupleMarshaller { template struct TupleMarshaller { - static void marshall(Message &, const Tuple &) {} - static void unmarshall(Message &, Tuple &) {} + static void marshall(Message & /*unused*/, const Tuple & /*unused*/) {} + static void unmarshall(Message & /*unused*/, Tuple & /*unused*/) {} }; /** @@ -364,9 +367,9 @@ public: template Message &operator<<(const DBusStruct &t) { - typedef DBusStruct value_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = DBusStruct; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this << Container(Container::Type::Struct, Signature(signature::data()))) { TupleMarshaller Message &operator<<(const DictEntry &t) { - typedef DictEntry value_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = DictEntry; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this << Container(Container::Type::DictEntry, Signature(signature::data()))) { *this << t.key(); @@ -402,9 +405,9 @@ public: template Message &operator<<(const std::vector &t) { - typedef std::vector value_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = std::vector; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this << Container(Container::Type::Array, Signature(signature::data()))) { for (auto &v : t) { @@ -453,10 +456,10 @@ public: template Message &operator>>(DBusStruct &t) { - typedef DBusStruct value_type; - typedef typename value_type::tuple_type tuple_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = DBusStruct; + using tuple_type = typename value_type::tuple_type; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this >> Container(Container::Type::Struct, Signature(signature::data()))) { TupleMarshaller::unmarshall(*this, @@ -470,9 +473,9 @@ public: template Message &operator>>(DictEntry &t) { - typedef DictEntry value_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = DictEntry; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this >> Container(Container::Type::DictEntry, Signature(signature::data()))) { *this >> t.key(); @@ -492,9 +495,9 @@ public: template Message &operator>>(std::vector &t) { - typedef std::vector value_type; - typedef typename DBusContainerSignatureTraits::signature - signature; + using value_type = std::vector; + using signature = + typename DBusContainerSignatureTraits::signature; if (*this >> Container(Container::Type::Array, Signature(signature::data()))) { t.clear(); diff --git a/src/lib/fcitx-utils/dbus/message_details.h b/src/lib/fcitx-utils/dbus/message_details.h index 577a9032..54bd04f3 100644 --- a/src/lib/fcitx-utils/dbus/message_details.h +++ b/src/lib/fcitx-utils/dbus/message_details.h @@ -7,25 +7,27 @@ #ifndef _FCITX_UTILS_DBUS_MESSAGE_DETAILS_H_ #define _FCITX_UTILS_DBUS_MESSAGE_DETAILS_H_ +// IWYU pragma: private, include "message.h" + #include +#include #include +#include #include #include #include #include -namespace fcitx { - -namespace dbus { +namespace fcitx::dbus { template struct MakeTupleIfNeeded { - typedef std::tuple type; + using type = std::tuple; }; template struct MakeTupleIfNeeded> { - typedef std::tuple type; + using type = std::tuple; }; template @@ -33,12 +35,12 @@ using MakeTupleIfNeededType = typename MakeTupleIfNeeded::type; template struct RemoveTupleIfUnnecessary { - typedef T type; + using type = T; }; template struct RemoveTupleIfUnnecessary> { - typedef Arg type; + using type = Arg; }; template @@ -62,12 +64,12 @@ struct DBusSignatureToBasicType; #define DBUS_SIGNATURE_TRAITS(TYPENAME, SIG) \ template <> \ struct DBusSignatureTraits { \ - typedef MetaString signature; \ + using signature = MetaString; \ }; \ \ template <> \ struct DBusSignatureToBasicType { \ - typedef TYPENAME type; \ + using type = TYPENAME; \ }; DBUS_SIGNATURE_TRAITS(std::string, 's'); @@ -86,47 +88,44 @@ DBUS_SIGNATURE_TRAITS(Variant, 'v'); template struct DBusSignatureTraits> { - typedef ConcatMetaStringType::signature, - typename DBusSignatureTraits::signature> - signature; + using signature = + ConcatMetaStringType::signature, + typename DBusSignatureTraits::signature>; }; template struct DBusSignatureTraits> { - typedef ConcatMetaStringType< + using signature = ConcatMetaStringType< typename DBusSignatureTraits::signature, - typename DBusSignatureTraits>::signature> - signature; + typename DBusSignatureTraits>::signature>; }; template <> struct DBusSignatureTraits> { - typedef MetaString<> signature; + using signature = MetaString<>; }; template struct DBusSignatureTraits> { - typedef ConcatMetaStringType< + using signature = ConcatMetaStringType< MetaString<'('>, typename DBusSignatureTraits>::signature, - MetaString<')'>> - signature; + MetaString<')'>>; }; template struct DBusSignatureTraits> { - typedef ConcatMetaStringType< + using signature = ConcatMetaStringType< MetaString<'{'>, typename DBusSignatureTraits>::signature, - MetaString<'}'>> - signature; + MetaString<'}'>>; }; template struct DBusSignatureTraits> { - typedef ConcatMetaStringType, - typename DBusSignatureTraits::signature> - signature; + using signature = + ConcatMetaStringType, + typename DBusSignatureTraits::signature>; }; template @@ -134,19 +133,19 @@ struct DBusContainerSignatureTraits; template struct DBusContainerSignatureTraits> { - typedef - typename DBusSignatureTraits>::signature signature; + using signature = + typename DBusSignatureTraits>::signature; }; template struct DBusContainerSignatureTraits> { - typedef typename DBusSignatureTraits>::signature - signature; + using signature = + typename DBusSignatureTraits>::signature; }; template struct DBusContainerSignatureTraits> { - typedef typename DBusSignatureTraits::signature signature; + using signature = typename DBusSignatureTraits::signature; }; template @@ -154,54 +153,51 @@ struct SkipTillNext; template struct SkipTillNext> { - typedef typename SkipTillNext>::type - type; - typedef ConcatMetaStringType< + using type = + typename SkipTillNext>::type; + using str = ConcatMetaStringType< MetaString, - typename SkipTillNext>::str> - str; + typename SkipTillNext>::str>; }; template struct SkipTillNext> { - typedef - typename SkipTillNext>::type - type; - typedef ConcatMetaStringType< - MetaString, - typename SkipTillNext>::str> - str; + using type = typename SkipTillNext>::type; + using str = + ConcatMetaStringType, + typename SkipTillNext>::str>; }; template struct SkipTillNext> { - typedef - typename SkipTillNext>::type - type; - typedef ConcatMetaStringType< - MetaString, - typename SkipTillNext>::str> - str; + using type = typename SkipTillNext>::type; + using str = + ConcatMetaStringType, + typename SkipTillNext>::str>; }; template struct SkipTillNext> { - typedef MetaString type; - typedef MetaString<> str; + using type = MetaString; + using str = MetaString<>; }; // This is required to resolve ambiguity like (i)(i), when a '(' appear // immediate after a closed ')'. template struct SkipTillNext> { - typedef MetaString type; - typedef MetaString<> str; + using type = MetaString; + using str = MetaString<>; }; template struct SkipTillNext> { - typedef MetaString<> type; - typedef MetaString<> str; + using type = MetaString<>; + using str = MetaString<>; }; template @@ -233,15 +229,15 @@ struct DBusSignatureGetNextSignature; template struct DBusSignatureGetNextSignature { - typedef typename DBusSignatureToType::type cur; - typedef typename DBusSignatureToType::type next; + using cur = typename DBusSignatureToType::type; + using next = typename DBusSignatureToType::type; }; template struct DBusSignatureGetNextSignature<'a', nextChar...> { - typedef DBusSignatureGetNextSignature SplitType; - typedef std::vector cur; - typedef typename SplitType::next next; + using SplitType = DBusSignatureGetNextSignature; + using cur = std::vector; + using next = typename SplitType::next; }; template @@ -252,42 +248,37 @@ using SkipTillNextBrace = SkipTillNext<'{', '}', level, S>; template struct DBusSignatureGetNextSignature<'(', nextChar...> { - typedef TupleToDBusStruct< - DBusMetaStringSignatureToTuple>::str>>> - cur; - typedef DBusMetaStringSignatureToTuple< - typename SkipTillNextParentheses<1, MetaString>::type> - next; + using cur = TupleToDBusStruct>::str>>>; + using next = DBusMetaStringSignatureToTuple< + typename SkipTillNextParentheses<1, MetaString>::type>; }; template struct DBusSignatureGetNextSignature<'{', nextChar...> { - typedef TupleToDictEntry< + using cur = TupleToDictEntry< DBusMetaStringSignatureToTuple>::str>>> - cur; - typedef DBusMetaStringSignatureToTuple< - typename SkipTillNextBrace<1, MetaString>::type> - next; + typename SkipTillNextBrace<1, MetaString>::str>>>; + using next = DBusMetaStringSignatureToTuple< + typename SkipTillNextBrace<1, MetaString>::type>; }; template struct DBusSignatureToType { - typedef DBusSignatureGetNextSignature SplitType; - typedef RemoveTupleIfUnnecessaryType< + using SplitType = DBusSignatureGetNextSignature; + using type = RemoveTupleIfUnnecessaryType< CombineTuplesType, - MakeTupleIfNeededType>> - type; + MakeTupleIfNeededType>>; }; template struct DBusSignatureToType { - typedef typename DBusSignatureToBasicType::type type; + using type = typename DBusSignatureToBasicType::type; }; template <> struct DBusSignatureToType<> { - typedef std::tuple<> type; + using type = std::tuple<>; }; template @@ -295,7 +286,7 @@ struct MetaStringToDBusTuple; template struct MetaStringToDBusTuple> { - typedef typename DBusSignatureToType::type type; + using type = typename DBusSignatureToType::type; }; template @@ -303,12 +294,12 @@ using MetaStringToDBusTupleType = typename MetaStringToDBusTuple::type; template struct DBusTupleToReturn { - typedef T type; + using type = T; }; template <> struct DBusTupleToReturn> { - typedef void type; + using type = void; }; template @@ -320,7 +311,6 @@ using DBusTupleToReturnType = typename DBusTupleToReturn::type; #define FCITX_STRING_TO_DBUS_TYPE(STRING) \ ::fcitx::dbus::DBusTupleToReturnType< \ ::fcitx::dbus::MetaStringToDBusTupleType> -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_MESSAGE_DETAILS_H_ diff --git a/src/lib/fcitx-utils/dbus/objectvtable.h b/src/lib/fcitx-utils/dbus/objectvtable.h index c8cfe183..c6f91d54 100644 --- a/src/lib/fcitx-utils/dbus/objectvtable.h +++ b/src/lib/fcitx-utils/dbus/objectvtable.h @@ -7,34 +7,36 @@ #ifndef _FCITX_UTILS_DBUS_OBJECTVTABLE_H_ #define _FCITX_UTILS_DBUS_OBJECTVTABLE_H_ +#include +#include #include #include #include -#include #include +#include #include #include #include #include #include +#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ /// \file /// \brief High level API for dbus objects. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class Message; class ObjectVTableBase; class Slot; class Bus; class ObjectVTablePrivate; -typedef std::function ObjectMethod; -typedef std::function ObjectMethodClosure; -typedef std::function PropertyGetMethod; -typedef std::function PropertySetMethod; +using ObjectMethod = std::function; +using ObjectMethodClosure = std::function; +using PropertyGetMethod = std::function; +using PropertySetMethod = std::function; /** * An exception if you want message to return a DBus error. @@ -101,7 +103,7 @@ private: template struct ReturnValueHelper { - typedef T type; + using type = T; type ret; template @@ -112,7 +114,7 @@ struct ReturnValueHelper { template <> struct ReturnValueHelper { - typedef std::tuple<> type; + using type = std::tuple<>; type ret; template void call(U u) { @@ -160,7 +162,7 @@ struct ReturnValueHelper { #define FCITX_OBJECT_VTABLE_SIGNAL(SIGNAL, SIGNAL_NAME, SIGNATURE) \ ::fcitx::dbus::ObjectVTableSignal SIGNAL##Signal{this, SIGNAL_NAME, \ SIGNATURE}; \ - typedef FCITX_STRING_TO_DBUS_TUPLE(SIGNATURE) SIGNAL##ArgType; \ + using SIGNAL##ArgType = FCITX_STRING_TO_DBUS_TUPLE(SIGNATURE); \ template \ void SIGNAL(Args &&...args) { \ auto msg = SIGNAL##Signal.createSignal(); \ @@ -408,7 +410,7 @@ public: Args args; msg >> args; try { - typedef decltype(callWithTuple(callback_, args)) ReturnType; + using ReturnType = decltype(callWithTuple(callback_, args)); static_assert(std::is_same::value, "Return type does not match."); ReturnValueHelper helper; @@ -502,7 +504,6 @@ auto makeObjectVTablePropertySetMethodAdaptor(ObjectVTableBase *base, base, std::forward(callback)); } -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_OBJECTVTABLE_H_ diff --git a/src/lib/fcitx-utils/dbus/objectvtable_p.h b/src/lib/fcitx-utils/dbus/objectvtable_p.h index ccc2ba4a..e8009705 100644 --- a/src/lib/fcitx-utils/dbus/objectvtable_p.h +++ b/src/lib/fcitx-utils/dbus/objectvtable_p.h @@ -7,18 +7,20 @@ #ifndef _FCITX_UTILS_DBUS_OBJECTVTABLE_P_H_ #define _FCITX_UTILS_DBUS_OBJECTVTABLE_P_H_ +#include +#include #include "objectvtable.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class ObjectVTableMethodPrivate { public: - ObjectVTableMethodPrivate(ObjectVTableBase *vtable, const std::string &name, - const std::string &signature, - const std::string &ret, ObjectMethod handler) - : name_(name), signature_(signature), ret_(ret), - internalHandler_(std::move(handler)), vtable_(vtable) {} + ObjectVTableMethodPrivate(ObjectVTableBase *vtable, std::string name, + std::string signature, std::string ret, + ObjectMethod handler) + : name_(std::move(name)), signature_(std::move(signature)), + ret_(std::move(ret)), internalHandler_(std::move(handler)), + vtable_(vtable) {} const std::string name_; const std::string signature_; @@ -72,7 +74,6 @@ public: PropertySetMethod setMethod_; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_OBJECTVTABLE_P_H_ diff --git a/src/lib/fcitx-utils/dbus/sdbus/bus.cpp b/src/lib/fcitx-utils/dbus/sdbus/bus.cpp index d125b454..7654eb65 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/bus.cpp +++ b/src/lib/fcitx-utils/dbus/sdbus/bus.cpp @@ -5,12 +5,27 @@ * */ +#include "../../dbus/bus.h" +#include +#include +#include +#include +#include #include +#include #include +#include +#include "../../dbus/matchrule.h" +#include "../../dbus/message.h" +#include "../../dbus/objectvtable.h" +#include "../../event.h" +#include "../../flags.h" #include "../../log.h" +#include "../../macros.h" #include "bus_p.h" #include "message_p.h" #include "objectvtable_p_sdbus.h" +#include "sd-bus-wrap.h" namespace fcitx::dbus { @@ -18,11 +33,9 @@ Slot::~Slot() {} class BusPrivate { public: - BusPrivate() : bus_(nullptr) {} - ~BusPrivate() { sd_bus_flush_close_unref(bus_); } - sd_bus *bus_; + sd_bus *bus_ = nullptr; EventLoop *eventLoop_ = nullptr; }; @@ -143,7 +156,8 @@ EventLoop *Bus::eventLoop() const { return d->eventLoop_; } -int SDMessageCallback(sd_bus_message *m, void *userdata, sd_bus_error *) { +int SDMessageCallback(sd_bus_message *m, void *userdata, + sd_bus_error * /*unused*/) { auto *slot = static_cast(userdata); if (!slot) { return 0; @@ -155,7 +169,7 @@ int SDMessageCallback(sd_bus_message *m, void *userdata, sd_bus_error *) { } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return 1; } diff --git a/src/lib/fcitx-utils/dbus/sdbus/bus_p.h b/src/lib/fcitx-utils/dbus/sdbus/bus_p.h index 87537bf4..c24c52b1 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/bus_p.h +++ b/src/lib/fcitx-utils/dbus/sdbus/bus_p.h @@ -7,12 +7,13 @@ #ifndef _FCITX_UTILS_DBUS_BUS_P_H_ #define _FCITX_UTILS_DBUS_BUS_P_H_ +#include +#include #include "../bus.h" +#include "../message.h" #include "sd-bus-wrap.h" -namespace fcitx { - -namespace dbus { +namespace fcitx::dbus { int SDMessageCallback(sd_bus_message *m, void *userdata, sd_bus_error *); @@ -29,9 +30,9 @@ private: class SDVTableSlot : public Slot { public: - SDVTableSlot(Bus *bus_, const std::string &path_, - const std::string &interface_) - : slot_(nullptr), bus_(bus_), path_(path_), interface_(interface_) {} + SDVTableSlot(Bus *bus_, std::string path, std::string interface) + : bus_(bus_), path_(std::move(path)), interface_(std::move(interface)) { + } ~SDVTableSlot() { if (slot_) { @@ -40,7 +41,7 @@ public: } } - sd_bus_slot *slot_; + sd_bus_slot *slot_ = nullptr; Bus *bus_; std::string path_; std::string interface_; @@ -61,7 +62,6 @@ public: MessageCallback callback_; sd_bus_slot *slot_; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_BUS_P_H_ diff --git a/src/lib/fcitx-utils/dbus/sdbus/message.cpp b/src/lib/fcitx-utils/dbus/sdbus/message.cpp index c53d20f3..998d3292 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/message.cpp +++ b/src/lib/fcitx-utils/dbus/sdbus/message.cpp @@ -8,15 +8,18 @@ #include "../message.h" #include #include -#include -#include +#include +#include +#include #include -#include -#include "../../misc_p.h" +#include +#include +#include "../../macros.h" #include "../../unixfd.h" #include "../variant.h" #include "bus_p.h" #include "message_p.h" +#include "sd-bus-wrap.h" namespace fcitx::dbus { @@ -240,6 +243,7 @@ Message &Message::operator>>(bool &b) { return *this; } +// NOLINTBEGIN(bugprone-macro-parentheses) #define _MARSHALL_FUNC(TYPE, TYPE2) \ Message &Message::operator<<(TYPE v) { \ if (!(*this)) { \ @@ -259,6 +263,7 @@ Message &Message::operator>>(bool &b) { sd_bus_message_read_basic(d->msg_, SD_BUS_TYPE_##TYPE2, &v); \ return *this; \ } +// NOLINTEND(bugprone-macro-parentheses) _MARSHALL_FUNC(uint8_t, BYTE) _MARSHALL_FUNC(int16_t, INT16) @@ -395,7 +400,7 @@ Message &Message::operator>>(const Container &c) { return *this; } -Message &Message::operator<<(const ContainerEnd &) { +Message &Message::operator<<(const ContainerEnd & /*unused*/) { if (!(*this)) { return *this; } @@ -404,7 +409,7 @@ Message &Message::operator<<(const ContainerEnd &) { return *this; } -Message &Message::operator>>(const ContainerEnd &) { +Message &Message::operator>>(const ContainerEnd & /*unused*/) { if (!(*this)) { return *this; } @@ -451,9 +456,8 @@ Message &Message::operator>>(Variant &variant) { } } return *this; - } else { - d->lastError_ = sd_bus_message_skip(d->msg_, "v"); } + d->lastError_ = sd_bus_message_skip(d->msg_, "v"); return *this; } } // namespace fcitx::dbus diff --git a/src/lib/fcitx-utils/dbus/sdbus/message_p.h b/src/lib/fcitx-utils/dbus/sdbus/message_p.h index c8058e37..0a468334 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/message_p.h +++ b/src/lib/fcitx-utils/dbus/sdbus/message_p.h @@ -7,11 +7,12 @@ #ifndef _FCITX_UTILS_DBUS_MESSAGE_P_H_ #define _FCITX_UTILS_DBUS_MESSAGE_P_H_ +#include +#include #include "../message.h" #include "sd-bus-wrap.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class MessagePrivate { public: @@ -60,7 +61,6 @@ public: std::string message_; int lastError_ = 0; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_MESSAGE_P_H_ diff --git a/src/lib/fcitx-utils/dbus/sdbus/objectvtable_p_sdbus.h b/src/lib/fcitx-utils/dbus/sdbus/objectvtable_p_sdbus.h index c9b6f51f..e91980c8 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/objectvtable_p_sdbus.h +++ b/src/lib/fcitx-utils/dbus/sdbus/objectvtable_p_sdbus.h @@ -8,18 +8,16 @@ #define _FCITX_UTILS_DBUS_OBJECTVTABLE_P_SDBUS_H_ #include -#include +#include +#include #include "../objectvtable.h" -#include "message_p.h" -#include "objectvtablewrapper_p.h" +#include "sd-bus-wrap.h" -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class SDVTableSlot; class ObjectVTableBasePrivate { public: - ObjectVTableBasePrivate() {} ~ObjectVTableBasePrivate(); const sd_bus_vtable *toSDBusVTable(ObjectVTableBase *q); @@ -31,7 +29,6 @@ public: Message *msg_ = nullptr; }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_OBJECTVTABLE_SDBUS_P_H_ diff --git a/src/lib/fcitx-utils/dbus/sdbus/objectvtable_sdbus.cpp b/src/lib/fcitx-utils/dbus/sdbus/objectvtable_sdbus.cpp index 0c1989c6..de0448d6 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/objectvtable_sdbus.cpp +++ b/src/lib/fcitx-utils/dbus/sdbus/objectvtable_sdbus.cpp @@ -5,11 +5,23 @@ * */ +#include +#include +#include +#include +#include +#include #include +#include +#include #include "../../log.h" +#include "../../macros.h" #include "../objectvtable.h" #include "bus_p.h" +#include "message_p.h" #include "objectvtable_p_sdbus.h" +#include "objectvtablewrapper_p.h" +#include "sd-bus-wrap.h" namespace fcitx::dbus { @@ -28,7 +40,8 @@ public: std::unordered_set stringPool_; }; -int SDMethodCallback(sd_bus_message *m, void *userdata, sd_bus_error *) { +int SDMethodCallback(sd_bus_message *m, void *userdata, + sd_bus_error * /*unused*/) { auto *vtable = static_cast(userdata); if (!vtable) { return 0; @@ -43,14 +56,15 @@ int SDMethodCallback(sd_bus_message *m, void *userdata, sd_bus_error *) { } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return 0; } -int SDPropertyGetCallback(sd_bus *, const char *, const char *, - const char *property, sd_bus_message *reply, - void *userdata, sd_bus_error *) { +int SDPropertyGetCallback(sd_bus * /*unused*/, const char * /*unused*/, + const char * /*unused*/, const char *property, + sd_bus_message *reply, void *userdata, + sd_bus_error * /*unused*/) { auto *vtable = static_cast(userdata); if (!vtable) { return 0; @@ -66,14 +80,15 @@ int SDPropertyGetCallback(sd_bus *, const char *, const char *, } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return 0; } -int SDPropertySetCallback(sd_bus *, const char *, const char *, - const char *property, sd_bus_message *value, - void *userdata, sd_bus_error *) { +int SDPropertySetCallback(sd_bus * /*unused*/, const char * /*unused*/, + const char * /*unused*/, const char *property, + sd_bus_message *value, void *userdata, + sd_bus_error * /*unused*/) { auto *vtable = static_cast(userdata); if (!vtable) { return 0; @@ -89,7 +104,7 @@ int SDPropertySetCallback(sd_bus *, const char *, const char *, } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return 0; } diff --git a/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper.c b/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper.c index 91bad63e..103cc2f3 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper.c +++ b/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper.c @@ -5,7 +5,9 @@ * */ +#include #include "objectvtablewrapper_p.h" +#include "sd-bus-wrap.h" sd_bus_vtable vtable_start() { sd_bus_vtable result = SD_BUS_VTABLE_START(0); diff --git a/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper_p.h b/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper_p.h index 875d87bc..8fb2498e 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper_p.h +++ b/src/lib/fcitx-utils/dbus/sdbus/objectvtablewrapper_p.h @@ -7,6 +7,8 @@ #ifndef _FCITX_UTILS_DBUS_OBJECTVTABLEWRAPPER_P_H_ #define _FCITX_UTILS_DBUS_OBJECTVTABLEWRAPPER_P_H_ +#include // NOLINT(modernize-deprecated-headers) +#include // NOLINT(modernize-deprecated-headers) #include "sd-bus-wrap.h" #ifdef __cplusplus diff --git a/src/lib/fcitx-utils/dbus/sdbus/sd-bus-wrap.h b/src/lib/fcitx-utils/dbus/sdbus/sd-bus-wrap.h index 4298fc6d..9d0fd282 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/sd-bus-wrap.h +++ b/src/lib/fcitx-utils/dbus/sdbus/sd-bus-wrap.h @@ -10,6 +10,9 @@ #if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) #define __INCLUDE_LEVEL__ 2 #endif -#include +#include // IWYU pragma: export +#include // IWYU pragma: export +#include // IWYU pragma: export +#include // IWYU pragma: export #endif // _FCITX_UTILS_DBUS_SD_BUS_WRAP_H_ diff --git a/src/lib/fcitx-utils/dbus/servicewatcher.cpp b/src/lib/fcitx-utils/dbus/servicewatcher.cpp index 4cfeb7e2..a9c2bf6c 100644 --- a/src/lib/fcitx-utils/dbus/servicewatcher.cpp +++ b/src/lib/fcitx-utils/dbus/servicewatcher.cpp @@ -6,8 +6,16 @@ */ #include "servicewatcher.h" +#include +#include +#include #include +#include +#include "../handlertable.h" +#include "../macros.h" #include "../trackableobject.h" +#include "matchrule.h" +#include "message.h" namespace fcitx::dbus { @@ -22,7 +30,9 @@ public: "org.freedesktop.DBus", "NameOwnerChanged", {key}), [this](Message &msg) { - std::string name, oldOwner, newOwner; + std::string name; + std::string oldOwner; + std::string newOwner; msg >> name >> oldOwner >> newOwner; querySlots_.erase(name); @@ -35,7 +45,7 @@ public: auto querySlot = bus_->serviceOwnerAsync( key, 0, [this, key](Message &msg) { // Key itself may be gone later, put it on the stack. - std::string pivotKey = key; + const std::string &pivotKey = key; auto protector = watch(); std::string newName; if (msg.type() != dbus::MessageType::Error) { diff --git a/src/lib/fcitx-utils/dbus/servicewatcher.h b/src/lib/fcitx-utils/dbus/servicewatcher.h index 965ead2b..ed80595d 100644 --- a/src/lib/fcitx-utils/dbus/servicewatcher.h +++ b/src/lib/fcitx-utils/dbus/servicewatcher.h @@ -7,6 +7,7 @@ #ifndef _FCITX_UTILS_DBUS_SERVICEWATCHER_H_ #define _FCITX_UTILS_DBUS_SERVICEWATCHER_H_ +#include #include #include #include @@ -18,14 +19,11 @@ /// \file /// \brief API for service monitoring. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { -typedef std::function - ServiceWatcherCallback; -typedef HandlerTableEntry ServiceWatcherEntry; +using ServiceWatcherCallback = std::function; +using ServiceWatcherEntry = HandlerTableEntry; class ServiceWatcherPrivate; @@ -48,7 +46,6 @@ private: std::unique_ptr d_ptr; FCITX_DECLARE_PRIVATE(ServiceWatcher); }; -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_SERVICEWATCHER_H_ diff --git a/src/lib/fcitx-utils/dbus/utils_p.h b/src/lib/fcitx-utils/dbus/utils_p.h index 8287c123..ef46c576 100644 --- a/src/lib/fcitx-utils/dbus/utils_p.h +++ b/src/lib/fcitx-utils/dbus/utils_p.h @@ -10,8 +10,7 @@ #include #include -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { static inline std::string::const_iterator findMatched(std::string::const_iterator start, std::string::const_iterator end, @@ -58,7 +57,6 @@ splitDBusSignature(const std::string &s) { return result; } -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_UTILS_P_H_ diff --git a/src/lib/fcitx-utils/dbus/variant.cpp b/src/lib/fcitx-utils/dbus/variant.cpp index 73ade955..633c9821 100644 --- a/src/lib/fcitx-utils/dbus/variant.cpp +++ b/src/lib/fcitx-utils/dbus/variant.cpp @@ -6,7 +6,7 @@ */ #include "variant.h" #include -#include "fcitx-utils/misc_p.h" +#include "../misc_p.h" namespace fcitx::dbus { diff --git a/src/lib/fcitx-utils/dbus/variant.h b/src/lib/fcitx-utils/dbus/variant.h index c61452cf..06f8d01a 100644 --- a/src/lib/fcitx-utils/dbus/variant.h +++ b/src/lib/fcitx-utils/dbus/variant.h @@ -7,17 +7,22 @@ #ifndef _FCITX_UTILS_DBUS_VARIANT_H_ #define _FCITX_UTILS_DBUS_VARIANT_H_ +#include #include #include +#include +#include #include +#include +#include +#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ /// \file /// \brief API for dbus variant type. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class VariantTypeRegistryPrivate; @@ -148,7 +153,7 @@ private: template void Variant::setData(Value &&value) { - typedef std::remove_cv_t> value_type; + using value_type = std::remove_cv_t>; signature_ = DBusSignatureTraits::signature::data(); data_ = std::make_shared(std::forward(value)); helper_ = std::make_shared>(); @@ -162,7 +167,6 @@ static inline LogMessageBuilder &operator<<(LogMessageBuilder &builder, return builder; } -} // namespace dbus -} // namespace fcitx +} // namespace fcitx::dbus #endif // _FCITX_UTILS_DBUS_VARIANT_H_ diff --git a/src/lib/fcitx-utils/element.cpp b/src/lib/fcitx-utils/element.cpp index 167865a1..32dcf306 100644 --- a/src/lib/fcitx-utils/element.cpp +++ b/src/lib/fcitx-utils/element.cpp @@ -6,8 +6,9 @@ */ #include "element.h" -#include -#include +#include +#include +#include "macros.h" #include "misc_p.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/element.h b/src/lib/fcitx-utils/element.h index 5169cdbd..ed975d9f 100644 --- a/src/lib/fcitx-utils/element.h +++ b/src/lib/fcitx-utils/element.h @@ -7,7 +7,10 @@ #ifndef _FCITX_UTILS_ELEMENT_H_ #define _FCITX_UTILS_ELEMENT_H_ +#include +#include #include +#include #include "fcitxutils_export.h" /// \addtogroup FcitxUtils diff --git a/src/lib/fcitx-utils/endian_p.h b/src/lib/fcitx-utils/endian_p.h index 524a26fa..332043b8 100644 --- a/src/lib/fcitx-utils/endian_p.h +++ b/src/lib/fcitx-utils/endian_p.h @@ -9,10 +9,10 @@ #include #if defined(__linux__) || defined(__GLIBC__) || defined(__EMSCRIPTEN__) -#include +#include // IWYU pragma: export #elif defined(__APPLE__) -#include +#include // IWYU pragma: export #define htobe16(x) OSSwapHostToBigInt16(x) #define htole16(x) OSSwapHostToLittleInt16(x) @@ -30,7 +30,7 @@ #define le64toh(x) OSSwapLittleToHostInt64(x) #else -#include +#include // IWYU pragma: export #endif enum { BYTE_ORDER_MSB_FIRST = 1, BYTE_ORDER_LSB_FIRST = 0 }; diff --git a/src/lib/fcitx-utils/event.h b/src/lib/fcitx-utils/event.h index 5c24cb87..8474553c 100644 --- a/src/lib/fcitx-utils/event.h +++ b/src/lib/fcitx-utils/event.h @@ -8,6 +8,7 @@ #define _FCITX_UTILS_EVENT_H_ #include +#include #include #include #include diff --git a/src/lib/fcitx-utils/event_libuv.cpp b/src/lib/fcitx-utils/event_libuv.cpp index 8af3222b..93821191 100644 --- a/src/lib/fcitx-utils/event_libuv.cpp +++ b/src/lib/fcitx-utils/event_libuv.cpp @@ -143,7 +143,7 @@ bool EventLoopLibUV::exec() { event->callback_(event); } catch (const std::exception &e) { // some abnormal things threw - abort(); + std::abort(); } } } diff --git a/src/lib/fcitx-utils/event_none.cpp b/src/lib/fcitx-utils/event_none.cpp index a0ea0d50..16ed3b4a 100644 --- a/src/lib/fcitx-utils/event_none.cpp +++ b/src/lib/fcitx-utils/event_none.cpp @@ -5,7 +5,9 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ +#include #include "event_p.h" +#include "eventloopinterface.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/event_sdevent.cpp b/src/lib/fcitx-utils/event_sdevent.cpp index 77ba903d..d9608998 100644 --- a/src/lib/fcitx-utils/event_sdevent.cpp +++ b/src/lib/fcitx-utils/event_sdevent.cpp @@ -14,9 +14,9 @@ #include #include #include -#include "fcitx-utils/macros.h" #include "eventloopinterface.h" #include "log.h" +#include "macros.h" #include "stringutils.h" #if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) @@ -300,7 +300,7 @@ int TimeEventCallback(sd_event_source * /*unused*/, uint64_t usec, } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return -1; } @@ -331,7 +331,7 @@ int StaticEventCallback(sd_event_source * /*unused*/, void *userdata) { } catch (const std::exception &e) { // some abnormal things threw FCITX_ERROR() << e.what(); - abort(); + std::abort(); } return -1; } diff --git a/src/lib/fcitx-utils/eventdispatcher.cpp b/src/lib/fcitx-utils/eventdispatcher.cpp index de9f7b4d..cd88dc58 100644 --- a/src/lib/fcitx-utils/eventdispatcher.cpp +++ b/src/lib/fcitx-utils/eventdispatcher.cpp @@ -5,10 +5,17 @@ * */ #include "eventdispatcher.h" +#include +#include +#include #include #include #include +#include #include "event.h" +#include "eventloopinterface.h" +#include "fs.h" +#include "macros.h" #include "misc_p.h" #include "unixfd.h" diff --git a/src/lib/fcitx-utils/eventdispatcher.h b/src/lib/fcitx-utils/eventdispatcher.h index 6e4619b3..d93741fe 100644 --- a/src/lib/fcitx-utils/eventdispatcher.h +++ b/src/lib/fcitx-utils/eventdispatcher.h @@ -10,6 +10,7 @@ #include #include +#include #include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/flags.h b/src/lib/fcitx-utils/flags.h index 2bd2dad8..f84cc168 100644 --- a/src/lib/fcitx-utils/flags.h +++ b/src/lib/fcitx-utils/flags.h @@ -9,7 +9,7 @@ #include #include -#include "fcitx-utils/macros.h" +#include /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/handlertable.h b/src/lib/fcitx-utils/handlertable.h index 6e71956d..d74d0bdf 100644 --- a/src/lib/fcitx-utils/handlertable.h +++ b/src/lib/fcitx-utils/handlertable.h @@ -7,10 +7,16 @@ #ifndef _FCITX_UTILS_HANDLERTABLE_H_ #define _FCITX_UTILS_HANDLERTABLE_H_ +#include #include +#include +#include #include +#include #include // IWYU pragma: export #include +#include +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/handlertable_details.h b/src/lib/fcitx-utils/handlertable_details.h index ba657f7a..9fd07796 100644 --- a/src/lib/fcitx-utils/handlertable_details.h +++ b/src/lib/fcitx-utils/handlertable_details.h @@ -7,10 +7,14 @@ #ifndef _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ #define _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ -#include +// IWYU pragma: private, include "handlertable.h" + +#include +#include #include #include #include +#include #include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/i18n.cpp b/src/lib/fcitx-utils/i18n.cpp index dbee8f23..9c0799f0 100644 --- a/src/lib/fcitx-utils/i18n.cpp +++ b/src/lib/fcitx-utils/i18n.cpp @@ -11,6 +11,7 @@ #include #include "log.h" #include "standardpath.h" +#include "stringutils.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/i18nstring.cpp b/src/lib/fcitx-utils/i18nstring.cpp index 2c6f7436..da9dfdd6 100644 --- a/src/lib/fcitx-utils/i18nstring.cpp +++ b/src/lib/fcitx-utils/i18nstring.cpp @@ -6,8 +6,11 @@ */ #include "i18nstring.h" -#include "fcitx-utils/misc.h" +#include +#include +#include #include "charutils.h" +#include "misc.h" namespace fcitx { const std::string &I18NString::match(const std::string &locale_) const { diff --git a/src/lib/fcitx-utils/i18nstring.h b/src/lib/fcitx-utils/i18nstring.h index 4ba7b996..27d3c190 100644 --- a/src/lib/fcitx-utils/i18nstring.h +++ b/src/lib/fcitx-utils/i18nstring.h @@ -7,7 +7,6 @@ #ifndef _FCITX_UTILS_I18NSTRING_H_ #define _FCITX_UTILS_I18NSTRING_H_ -#include #include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/inputbuffer.cpp b/src/lib/fcitx-utils/inputbuffer.cpp index 0dc03b3b..67f7345e 100644 --- a/src/lib/fcitx-utils/inputbuffer.cpp +++ b/src/lib/fcitx-utils/inputbuffer.cpp @@ -5,10 +5,17 @@ * */ #include "inputbuffer.h" +#include +#include +#include +#include #include +#include #include +#include #include -#include "fcitx-utils/utf8.h" +#include "macros.h" +#include "utf8.h" namespace fcitx { @@ -157,7 +164,8 @@ void InputBuffer::erase(size_t from, size_t to) { return; } - size_t fromByChar, lengthByChar; + size_t fromByChar; + size_t lengthByChar; if (d->isAsciiOnly()) { fromByChar = from; lengthByChar = to - from; diff --git a/src/lib/fcitx-utils/inputbuffer.h b/src/lib/fcitx-utils/inputbuffer.h index 6ec8b10f..c2bf547b 100644 --- a/src/lib/fcitx-utils/inputbuffer.h +++ b/src/lib/fcitx-utils/inputbuffer.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/intrusivelist.h b/src/lib/fcitx-utils/intrusivelist.h index c0e08ad5..2bafa879 100644 --- a/src/lib/fcitx-utils/intrusivelist.h +++ b/src/lib/fcitx-utils/intrusivelist.h @@ -7,10 +7,12 @@ #ifndef _FCITX_UTILS_INSTRUSIVELIST_H_ #define _FCITX_UTILS_INSTRUSIVELIST_H_ -#include #include +#include #include #include +#include +#include #include "misc.h" namespace fcitx { @@ -190,7 +192,7 @@ public: template IntrusiveListIterator( const IntrusiveListIterator &other, - std::enable_if_t = enabler()) + std::enable_if_t /*unused*/ = enabler()) : IntrusiveListIterator(other.pointed_node(), other.get_nodeGetter()) {} FCITX_INLINE_DEFINE_DEFAULT_DTOR_AND_COPY(IntrusiveListIterator) diff --git a/src/lib/fcitx-utils/key.cpp b/src/lib/fcitx-utils/key.cpp index f9f94625..57701055 100644 --- a/src/lib/fcitx-utils/key.cpp +++ b/src/lib/fcitx-utils/key.cpp @@ -6,13 +6,21 @@ */ #include "key.h" +#include +#include #include +#include +#include #include +#include #include "charutils.h" #include "i18n.h" #include "keydata.h" #include "keynametable-compat.h" #include "keynametable.h" +#include "keysym.h" +#include "macros.h" +#include "misc.h" #include "misc_p.h" #include "stringutils.h" #include "utf8.h" @@ -679,16 +687,19 @@ KeySym Key::keySymFromUnicode(uint32_t unicode) { if ((unicode >= (FcitxKey_BackSpace & 0x7f) && unicode <= (FcitxKey_Clear & 0x7f)) || unicode == (FcitxKey_Return & 0x7f) || - unicode == (FcitxKey_Escape & 0x7f)) + unicode == (FcitxKey_Escape & 0x7f)) { return static_cast(unicode | 0xff00); - if (unicode == (FcitxKey_Delete & 0x7f)) + } + if (unicode == (FcitxKey_Delete & 0x7f)) { return FcitxKey_Delete; + } /* Unicode non-symbols and code points outside Unicode planes */ if ((unicode >= 0xd800 && unicode <= 0xdfff) || (unicode >= 0xfdd0 && unicode <= 0xfdef) || unicode > 0x10ffff || - (unicode & 0xfffe) == 0xfffe) + (unicode & 0xfffe) == 0xfffe) { return FcitxKey_None; + } /* Binary search in table */ while (max >= min) { diff --git a/src/lib/fcitx-utils/key.h b/src/lib/fcitx-utils/key.h index 9afcf917..0637344e 100644 --- a/src/lib/fcitx-utils/key.h +++ b/src/lib/fcitx-utils/key.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/keydata.h b/src/lib/fcitx-utils/keydata.h index 211d3d21..e9c86251 100644 --- a/src/lib/fcitx-utils/keydata.h +++ b/src/lib/fcitx-utils/keydata.h @@ -25,7 +25,7 @@ #include #include -#include "fcitx-utils/macros.h" +#include namespace fcitx { struct KeySymUnicode { diff --git a/src/lib/fcitx-utils/library.cpp b/src/lib/fcitx-utils/library.cpp index 8737f9a7..4dbe80c3 100644 --- a/src/lib/fcitx-utils/library.cpp +++ b/src/lib/fcitx-utils/library.cpp @@ -12,8 +12,14 @@ #include #include #include +#include #include +#include +#include +#include +#include #include "config.h" +#include "macros.h" #include "misc.h" #include "stringutils.h" diff --git a/src/lib/fcitx-utils/library.h b/src/lib/fcitx-utils/library.h index 11132775..0f88baf8 100644 --- a/src/lib/fcitx-utils/library.h +++ b/src/lib/fcitx-utils/library.h @@ -12,6 +12,7 @@ /// \file /// \brief Class to handler dynamic library. +#include #include #include #include diff --git a/src/lib/fcitx-utils/log.cpp b/src/lib/fcitx-utils/log.cpp index 705bc270..8f47910c 100644 --- a/src/lib/fcitx-utils/log.cpp +++ b/src/lib/fcitx-utils/log.cpp @@ -6,13 +6,23 @@ */ #include "log.h" +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include #include +#include "macros.h" #include "stringutils.h" #if FMT_VERSION >= 50300 +#include #include #endif diff --git a/src/lib/fcitx-utils/log.h b/src/lib/fcitx-utils/log.h index ebdb8158..c44b0964 100644 --- a/src/lib/fcitx-utils/log.h +++ b/src/lib/fcitx-utils/log.h @@ -16,14 +16,18 @@ #include #include #include +#include #include #include #include #include #include #include +#include +#include #include #include +#include #include #include #include @@ -265,7 +269,8 @@ private: } template - void printWithIndices(Sequence, const std::tuple &tuple) { + void printWithIndices(Sequence /*unused*/, + const std::tuple &tuple) { using swallow = int[]; (void)swallow{ 0, diff --git a/src/lib/fcitx-utils/macros.h b/src/lib/fcitx-utils/macros.h index f2863a68..c9125ec4 100644 --- a/src/lib/fcitx-utils/macros.h +++ b/src/lib/fcitx-utils/macros.h @@ -7,8 +7,6 @@ #ifndef _FCITX_UTILS_MACROS_H_ #define _FCITX_UTILS_MACROS_H_ -#include "fcitxutils_export.h" - // steal some Qt macro here #define FCITX_DECLARE_PRIVATE(Class) \ diff --git a/src/lib/fcitx-utils/misc.cpp b/src/lib/fcitx-utils/misc.cpp index 5a31671c..ef5eb415 100644 --- a/src/lib/fcitx-utils/misc.cpp +++ b/src/lib/fcitx-utils/misc.cpp @@ -7,10 +7,13 @@ #include "misc.h" #include #include +#include +#include +#include #include -#include "fcitx-utils/fs.h" -#include "fcitx-utils/misc_p.h" +#include "fs.h" #include "log.h" +#include "misc_p.h" #if defined(LIBKVM_FOUND) #include diff --git a/src/lib/fcitx-utils/misc.h b/src/lib/fcitx-utils/misc.h index a51f6b61..4e660c99 100644 --- a/src/lib/fcitx-utils/misc.h +++ b/src/lib/fcitx-utils/misc.h @@ -8,11 +8,13 @@ #define _FCITX_UTILS_MISC_H_ #include +#include #include #include +#include #include #include -#include +#include #include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/misc_p.h b/src/lib/fcitx-utils/misc_p.h index a2f2f76d..aa051cee 100644 --- a/src/lib/fcitx-utils/misc_p.h +++ b/src/lib/fcitx-utils/misc_p.h @@ -10,13 +10,16 @@ #include #include #include +#include #include #include +#include +#include #include #include -#include #include -#include +#include +#include "config.h" #include "endian_p.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/mtime_p.h b/src/lib/fcitx-utils/mtime_p.h index 032dd79f..e0de5b7f 100644 --- a/src/lib/fcitx-utils/mtime_p.h +++ b/src/lib/fcitx-utils/mtime_p.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/semver.cpp b/src/lib/fcitx-utils/semver.cpp index 91bc03de..057fae8f 100644 --- a/src/lib/fcitx-utils/semver.cpp +++ b/src/lib/fcitx-utils/semver.cpp @@ -6,8 +6,18 @@ */ #include "semver.h" +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include #include "charutils.h" #include "misc.h" diff --git a/src/lib/fcitx-utils/semver.h b/src/lib/fcitx-utils/semver.h index 7d1103fd..8cbf0a9c 100644 --- a/src/lib/fcitx-utils/semver.h +++ b/src/lib/fcitx-utils/semver.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include "fcitxutils_export.h" @@ -59,7 +60,7 @@ public: FCITX_DECLARE_PROPERTY(std::vector, buildIds, setBuildIds); bool isPreRelease() const; - int compare(const SemanticVersion &version) const noexcept; + int compare(const SemanticVersion &other) const noexcept; private: uint32_t major_ = 0; diff --git a/src/lib/fcitx-utils/signals.h b/src/lib/fcitx-utils/signals.h index ec43b090..07e5c04a 100644 --- a/src/lib/fcitx-utils/signals.h +++ b/src/lib/fcitx-utils/signals.h @@ -12,7 +12,9 @@ /// \file /// \brief A signal-slot implemention. -#include +#include +#include +#include #include #include #include diff --git a/src/lib/fcitx-utils/signals_details.h b/src/lib/fcitx-utils/signals_details.h index 687618ed..17c5d164 100644 --- a/src/lib/fcitx-utils/signals_details.h +++ b/src/lib/fcitx-utils/signals_details.h @@ -7,8 +7,10 @@ #ifndef _FCITX_UTILS_SIGNAL_DETAILS_H_ #define _FCITX_UTILS_SIGNAL_DETAILS_H_ +#include #include #include +#include #include #include #include diff --git a/src/lib/fcitx-utils/stringutils.cpp b/src/lib/fcitx-utils/stringutils.cpp index 4bdfa26d..4ce2d999 100644 --- a/src/lib/fcitx-utils/stringutils.cpp +++ b/src/lib/fcitx-utils/stringutils.cpp @@ -5,9 +5,16 @@ * */ #include "stringutils.h" +#include #include #include +#include +#include #include +#include +#include +#include +#include "fcitxutils_export.h" #include "charutils.h" #include "macros.h" diff --git a/src/lib/fcitx-utils/stringutils_details.h b/src/lib/fcitx-utils/stringutils_details.h index a5c90a1f..5fb0a53a 100644 --- a/src/lib/fcitx-utils/stringutils_details.h +++ b/src/lib/fcitx-utils/stringutils_details.h @@ -7,14 +7,16 @@ #ifndef _FCITX_UTILS_STRINGUTILS_DETAIL_H_ #define _FCITX_UTILS_STRINGUTILS_DETAIL_H_ -#include +// IWYU pragma: private, include "stringutils.h" + #include #include #include -#include +#include #include #include -#include +#include +#include #include "fcitxutils_export.h" namespace fcitx::stringutils::details { diff --git a/src/lib/fcitx-utils/testing.cpp b/src/lib/fcitx-utils/testing.cpp index 5b7ed79c..cc4b3199 100644 --- a/src/lib/fcitx-utils/testing.cpp +++ b/src/lib/fcitx-utils/testing.cpp @@ -6,6 +6,8 @@ */ #include "testing.h" #include +#include +#include #include "standardpath.h" #include "stringutils.h" diff --git a/src/lib/fcitx-utils/trackableobject.h b/src/lib/fcitx-utils/trackableobject.h index 15638f81..ef13646a 100644 --- a/src/lib/fcitx-utils/trackableobject.h +++ b/src/lib/fcitx-utils/trackableobject.h @@ -13,6 +13,8 @@ /// \brief Utitliy classes for statically tracking the life of a object. #include +#include +#include #include #include diff --git a/src/lib/fcitx-utils/tuplehelpers.h b/src/lib/fcitx-utils/tuplehelpers.h index 16e96134..fcc93e35 100644 --- a/src/lib/fcitx-utils/tuplehelpers.h +++ b/src/lib/fcitx-utils/tuplehelpers.h @@ -7,7 +7,6 @@ #ifndef _FCITX_UTILS_COMBINETUPLES_H_ #define _FCITX_UTILS_COMBINETUPLES_H_ -#include #include namespace fcitx { @@ -51,9 +50,8 @@ struct MakeSequence<0, S...> { }; template -auto callWithIndices(const F &func, Sequence, +auto callWithIndices(const F &func, Sequence /*unused*/, std::tuple &tuple) { - return func(std::get(tuple)...); } diff --git a/src/lib/fcitx-utils/unixfd.cpp b/src/lib/fcitx-utils/unixfd.cpp index 13861fd2..18678a2b 100644 --- a/src/lib/fcitx-utils/unixfd.cpp +++ b/src/lib/fcitx-utils/unixfd.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/utf8.cpp b/src/lib/fcitx-utils/utf8.cpp index 36e8d926..1d30fe67 100644 --- a/src/lib/fcitx-utils/utf8.cpp +++ b/src/lib/fcitx-utils/utf8.cpp @@ -6,6 +6,8 @@ */ #include "utf8.h" +#include +#include #include "cutf8.h" namespace fcitx::utf8 { diff --git a/src/lib/fcitx-utils/utf8.h b/src/lib/fcitx-utils/utf8.h index e9dfb82b..45d369bf 100644 --- a/src/lib/fcitx-utils/utf8.h +++ b/src/lib/fcitx-utils/utf8.h @@ -12,11 +12,16 @@ /// \file /// \brief C++ Utility functions for handling utf8 strings. +#include +#include +#include #include #include #include #include +#include #include +#include #include #include "fcitxutils_export.h" diff --git a/src/lib/fcitx-utils/uuid_p.h b/src/lib/fcitx-utils/uuid_p.h index 165b9a4c..1ca534c2 100644 --- a/src/lib/fcitx-utils/uuid_p.h +++ b/src/lib/fcitx-utils/uuid_p.h @@ -14,7 +14,8 @@ #include #include #include "charutils.h" -#include "event.h" +#include "eventloopinterface.h" +#include "fs.h" #include "unixfd.h" #ifdef TEST_DISABLE_LIBUUID -- Gitee From 145fcd1cd67ed323f631b764e9408053c022427a Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 09:54:34 -0800 Subject: [PATCH 47/69] Update fs::baseName to use std::string_view. --- src/lib/fcitx-utils/fs.cpp | 32 ++++++++++++++++++++++---------- src/lib/fcitx-utils/fs.h | 7 +++++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/lib/fcitx-utils/fs.cpp b/src/lib/fcitx-utils/fs.cpp index 507de8e1..d83acafb 100644 --- a/src/lib/fcitx-utils/fs.cpp +++ b/src/lib/fcitx-utils/fs.cpp @@ -7,9 +7,18 @@ #include "fs.h" #include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include "fcitxutils_export.h" +#include "misc.h" #include "mtime_p.h" #include "standardpath.h" #include "stringutils.h" @@ -188,21 +197,24 @@ std::string dirName(const std::string &path) { return result; } -std::string baseName(const std::string &path) { - auto result = path; +FCITXUTILS_DEPRECATED_EXPORT std::string baseName(const std::string &path) { + return baseName(std::string_view(path)); +} + +std::string baseName(std::string_view path) { // remove trailing slash - while (result.size() > 1 && result.back() == '/') { - result.pop_back(); + while (path.size() > 1 && path.back() == '/') { + path.remove_suffix(1); } - if (result.size() <= 1) { - return result; + if (path.size() <= 1) { + return std::string{path}; } - auto iter = std::find(result.rbegin(), result.rend(), '/'); - if (iter != result.rend()) { - result.erase(result.begin(), iter.base()); + auto iter = std::find(path.rbegin(), path.rend(), '/'); + if (iter != path.rend()) { + path.remove_prefix(std::distance(path.begin(), iter.base())); } - return result; + return std::string{path}; } ssize_t safeRead(int fd, void *data, size_t maxlen) { diff --git a/src/lib/fcitx-utils/fs.h b/src/lib/fcitx-utils/fs.h index ad1e15c0..baefe362 100644 --- a/src/lib/fcitx-utils/fs.h +++ b/src/lib/fcitx-utils/fs.h @@ -7,9 +7,12 @@ #ifndef _FCITX_UTILS_FS_H_ #define _FCITX_UTILS_FS_H_ -#include +#include +#include +#include #include #include +#include #include #include "fcitxutils_export.h" @@ -44,7 +47,7 @@ FCITXUTILS_EXPORT bool makePath(const std::string &path); /// \brief Get directory name of path FCITXUTILS_EXPORT std::string dirName(const std::string &path); /// \brief Get base file name of path. -FCITXUTILS_EXPORT std::string baseName(const std::string &path); +FCITXUTILS_EXPORT std::string baseName(std::string_view path); /// \brief a simple wrapper around read(), ignore EINTR. FCITXUTILS_EXPORT ssize_t safeRead(int fd, void *data, size_t maxlen); -- Gitee From d56196fbfe4d684ca0ad42e0ccaf31492b69d8de Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 12:34:14 -0800 Subject: [PATCH 48/69] Update how fcitxutils_export.h is included. we have been using "fcitxutils_export.h", however, it is inconsistent for sub directory. Use fcitx-utils/prefix for it for consistency. --- src/lib/fcitx-utils/CMakeLists.txt | 2 +- src/lib/fcitx-utils/color.h | 2 +- src/lib/fcitx-utils/connectableobject.h | 2 +- src/lib/fcitx-utils/cutf8.h | 2 +- src/lib/fcitx-utils/dbus/bus.h | 2 +- src/lib/fcitx-utils/dbus/matchrule.cpp | 6 ++++++ src/lib/fcitx-utils/dbus/matchrule.h | 3 +++ src/lib/fcitx-utils/dbus/message.h | 2 +- src/lib/fcitx-utils/dbus/objectvtable.cpp | 5 +++++ src/lib/fcitx-utils/dbus/objectvtable.h | 2 +- src/lib/fcitx-utils/dbus/servicewatcher.h | 1 + src/lib/fcitx-utils/dbus/variant.cpp | 8 ++++++++ src/lib/fcitx-utils/dbus/variant.h | 2 +- src/lib/fcitx-utils/element.h | 2 +- src/lib/fcitx-utils/event.h | 2 +- src/lib/fcitx-utils/eventdispatcher.h | 2 +- src/lib/fcitx-utils/eventloopinterface.h | 2 +- src/lib/fcitx-utils/fs.cpp | 2 +- src/lib/fcitx-utils/fs.h | 2 +- src/lib/fcitx-utils/handlertable_details.h | 2 +- src/lib/fcitx-utils/i18n.h | 2 +- src/lib/fcitx-utils/i18nstring.h | 2 +- src/lib/fcitx-utils/inputbuffer.h | 2 +- src/lib/fcitx-utils/key.h | 2 +- src/lib/fcitx-utils/library.h | 2 +- src/lib/fcitx-utils/log.h | 2 +- src/lib/fcitx-utils/misc.h | 2 +- src/lib/fcitx-utils/rect.h | 2 +- src/lib/fcitx-utils/semver.h | 2 +- src/lib/fcitx-utils/standardpath.h | 2 +- src/lib/fcitx-utils/stringutils.cpp | 2 +- src/lib/fcitx-utils/stringutils.h | 2 +- src/lib/fcitx-utils/stringutils_details.h | 2 +- src/lib/fcitx-utils/testing.h | 2 +- src/lib/fcitx-utils/unixfd.h | 2 +- src/lib/fcitx-utils/utf8.h | 2 +- 36 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/lib/fcitx-utils/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index 86819ec6..9eb64046 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -127,7 +127,7 @@ set_target_properties(Fcitx5Utils ) target_include_directories(Fcitx5Utils PUBLIC $ - $ + $ $) target_link_libraries(Fcitx5Utils PRIVATE DL::DL LibIntl::LibIntl Pthread::Pthread ${FMT_TARGET}) if(LIBKVM_FOUND) diff --git a/src/lib/fcitx-utils/color.h b/src/lib/fcitx-utils/color.h index 321c9b2a..ea0bd2d4 100644 --- a/src/lib/fcitx-utils/color.h +++ b/src/lib/fcitx-utils/color.h @@ -11,8 +11,8 @@ #include #include #include +#include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/connectableobject.h b/src/lib/fcitx-utils/connectableobject.h index 443a3060..4d477584 100644 --- a/src/lib/fcitx-utils/connectableobject.h +++ b/src/lib/fcitx-utils/connectableobject.h @@ -11,10 +11,10 @@ #include #include #include +#include #include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/cutf8.h b/src/lib/fcitx-utils/cutf8.h index 90406607..94c97623 100644 --- a/src/lib/fcitx-utils/cutf8.h +++ b/src/lib/fcitx-utils/cutf8.h @@ -15,7 +15,7 @@ #include #include -#include "fcitxutils_export.h" +#include //// Max length of a utf8 character #define FCITX_UTF8_MAX_LENGTH 6 diff --git a/src/lib/fcitx-utils/dbus/bus.h b/src/lib/fcitx-utils/dbus/bus.h index da8de850..3c0ffc28 100644 --- a/src/lib/fcitx-utils/dbus/bus.h +++ b/src/lib/fcitx-utils/dbus/bus.h @@ -14,9 +14,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/dbus/matchrule.cpp b/src/lib/fcitx-utils/dbus/matchrule.cpp index 76966052..f09906c5 100644 --- a/src/lib/fcitx-utils/dbus/matchrule.cpp +++ b/src/lib/fcitx-utils/dbus/matchrule.cpp @@ -6,6 +6,12 @@ */ #include "matchrule.h" +#include +#include +#include +#include +#include +#include "../macros.h" #include "../stringutils.h" #include "message.h" #include "utils_p.h" diff --git a/src/lib/fcitx-utils/dbus/matchrule.h b/src/lib/fcitx-utils/dbus/matchrule.h index bd0d8042..ed0f9f13 100644 --- a/src/lib/fcitx-utils/dbus/matchrule.h +++ b/src/lib/fcitx-utils/dbus/matchrule.h @@ -7,10 +7,13 @@ #ifndef _FCITX_UTILS_DBUS_MATCHRULE_H_ #define _FCITX_UTILS_DBUS_MATCHRULE_H_ +#include +#include #include #include #include #include +#include #include /// \addtogroup FcitxUtils diff --git a/src/lib/fcitx-utils/dbus/message.h b/src/lib/fcitx-utils/dbus/message.h index a02f6762..f027a0a7 100644 --- a/src/lib/fcitx-utils/dbus/message.h +++ b/src/lib/fcitx-utils/dbus/message.h @@ -18,12 +18,12 @@ #include #include #include // IWYU pragma: export +#include #include #include #include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/dbus/objectvtable.cpp b/src/lib/fcitx-utils/dbus/objectvtable.cpp index 63b82ddc..e8c8f7fd 100644 --- a/src/lib/fcitx-utils/dbus/objectvtable.cpp +++ b/src/lib/fcitx-utils/dbus/objectvtable.cpp @@ -4,6 +4,11 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ +#include "objectvtable.h" +#include +#include +#include +#include "../macros.h" #include "bus.h" #include "objectvtable_p.h" diff --git a/src/lib/fcitx-utils/dbus/objectvtable.h b/src/lib/fcitx-utils/dbus/objectvtable.h index c6f91d54..f9de58e7 100644 --- a/src/lib/fcitx-utils/dbus/objectvtable.h +++ b/src/lib/fcitx-utils/dbus/objectvtable.h @@ -16,10 +16,10 @@ #include #include #include +#include #include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/dbus/servicewatcher.h b/src/lib/fcitx-utils/dbus/servicewatcher.h index ed80595d..45956611 100644 --- a/src/lib/fcitx-utils/dbus/servicewatcher.h +++ b/src/lib/fcitx-utils/dbus/servicewatcher.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/src/lib/fcitx-utils/dbus/variant.cpp b/src/lib/fcitx-utils/dbus/variant.cpp index 633c9821..1ac702cf 100644 --- a/src/lib/fcitx-utils/dbus/variant.cpp +++ b/src/lib/fcitx-utils/dbus/variant.cpp @@ -5,8 +5,16 @@ * */ #include "variant.h" +#include +#include +#include #include +#include +#include +#include +#include "../macros.h" #include "../misc_p.h" +#include "fmessage.h" namespace fcitx::dbus { diff --git a/src/lib/fcitx-utils/dbus/variant.h b/src/lib/fcitx-utils/dbus/variant.h index 06f8d01a..d0feecbb 100644 --- a/src/lib/fcitx-utils/dbus/variant.h +++ b/src/lib/fcitx-utils/dbus/variant.h @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/element.h b/src/lib/fcitx-utils/element.h index ed975d9f..e9b562c8 100644 --- a/src/lib/fcitx-utils/element.h +++ b/src/lib/fcitx-utils/element.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/event.h b/src/lib/fcitx-utils/event.h index 8474553c..66a2755d 100644 --- a/src/lib/fcitx-utils/event.h +++ b/src/lib/fcitx-utils/event.h @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/eventdispatcher.h b/src/lib/fcitx-utils/eventdispatcher.h index d93741fe..ebec1602 100644 --- a/src/lib/fcitx-utils/eventdispatcher.h +++ b/src/lib/fcitx-utils/eventdispatcher.h @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/eventloopinterface.h b/src/lib/fcitx-utils/eventloopinterface.h index 963f96ce..f31c28f0 100644 --- a/src/lib/fcitx-utils/eventloopinterface.h +++ b/src/lib/fcitx-utils/eventloopinterface.h @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/fs.cpp b/src/lib/fcitx-utils/fs.cpp index d83acafb..9f3b4309 100644 --- a/src/lib/fcitx-utils/fs.cpp +++ b/src/lib/fcitx-utils/fs.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include #include "misc.h" #include "mtime_p.h" #include "standardpath.h" diff --git a/src/lib/fcitx-utils/fs.h b/src/lib/fcitx-utils/fs.h index baefe362..11331545 100644 --- a/src/lib/fcitx-utils/fs.h +++ b/src/lib/fcitx-utils/fs.h @@ -13,8 +13,8 @@ #include #include #include +#include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/handlertable_details.h b/src/lib/fcitx-utils/handlertable_details.h index 9fd07796..919ec3ea 100644 --- a/src/lib/fcitx-utils/handlertable_details.h +++ b/src/lib/fcitx-utils/handlertable_details.h @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/i18n.h b/src/lib/fcitx-utils/i18n.h index db4bf3f8..e52e19d5 100644 --- a/src/lib/fcitx-utils/i18n.h +++ b/src/lib/fcitx-utils/i18n.h @@ -8,7 +8,7 @@ #define _FCITX_UTILS_I18N_H_ #include -#include "fcitxutils_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/i18nstring.h b/src/lib/fcitx-utils/i18nstring.h index 27d3c190..a69c179a 100644 --- a/src/lib/fcitx-utils/i18nstring.h +++ b/src/lib/fcitx-utils/i18nstring.h @@ -9,7 +9,7 @@ #include #include -#include "fcitxutils_export.h" +#include namespace fcitx { class FCITXUTILS_EXPORT I18NString { diff --git a/src/lib/fcitx-utils/inputbuffer.h b/src/lib/fcitx-utils/inputbuffer.h index c2bf547b..0702a457 100644 --- a/src/lib/fcitx-utils/inputbuffer.h +++ b/src/lib/fcitx-utils/inputbuffer.h @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/key.h b/src/lib/fcitx-utils/key.h index 0637344e..09d991ac 100644 --- a/src/lib/fcitx-utils/key.h +++ b/src/lib/fcitx-utils/key.h @@ -18,10 +18,10 @@ #include #include #include +#include #include #include #include -#include "fcitxutils_export.h" namespace fcitx { class Key; diff --git a/src/lib/fcitx-utils/library.h b/src/lib/fcitx-utils/library.h index 0f88baf8..e11d84eb 100644 --- a/src/lib/fcitx-utils/library.h +++ b/src/lib/fcitx-utils/library.h @@ -16,9 +16,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/log.h b/src/lib/fcitx-utils/log.h index c44b0964..9f36e3ee 100644 --- a/src/lib/fcitx-utils/log.h +++ b/src/lib/fcitx-utils/log.h @@ -25,13 +25,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/misc.h b/src/lib/fcitx-utils/misc.h index 4e660c99..6a48096a 100644 --- a/src/lib/fcitx-utils/misc.h +++ b/src/lib/fcitx-utils/misc.h @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/rect.h b/src/lib/fcitx-utils/rect.h index a99cb8c2..8a2e0e40 100644 --- a/src/lib/fcitx-utils/rect.h +++ b/src/lib/fcitx-utils/rect.h @@ -15,7 +15,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include namespace fcitx { class FCITXUTILS_EXPORT Rect { diff --git a/src/lib/fcitx-utils/semver.h b/src/lib/fcitx-utils/semver.h index 8cbf0a9c..55b93ff1 100644 --- a/src/lib/fcitx-utils/semver.h +++ b/src/lib/fcitx-utils/semver.h @@ -13,7 +13,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include #include "log.h" #include "macros.h" diff --git a/src/lib/fcitx-utils/standardpath.h b/src/lib/fcitx-utils/standardpath.h index 810459c1..796242ed 100644 --- a/src/lib/fcitx-utils/standardpath.h +++ b/src/lib/fcitx-utils/standardpath.h @@ -26,11 +26,11 @@ #include #include #include +#include #include #include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/stringutils.cpp b/src/lib/fcitx-utils/stringutils.cpp index 4ce2d999..bf113472 100644 --- a/src/lib/fcitx-utils/stringutils.cpp +++ b/src/lib/fcitx-utils/stringutils.cpp @@ -14,7 +14,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include #include "charutils.h" #include "macros.h" diff --git a/src/lib/fcitx-utils/stringutils.h b/src/lib/fcitx-utils/stringutils.h index 59307054..5450c0ac 100644 --- a/src/lib/fcitx-utils/stringutils.h +++ b/src/lib/fcitx-utils/stringutils.h @@ -20,7 +20,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include #include "stringutils_details.h" namespace fcitx::stringutils { diff --git a/src/lib/fcitx-utils/stringutils_details.h b/src/lib/fcitx-utils/stringutils_details.h index 5fb0a53a..2b653acd 100644 --- a/src/lib/fcitx-utils/stringutils_details.h +++ b/src/lib/fcitx-utils/stringutils_details.h @@ -17,7 +17,7 @@ #include #include #include -#include "fcitxutils_export.h" +#include namespace fcitx::stringutils::details { diff --git a/src/lib/fcitx-utils/testing.h b/src/lib/fcitx-utils/testing.h index ef606ac4..de921d6b 100644 --- a/src/lib/fcitx-utils/testing.h +++ b/src/lib/fcitx-utils/testing.h @@ -9,7 +9,7 @@ #include #include -#include "fcitxutils_export.h" +#include /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/unixfd.h b/src/lib/fcitx-utils/unixfd.h index 97d4d751..01980e3f 100644 --- a/src/lib/fcitx-utils/unixfd.h +++ b/src/lib/fcitx-utils/unixfd.h @@ -12,9 +12,9 @@ /// \file /// \brief Utility class to handle unix file decriptor. +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/utf8.h b/src/lib/fcitx-utils/utf8.h index 45d369bf..7eb1c1cc 100644 --- a/src/lib/fcitx-utils/utf8.h +++ b/src/lib/fcitx-utils/utf8.h @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx::utf8 { -- Gitee From 0bd606afcd38bb91eaa9b0220f8a250becca1fbe Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 15:22:35 -0800 Subject: [PATCH 49/69] Fix typo --- src/lib/fcitx-utils/dbus/variant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/fcitx-utils/dbus/variant.cpp b/src/lib/fcitx-utils/dbus/variant.cpp index 1ac702cf..c540730b 100644 --- a/src/lib/fcitx-utils/dbus/variant.cpp +++ b/src/lib/fcitx-utils/dbus/variant.cpp @@ -14,7 +14,7 @@ #include #include "../macros.h" #include "../misc_p.h" -#include "fmessage.h" +#include "message.h" namespace fcitx::dbus { -- Gitee From 1fe6ca1c41cf0bc66e9941fb6d91cb7fd8da2e9c Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 29 Dec 2024 15:27:23 -0800 Subject: [PATCH 50/69] Fix test with new include path --- test/testlibrary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp index 05dce4b6..f969b34c 100644 --- a/test/testlibrary.cpp +++ b/test/testlibrary.cpp @@ -6,9 +6,9 @@ */ #include +#include "fcitx-utils/fcitxutils_export.h" #include "fcitx-utils/library.h" #include "fcitx-utils/log.h" -#include "fcitxutils_export.h" #define DATA "AAAAAAAAA" #define MAGIC "MAGIC_TEST_DATA" -- Gitee From 7dede8b69294722284991b3260e4fed95c10c203 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 30 Dec 2024 23:27:11 -0800 Subject: [PATCH 51/69] Remove configtool & obsoleted part in fcitx5-diagnose. There's never fcitx5-config-gtk, and also, the log is duplicated between fcitx5-configtool & fcitx5-diagnose. The package name is also not sync'ed. So better to let fcitx5-configtool to its job. --- data/fcitx5-diagnose.sh | 101 ---------------------------------------- 1 file changed, 101 deletions(-) diff --git a/data/fcitx5-diagnose.sh b/data/fcitx5-diagnose.sh index 3ea44eb7..6549bbe6 100755 --- a/data/fcitx5-diagnose.sh +++ b/data/fcitx5-diagnose.sh @@ -1012,106 +1012,6 @@ check_fcitx() { fi } -_find_config_gtk() { - [ -n "${_config_tool_gtk_exe}" ] && { - echo "${_config_tool_gtk_exe}" - return 0 - } - local config_gtk - config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1 - echo "${config_gtk}" - _config_tool_gtk_exe="${config_gtk}" -} - -_check_config_gtk_version() { - local version=$1 - local config_gtk - [ -z "${_config_tool_gtk_version}" ] && { - config_gtk="$(_find_config_gtk)" || return 1 - ld_info="$(ldd "$config_gtk" 2> /dev/null)" || - ld_info="$(objdump -p "$config_gtk" 2> /dev/null)" || return 1 - if [[ $ld_info =~ libgtk[-._a-zA-Z0-9]*3[-._a-zA-Z0-9]*\.so ]]; then - _config_tool_gtk_version=3 - elif [[ $ld_info =~ libgtk[-._a-zA-Z0-9]*2[-._a-zA-Z0-9]*\.so ]]; then - _config_tool_gtk_version=2 - else - return 1 - fi - } - [ "${_config_tool_gtk_version}" = "$version" ] -} - -_check_config_gtk() { - local version=$1 - local config_gtk config_gtk_name - write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}" - if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then - if ! _check_config_gtk_version "${version}"; then - write_error_eval \ - "$(_ 'Config GUI for gtk${1} not found.')" "${version}" - return 1 - else - config_gtk=$(_find_config_gtk) - config_gtk_name="fcitx5-config-gtk" - fi - else - config_gtk_name="fcitx5-config-gtk${version}" - fi - write_eval "$(_ 'Found ${1} at ${2}.')" \ - "$(code_inline "${config_gtk_name}")" \ - "$(code_inline "${config_gtk}")" -} - -_check_config_qt() { - local config_qt config_qt_name - config_qt_name="fcitx5-config-qt" - write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}" - if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then - write_error "$(_ 'Config GUI for qt not found.')" - return 1 - fi - write_eval "$(_ 'Found ${1} at ${2}.')" \ - "$(code_inline "${config_qt_name}")" \ - "$(code_inline "${config_qt}")" -} - -_check_config_kcm() { - local version=$1 - local kcm_shell config_kcm - write_order_list "$(_ 'Config GUI for kde:')" - if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then - write_error "$(print_not_found "kcmshell${version}")" - return 1 - fi - config_kcm="$(${kcm_shell} --list 2> /dev/null | grep -i fcitx5)" && { - write_eval "$(_ 'Found ${1} kcm module.')" fcitx5 - write_quote_str "${config_kcm}" - return 0 - } - return 1 -} - -check_config_ui() { - local IFS=$'\n' - write_title 1 "$(_ 'Fcitx Configure UI:')" - write_order_list "$(_ 'Config Tool Wrapper:')" - if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then - write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool - else - write_eval "$(_ 'Found ${1} at ${2}.')" \ - fcitx5-configtool \ - "$(code_inline "${fcitx_configtool}")" - fi - local config_backend_found=0 - _check_config_qt && config_backend_found=1 - _check_config_kcm 5 && config_backend_found=1 - if ((!config_backend_found)) && [[ -n "$DISPLAY$WAYLAND_DISPLAY" ]]; then - write_error_eval "$(_ 'Cannot find a GUI config tool, please install one of ${1}, or ${2}.')" \ - "$(code_inline kcm-fcitx5)" "$(code_inline fcitx5-config-qt)" - fi -} - - ############################# # front end ############################# @@ -1779,7 +1679,6 @@ check_istty check_system check_env check_fcitx -check_config_ui ((_check_frontend)) && { write_title 1 "$(_ 'Frontends setup:')" -- Gitee From c29988586574f0ad5c56e2aba2dffbd8e2388a3f Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 31 Dec 2024 00:18:21 -0800 Subject: [PATCH 52/69] Unify the #include style for fcitx headers 1. library header: <> 2. source code & other header: "" 3. *_export.h, use <> instead of old "". --- src/lib/fcitx-config/CMakeLists.txt | 2 +- src/lib/fcitx-config/configuration.h | 2 +- src/lib/fcitx-config/dbushelper.h | 2 +- src/lib/fcitx-config/iniparser.h | 2 +- src/lib/fcitx-config/marshallfunction.h | 6 +++--- src/lib/fcitx-config/option.h | 4 ++-- src/lib/fcitx-config/option_details.h | 2 +- src/lib/fcitx-config/rawconfig.h | 2 +- src/lib/fcitx-utils/handlertable_details.h | 2 +- src/lib/fcitx-utils/intrusivelist.h | 2 +- src/lib/fcitx-utils/misc_p.h | 2 +- src/lib/fcitx-utils/semver.h | 4 ++-- src/lib/fcitx-utils/stringutils.h | 2 +- src/lib/fcitx-utils/stringutils_details.h | 2 +- src/lib/fcitx-utils/uuid_p.h | 8 ++++---- src/lib/fcitx/CMakeLists.txt | 2 +- src/lib/fcitx/action.h | 2 +- src/lib/fcitx/addonfactory.h | 2 +- src/lib/fcitx/addoninfo.h | 2 +- src/lib/fcitx/addoninstance.h | 2 +- src/lib/fcitx/addoninstance_p.h | 4 ++-- src/lib/fcitx/addonloader.h | 2 +- src/lib/fcitx/addonloader_p.h | 14 +++++++------- src/lib/fcitx/addonmanager.h | 2 +- src/lib/fcitx/candidateaction.h | 2 +- src/lib/fcitx/candidatelist.h | 2 +- src/lib/fcitx/event.h | 2 +- src/lib/fcitx/focusgroup.h | 6 +++--- src/lib/fcitx/focusgroup_p.h | 4 ++-- src/lib/fcitx/globalconfig.h | 2 +- src/lib/fcitx/icontheme.h | 2 +- src/lib/fcitx/inputcontext.h | 2 +- src/lib/fcitx/inputcontext_p.h | 2 +- src/lib/fcitx/inputcontextmanager.h | 2 +- src/lib/fcitx/inputcontextproperty.h | 2 +- src/lib/fcitx/inputcontextproperty_p.h | 4 +++- src/lib/fcitx/inputmethodconfig_p.h | 6 +++--- src/lib/fcitx/inputmethodengine.h | 2 +- src/lib/fcitx/inputmethodentry.h | 2 +- src/lib/fcitx/inputmethodgroup.h | 2 +- src/lib/fcitx/inputmethodmanager.h | 2 +- src/lib/fcitx/inputpanel.h | 2 +- src/lib/fcitx/instance.h | 4 ++-- src/lib/fcitx/instance_p.h | 18 +++++++++--------- src/lib/fcitx/menu.h | 2 +- src/lib/fcitx/misc_p.h | 16 ++++++++-------- src/lib/fcitx/statusarea.h | 2 +- src/lib/fcitx/surroundingtext.h | 2 +- src/lib/fcitx/text.h | 2 +- src/lib/fcitx/userinterfacemanager.h | 2 +- src/modules/clipboard/waylandclipboard.h | 10 +++++----- .../notificationitem/notificationitem.h | 2 +- .../quickphrase/quickphraseprovider.cpp | 4 ++-- src/modules/unicode/unicode.cpp | 2 +- src/modules/xcb/xcbconnection.h | 2 +- src/modules/xcb/xcbeventreader.h | 6 +++--- src/ui/classic/colorhelper.cpp | 2 +- src/ui/classic/colorhelper.h | 2 +- test/addon/dummyaddondeps.cpp | 4 ++-- test/testconfig.cpp | 6 +++--- test/testemoji.cpp | 8 ++++---- test/testfs.cpp | 2 +- test/testisocodes.cpp | 2 +- test/testlist.cpp | 2 +- test/testlog.cpp | 4 ++-- test/testtext.cpp | 6 +++--- testing/testfrontend/testfrontend.cpp | 8 ++++---- testing/testim/testim.cpp | 4 ++-- 68 files changed, 125 insertions(+), 123 deletions(-) diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt index 63759f5d..b2f37acd 100644 --- a/src/lib/fcitx-config/CMakeLists.txt +++ b/src/lib/fcitx-config/CMakeLists.txt @@ -36,7 +36,7 @@ set_target_properties(Fcitx5Config ) target_include_directories(Fcitx5Config PUBLIC $ - $ + $ $) target_link_libraries(Fcitx5Config PUBLIC Fcitx5::Utils) diff --git a/src/lib/fcitx-config/configuration.h b/src/lib/fcitx-config/configuration.h index ac2509b3..11a5adc7 100644 --- a/src/lib/fcitx-config/configuration.h +++ b/src/lib/fcitx-config/configuration.h @@ -10,11 +10,11 @@ #include #include #include +#include #include #include #include #include -#include "fcitxconfig_export.h" #define FCITX_CONFIGURATION_EXTEND(NAME, SUBCLASS, ...) \ class NAME; \ diff --git a/src/lib/fcitx-config/dbushelper.h b/src/lib/fcitx-config/dbushelper.h index fae36fd4..dd16c7cc 100644 --- a/src/lib/fcitx-config/dbushelper.h +++ b/src/lib/fcitx-config/dbushelper.h @@ -10,9 +10,9 @@ #include #include #include +#include #include #include -#include "fcitxconfig_export.h" namespace fcitx { diff --git a/src/lib/fcitx-config/iniparser.h b/src/lib/fcitx-config/iniparser.h index 6c67d5d5..06865a2e 100644 --- a/src/lib/fcitx-config/iniparser.h +++ b/src/lib/fcitx-config/iniparser.h @@ -9,9 +9,9 @@ #include #include +#include #include #include -#include "fcitxconfig_export.h" namespace fcitx { class Configuration; diff --git a/src/lib/fcitx-config/marshallfunction.h b/src/lib/fcitx-config/marshallfunction.h index ee4eb656..ef91f0bb 100644 --- a/src/lib/fcitx-config/marshallfunction.h +++ b/src/lib/fcitx-config/marshallfunction.h @@ -10,12 +10,12 @@ #include #include #include +#include +#include #include #include +#include #include -#include "fcitx-utils/key.h" -#include "fcitxconfig_export.h" -#include "rawconfig.h" namespace fcitx { diff --git a/src/lib/fcitx-config/option.h b/src/lib/fcitx-config/option.h index c1ad3d3e..95e614b4 100644 --- a/src/lib/fcitx-config/option.h +++ b/src/lib/fcitx-config/option.h @@ -14,13 +14,13 @@ #include #include #include +#include #include #include // IWYU pragma: export #include #include #include -#include "fcitx-utils/key.h" -#include "fcitxconfig_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx-config/option_details.h b/src/lib/fcitx-config/option_details.h index fb04a183..577de6fa 100644 --- a/src/lib/fcitx-config/option_details.h +++ b/src/lib/fcitx-config/option_details.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include "fcitxconfig_export.h" namespace fcitx { diff --git a/src/lib/fcitx-config/rawconfig.h b/src/lib/fcitx-config/rawconfig.h index 7b603702..b94999c0 100644 --- a/src/lib/fcitx-config/rawconfig.h +++ b/src/lib/fcitx-config/rawconfig.h @@ -13,9 +13,9 @@ #include #include #include +#include #include #include -#include "fcitxconfig_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/handlertable_details.h b/src/lib/fcitx-utils/handlertable_details.h index 919ec3ea..843daca0 100644 --- a/src/lib/fcitx-utils/handlertable_details.h +++ b/src/lib/fcitx-utils/handlertable_details.h @@ -7,7 +7,7 @@ #ifndef _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ #define _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ -// IWYU pragma: private, include "handlertable.h" +// IWYU pragma: private, include #include #include diff --git a/src/lib/fcitx-utils/intrusivelist.h b/src/lib/fcitx-utils/intrusivelist.h index 2bafa879..5c01bff8 100644 --- a/src/lib/fcitx-utils/intrusivelist.h +++ b/src/lib/fcitx-utils/intrusivelist.h @@ -13,7 +13,7 @@ #include #include #include -#include "misc.h" +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/misc_p.h b/src/lib/fcitx-utils/misc_p.h index aa051cee..f8235e4f 100644 --- a/src/lib/fcitx-utils/misc_p.h +++ b/src/lib/fcitx-utils/misc_p.h @@ -19,8 +19,8 @@ #include #include #include +#include #include "config.h" -#include "endian_p.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/semver.h b/src/lib/fcitx-utils/semver.h index 55b93ff1..59993459 100644 --- a/src/lib/fcitx-utils/semver.h +++ b/src/lib/fcitx-utils/semver.h @@ -14,8 +14,8 @@ #include #include #include -#include "log.h" -#include "macros.h" +#include +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/stringutils.h b/src/lib/fcitx-utils/stringutils.h index 5450c0ac..f74cd17f 100644 --- a/src/lib/fcitx-utils/stringutils.h +++ b/src/lib/fcitx-utils/stringutils.h @@ -21,7 +21,7 @@ #include #include #include -#include "stringutils_details.h" +#include // IWYU pragma: export namespace fcitx::stringutils { diff --git a/src/lib/fcitx-utils/stringutils_details.h b/src/lib/fcitx-utils/stringutils_details.h index 2b653acd..addb36b4 100644 --- a/src/lib/fcitx-utils/stringutils_details.h +++ b/src/lib/fcitx-utils/stringutils_details.h @@ -7,7 +7,7 @@ #ifndef _FCITX_UTILS_STRINGUTILS_DETAIL_H_ #define _FCITX_UTILS_STRINGUTILS_DETAIL_H_ -// IWYU pragma: private, include "stringutils.h" +// IWYU pragma: private, include #include #include diff --git a/src/lib/fcitx-utils/uuid_p.h b/src/lib/fcitx-utils/uuid_p.h index 1ca534c2..3b3fe6a6 100644 --- a/src/lib/fcitx-utils/uuid_p.h +++ b/src/lib/fcitx-utils/uuid_p.h @@ -13,10 +13,10 @@ #include #include #include -#include "charutils.h" -#include "eventloopinterface.h" -#include "fs.h" -#include "unixfd.h" +#include +#include +#include +#include #ifdef TEST_DISABLE_LIBUUID #undef ENABLE_LIBUUID diff --git a/src/lib/fcitx/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt index 56314e75..927d1676 100644 --- a/src/lib/fcitx/CMakeLists.txt +++ b/src/lib/fcitx/CMakeLists.txt @@ -73,7 +73,7 @@ set_target_properties(Fcitx5Core ) target_include_directories(Fcitx5Core PUBLIC $ - $ + $ $) target_link_libraries(Fcitx5Core PUBLIC Fcitx5::Config Fcitx5::Utils PRIVATE LibIntl::LibIntl ${FMT_TARGET}) if (ENABLE_KEYBOARD) diff --git a/src/lib/fcitx/action.h b/src/lib/fcitx/action.h index b840c89c..bf9b05f2 100644 --- a/src/lib/fcitx/action.h +++ b/src/lib/fcitx/action.h @@ -11,7 +11,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { class ActionPrivate; diff --git a/src/lib/fcitx/addonfactory.h b/src/lib/fcitx/addonfactory.h index b1c287df..1dd63c7c 100644 --- a/src/lib/fcitx/addonfactory.h +++ b/src/lib/fcitx/addonfactory.h @@ -8,7 +8,7 @@ #define _FCITX_ADDONFACTORY_H_ #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/addoninfo.h b/src/lib/fcitx/addoninfo.h index 55704851..3d4a8ce3 100644 --- a/src/lib/fcitx/addoninfo.h +++ b/src/lib/fcitx/addoninfo.h @@ -16,7 +16,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx/addoninstance.h b/src/lib/fcitx/addoninstance.h index 8e3cb4c3..58b27d8f 100644 --- a/src/lib/fcitx/addoninstance.h +++ b/src/lib/fcitx/addoninstance.h @@ -16,7 +16,7 @@ #include #include #include // IWYU pragma: export -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/addoninstance_p.h b/src/lib/fcitx/addoninstance_p.h index ec7873e8..2aad8188 100644 --- a/src/lib/fcitx/addoninstance_p.h +++ b/src/lib/fcitx/addoninstance_p.h @@ -9,8 +9,8 @@ #include #include -#include "addoninfo.h" -#include "addoninstance.h" +#include +#include namespace fcitx { diff --git a/src/lib/fcitx/addonloader.h b/src/lib/fcitx/addonloader.h index e7ebf6b8..452266b5 100644 --- a/src/lib/fcitx/addonloader.h +++ b/src/lib/fcitx/addonloader.h @@ -11,7 +11,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx/addonloader_p.h b/src/lib/fcitx/addonloader_p.h index 66f1d63e..e15894f3 100644 --- a/src/lib/fcitx/addonloader_p.h +++ b/src/lib/fcitx/addonloader_p.h @@ -13,13 +13,13 @@ #include #include #include -#include "fcitx-utils/library.h" -#include "fcitx-utils/standardpath.h" -#include "fcitx-utils/stringutils.h" -#include "addonfactory.h" -#include "addoninfo.h" -#include "addoninstance.h" -#include "addonloader.h" +#include +#include +#include +#include +#include +#include +#include namespace fcitx { diff --git a/src/lib/fcitx/addonmanager.h b/src/lib/fcitx/addonmanager.h index 09bced6d..1b99013d 100644 --- a/src/lib/fcitx/addonmanager.h +++ b/src/lib/fcitx/addonmanager.h @@ -13,7 +13,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/candidateaction.h b/src/lib/fcitx/candidateaction.h index a5b9dff7..659e01a2 100644 --- a/src/lib/fcitx/candidateaction.h +++ b/src/lib/fcitx/candidateaction.h @@ -10,7 +10,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx/candidatelist.h b/src/lib/fcitx/candidatelist.h index 8013e4fd..e188e17a 100644 --- a/src/lib/fcitx/candidatelist.h +++ b/src/lib/fcitx/candidatelist.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include "fcitxcore_export.h" namespace fcitx { diff --git a/src/lib/fcitx/event.h b/src/lib/fcitx/event.h index 0ada9bb0..3ef36628 100644 --- a/src/lib/fcitx/event.h +++ b/src/lib/fcitx/event.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include "fcitxcore_export.h" /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/focusgroup.h b/src/lib/fcitx/focusgroup.h index b46692e3..cc620342 100644 --- a/src/lib/fcitx/focusgroup.h +++ b/src/lib/fcitx/focusgroup.h @@ -9,9 +9,9 @@ #include #include -#include "fcitxcore_export.h" -#include "inputcontext.h" -#include "inputpanel.h" +#include +#include +#include namespace fcitx { diff --git a/src/lib/fcitx/focusgroup_p.h b/src/lib/fcitx/focusgroup_p.h index 949d3bfe..f7e59a3a 100644 --- a/src/lib/fcitx/focusgroup_p.h +++ b/src/lib/fcitx/focusgroup_p.h @@ -8,8 +8,8 @@ #define _FCITX_FOCUSGROUP_P_H_ #include -#include "fcitx-utils/intrusivelist.h" -#include "focusgroup.h" +#include +#include namespace fcitx { diff --git a/src/lib/fcitx/globalconfig.h b/src/lib/fcitx/globalconfig.h index 096cc09b..1ddfa842 100644 --- a/src/lib/fcitx/globalconfig.h +++ b/src/lib/fcitx/globalconfig.h @@ -15,8 +15,8 @@ #include #include #include +#include #include -#include "fcitxcore_export.h" namespace fcitx { diff --git a/src/lib/fcitx/icontheme.h b/src/lib/fcitx/icontheme.h index e01af578..bbb123c5 100644 --- a/src/lib/fcitx/icontheme.h +++ b/src/lib/fcitx/icontheme.h @@ -14,7 +14,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/inputcontext.h b/src/lib/fcitx/inputcontext.h index 215f9331..9fd68172 100644 --- a/src/lib/fcitx/inputcontext.h +++ b/src/lib/fcitx/inputcontext.h @@ -17,9 +17,9 @@ #include #include #include +#include #include #include -#include "fcitxcore_export.h" /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/inputcontext_p.h b/src/lib/fcitx/inputcontext_p.h index 0b7bc693..466878cf 100644 --- a/src/lib/fcitx/inputcontext_p.h +++ b/src/lib/fcitx/inputcontext_p.h @@ -10,13 +10,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include "fcitx/event.h" namespace fcitx { diff --git a/src/lib/fcitx/inputcontextmanager.h b/src/lib/fcitx/inputcontextmanager.h index 3c3561f5..c4346424 100644 --- a/src/lib/fcitx/inputcontextmanager.h +++ b/src/lib/fcitx/inputcontextmanager.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include "fcitxcore_export.h" namespace fcitx { diff --git a/src/lib/fcitx/inputcontextproperty.h b/src/lib/fcitx/inputcontextproperty.h index e5c0d99c..1a94f7ca 100644 --- a/src/lib/fcitx/inputcontextproperty.h +++ b/src/lib/fcitx/inputcontextproperty.h @@ -10,7 +10,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/inputcontextproperty_p.h b/src/lib/fcitx/inputcontextproperty_p.h index 5b0349d3..75f7fcb5 100644 --- a/src/lib/fcitx/inputcontextproperty_p.h +++ b/src/lib/fcitx/inputcontextproperty_p.h @@ -8,7 +8,9 @@ #define _FCITX_INPUTCONTEXTPROPERTY_P_H_ #include -#include "inputcontextproperty.h" +#include +#include "fcitx-utils/macros.h" +#include "fcitx/inputcontextmanager.h" namespace fcitx { class InputContextManagerPrivate; diff --git a/src/lib/fcitx/inputmethodconfig_p.h b/src/lib/fcitx/inputmethodconfig_p.h index 8b8f0e9f..b792b2e8 100644 --- a/src/lib/fcitx/inputmethodconfig_p.h +++ b/src/lib/fcitx/inputmethodconfig_p.h @@ -8,9 +8,9 @@ #define _FCITX_INPUTMETHODCONFIG_P_H_ #include -#include "fcitx-config/configuration.h" -#include "fcitx-utils/i18nstring.h" -#include "inputmethodentry.h" +#include +#include +#include namespace fcitx { FCITX_CONFIGURATION(InputMethodGroupItemConfig, diff --git a/src/lib/fcitx/inputmethodengine.h b/src/lib/fcitx/inputmethodengine.h index a01431a2..3c1f2309 100644 --- a/src/lib/fcitx/inputmethodengine.h +++ b/src/lib/fcitx/inputmethodengine.h @@ -9,8 +9,8 @@ #include #include +#include #include -#include "fcitxcore_export.h" namespace fcitx { diff --git a/src/lib/fcitx/inputmethodentry.h b/src/lib/fcitx/inputmethodentry.h index 075c6f26..fa85aaa4 100644 --- a/src/lib/fcitx/inputmethodentry.h +++ b/src/lib/fcitx/inputmethodentry.h @@ -10,7 +10,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx/inputmethodgroup.h b/src/lib/fcitx/inputmethodgroup.h index 41757fbd..5d06fd68 100644 --- a/src/lib/fcitx/inputmethodgroup.h +++ b/src/lib/fcitx/inputmethodgroup.h @@ -12,7 +12,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx/inputmethodmanager.h b/src/lib/fcitx/inputmethodmanager.h index 63faabb8..9b88a1c3 100644 --- a/src/lib/fcitx/inputmethodmanager.h +++ b/src/lib/fcitx/inputmethodmanager.h @@ -13,8 +13,8 @@ #include #include #include +#include #include -#include "fcitxcore_export.h" /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/inputpanel.h b/src/lib/fcitx/inputpanel.h index a78ba269..ac2681c1 100644 --- a/src/lib/fcitx/inputpanel.h +++ b/src/lib/fcitx/inputpanel.h @@ -9,7 +9,7 @@ #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/instance.h b/src/lib/fcitx/instance.h index 5e1102e4..ace03efc 100644 --- a/src/lib/fcitx/instance.h +++ b/src/lib/fcitx/instance.h @@ -10,12 +10,12 @@ #include #include #include +#include #include #include +#include #include #include -#include "fcitx-utils/eventdispatcher.h" -#include "fcitxcore_export.h" #define FCITX_INVALID_COMPOSE_RESULT 0xffffffff diff --git a/src/lib/fcitx/instance_p.h b/src/lib/fcitx/instance_p.h index 314fdeac..e386a5ef 100644 --- a/src/lib/fcitx/instance_p.h +++ b/src/lib/fcitx/instance_p.h @@ -11,16 +11,16 @@ #include #include #include -#include "fcitx-utils/event.h" -#include "fcitx-utils/eventdispatcher.h" -#include "fcitx-utils/handlertable.h" -#include "fcitx-utils/misc.h" -#include "fcitx-utils/trackableobject.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "config.h" -#include "inputcontextproperty.h" -#include "inputmethodmanager.h" -#include "instance.h" -#include "userinterfacemanager.h" #ifdef ENABLE_KEYBOARD #include diff --git a/src/lib/fcitx/menu.h b/src/lib/fcitx/menu.h index 9870a5da..65e132cc 100644 --- a/src/lib/fcitx/menu.h +++ b/src/lib/fcitx/menu.h @@ -11,7 +11,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/misc_p.h b/src/lib/fcitx/misc_p.h index 6eabb054..1a335455 100644 --- a/src/lib/fcitx/misc_p.h +++ b/src/lib/fcitx/misc_p.h @@ -12,14 +12,14 @@ #include #include #include -#include "fcitx-utils/charutils.h" -#include "fcitx-utils/log.h" -#include "fcitx-utils/misc_p.h" -#include "fcitx-utils/stringutils.h" -#include "fcitx/candidatelist.h" -#include "fcitx/inputmethodentry.h" -#include "fcitx/inputmethodmanager.h" -#include "fcitx/instance.h" +#include +#include +#include +#include +#include +#include +#include +#include // This ia a file for random private util functions that we'd like to share // among different modules. diff --git a/src/lib/fcitx/statusarea.h b/src/lib/fcitx/statusarea.h index a3826008..fd2de37b 100644 --- a/src/lib/fcitx/statusarea.h +++ b/src/lib/fcitx/statusarea.h @@ -11,7 +11,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/surroundingtext.h b/src/lib/fcitx/surroundingtext.h index ee26b2f4..a776d6b0 100644 --- a/src/lib/fcitx/surroundingtext.h +++ b/src/lib/fcitx/surroundingtext.h @@ -11,7 +11,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/text.h b/src/lib/fcitx/text.h index 12d23537..bb520839 100644 --- a/src/lib/fcitx/text.h +++ b/src/lib/fcitx/text.h @@ -13,7 +13,7 @@ #include #include #include -#include "fcitxcore_export.h" +#include /// \addtogroup FcitxCore /// \{ diff --git a/src/lib/fcitx/userinterfacemanager.h b/src/lib/fcitx/userinterfacemanager.h index 322691f5..70a2a32f 100644 --- a/src/lib/fcitx/userinterfacemanager.h +++ b/src/lib/fcitx/userinterfacemanager.h @@ -10,10 +10,10 @@ #include #include #include +#include #include #include #include -#include "fcitxcore_export.h" /// \addtogroup FcitxCore /// \{ diff --git a/src/modules/clipboard/waylandclipboard.h b/src/modules/clipboard/waylandclipboard.h index 217878ee..1013628b 100644 --- a/src/modules/clipboard/waylandclipboard.h +++ b/src/modules/clipboard/waylandclipboard.h @@ -9,12 +9,12 @@ #include #include -#include -#include -#include -#include -#include +#include "fcitx-utils/event.h" +#include "fcitx-utils/eventdispatcher.h" #include "fcitx-utils/macros.h" +#include "fcitx-utils/signals.h" +#include "fcitx-utils/trackableobject.h" +#include "fcitx-utils/unixfd.h" #include "display.h" #include "zwlr_data_control_device_v1.h" #include "zwlr_data_control_manager_v1.h" diff --git a/src/modules/notificationitem/notificationitem.h b/src/modules/notificationitem/notificationitem.h index 34c1f357..b9630db3 100644 --- a/src/modules/notificationitem/notificationitem.h +++ b/src/modules/notificationitem/notificationitem.h @@ -8,10 +8,10 @@ #define _FCITX_MODULES_NOTIFICATIONITEM_NOTIFICATIONITEM_H_ #include -#include #include "fcitx-utils/dbus/servicewatcher.h" #include "fcitx-utils/trackableobject.h" #include "fcitx/addoninstance.h" +#include "fcitx/addonmanager.h" #include "fcitx/instance.h" #include "dbus_public.h" #include "notificationitem_public.h" diff --git a/src/modules/quickphrase/quickphraseprovider.cpp b/src/modules/quickphrase/quickphraseprovider.cpp index 6544fd78..25fecb47 100644 --- a/src/modules/quickphrase/quickphraseprovider.cpp +++ b/src/modules/quickphrase/quickphraseprovider.cpp @@ -10,14 +10,14 @@ #include #include #include -#include -#include #include "fcitx-utils/fs.h" #include "fcitx-utils/macros.h" #include "fcitx-utils/misc.h" #include "fcitx-utils/standardpath.h" #include "fcitx-utils/stringutils.h" +#include "fcitx-utils/utf8.h" #include "fcitx/inputcontext.h" +#include "fcitx/inputmethodentry.h" #include "quickphrase.h" #include "quickphrase_public.h" #include "spell_public.h" diff --git a/src/modules/unicode/unicode.cpp b/src/modules/unicode/unicode.cpp index d5b00f8b..04b84bb0 100644 --- a/src/modules/unicode/unicode.cpp +++ b/src/modules/unicode/unicode.cpp @@ -5,8 +5,8 @@ * */ #include "unicode.h" -#include #include +#include "fcitx-utils/charutils.h" #include "fcitx-utils/i18n.h" #include "fcitx-utils/inputbuffer.h" #include "fcitx-utils/utf8.h" diff --git a/src/modules/xcb/xcbconnection.h b/src/modules/xcb/xcbconnection.h index 888d21b7..1db2926b 100644 --- a/src/modules/xcb/xcbconnection.h +++ b/src/modules/xcb/xcbconnection.h @@ -8,10 +8,10 @@ #define _FCITX_MODULES_XCB_XCBCONNECTION_H_ #include -#include #include #include "fcitx-utils/handlertable.h" #include "fcitx-utils/key.h" +#include "fcitx/instance.h" #include "xcb_public.h" namespace fcitx { diff --git a/src/modules/xcb/xcbeventreader.h b/src/modules/xcb/xcbeventreader.h index 5449270c..d83e95f7 100644 --- a/src/modules/xcb/xcbeventreader.h +++ b/src/modules/xcb/xcbeventreader.h @@ -9,10 +9,10 @@ #include #include -#include -#include -#include #include +#include "fcitx-utils/event.h" +#include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/trackableobject.h" #include "xcb_public.h" namespace fcitx { diff --git a/src/ui/classic/colorhelper.cpp b/src/ui/classic/colorhelper.cpp index f551d059..1b300923 100644 --- a/src/ui/classic/colorhelper.cpp +++ b/src/ui/classic/colorhelper.cpp @@ -6,7 +6,7 @@ #include "colorhelper.h" #include -#include +#include "fcitx-utils/color.h" namespace fcitx::classicui { diff --git a/src/ui/classic/colorhelper.h b/src/ui/classic/colorhelper.h index 7217c11d..0e1b6a46 100644 --- a/src/ui/classic/colorhelper.h +++ b/src/ui/classic/colorhelper.h @@ -7,7 +7,7 @@ #ifndef _FCITX_UI_CLASSIC_COLORHELPER_H_ #define _FCITX_UI_CLASSIC_COLORHELPER_H_ -#include +#include "fcitx-utils/color.h" namespace fcitx::classicui { diff --git a/test/addon/dummyaddondeps.cpp b/test/addon/dummyaddondeps.cpp index f702003e..7e665162 100644 --- a/test/addon/dummyaddondeps.cpp +++ b/test/addon/dummyaddondeps.cpp @@ -1,8 +1,8 @@ -#include +#include "fcitx-utils/log.h" FCITX_DEFINE_LOG_CATEGORY(dummyaddondeps, "dummyaddondeps"); static int init = []() { fcitx::Log::setLogRule("default=3"); return 0; -}(); \ No newline at end of file +}(); diff --git a/test/testconfig.cpp b/test/testconfig.cpp index 68dc4fb6..0730d8ae 100644 --- a/test/testconfig.cpp +++ b/test/testconfig.cpp @@ -7,9 +7,9 @@ #include "testconfig.h" #include -#include -#include -#include +#include "fcitx-config/configuration.h" +#include "fcitx-config/enum.h" +#include "fcitx-config/iniparser.h" #include "fcitx-utils/log.h" using namespace fcitx; diff --git a/test/testemoji.cpp b/test/testemoji.cpp index 7a51aa2a..8df7f6f9 100644 --- a/test/testemoji.cpp +++ b/test/testemoji.cpp @@ -5,10 +5,10 @@ * */ #include -#include -#include -#include -#include +#include "fcitx-utils/log.h" +#include "fcitx-utils/standardpath.h" +#include "fcitx-utils/testing.h" +#include "fcitx/addonmanager.h" #include "emoji_public.h" #include "testdir.h" diff --git a/test/testfs.cpp b/test/testfs.cpp index 7fedfdc9..470bf34d 100644 --- a/test/testfs.cpp +++ b/test/testfs.cpp @@ -7,10 +7,10 @@ #include #include -#include #include "fcitx-utils/fs.h" #include "fcitx-utils/log.h" #include "fcitx-utils/misc.h" +#include "fcitx-utils/stringutils.h" using namespace fcitx::fs; using namespace fcitx; diff --git a/test/testisocodes.cpp b/test/testisocodes.cpp index 60a6fda7..6306c4f4 100644 --- a/test/testisocodes.cpp +++ b/test/testisocodes.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ -#include +#include "fcitx-utils/log.h" #include "config.h" #include "im/keyboard/isocodes.h" diff --git a/test/testlist.cpp b/test/testlist.cpp index cc458286..36e4a20c 100644 --- a/test/testlist.cpp +++ b/test/testlist.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include "fcitx-utils/intrusivelist.h" #include "fcitx-utils/log.h" using namespace fcitx; diff --git a/test/testlog.cpp b/test/testlog.cpp index be12e46d..49591e12 100644 --- a/test/testlog.cpp +++ b/test/testlog.cpp @@ -5,8 +5,8 @@ * */ #include -#include -#include +#include "fcitx-utils/log.h" +#include "fcitx-utils/metastring.h" int main() { int a = 0; diff --git a/test/testtext.cpp b/test/testtext.cpp index c096e220..db06d7ed 100644 --- a/test/testtext.cpp +++ b/test/testtext.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * */ -#include -#include -#include +#include "fcitx-utils/log.h" +#include "fcitx-utils/textformatflags.h" +#include "fcitx/text.h" using namespace fcitx; void test_basic() { diff --git a/testing/testfrontend/testfrontend.cpp b/testing/testfrontend/testfrontend.cpp index afb30056..56320c78 100644 --- a/testing/testfrontend/testfrontend.cpp +++ b/testing/testfrontend/testfrontend.cpp @@ -5,10 +5,10 @@ * */ #include "testfrontend.h" -#include -#include -#include -#include +#include "fcitx/addonfactory.h" +#include "fcitx/addonmanager.h" +#include "fcitx/inputcontextmanager.h" +#include "fcitx/inputpanel.h" namespace fcitx { diff --git a/testing/testim/testim.cpp b/testing/testim/testim.cpp index 8895867d..6cddbc13 100644 --- a/testing/testim/testim.cpp +++ b/testing/testim/testim.cpp @@ -5,8 +5,8 @@ * */ #include "testim.h" -#include -#include +#include "fcitx/addonfactory.h" +#include "fcitx/addonmanager.h" namespace fcitx { -- Gitee From 3214b0cb9ad9d1456129f54b7324654b398e03fd Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Tue, 31 Dec 2024 20:24:06 +0000 Subject: [PATCH 53/69] [trans] Update Translation --- po/ca.po | 857 ++++++++++++++++++++++++------------------------- po/da.po | 859 ++++++++++++++++++++++++------------------------- po/de.po | 859 ++++++++++++++++++++++++------------------------- po/es.po | 862 ++++++++++++++++++++++++-------------------------- po/fcitx5.pot | 857 ++++++++++++++++++++++++------------------------- po/fr.po | 859 ++++++++++++++++++++++++------------------------- po/he.po | 857 ++++++++++++++++++++++++------------------------- po/ja.po | 858 ++++++++++++++++++++++++------------------------- po/ko.po | 857 ++++++++++++++++++++++++------------------------- po/ru.po | 859 ++++++++++++++++++++++++------------------------- po/vi.po | 858 ++++++++++++++++++++++++------------------------- po/zh_CN.po | 857 ++++++++++++++++++++++++------------------------- po/zh_TW.po | 857 ++++++++++++++++++++++++------------------------- 13 files changed, 5308 insertions(+), 5848 deletions(-) diff --git a/po/ca.po b/po/ca.po index 0cacf082..a4903097 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch , 2020\n" "Language-Team: Catalan (https://app.transifex.com/fcitx/teams/12005/ca/)\n" @@ -108,7 +108,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -120,7 +120,7 @@ msgstr "Activa el mètode d'entrada" msgid "Active By Default" msgstr "Activa per defecte" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Afegeix un preferit" @@ -129,19 +129,19 @@ msgstr "Afegeix un preferit" msgid "Add Unicode Typing Support" msgstr "Afegeix la compatibilitat amb l'escriptura unicode" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajusta la brillantor" @@ -150,11 +150,11 @@ msgstr "Ajusta la brillantor" msgid "All" msgstr "" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "" @@ -178,7 +178,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -187,12 +187,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "" @@ -201,36 +201,36 @@ msgstr "" msgid "Applications disabled for long press" msgstr "" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Repetició de l'àudio" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "" @@ -239,15 +239,15 @@ msgstr "" msgid "Backends" msgstr "" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Retrocés" @@ -256,7 +256,7 @@ msgstr "Retrocés" msgid "Bash Version:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Bateria" @@ -269,69 +269,69 @@ msgstr "" msgid "Behavior" msgstr "Comportament" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Blau" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Llibre" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Navegador" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Calculadora" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Cancel·la" @@ -348,28 +348,24 @@ msgstr "" msgid "Cannot determine desktop environment." msgstr "" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "" @@ -377,11 +373,7 @@ msgstr "" msgid "Cannot find DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "" @@ -389,19 +381,19 @@ msgstr "" msgid "Cannot find fcitx5 executable!" msgstr "" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -410,28 +402,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "Bloq Maj" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "" @@ -439,7 +431,7 @@ msgstr "" msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "" @@ -451,12 +443,12 @@ msgstr "Escolliu el modificador de tecla" msgid "Classic User Interface" msgstr "" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Neteja" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "" @@ -468,21 +460,21 @@ msgstr "Porta-retalls" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Tanca" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Comunitat" @@ -503,35 +495,11 @@ msgstr "" msgid "Completion is enabled." msgstr "" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Configura" @@ -540,12 +508,12 @@ msgstr "Configura" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Copia" @@ -574,7 +542,7 @@ msgstr "Personalitzat" msgid "Custom Xkb Option" msgstr "" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Retalla" @@ -599,12 +567,12 @@ msgstr "" msgid "DBus interface:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -645,12 +613,12 @@ msgstr "Re Pàg predeterminat" msgid "Default page size" msgstr "Mida de pàgina predeterminada" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "" @@ -685,7 +653,7 @@ msgstr "" msgid "Directories:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "" @@ -698,12 +666,12 @@ msgstr "No ho mostris un altre cop" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Documents" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "Avall" @@ -712,17 +680,17 @@ msgstr "Avall" msgid "Editor" msgstr "" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Expulsa" @@ -735,7 +703,7 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" @@ -751,7 +719,7 @@ msgstr "" msgid "Enable emoji in quickphrase" msgstr "" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -763,7 +731,7 @@ msgstr "" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Fi" @@ -792,7 +760,7 @@ msgstr "" msgid "Enumerate when press trigger key repeatedly" msgstr "" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -802,7 +770,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" @@ -818,26 +786,26 @@ msgstr "" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Esc" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Executa" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Surt" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "" @@ -845,7 +813,7 @@ msgstr "" msgid "Fallback Spell check language" msgstr "" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Preferits" @@ -867,14 +835,10 @@ msgstr "Configuració de fcitx 5" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "" @@ -905,29 +869,29 @@ msgstr "" msgid "Fcitx4 Frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Finances" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Troba" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -935,11 +899,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -950,11 +914,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "" @@ -963,7 +927,7 @@ msgstr "" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -975,56 +939,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1032,26 +991,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Joc" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Verd" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Grup" @@ -1066,15 +1025,15 @@ msgstr "Grup {0}: {1}" msgid "Group {}" msgstr "" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "" @@ -1082,77 +1041,77 @@ msgstr "" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Ajuda" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "" @@ -1165,56 +1124,56 @@ msgstr "" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "Historial" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "" @@ -1223,7 +1182,7 @@ msgstr "" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "" @@ -1241,7 +1200,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1277,7 +1236,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "" @@ -1299,31 +1258,31 @@ msgstr "" msgid "Input Method Related Environment Variables: " msgstr "" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1337,7 +1296,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" @@ -1346,11 +1305,11 @@ msgstr "" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1369,26 +1328,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Tauler del mètode d'entrada de KDE" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "" @@ -1415,12 +1374,12 @@ msgstr "Teclat - {0}" msgid "Keyboard - {0} - {1}" msgstr "Teclat - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "" @@ -1429,315 +1388,315 @@ msgstr "" msgid "Keyboard Layout:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "Alt esquerre" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "Control esquerre" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "Majúscules esquerre" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "" @@ -1746,11 +1705,11 @@ msgstr "" msgid "Locale:" msgstr "" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "" @@ -1759,142 +1718,142 @@ msgstr "" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "Mercat" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "Menú" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "Silencia el micròfon" @@ -1903,46 +1862,46 @@ msgstr "Silencia el micròfon" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "Diversos candidats" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "Música" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "Els meus llocs" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "" @@ -1951,7 +1910,7 @@ msgstr "" msgid "Next Candidate" msgstr "Següent candidat" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1967,11 +1926,11 @@ msgstr "" msgid "None" msgstr "Cap" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -1990,7 +1949,7 @@ msgstr "" msgid "Notification" msgstr "Notificació" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "Bloq Núm" @@ -2005,38 +1964,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "Obre" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "Obre l'URL" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "Opció" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2052,17 +2011,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2070,7 +2029,7 @@ msgstr "" msgid "Page size" msgstr "Mida de pàgina" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Enganxa" @@ -2079,17 +2038,17 @@ msgstr "Enganxa" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "Pausa" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "Telèfon" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "Imatges" @@ -2110,12 +2069,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "Apaga" @@ -2132,7 +2091,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2144,16 +2103,16 @@ msgstr "" msgid "Prev Candidate" msgstr "" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "Candidat anterior" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "Impr Pant" @@ -2162,7 +2121,7 @@ msgstr "Impr Pant" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "" @@ -2174,27 +2133,27 @@ msgstr "Frase ràpida" msgid "Quick Phrase: " msgstr "Frase ràpida:" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "Roig" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "Refés" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "Refresca" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "Recarrega" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "Respon" @@ -2203,62 +2162,62 @@ msgstr "Respon" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Reinicia" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Retorn" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "Alt dret" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "Control dret" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "Majúscules dret" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "Gira les finestres" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "" @@ -2267,22 +2226,22 @@ msgstr "" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Desa" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "Estalvi de pantalla" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "Cerca" @@ -2291,7 +2250,7 @@ msgstr "Cerca" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "Selecciona" @@ -2308,11 +2267,11 @@ msgstr "" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "Envia" @@ -2324,11 +2283,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2336,12 +2295,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Majúscules" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "" @@ -2354,7 +2313,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2366,7 +2325,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2390,17 +2349,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "Espai" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "" @@ -2408,22 +2367,22 @@ msgstr "" msgid "Spell" msgstr "Ortografia" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "Full de càlcul" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "" @@ -2437,16 +2396,16 @@ msgstr "Mètode d'entrada estàndard" msgid "Status Notifier" msgstr "Notificador d'estat" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "Atura" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "Subtítol" @@ -2455,17 +2414,17 @@ msgstr "Subtítol" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "Suspèn" @@ -2489,17 +2448,17 @@ msgstr "" msgid "System Info:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "Petició del sistema" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Tab" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "Tauler de tasques" @@ -2508,12 +2467,12 @@ msgstr "Tauler de tasques" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "Terminal" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2532,38 +2491,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "Hora" @@ -2580,66 +2539,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "Eines" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2681,7 +2640,7 @@ msgstr "" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Desfés" @@ -2694,7 +2653,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Amunt" @@ -2703,19 +2662,19 @@ msgstr "Amunt" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2723,7 +2682,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2737,59 +2696,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "Vídeo" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "Visualitza" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "Abaixa el volum" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "Silencia el volum" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "Apuja el volum" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Desperta" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2808,7 +2767,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Webcam" @@ -2837,12 +2796,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "Sense fil" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "Processador de text" @@ -2859,42 +2818,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "Groc" @@ -2912,11 +2871,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2934,35 +2893,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "Amplia el zoom" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "Redueix el zoom" @@ -2975,7 +2934,7 @@ msgstr "" msgid "here" msgstr "" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/da.po b/po/da.po index f17384f7..7bf09153 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://app.transifex.com/fcitx/teams/12005/da/)\n" @@ -108,7 +108,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -120,7 +120,7 @@ msgstr "Aktivér inputmetode" msgid "Active By Default" msgstr "Aktivér som standard" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Tilføj favorit" @@ -129,19 +129,19 @@ msgstr "Tilføj favorit" msgid "Add Unicode Typing Support" msgstr "Tilføj understøttelse af unicode-indtastning" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "Tilføjelseskonfigurationsmappe:" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "Tilføjelsesbiblioteker:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "Tilføjelsesliste:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Juster lysstyrke" @@ -150,11 +150,11 @@ msgstr "Juster lysstyrke" msgid "All" msgstr "" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "Alle fundne Gtk ${1} im-modul-filer findes." -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "Alle biblioteker til alle tilføjelse er fundet." @@ -178,7 +178,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -187,12 +187,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "Program venstre" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "Program højre" @@ -201,36 +201,36 @@ msgstr "Program højre" msgid "Applications disabled for long press" msgstr "Programmer deaktiveret for langt tryk" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "Lyd gennemløb spor" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "Lyd tilfældig afspilning" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Lyd gentag" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "Forfatter" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Væk" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Tilbage" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Tilbage fremad" @@ -239,15 +239,15 @@ msgstr "Tilbage fremad" msgid "Backends" msgstr "" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "Baggrund" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "Baggrundsbillede" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Backspace" @@ -256,7 +256,7 @@ msgstr "Backspace" msgid "Bash Version:" msgstr "Bash-version:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Batteri" @@ -269,69 +269,69 @@ msgstr "Begyndervejledning" msgid "Behavior" msgstr "Opførsel" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Blå" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "Sløringsmargen" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Bog" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "Nederst i midten" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "Nederst til venstre" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "Nederst til højre" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Browser" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Lommeregner" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Annuller" @@ -348,28 +348,24 @@ msgstr "Kan ikke oprette forbindelse til ${1} korrekt." msgid "Cannot determine desktop environment." msgstr "Kan ikke bestemme skrivebordsmiljø." -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "Kan ikke finde ${1}-tilføjelseskonfigurationsmappe." -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "Kan ikke finde ${1}-eksekverbar!" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "Kan ikke finde ${1}-im-modul til gtk ${2} i mellemlager." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "Kan ikke finde ${1}-im-modul til gtk ${2}." -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "Kan ikke finde ${1}-inputmetode-modul til ${2}." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "Kan ikke finde ${2} til gtk ${1}" @@ -377,13 +373,7 @@ msgstr "Kan ikke finde ${2} til gtk ${1}" msgid "Cannot find DBus name ${1} owner." msgstr "Kan ikke finde ejer af DBus-navnet ${1}." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"Kan ikke finde et konfigurationsværktøj med grafisk brugerflade, installer " -"venligst ${1} eller ${2}." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "Kan ikke finde aktiveret ${1}-brugerflade!" @@ -391,20 +381,20 @@ msgstr "Kan ikke finde aktiveret ${1}-brugerflade!" msgid "Cannot find fcitx5 executable!" msgstr "Kan ikke finde fcitx5-eksekverbar!" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "Kan ikke filen ${1} af tilføjelsen ${2}." -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" "Kan ikke finde følgende krævede biblioteker for ${1} af tilføjelsen ${2}." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "Kan ikke finde im-modul mellemlager til gtk ${1}" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -415,28 +405,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "Kan ikke finde pid på ejer af DBus-navnet ${1}." -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "Kan ikke finde xim_server på rodvindue." -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "Kan ikke fortolke XMODIFIERS: ${1}." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "CapsLock" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "I midten" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "I midten til venstre" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "I midten til højre" @@ -444,7 +434,7 @@ msgstr "I midten til højre" msgid "Change Fcitx 5 Configuration" msgstr "Skift Fcitx 5-konfiguration" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Afkrydsningsboks" @@ -456,12 +446,12 @@ msgstr "Vælg ændringstast" msgid "Classic User Interface" msgstr "" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Ryd" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "Klikmargen" @@ -473,21 +463,21 @@ msgstr "Udklipsholder" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Luk" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "Kodeinput" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Fællesskab" @@ -508,35 +498,11 @@ msgstr "" msgid "Completion is enabled." msgstr "Fuldførsel er aktiveret." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "Konfiguration med grafisk brugerflade til gtk${1} ikke fundet." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "Konfiguration med grafisk brugerflade til gtk${1}:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "Konfiguration med grafisk brugerflade til kde:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Konfiguration med grafisk brugerflade til qt ikke fundet." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Konfiguration med grafisk brugerflade til qt:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "Konfigurationsværktøjs-wrapper:" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "Konfiguration:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Konfigurer" @@ -545,12 +511,12 @@ msgstr "Konfigurer" msgid "Control" msgstr "Styring" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Styring" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Kopiér" @@ -579,7 +545,7 @@ msgstr "Tilpasset" msgid "Custom Xkb Option" msgstr "" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Kliip" @@ -604,12 +570,12 @@ msgstr "DBus-baseret nyt Freedesktop.org-bakkeikon" msgid "DBus interface:" msgstr "DBus-grænseflade:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -650,12 +616,12 @@ msgstr "Standard-forrige side" msgid "Default page size" msgstr "Standardsidestørrelse" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "Slet" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "Beskrivelse" @@ -690,7 +656,7 @@ msgstr "" msgid "Directories:" msgstr "Mapper:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "Vis" @@ -703,12 +669,12 @@ msgstr "Vis ikke igen" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Dokumenter" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "Ned" @@ -717,17 +683,17 @@ msgstr "Ned" msgid "Editor" msgstr "Redigering" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "Eisu-skift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "Eisu skift" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Skub ud" @@ -740,7 +706,7 @@ msgstr "Emoji" msgid "Enable" msgstr "Aktivér" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "Aktivér sløring i KWin" @@ -756,7 +722,7 @@ msgstr "Aktivér emoji i tip" msgid "Enable emoji in quickphrase" msgstr "Aktivér emoji i hurtigfrase" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -768,7 +734,7 @@ msgstr "" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "End" @@ -797,7 +763,7 @@ msgstr "Gennemløb inputmetode-gruppe forlæns" msgid "Enumerate when press trigger key repeatedly" msgstr "Gennemløb når der trykkes på udløsertast gentagne gange" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -809,7 +775,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "Miljøvariablen ${1} er ikke sat." -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "Miljøvariablen ${1} er sat korrekt til \"${2}\"." @@ -827,26 +793,26 @@ msgstr "" "Der opstod en fejl under kørsel af ${1}. Tjek venligst dine lokale " "indstillinger." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Escape" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Udfør" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Afslut" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "Kunne ikke finde ${1} i im-modul mellemlager ved ${2}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "Kunne ikke finde ${1} i outputtet af ${2}" @@ -854,7 +820,7 @@ msgstr "Kunne ikke finde ${1} i outputtet af ${2}" msgid "Fallback Spell check language" msgstr "Reserve sprog for stavekontrol" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Favoritter" @@ -876,14 +842,10 @@ msgstr "Fcitx 5-konfiguration" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx-tilføjelser:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx-konfiguration med brugerflade:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx-tilstand:" @@ -917,29 +879,29 @@ msgstr "Fcitx-version: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4-frontend" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Finans" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Find" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -947,11 +909,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "Skrifttype" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -962,11 +924,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Fremad" @@ -975,7 +937,7 @@ msgstr "Fremad" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Fandt ${1} ${2}-modul: ${3}." @@ -987,56 +949,51 @@ msgstr "Fandt ${1} ${2}-proces:" msgid "Found ${1} ${2} processes:" msgstr "Fandt ${1} ${2}-processer:" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "Fandt ${1}-tilføjelseskonfigurationsmappe: ${2}." -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "Fandt ${1} ved ${2}." -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "Fandt ${1} deaktiverede tilføjelser:" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "Fandt ${1} aktiverede tilføjelser:" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "Fandt ${1} aktiverede brugergrænsefladetilføjelser:" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "Fandt ${1} im-moduler til gtk ${2}." -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "Fandt ${1} kcm-modul." - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "Fandt ${2} til ukendt gtk-version ved ${1}." -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "Fandt ${3} til gtk ${1} ved ${2}." -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "Fandt ${3} im-modul til ${2}: ${1}." -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "Fandt im-modul mellemlager for ukendt gtk-version ved ${1}." -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "Fandt im-modulers mellemlager til gtk ${1} ved ${2}." -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "Fandt ukendt ${1} qt-modul: ${2}." @@ -1044,26 +1001,26 @@ msgstr "Fandt ukendt ${1} qt-modul: ${2}." msgid "Freedesktop.org Notification Support" msgstr "Understøttelse af Freedesktop.org-underretning" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "Frontendens opsætning:" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Spil" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Gå" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Grøn" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Gruppe" @@ -1078,15 +1035,15 @@ msgstr "Gruppe {0}: {1}" msgid "Group {}" msgstr "Gruppe {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Gtk ${1} im-modul-filen ${2} findes ikke." -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Mellemlager for Gtk IM-modul:" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Filer for Gtk IM-modul:" @@ -1094,77 +1051,77 @@ msgstr "Filer for Gtk IM-modul:" msgid "Hall of Shame for Linux IME Support" msgstr "Hall of Shame for understøttelse af Linux IME" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "Hangul" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "Hangul Banja" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "Hangul-slut" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "Hangul Hanja" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "Hangul Jamo" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "Hangul Jeonja" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "Hangul PostHanja" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "Hangul PreHanja" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "Hangul Romaja" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "Hangul-special" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "Hangul-start" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "Hankaku" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Hjælp" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "Henkan" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "Dvale" @@ -1177,56 +1134,56 @@ msgstr "Skjulte underretninger" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "Skjul overlægningen hvis størrelsen ikke passer" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "Baggrund for fremhævning" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "Baggrundsfarve for fremhævning" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "Kandidatfarve for fremhævning" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "Fremhæv klikmargen" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "Tekstfarve for fremhævning" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "Hiragana" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "Hiragana Katakana" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "Historik" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "Home" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "Hjemmekontor" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "Startside" @@ -1235,7 +1192,7 @@ msgstr "Startside" msgid "Home:" msgstr "Hjem:" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "Hotlinks" @@ -1255,7 +1212,7 @@ msgstr "" "Hottast til at skifte til den niende inputmetode kun til nuværende " "inputkontekst" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1297,7 +1254,7 @@ msgstr "" "bruger kommandoen ${g36_disable_ibus} til at deaktivere IBus-integration for " "at kunne bruge andre inputmetoder end ${2}. Se ${link} for flere detaljer." -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "Billede" @@ -1319,31 +1276,31 @@ msgstr "Konfiguration af inputmetode" msgid "Input Method Related Environment Variables: " msgstr "Inputmetode med relation til miljøvariabler: " -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "Inputpanel" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1357,7 +1314,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Indsæt" @@ -1366,11 +1323,11 @@ msgstr "Indsæt" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "Ugyldig tilføjelseskonfigurationsfil ${1}." -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1389,26 +1346,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Panel til KDE-inputmetode" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "Kana-lås" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "Kana-skift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "Kanji" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "Katakana" @@ -1435,12 +1392,12 @@ msgstr "Tastatur - {0}" msgid "Keyboard - {0} - {1}" msgstr "Tastatur - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "Tastaturlysstyrke ned" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "Tastaturlysstyrke op" @@ -1449,315 +1406,315 @@ msgstr "Tastaturlysstyrke op" msgid "Keyboard Layout:" msgstr "Tastaturlayout:" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "Tastaturlys til/fra" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "Tastaturmenu" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Kimpanel-proces:" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "Start (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "Start (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "Start (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "Start (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "Start (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "Start (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "Start (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "Start (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "Start (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "Start (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "Start (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "Start (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "Start (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "Start (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "Start (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "Start (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "Start mail" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "Venstre" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "Venstre Alt" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "Venstre Control" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "Venstre Hyper" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "Venstre Skift" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "Venstre Super" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "Pære" @@ -1766,11 +1723,11 @@ msgstr "Pære" msgid "Locale:" msgstr "Sprog:" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "Log:" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "Log ud" @@ -1779,142 +1736,142 @@ msgstr "Log ud" msgid "Long Press behavior" msgstr "Opførsel for langt tryk" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "Mail videresend" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "Margen" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "Margen nederst" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "Margen til venstre" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "Margen til højre" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "Margen øverst" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "Margen omkring al indholdet" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "Margen omkring tekst" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "Marked" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "Medie hurtig fremad" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "Medie næste" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "Medie pause" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "Medie afspil" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "Medie forrige" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "Medie optag" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "Medie spol tilbage" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "Medie stop" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "Møde" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "Menu" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "Menu" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "Menuens skrifttype" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "Menu-PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "Messenger" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "Metadata" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon mute" @@ -1923,46 +1880,46 @@ msgstr "Mikrofon mute" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "Skærm lysstyrke ned" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "Skærm lysstyrke op" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "Muhenkan" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "Flere kandidat" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "Musik" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "Mine steder" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "Navn" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "Ny(t)" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "Nyheder" @@ -1971,7 +1928,7 @@ msgstr "Nyheder" msgid "Next Candidate" msgstr "Næste kandidat" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "Knap for næste side" @@ -1987,11 +1944,11 @@ msgstr "Ingen udklipsholderhistorik." msgid "None" msgstr "Ingen" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "Normal tekstfarve" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2010,7 +1967,7 @@ msgstr "Bemærkning til GNOME senere end 3.6" msgid "Notification" msgstr "Underretning" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2027,38 +1984,38 @@ msgstr "" "Fandt kun understøttelse af emoji. For at aktivere stavekontrol skal du " "installere stavekontroldata til sproget." -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "Åbn" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "Åbn URL" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "Valgmulighed" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "Klikmargen for overlægning" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "Billede for overlægning" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "X-forskydning for overlægning" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "Y-forskydning for overlægning" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "Placering for overlægning" @@ -2074,17 +2031,17 @@ msgstr "Ejer af DBus-navnet ${1} er ${2}." msgid "PID of DBus name ${1} owner is ${2}." msgstr "PID af ejeren af DBus-navnet ${1} er ${2}." -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2092,7 +2049,7 @@ msgstr "" msgid "Page size" msgstr "Sidestørrelse" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Indsæt" @@ -2101,17 +2058,17 @@ msgstr "Indsæt" msgid "Paste Primary" msgstr "Indsæt primære" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "Pause" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "Telefon" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "Billeder" @@ -2137,12 +2094,12 @@ msgstr "" "værktøjet som din distribution leverer eller tilføj ${1} til din ${2}. Se " "${link}." -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "Sluk" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "Sluk" @@ -2159,7 +2116,7 @@ msgstr "Preedit deaktiveret" msgid "Preedit enabled" msgstr "Preedit aktiveret" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2171,16 +2128,16 @@ msgstr "Varsel" msgid "Prev Candidate" msgstr "Forrige kandidat" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "Knap for forrige side" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "Forrige kandidat" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "Print Screen" @@ -2189,7 +2146,7 @@ msgstr "Print Screen" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Filer for Qt IM-modul:" @@ -2201,27 +2158,27 @@ msgstr "Hurtigfrase" msgid "Quick Phrase: " msgstr "Hurtigfrase: " -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "Rød" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "Omgør" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "Genindlæs" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "Genindlæs" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "Svar" @@ -2230,62 +2187,62 @@ msgstr "Svar" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Genstart" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Retur" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "Højre" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "Højre Alt" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "Højre Control" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "Højre Hyper" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "Højre Skift" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "Højre Super" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "Romaji" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "Roter vinduer" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "Rotation KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "Rotation PB" @@ -2294,22 +2251,22 @@ msgstr "Rotation PB" msgid "Running as root:" msgstr "Kører som root:" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Gem" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "Pauseskærm" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "ScrollLock" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "Søg" @@ -2318,7 +2275,7 @@ msgstr "Søg" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "Vælg" @@ -2335,11 +2292,11 @@ msgstr "Vælg lokal inputmetode:" msgid "Select specific input method via keyboard" msgstr "Vælg bestemt inputmetode via tastatur" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "Send" @@ -2351,11 +2308,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "Baggrund for separator" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2363,12 +2320,12 @@ msgstr "" msgid "Share Input State" msgstr "Del inputtilstand" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Skift" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "Butik" @@ -2381,7 +2338,7 @@ msgstr "Vis information om inputmetode når der skiftes fokus" msgid "Show Input Method Information when switch input method" msgstr "Vis information om inputmetode når der skiftes inputmetode" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2393,7 +2350,7 @@ msgstr "Vis kompakt information om inputmetode" msgid "Show first input method information" msgstr "Vis første information om inputmetode" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2417,17 +2374,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "Spring over første inputmetode under gennemløb" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "Sov" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "Mellemrum" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "Afstand" @@ -2435,22 +2392,22 @@ msgstr "Afstand" msgid "Spell" msgstr "Stav" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "Stavekontrol" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "Opdelt skærm" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "Regneark" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "Standby" @@ -2464,16 +2421,16 @@ msgstr "Start inputmetode" msgid "Status Notifier" msgstr "Statusunderretter" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "Stop" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "Undermenu" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "Undertekst" @@ -2482,17 +2439,17 @@ msgstr "Undertekst" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "Understøttelse" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "Hvile" @@ -2516,17 +2473,17 @@ msgstr "Skiftede gruppe til {0}" msgid "System Info:" msgstr "Systeminfo:" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "System Request" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Tabulator" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "Opgavepanel" @@ -2535,12 +2492,12 @@ msgstr "Opgavepanel" msgid "Temporally switch between first and current Input Method" msgstr "Skift midlertidigt mellem første og nuværende inputmetode" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "Terminal" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2559,38 +2516,38 @@ msgstr "Den niende hottast i listen vælger den niende inputmetode." msgid "The script is run as ${1} (${2})." msgstr "Scriptet køres som ${1} (${2})." -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "Tema" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "Anvendes kun når bakkeikonet er xembed." -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "Klokkeslæt" @@ -2610,66 +2567,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "Indlejret preedit til/fra" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "Værktøjer" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "Øverst i midten" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "Øverst til venstre" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "Topmenu" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "Øverst til højre" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "Touchpad fra" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "Touchpad til" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "Touchpad til/fra" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "Touroku" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "Rejse" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "Skrifttype for bakke" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2711,7 +2668,7 @@ msgstr "Skriver med Fcitx og Kimpanel" msgid "Unable to find a program to check dbus." msgstr "Kan ikke finde et program til at tjekke dbus." -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Fortryd" @@ -2724,7 +2681,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Op" @@ -2733,19 +2690,19 @@ msgstr "Op" msgid "Use On The Spot Style (Needs restarting)" msgstr "Brug her-og-nu-stil (kræver genstart)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "Brug al vandret plads til fremhævning når det er en lodret liste" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "Brug musehjulet for at gå til forrige eller næste side" @@ -2753,7 +2710,7 @@ msgstr "Brug musehjulet for at gå til forrige eller næste side" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "Brugerflade:" @@ -2767,59 +2724,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "Version" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "Versionslinje:" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "Lodret kandidatliste" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "Video" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "Visning" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "Lydstyrke ned" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "Lydstyrke mute" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "Lydstyrke op" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Vågn op" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2838,7 +2795,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "Wayland-inputmetode-frontend" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Webcam" @@ -2867,12 +2824,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "Hvorfor det er en dårlig ide at køre som root" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "Trådløs" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "Tekstbehandling" @@ -2889,36 +2846,36 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM-kodning:" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "XIM til Emacs:" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "XIM_SERVERS på rod-vindue:" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS er ikke sat" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "Xim-servernavn fra miljøvariabel er ${1}." -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "Xim-servernavn er det samme som det der er sat i miljøvariablen." -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." @@ -2926,7 +2883,7 @@ msgstr "" "Xim-servernavn: \"${1}\" er ikke det samme som det der er sat i " "miljøvariablen: \"${2}\"." -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "Gul" @@ -2950,11 +2907,11 @@ msgstr "" "Du bruger formodentligt ${1} til at køre scriptet. Det betyder at resultatet " "af scriptet kan være upræcist. Se ${2} for mere information." -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "Du bruger xim i ${1} programmer." -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "Det kan være at du har problemer med at bruge fcitx i ${1} programmer." @@ -2972,7 +2929,7 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -2982,7 +2939,7 @@ msgstr "" "kunne bruge inputmetode i emacs pga. en meget gammel emacs-fejl som upstream " "har nægtet at rette i årevis." -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -2990,22 +2947,22 @@ msgstr "" "Din LC_CTYPE er sat til ${1} hvor kodningen ikke er UTF-8. Du kan have " "problemer med at udføre strenge ved brug af XIM." -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "Zenkaku" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "Zenkaku Hankaku" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "Zoom ind" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "Zoom ud" @@ -3018,7 +2975,7 @@ msgstr "eksekverbar:" msgid "here" msgstr "her" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/de.po b/po/de.po index 1cb2cca0..d1fde3d9 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: mar well , 2023\n" "Language-Team: German (https://app.transifex.com/fcitx/teams/12005/de/)\n" @@ -110,7 +110,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "Eine virtuelle Tastatur basierend auf DBus" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -122,7 +122,7 @@ msgstr "Eingabemethode aktivieren" msgid "Active By Default" msgstr "Per Voreinstellung aktiviert" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Favorit hinzufügen" @@ -131,19 +131,19 @@ msgstr "Favorit hinzufügen" msgid "Add Unicode Typing Support" msgstr "Unicode-Unterstützung hinzufügen" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "Verzeichnis Addon-Konfigurationen" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "Addon Bibliotheken:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "Liste Addons:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Helligkeit einstellen" @@ -152,11 +152,11 @@ msgstr "Helligkeit einstellen" msgid "All" msgstr "Alle" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "Alle gefundenen Gtk ${1} Dateien von Eingabemethoden existieren" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "Alle Addon-Bibliotheken gefunden." @@ -180,7 +180,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -189,12 +189,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "Anwendung Links" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "Anwendung Rechts" @@ -203,36 +203,36 @@ msgstr "Anwendung Rechts" msgid "Applications disabled for long press" msgstr "" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "Automatische, zufällige Audioausgabe" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Audio Wiederhohlung" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "Autor" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Abwesend" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Zurück" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Zurück vorwärts" @@ -241,15 +241,15 @@ msgstr "Zurück vorwärts" msgid "Backends" msgstr "Backends" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "Hintergrund" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "Hintergrundbild" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Rücktaste" @@ -258,7 +258,7 @@ msgstr "Rücktaste" msgid "Bash Version:" msgstr "Bash-Version:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Batterie" @@ -271,69 +271,69 @@ msgstr "Anleitung für Anfänger" msgid "Behavior" msgstr "Verhalten" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Blau" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "Unscharfer Rand" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "Unschärfemaske" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Buch" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "Rahmenfarbe" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "Rahmenbreite" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "Grund" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "Unten links" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "Unten rechts" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Browser" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Rechner" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Abbrechen" @@ -350,28 +350,24 @@ msgstr "Kann nicht richtig zu ${1} verbinden." msgid "Cannot determine desktop environment." msgstr "Kann den verwendeten Desktop nicht feststellen" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "Kann das ${1} Addon Konfigurationsverzeichnis nicht finden." -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "Kann das ${1} Programm nicht finden!" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "Kann das ${1} Eingabemodul für gtk ${2} nicht im Cache finden." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "Kann das ${1} Eingabemodul für gtk ${2}nicht finden. " -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "Kann das ${1} Eingabemethodenmodul für ${2}nicht finden." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "Kann ${2} für gtk ${1} nicht finden" @@ -379,13 +375,7 @@ msgstr "Kann ${2} für gtk ${1} nicht finden" msgid "Cannot find DBus name ${1} owner." msgstr "Kann den Eigentümer von DBus ${1} nicht finden." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"Kann kein Konfigurationswerkzeug für die GUI finden. Bitte installieren Sie " -"ein von ${1}, oder ${2}." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "" @@ -393,20 +383,20 @@ msgstr "" msgid "Cannot find fcitx5 executable!" msgstr "Kann das Programm fcitx5 nicht finden!" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "Kann Datei ${1} vom Addon ${2}nicht finden." -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" "Kann diese erforderlichen Bibliotheken für ${1} vom addon ${2}nicht finden." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "Kann den Eingabemethoden Modulcache für gtk ${1}nicht finden" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -417,28 +407,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "Kann XMODIFIERS: ${1}nicht interpretieren." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "CapsLock" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "Zentrum" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "Zentrum links" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "Zentrum rehts" @@ -446,7 +436,7 @@ msgstr "Zentrum rehts" msgid "Change Fcitx 5 Configuration" msgstr "Fcitx 5 Konfiguration ändern" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Checkbox" @@ -458,12 +448,12 @@ msgstr "Funktionstaste wählen" msgid "Classic User Interface" msgstr "Klassisches User Interface" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Löschen" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "Rand Clickbereich" @@ -475,21 +465,21 @@ msgstr "Clipboard" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "Clipboard (BackSpace/Delete drücken, um den Verlauf zu löschen):" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Schließen" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "Codeeingabe" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "Farbe" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Gemeinschaft" @@ -510,35 +500,11 @@ msgstr "Vervollständigung ist vorübergehend aktiviert." msgid "Completion is enabled." msgstr "Vervollständigung ist aktiviert." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "Konfiguratoinsoberfläche für gtk${1} nicht gefunden." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "Konfigurationsoberfläche für gtk${1}:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "Konfigurationsoberfläche für KDE:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Konfigurationsoberfläche für QT nicht gefunden." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Konfigurationsoberfläche für QT:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "Konfiguration:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Konfigurieren" @@ -547,12 +513,12 @@ msgstr "Konfigurieren" msgid "Control" msgstr "Kontrolle" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Kontrolle" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Kopieren" @@ -581,7 +547,7 @@ msgstr "Anwenderspezifisch" msgid "Custom Xkb Option" msgstr "Benutzerdefinierte xkb Option" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Ausschneiden" @@ -606,12 +572,12 @@ msgstr "DBus basiertes, neues Freedesktop.org tray icon" msgid "DBus interface:" msgstr "DBus-Schnittstelle:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "Dunkles Thema" @@ -652,12 +618,12 @@ msgstr "Vorgabe für vorherige Seite" msgid "Default page size" msgstr "Standard Seitengröße" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "Löschen" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "Beschreibung" @@ -692,7 +658,7 @@ msgstr "Aktuelles Programm erkennen (Benötigt Neustart)" msgid "Directories:" msgstr "Verzeichnisse:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "Zeigen" @@ -705,12 +671,12 @@ msgstr "Nicht mehr zeigen" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Dokumente" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "Runter" @@ -719,17 +685,17 @@ msgstr "Runter" msgid "Editor" msgstr "Editor" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "Eisu Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "Eisu umschalten" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Auswerfen" @@ -742,7 +708,7 @@ msgstr "Emoji" msgid "Enable" msgstr "Aktivieren" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "Unschärfe für KWin einschalten" @@ -758,7 +724,7 @@ msgstr "Emoji für Hinweise einschalten" msgid "Enable emoji in quickphrase" msgstr "" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -770,7 +736,7 @@ msgstr "Hinweise standardmäßig einschalten" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Ende" @@ -799,7 +765,7 @@ msgstr "" msgid "Enumerate when press trigger key repeatedly" msgstr "" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -809,7 +775,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "Umgebungsvariante ${1} ist nicht gesetzt." -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "Umgebungsvariable ${1} ist richtig auf \"${2}\" gesetzt." @@ -827,26 +793,26 @@ msgstr "" "Ein Fehler tritt auf wenn ${1}läuft. Bitte die locale Einstellungen " "überprüfen." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Escape" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Ausführen" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Beenden" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "Kann ${1} im Eingabemethoden-Cache bei ${2} nicht finden" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "Finde ${1} nicht in der Ausgabe von ${2}" @@ -854,7 +820,7 @@ msgstr "Finde ${1} nicht in der Ausgabe von ${2}" msgid "Fallback Spell check language" msgstr "Fallback Rechtschreibprüfungssprache" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Favoriten" @@ -876,14 +842,10 @@ msgstr "Fcitx 5 Konfiguration" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx Addons:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx UI Konfiguration:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx-Status:" @@ -917,29 +879,29 @@ msgstr "Fcitx-Version: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Finanzen" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Finden" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "Erster Kandidat" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "Dunkles/Helles Farbschema" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -947,11 +909,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "Schriftart" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -962,11 +924,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Vorwärts" @@ -975,7 +937,7 @@ msgstr "Vorwärts" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -987,56 +949,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "${1} bei ${2} gefunden." -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr " ${1} deaktivierte Addons gefunden:" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr " ${1} aktivierte Addons gefunden:" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "${1} kcm Modul gefunden." - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "${2} für unbekannte gtk Version bei ${1}gefunden." -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "${3} für gtk ${1} bei ${2}gefunden." -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "${3} Eingabemodul für ${2}: ${1}gefunden." -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1044,26 +1001,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org Notification Unterstützung" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Spiel" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Los" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Grün" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Gruppe" @@ -1078,15 +1035,15 @@ msgstr "Gruppe {0}: {1}" msgid "Group {}" msgstr "Gruppe {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Gtk Eingabemethode Modul Cache:" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Gtk Eingabemethode Modul Dateien:" @@ -1094,77 +1051,77 @@ msgstr "Gtk Eingabemethode Modul Dateien:" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "Hangul" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "Hangul Banja" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "Hangul End" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "Hangul Hanja" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "Hangul Jamo" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "Hangul Jeonja" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "Hangul PostHanja" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "Hangul PreHanja" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "Hangul Romaja" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "Hangul Special" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "Hangul Start" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "Hankaku" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Hilfe" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "Henkan" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "Hibernate" @@ -1177,56 +1134,56 @@ msgstr "Verborgene Hinweise" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "Hiragana" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "Hiragana Katakana" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "Verlauf" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "Home Verzeichnis:" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "Home Office" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "Home Page" @@ -1235,7 +1192,7 @@ msgstr "Home Page" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "Wichtige Links" @@ -1253,7 +1210,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1289,7 +1246,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "Bild" @@ -1311,31 +1268,31 @@ msgstr "Konfiguration Eingabemethode" msgid "Input Method Related Environment Variables: " msgstr "" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "Eingabemethoden:" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "Eingabeleiste" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1349,7 +1306,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Einfügen" @@ -1358,11 +1315,11 @@ msgstr "Einfügen" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1381,26 +1338,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Einstellungen KDE Eingabemethode" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "Kana Lock" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "Kana Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "Kanji" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "Katakana" @@ -1427,12 +1384,12 @@ msgstr "Tastatur - {0}" msgid "Keyboard - {0} - {1}" msgstr "Tastatur - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "Tastaturhelligkeit dunkler" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "Tastaturhelligkeit heller" @@ -1441,315 +1398,315 @@ msgstr "Tastaturhelligkeit heller" msgid "Keyboard Layout:" msgstr "Tastaturbelegung:" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "Tastaturbeleuchtung Ein/Aus" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "Tastaturmenu" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "Starten (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "Starten (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "Starten (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "Starten (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "Starten (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "Starten (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "Starten (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "Starten (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "Starten (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "Starten (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "Starten (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "Starten (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "Starten (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "Starten (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "Starten (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "Starten (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "Mail starten" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "Links" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "Alt-L" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "Ctrl-L" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "Shift-L" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "Super-L" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "LightBulb" @@ -1758,11 +1715,11 @@ msgstr "LightBulb" msgid "Locale:" msgstr "Sprachumgebung:" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "Protokoll:" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "Ausloggen" @@ -1771,142 +1728,142 @@ msgstr "Ausloggen" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "Mail weiterleiten" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "Rand um alle Inhalte" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "Market" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "Medium schneller Vorlauf" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "Medium Nächstes" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "Medium Pause" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "Medium Spielen" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "Medium Vorheriges" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "Medium Aufnahme" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "Medium Zurück" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "Medium Stop" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "Treffen" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "Menü" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "Menü" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "Menüschriftart" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "Menü PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "Messenger" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "Metadaten" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon Mute" @@ -1915,46 +1872,46 @@ msgstr "Mikrofon Mute" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "Monitorhelligkeit dunkler" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "Monitorhelligkeit heller" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "Muhenkan" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "Mehrfache Kandidaten" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "Musik" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "Meine Seiten" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "Name" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "Neu" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "Neuigkeiten" @@ -1963,7 +1920,7 @@ msgstr "Neuigkeiten" msgid "Next Candidate" msgstr "Nächster Kandidat" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1979,11 +1936,11 @@ msgstr "Kein Zwischenablageverlauf" msgid "None" msgstr "Nicht beibehalten" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "Normale Textfarbe" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2005,7 +1962,7 @@ msgstr "" msgid "Notification" msgstr "Benachrichtigung" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2020,38 +1977,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "Öffnen" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "URL öffnen" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "Option" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2067,17 +2024,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2085,7 +2042,7 @@ msgstr "" msgid "Page size" msgstr "Seitengröße" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Einfügen" @@ -2094,17 +2051,17 @@ msgstr "Einfügen" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "Pause" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "Telefon" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "Bilder" @@ -2125,12 +2082,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "Ausschalten" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "Ausschalten" @@ -2147,7 +2104,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2159,16 +2116,16 @@ msgstr "Vorhersage" msgid "Prev Candidate" msgstr "Vorheriger Kandidat" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "Vorheriger Kandidat" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "Bildschirm drucken" @@ -2177,7 +2134,7 @@ msgstr "Bildschirm drucken" msgid "Program" msgstr "Programm" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Qt-IM-Moduldateien:" @@ -2189,27 +2146,27 @@ msgstr "Quick Phrase" msgid "Quick Phrase: " msgstr "Quick Phrase: " -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "Rot" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "Rückgängig" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "Neuladen" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "Neuladen" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "Antworten" @@ -2218,62 +2175,62 @@ msgstr "Antworten" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Neustart" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Zurück" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "Rechts" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "Alt-R" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "Ctrl-R" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "Shift-R" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "Super-R" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "Romaji" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "Fenster drehen" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "Rotation KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "Rotation PB" @@ -2282,22 +2239,22 @@ msgstr "Rotation PB" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Sichern" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "Bildschirmschoner" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "ScrollLock" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "Suche" @@ -2306,7 +2263,7 @@ msgstr "Suche" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "Auswählen" @@ -2323,11 +2280,11 @@ msgstr "Lokale Eingabemethode auswählen:" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "Senden" @@ -2339,11 +2296,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2351,12 +2308,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Shift" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "Shop" @@ -2369,7 +2326,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "Hinweis zur Eingabemethode zeigen, nachdem sie gewechselt wurde" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2381,7 +2338,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2405,17 +2362,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "Ruhezustand" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "Leerzeichen" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "Abstand" @@ -2423,22 +2380,22 @@ msgstr "Abstand" msgid "Spell" msgstr "Rechtschreibung" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "Rechtschreibkorrektur" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "Split Screen" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "Tabelle" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "Standby" @@ -2452,16 +2409,16 @@ msgstr "Eingabemethode starten" msgid "Status Notifier" msgstr "Hinweis Status" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "Stop" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "Untermenü" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "Untertitel" @@ -2470,17 +2427,17 @@ msgstr "Untertitel" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "Support" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "Suspend" @@ -2504,17 +2461,17 @@ msgstr "Gruppe auf {0} umgeschaltet" msgid "System Info:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "Systemanfrage" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Tab" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "" @@ -2523,12 +2480,12 @@ msgstr "" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "Terminal" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2547,38 +2504,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "Theme" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "Zeit" @@ -2595,66 +2552,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "Werkzeuge" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "Oben links" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "Menü oben" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "Oben rechts" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "Touchpad Aus" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "Touchpad An" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "Touchpad Wechsel" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "Touroku" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "Reisen" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2696,7 +2653,7 @@ msgstr "" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Rückgängig" @@ -2709,7 +2666,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Hoch" @@ -2718,19 +2675,19 @@ msgstr "Hoch" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2738,7 +2695,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "Benutzeroberfläche:" @@ -2752,59 +2709,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "Version" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "Versionszeile:" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "Senkrechte Kandidatenliste" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "Video" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "Ansicht" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "Leiser" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "Mute" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "Lauter" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Aufwachen" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2823,7 +2780,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "Wayland Eingabemethodenfrontend" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2852,12 +2809,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "Wireless" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "Word Processor" @@ -2874,42 +2831,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM-Kodierung:" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "XIM für Emacs:" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS ist nicht festgelegt" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "Gelb" @@ -2927,11 +2884,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2949,35 +2906,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "Zenkaku" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "Zenkaku Hankaku" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "Hereinzoomen" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "Herauszoomen" @@ -2990,7 +2947,7 @@ msgstr "" msgid "here" msgstr "hier" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/es.po b/po/es.po index 100530a5..b5181ad7 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:22+0000\n" +"POT-Creation-Date: 2024-12-31 20:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: csslayer , 2017\n" "Language-Team: Spanish (https://www.transifex.com/fcitx/teams/12005/es/)\n" @@ -106,7 +106,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -118,7 +118,7 @@ msgstr "" msgid "Active By Default" msgstr "" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "" @@ -127,19 +127,19 @@ msgstr "" msgid "Add Unicode Typing Support" msgstr "" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "" @@ -148,11 +148,11 @@ msgstr "" msgid "All" msgstr "" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "" @@ -176,7 +176,7 @@ msgstr "" msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "" @@ -185,12 +185,12 @@ msgstr "" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "" @@ -199,36 +199,36 @@ msgstr "" msgid "Applications disabled for long press" msgstr "" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "" @@ -237,15 +237,15 @@ msgstr "" msgid "Backends" msgstr "" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "" @@ -254,7 +254,7 @@ msgstr "" msgid "Bash Version:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "" @@ -267,69 +267,69 @@ msgstr "" msgid "Behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "" @@ -346,28 +346,24 @@ msgstr "" msgid "Cannot determine desktop environment." msgstr "" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "" @@ -375,11 +371,7 @@ msgstr "" msgid "Cannot find DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "" @@ -387,19 +379,19 @@ msgstr "" msgid "Cannot find fcitx5 executable!" msgstr "" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -408,28 +400,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "" @@ -437,7 +429,7 @@ msgstr "" msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "" @@ -449,12 +441,12 @@ msgstr "" msgid "Classic User Interface" msgstr "" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "" @@ -466,21 +458,21 @@ msgstr "" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "" @@ -501,36 +493,12 @@ msgstr "" msgid "Completion is enabled." msgstr "" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 #, fuzzy msgid "Configuration:" msgstr "Configurar" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Configurar" @@ -539,12 +507,12 @@ msgstr "Configurar" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "" @@ -573,7 +541,7 @@ msgstr "" msgid "Custom Xkb Option" msgstr "" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "" @@ -598,12 +566,12 @@ msgstr "" msgid "DBus interface:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -644,12 +612,12 @@ msgstr "" msgid "Default page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "" @@ -684,7 +652,7 @@ msgstr "" msgid "Directories:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "" @@ -697,12 +665,12 @@ msgstr "" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "" @@ -711,17 +679,17 @@ msgstr "" msgid "Editor" msgstr "" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "" @@ -734,7 +702,7 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" @@ -750,7 +718,7 @@ msgstr "" msgid "Enable emoji in quickphrase" msgstr "" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -762,7 +730,7 @@ msgstr "" msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -791,7 +759,7 @@ msgstr "" msgid "Enumerate when press trigger key repeatedly" msgstr "" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -801,7 +769,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" @@ -817,26 +785,26 @@ msgstr "" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Salir" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "" @@ -844,7 +812,7 @@ msgstr "" msgid "Fallback Spell check language" msgstr "" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "" @@ -866,15 +834,10 @@ msgstr "" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1096 -#, fuzzy -msgid "Fcitx Configure UI:" -msgstr "Configurar" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "" @@ -905,29 +868,29 @@ msgstr "" msgid "Fcitx4 Frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -935,11 +898,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -950,11 +913,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "" @@ -963,7 +926,7 @@ msgstr "" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -975,56 +938,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1032,26 +990,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "" @@ -1066,15 +1024,15 @@ msgstr "" msgid "Group {}" msgstr "" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "" @@ -1082,77 +1040,77 @@ msgstr "" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "" @@ -1165,56 +1123,56 @@ msgstr "" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "" @@ -1223,7 +1181,7 @@ msgstr "" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "" @@ -1241,7 +1199,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1277,7 +1235,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "" @@ -1299,31 +1257,31 @@ msgstr "" msgid "Input Method Related Environment Variables: " msgstr "" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1337,7 +1295,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" @@ -1346,11 +1304,11 @@ msgstr "" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1369,26 +1327,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "" @@ -1415,12 +1373,12 @@ msgstr "" msgid "Keyboard - {0} - {1}" msgstr "" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "" @@ -1429,315 +1387,315 @@ msgstr "" msgid "Keyboard Layout:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "" @@ -1746,11 +1704,11 @@ msgstr "" msgid "Locale:" msgstr "" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "" @@ -1759,142 +1717,142 @@ msgstr "" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "" @@ -1903,46 +1861,46 @@ msgstr "" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "" @@ -1951,7 +1909,7 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1967,11 +1925,11 @@ msgstr "" msgid "None" msgstr "" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -1990,7 +1948,7 @@ msgstr "" msgid "Notification" msgstr "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "" @@ -2005,38 +1963,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2052,17 +2010,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2070,7 +2028,7 @@ msgstr "" msgid "Page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "" @@ -2079,17 +2037,17 @@ msgstr "" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "" @@ -2110,12 +2068,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "" @@ -2132,7 +2090,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2144,16 +2102,16 @@ msgstr "" msgid "Prev Candidate" msgstr "" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "" @@ -2162,7 +2120,7 @@ msgstr "" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "" @@ -2174,27 +2132,27 @@ msgstr "" msgid "Quick Phrase: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "" @@ -2203,62 +2161,62 @@ msgstr "" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "" @@ -2267,22 +2225,22 @@ msgstr "" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "" @@ -2291,7 +2249,7 @@ msgstr "" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "" @@ -2308,11 +2266,11 @@ msgstr "" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "" @@ -2324,11 +2282,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2336,12 +2294,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "" @@ -2354,7 +2312,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2366,7 +2324,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2390,17 +2348,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "" @@ -2408,22 +2366,22 @@ msgstr "" msgid "Spell" msgstr "" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "" @@ -2437,16 +2395,16 @@ msgstr "" msgid "Status Notifier" msgstr "" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "" @@ -2455,17 +2413,17 @@ msgstr "" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "" @@ -2489,17 +2447,17 @@ msgstr "" msgid "System Info:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "" @@ -2508,12 +2466,12 @@ msgstr "" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2532,38 +2490,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "" @@ -2580,66 +2538,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2681,7 +2639,7 @@ msgstr "" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "" @@ -2694,7 +2652,7 @@ msgstr "" msgid "Unicode: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2703,19 +2661,19 @@ msgstr "" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2723,7 +2681,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2737,59 +2695,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2808,7 +2766,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2837,12 +2795,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "" @@ -2859,42 +2817,42 @@ msgstr "" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "" @@ -2912,11 +2870,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2934,35 +2892,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "" @@ -2975,7 +2933,7 @@ msgstr "" msgid "here" msgstr "" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "" @@ -3006,3 +2964,7 @@ msgstr "" #, c++-format msgid "{0} ({1})" msgstr "" + +#, fuzzy +#~ msgid "Fcitx Configure UI:" +#~ msgstr "Configurar" diff --git a/po/fcitx5.pot b/po/fcitx5.pot index 271c5891..4824d878 100644 --- a/po/fcitx5.pot +++ b/po/fcitx5.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -103,7 +103,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -115,7 +115,7 @@ msgstr "" msgid "Active By Default" msgstr "" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "" @@ -124,19 +124,19 @@ msgstr "" msgid "Add Unicode Typing Support" msgstr "" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "" @@ -145,11 +145,11 @@ msgstr "" msgid "All" msgstr "" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "" @@ -173,7 +173,7 @@ msgstr "" msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "" @@ -182,12 +182,12 @@ msgstr "" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "" @@ -196,36 +196,36 @@ msgstr "" msgid "Applications disabled for long press" msgstr "" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "" @@ -234,15 +234,15 @@ msgstr "" msgid "Backends" msgstr "" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "" @@ -251,7 +251,7 @@ msgstr "" msgid "Bash Version:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "" @@ -264,69 +264,69 @@ msgstr "" msgid "Behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "" @@ -343,28 +343,24 @@ msgstr "" msgid "Cannot determine desktop environment." msgstr "" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "" @@ -372,11 +368,7 @@ msgstr "" msgid "Cannot find DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "" @@ -384,19 +376,19 @@ msgstr "" msgid "Cannot find fcitx5 executable!" msgstr "" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -405,28 +397,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "" @@ -434,7 +426,7 @@ msgstr "" msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "" @@ -446,12 +438,12 @@ msgstr "" msgid "Classic User Interface" msgstr "" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "" @@ -463,21 +455,21 @@ msgstr "" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "" @@ -498,35 +490,11 @@ msgstr "" msgid "Completion is enabled." msgstr "" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "" @@ -535,12 +503,12 @@ msgstr "" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "" @@ -569,7 +537,7 @@ msgstr "" msgid "Custom Xkb Option" msgstr "" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "" @@ -594,12 +562,12 @@ msgstr "" msgid "DBus interface:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -640,12 +608,12 @@ msgstr "" msgid "Default page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "" @@ -680,7 +648,7 @@ msgstr "" msgid "Directories:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "" @@ -693,12 +661,12 @@ msgstr "" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "" @@ -707,17 +675,17 @@ msgstr "" msgid "Editor" msgstr "" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "" @@ -730,7 +698,7 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" @@ -746,7 +714,7 @@ msgstr "" msgid "Enable emoji in quickphrase" msgstr "" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -758,7 +726,7 @@ msgstr "" msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -787,7 +755,7 @@ msgstr "" msgid "Enumerate when press trigger key repeatedly" msgstr "" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -797,7 +765,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" @@ -813,26 +781,26 @@ msgstr "" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "" @@ -840,7 +808,7 @@ msgstr "" msgid "Fallback Spell check language" msgstr "" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "" @@ -862,14 +830,10 @@ msgstr "" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "" @@ -900,29 +864,29 @@ msgstr "" msgid "Fcitx4 Frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -930,11 +894,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -945,11 +909,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "" @@ -958,7 +922,7 @@ msgstr "" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -970,56 +934,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1027,26 +986,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "" @@ -1061,15 +1020,15 @@ msgstr "" msgid "Group {}" msgstr "" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "" @@ -1077,77 +1036,77 @@ msgstr "" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "" @@ -1160,56 +1119,56 @@ msgstr "" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "" @@ -1218,7 +1177,7 @@ msgstr "" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "" @@ -1236,7 +1195,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1272,7 +1231,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "" @@ -1294,31 +1253,31 @@ msgstr "" msgid "Input Method Related Environment Variables: " msgstr "" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1332,7 +1291,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" @@ -1341,11 +1300,11 @@ msgstr "" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1364,26 +1323,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "" @@ -1410,12 +1369,12 @@ msgstr "" msgid "Keyboard - {0} - {1}" msgstr "" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "" @@ -1424,315 +1383,315 @@ msgstr "" msgid "Keyboard Layout:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "" @@ -1741,11 +1700,11 @@ msgstr "" msgid "Locale:" msgstr "" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "" @@ -1754,142 +1713,142 @@ msgstr "" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "" @@ -1898,46 +1857,46 @@ msgstr "" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "" @@ -1946,7 +1905,7 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1962,11 +1921,11 @@ msgstr "" msgid "None" msgstr "" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -1985,7 +1944,7 @@ msgstr "" msgid "Notification" msgstr "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "" @@ -2000,38 +1959,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2047,17 +2006,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2065,7 +2024,7 @@ msgstr "" msgid "Page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "" @@ -2074,17 +2033,17 @@ msgstr "" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "" @@ -2105,12 +2064,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "" @@ -2127,7 +2086,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2139,16 +2098,16 @@ msgstr "" msgid "Prev Candidate" msgstr "" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "" @@ -2157,7 +2116,7 @@ msgstr "" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "" @@ -2169,27 +2128,27 @@ msgstr "" msgid "Quick Phrase: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "" @@ -2198,62 +2157,62 @@ msgstr "" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "" @@ -2262,22 +2221,22 @@ msgstr "" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "" @@ -2286,7 +2245,7 @@ msgstr "" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "" @@ -2303,11 +2262,11 @@ msgstr "" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "" @@ -2319,11 +2278,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2331,12 +2290,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "" @@ -2349,7 +2308,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2361,7 +2320,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2385,17 +2344,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "" @@ -2403,22 +2362,22 @@ msgstr "" msgid "Spell" msgstr "" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "" @@ -2432,16 +2391,16 @@ msgstr "" msgid "Status Notifier" msgstr "" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "" @@ -2450,17 +2409,17 @@ msgstr "" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "" @@ -2484,17 +2443,17 @@ msgstr "" msgid "System Info:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "" @@ -2503,12 +2462,12 @@ msgstr "" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2527,38 +2486,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "" @@ -2575,66 +2534,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2676,7 +2635,7 @@ msgstr "" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "" @@ -2689,7 +2648,7 @@ msgstr "" msgid "Unicode: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2698,19 +2657,19 @@ msgstr "" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2718,7 +2677,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2732,59 +2691,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2803,7 +2762,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2832,12 +2791,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "" @@ -2854,42 +2813,42 @@ msgstr "" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "" @@ -2907,11 +2866,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2929,35 +2888,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "" @@ -2970,7 +2929,7 @@ msgstr "" msgid "here" msgstr "" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "" diff --git a/po/fr.po b/po/fr.po index 07aa0c67..33cb8e81 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: csslayer , 2022\n" "Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" @@ -109,7 +109,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -121,7 +121,7 @@ msgstr "Activer la méthode de saisie" msgid "Active By Default" msgstr "Actif par défaut" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Ajouter un favori" @@ -130,19 +130,19 @@ msgstr "Ajouter un favori" msgid "Add Unicode Typing Support" msgstr "Ajouter la prise en charge de la saisie Unicode" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "Répertoire de configuration de l'extension :" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "Bibliothèques d'extensions :" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "Liste d'extensions :" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajuster la luminosité" @@ -151,11 +151,11 @@ msgstr "Ajuster la luminosité" msgid "All" msgstr "Tout" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "Tous les fichiers immodule Gtk ${1} trouvés existent." -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "Toutes les bibliothèques pour tous les extensions ont été trouvées." @@ -181,7 +181,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -192,12 +192,12 @@ msgstr "" "Toujours définir la mise en page comme étant uniquement la mise en page de " "groupe" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "Application restante" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "Droit d'application" @@ -206,36 +206,36 @@ msgstr "Droit d'application" msgid "Applications disabled for long press" msgstr "Applications désactivées pour un appui long" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "Piste de cycle audio" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "Lecture aléatoire audio" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Répétition audio" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "Auteur" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Absent" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Retour" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Retour Suivant" @@ -244,15 +244,15 @@ msgstr "Retour Suivant" msgid "Backends" msgstr "Backends" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "Arrière-plan" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "Image d'arrière-plan" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Retour arrière" @@ -261,7 +261,7 @@ msgstr "Retour arrière" msgid "Bash Version:" msgstr "Version Bash :" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Batterie" @@ -274,69 +274,69 @@ msgstr "Guide du débutant" msgid "Behavior" msgstr "Comportement" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Bleu" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "Marge floue" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Réserver" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "Couleur de bordure" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "Largeur de la bordure" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "En bas au centre" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "En bas à gauche" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "En bas à droite" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Navigateur" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Calculatrice" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Annuler" @@ -353,29 +353,25 @@ msgstr "Impossible de se connecter correctement à ${1}." msgid "Cannot determine desktop environment." msgstr "Impossible de déterminer l'environnement de bureau." -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "" "Impossible de trouver le répertoire de configuration de ${1} extension." -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "Impossible de trouver l'exécutable ${1}  !" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "Impossible de trouver le module im ${1} pour gtk ${2} dans le cache." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "Impossible de trouver le module im ${1} pour gtk ${2}." -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "Impossible de trouver le module de méthode d'entrée ${1} pour ${2}." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "Impossible de trouver ${2} pour gtk ${1}" @@ -383,13 +379,7 @@ msgstr "Impossible de trouver ${2} pour gtk ${1}" msgid "Cannot find DBus name ${1} owner." msgstr "Impossible de trouver le propriétaire du nom DBus ${1}." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"Impossible de trouver un outil de configuration de l'interface graphique, " -"veuillez en installer un parmi ${1} ou ${2}." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "Impossible de trouver l'interface utilisateur ${1} activée  !" @@ -397,21 +387,21 @@ msgstr "Impossible de trouver l'interface utilisateur ${1} activée  !" msgid "Cannot find fcitx5 executable!" msgstr "Impossible de trouver l'exécutable fcitx5  !" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "Impossible de trouver le fichier ${1} de l'extension ${2}." -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" "Impossible de trouver les bibliothèques requises suivantes pour ${1} de " "l'extension ${2}." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "Impossible de trouver le cache immodules pour gtk ${1}" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -422,28 +412,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "Impossible de trouver le pid du propriétaire du nom DBus ${1}." -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "Impossible de trouver xim_server sur la fenêtre racine." -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "Impossible d'interpréter XMODIFIERS  : ${1}." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "Verr Maj" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "Centre" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "Centre gauche" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "Centre droit" @@ -451,7 +441,7 @@ msgstr "Centre droit" msgid "Change Fcitx 5 Configuration" msgstr "Modifier la configuration de Fcitx 5" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Case à cocher" @@ -463,12 +453,12 @@ msgstr "Choisir le modificateur de clé" msgid "Classic User Interface" msgstr "Interface utilisateur classique" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Effacer" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "Cliquer sur la marge" @@ -481,21 +471,21 @@ msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" "Presse-papiers (appuyer sur Retour arrière/Suppr pour effacer l'historique) :" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Fermer" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "Entrée de code" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "Couleur" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Communauté" @@ -516,35 +506,11 @@ msgstr "La complétion est activée temporairement." msgid "Completion is enabled." msgstr "La complétion est activée." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "Interface graphique de configuration pour gtk${1} introuvable." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "Interface graphique de configuration pour gtk${1} :" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "Configuration de l'interface graphique pour kde :" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Interface graphique de configuration pour qt introuvable." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Configurer l'interface graphique pour qt :" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "Enveloppe de l'outil de configuration :" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "Configuration :" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Configurer" @@ -553,12 +519,12 @@ msgstr "Configurer" msgid "Control" msgstr "Contrôle" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Contrôle" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Copier" @@ -587,7 +553,7 @@ msgstr "Personnalisé" msgid "Custom Xkb Option" msgstr "Option Xkb personnalisée" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Couper" @@ -613,12 +579,12 @@ msgstr "" msgid "DBus interface:" msgstr "Interface DBus :" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -659,12 +625,12 @@ msgstr "Page précédente par défaut" msgid "Default page size" msgstr "Taille de page par défaut" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "Supprimer" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "Description" @@ -699,7 +665,7 @@ msgstr "" msgid "Directories:" msgstr "Répertoires :" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "Afficher" @@ -712,12 +678,12 @@ msgstr "Ne plus afficher" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Documents" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "En bas" @@ -726,17 +692,17 @@ msgstr "En bas" msgid "Editor" msgstr "Éditeur" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "Eisu Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "Bascule Eisu" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Éjecter" @@ -749,7 +715,7 @@ msgstr "Emoji" msgid "Enable" msgstr "Activer" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "Activer le flou sur KWin" @@ -765,7 +731,7 @@ msgstr "Activer les emoji dans l'indice" msgid "Enable emoji in quickphrase" msgstr "Activer les emoji dans la phrase rapide" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -777,7 +743,7 @@ msgstr "Activer l'indice par défaut" msgid "Enchant" msgstr "Enchanter" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Fin" @@ -807,7 +773,7 @@ msgid "Enumerate when press trigger key repeatedly" msgstr "" "Énumérer lorsque vous appuyez plusieurs fois sur la touche de déclenchement" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -820,7 +786,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "La variable d'environnement ${1} n'est pas définie." -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" "La variable d'environnement ${1} est définie sur \"${2}\" correctement." @@ -839,26 +805,26 @@ msgstr "" "Une erreur se produit lors de l'exécution de ${1}. Veuillez vérifier vos " "paramètres régionaux." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Échapper" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Exécuter" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Quitter" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "Impossible de trouver ${1} dans le cache immodule à ${2}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "Impossible de trouver ${1} dans la sortie de ${2}" @@ -866,7 +832,7 @@ msgstr "Impossible de trouver ${1} dans la sortie de ${2}" msgid "Fallback Spell check language" msgstr "Langue de vérification orthographique de secours" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Favoris" @@ -888,14 +854,10 @@ msgstr "Configuration Fcitx 5" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Modules complémentaires Fcitx :" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Configurer l'interface utilisateur Fcitx :" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "État Fcitx :" @@ -929,29 +891,29 @@ msgstr "Version Fcitx : ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Finances" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Rechercher" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -959,11 +921,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "Police" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -978,11 +940,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Transférer" @@ -991,7 +953,7 @@ msgstr "Transférer" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Module ${1} ${2} trouvé  : ${3}." @@ -1003,56 +965,51 @@ msgstr "Processus ${1} ${2} trouvé :" msgid "Found ${1} ${2} processes:" msgstr "Processus ${1} ${2} trouvés :" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "Répertoire de configuration de l'extension ${1} trouvé  : ${2}." -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "Trouvé ${1} à ${2}." -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "${1} extensions désactivées trouvés :" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "Extensions activées pour ${1} trouvés :" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "Ajouts d'interface utilisateur activés pour ${1} trouvés :" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "Modules ${1} im trouvés pour gtk ${2}." -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "Module ${1} kcm trouvé." - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "Trouvé ${2} pour une version gtk inconnue à ${1}." -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "Trouvé ${3} pour gtk ${1} à ${2}." -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "Module ${3} im trouvé pour ${2} : ${1}." -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "Cache immodule trouvé pour une version gtk inconnue à ${1}." -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "Cache immodules trouvé pour gtk ${1} à ${2}." -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "Module ${1} qt inconnu trouvé : ${2}." @@ -1060,26 +1017,26 @@ msgstr "Module ${1} qt inconnu trouvé : ${2}." msgid "Freedesktop.org Notification Support" msgstr "Prise en charge des notifications de Freedesktop.org" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "Configuration des interfaces :" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Jeu" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Aller" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Vert" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Groupe" @@ -1094,15 +1051,15 @@ msgstr "Groupe {0} : {1}" msgid "Group {}" msgstr "Groupe {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Le fichier immodule Gtk ${1} ${2} n'existe pas." -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Cache du module Gtk IM :" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Fichiers du module Gtk IM :" @@ -1110,77 +1067,77 @@ msgstr "Fichiers du module Gtk IM :" msgid "Hall of Shame for Linux IME Support" msgstr "Hall of Shame pour Linux IME Support" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "Hangul" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "Hangul Banja" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "Hangul Fin" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "Hangul Hanja" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "Hangul Jamo" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "Hangul Jeonja" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "Hangul PostHanja" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "Hangul PreHanja" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "Hangul Romaja" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "Spécial Hangul" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "Début Hangul" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "Hankaku" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Aide" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "Henkan" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "Hibernation" @@ -1193,56 +1150,56 @@ msgstr "Notifications masquées" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "Masquer la superposition si la taille ne convient pas" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "Mettre l'arrière-plan en surbrillance" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "Mettre en surbrillance la couleur d'arrière-plan" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "Mettre en surbrillance la couleur du candidat" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "Mettre en surbrillance la marge de clic" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "Mettre en surbrillance la couleur du texte" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "Hiragana" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "Hiragana Katakana" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "Historique" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "Accueil" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "Bureau à domicile" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "Page d'accueil" @@ -1251,7 +1208,7 @@ msgstr "Page d'accueil" msgid "Home:" msgstr "Accueil :" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "Liens dynamiques" @@ -1271,7 +1228,7 @@ msgstr "" "Touche de raccourci pour passer à la N-ième méthode de saisie uniquement " "pour le contexte de saisie actuel" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1314,7 +1271,7 @@ msgstr "" "afin d'utiliser une méthode de saisie autre que ${2}. Voir ${link} pour plus " "de détails." -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "Image" @@ -1336,31 +1293,31 @@ msgstr "Configuration de la méthode d'entrée" msgid "Input Method Related Environment Variables: " msgstr "Variables d'environnement liées à la méthode d'entrée  : " -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "Méthodes de saisie :" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "Panneau de saisie" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1377,7 +1334,7 @@ msgstr "" "propre configuration. Ceci est couramment utilisé par des modules comme " "presse-papiers ou quickphrase." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Insérer" @@ -1386,11 +1343,11 @@ msgstr "Insérer" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "Fichier de configuration d'extension invalide ${1}." -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1409,26 +1366,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Panneau de méthode de saisie KDE" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "Kana Lock" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "Kana Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "Kanji" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "Katakana" @@ -1455,12 +1412,12 @@ msgstr "Clavier - {0}" msgid "Keyboard - {0} - {1}" msgstr "Clavier - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "Réduction de la luminosité du clavier" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "Augmenter la luminosité du clavier" @@ -1469,315 +1426,315 @@ msgstr "Augmenter la luminosité du clavier" msgid "Keyboard Layout:" msgstr "Disposition du clavier :" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "Éclairage du clavier activé/désactivé" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "Menu clavier" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Processus Kimpanel :" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "Lancer (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "Lancer (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "Lancer (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "Lancer (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "Lancer (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "Lancer (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "Lancer (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "Lancer (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "Lancer (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "Lancer (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "Lancer (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "Lancer (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "Lancer (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "Lancer (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "Lancer (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "Lancer (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "Lancer Mail" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "Gauche" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "Alt Gauche" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "Contrôle gauche" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "Hyper gauche" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "Maj gauche" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "Super gauche" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "Ampoule" @@ -1786,11 +1743,11 @@ msgstr "Ampoule" msgid "Locale:" msgstr "Paramètres régionaux :" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "Journal :" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "Déconnexion" @@ -1799,142 +1756,142 @@ msgstr "Déconnexion" msgid "Long Press behavior" msgstr "Comportement d'appui long" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "Transfert de courrier" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "Marge" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "Marge inférieure" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "Marge à gauche" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "Marge droite" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "Marge supérieure" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "Marge autour de tout le contenu" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "Marge autour du texte" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "Marché" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "Avance rapide des médias" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "Média suivant" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "Pause média" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "Lecture multimédia" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "Média précédent" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "Enregistrement multimédia" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "Rembobiner le média" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "Arrêt média" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "Réunion" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "Menu" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "Menu" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "Police du menu" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "Menu PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "Messager" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "Métadonnées" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "Microphone muet" @@ -1943,46 +1900,46 @@ msgstr "Microphone muet" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "Réduire la luminosité du moniteur" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "Augmenter la luminosité du moniteur" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "Muhenkan" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "Candidat multiple" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "Musique" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "Mes sites" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "Nom" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "Nouveau" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "Actualités" @@ -1991,7 +1948,7 @@ msgstr "Actualités" msgid "Next Candidate" msgstr "Candidat suivant" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "Bouton de page suivante" @@ -2007,11 +1964,11 @@ msgstr "Aucun historique du presse-papiers." msgid "None" msgstr "Aucun" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "Couleur normale du texte" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2030,7 +1987,7 @@ msgstr "Remarque pour GNOME ultérieur à 3.6" msgid "Notification" msgstr "Notification" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2048,38 +2005,38 @@ msgstr "" "orthographique, vous devrez peut-être installer les données de vérification " "orthographique pour la langue." -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "Ouvrir" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "Ouvrir l'URL" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "Option" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "Superposer la marge du clip" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "Image de superposition" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "Superposer le décalage X" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "Superposer le décalage Y" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "Position de superposition" @@ -2095,17 +2052,17 @@ msgstr "Le propriétaire du nom DBus ${1} est ${2}." msgid "PID of DBus name ${1} owner is ${2}." msgstr "Le PID du propriétaire du nom DBus ${1} est ${2}." -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2113,7 +2070,7 @@ msgstr "" msgid "Page size" msgstr "Taille de la page" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Coller" @@ -2122,17 +2079,17 @@ msgstr "Coller" msgid "Paste Primary" msgstr "Coller le primaire" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "Pause" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "Téléphone" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "Images" @@ -2158,12 +2115,12 @@ msgstr "" "l'aide de l'outil fourni par votre distribution ou ajouter ${1} à votre " "${2}. Voir ${link}." -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "Éteindre" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "Éteindre" @@ -2180,7 +2137,7 @@ msgstr "Pré-édition désactivée" msgid "Preedit enabled" msgstr "Pré-édition activée" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "Préférer l'icône de texte" @@ -2192,16 +2149,16 @@ msgstr "Présage" msgid "Prev Candidate" msgstr "Candidat précédent" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "Bouton de page précédente" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "Candidat précédent" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "Impression d'écran" @@ -2210,7 +2167,7 @@ msgstr "Impression d'écran" msgid "Program" msgstr "Programme" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Fichiers du module Qt IM :" @@ -2222,27 +2179,27 @@ msgstr "Expression rapide" msgid "Quick Phrase: " msgstr "Expression rapide  : " -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "Rouge" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "Rétablir" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "Actualiser" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "Recharger" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "Répondre" @@ -2251,62 +2208,62 @@ msgstr "Répondre" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Redémarrer" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Retour" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "Bien" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "Alt droit" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "Contrôle droit" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "Hyper droit" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "Maj droite" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "Super droit" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "Romaji" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "Faire pivoter les fenêtres" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "Rotation KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "Rotation PB" @@ -2315,22 +2272,22 @@ msgstr "Rotation PB" msgid "Running as root:" msgstr "Exécuté en tant que root :" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Enregistrer" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "Écran de veille" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "ScrollLock" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "Rechercher" @@ -2339,7 +2296,7 @@ msgstr "Rechercher" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "Sélectionner" @@ -2356,11 +2313,11 @@ msgstr "Sélectionner la méthode de saisie locale :" msgid "Select specific input method via keyboard" msgstr "Sélectionner une méthode de saisie spécifique via le clavier" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "Envoyer" @@ -2372,11 +2329,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "Arrière-plan du séparateur" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "Marge d'ombre" @@ -2384,12 +2341,12 @@ msgstr "Marge d'ombre" msgid "Share Input State" msgstr "Partager l'état de l'entrée" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Maj" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "Boutique" @@ -2405,7 +2362,7 @@ msgstr "" "Afficher les informations sur la méthode d'entrée lors du changement de " "méthode d'entrée" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "Afficher le nom de la mise en page dans l'icône" @@ -2417,7 +2374,7 @@ msgstr "Afficher les informations sur la méthode d'entrée compacte" msgid "Show first input method information" msgstr "Afficher les informations de la première méthode d'entrée" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2446,17 +2403,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "Ignorer la première méthode de saisie lors de l'énumération" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "Veille" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "Espace" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "Espacement" @@ -2464,22 +2421,22 @@ msgstr "Espacement" msgid "Spell" msgstr "Épeler" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "Vérificateur orthographique" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "Écran partagé" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "Feuille de calcul" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "Veille" @@ -2493,16 +2450,16 @@ msgstr "Démarrer la méthode de saisie" msgid "Status Notifier" msgstr "Notification d'état" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "Arrêter" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "Sous-menu" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "Sous-titre" @@ -2511,17 +2468,17 @@ msgstr "Sous-titre" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "Assistance" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "Suspendre" @@ -2545,17 +2502,17 @@ msgstr "Groupe basculé vers {0}" msgid "System Info:" msgstr "Informations système :" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "Requête système" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Onglet" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "Panneau de tâches" @@ -2566,12 +2523,12 @@ msgstr "" "Basculer temporairement entre la première méthode de saisie et la méthode de " "saisie actuelle" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "Terminal" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2592,31 +2549,31 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "Le script est exécuté en tant que ${1} (${2})." -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "Thème" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "Ceci n'est efficace que lorsque l'icône de la barre d'état est xembed." -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "Cette option n'est efficace que si l'image n'est pas définie." -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "Cette valeur doit être inférieure à n'importe quelle valeur de marge." -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2626,7 +2583,7 @@ msgstr "" "de diagnostic, veuillez les vérifier et les supprimer si nécessaire avant de " "les publier en ligne publiquement." -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "Heure" @@ -2647,66 +2604,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "Basculer la pré-édition intégrée" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "Outils" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "En haut au centre" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "En haut à gauche" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "Menu principal" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "En haut à droite" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "Pavé tactile désactivé" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "Pavé tactile activé" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "Basculement du pavé tactile" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "Touroku" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "Voyage" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "Police du bac" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "Couleur du contour de l'étiquette du plateau" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "Couleur du texte de l'étiquette du plateau" @@ -2748,7 +2705,7 @@ msgstr "Saisie avec Fcitx et Kimpanel" msgid "Unable to find a program to check dbus." msgstr "Impossible de trouver un programme pour vérifier dbus." -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Annuler" @@ -2761,7 +2718,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode  : " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Haut" @@ -2770,21 +2727,21 @@ msgstr "Haut" msgid "Use On The Spot Style (Needs restarting)" msgstr "Utiliser le style On The Spot (nécessite un redémarrage)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" "Utiliser tout l'espace horizontal pour la surbrillance lorsqu'il s'agit " "d'une liste verticale" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "Utiliser la langue de la méthode de saisie pour afficher le texte" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" "Utiliser la molette de la souris pour aller à la page précédente ou suivante" @@ -2793,7 +2750,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "Utiliser le nouveau comportement de composition" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "Interface utilisateur :" @@ -2807,59 +2764,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "Version" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "Ligne de version :" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "Liste verticale des candidats" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "Vidéo" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "Afficher" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "Volume bas" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "Volume muet" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "Volume haut" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Se réveiller" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2881,7 +2838,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "Interface de la méthode Wayland Input" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2913,12 +2870,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "Pourquoi est-il mauvais de s'exécuter en tant que root" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "Sans fil" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "Traitement de texte" @@ -2935,38 +2892,38 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "TYPE DE SESSION XDG :" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "Encodage XIM :" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "XIM pour Emacs :" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "XIM_SERVERS sur la fenêtre racine :" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS n'est pas défini" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "Le nom du serveur Xim de la variable d'environnement est ${1}." -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" "Le nom du serveur Xim est le même que celui défini dans la variable " "d'environnement." -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." @@ -2974,7 +2931,7 @@ msgstr "" "Le nom du serveur Xim : \"${1}\" est différent de celui défini dans la " "variable d'environnement : \"${2}\"." -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "Jaune" @@ -2999,11 +2956,11 @@ msgstr "" "le résultat de ce script peut ne pas être exact. Voir ${2} pour plus " "d'informations." -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "Vous utilisez xim dans des programmes ${1}." -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" "Vous pouvez avoir des difficultés à utiliser fcitx dans les programmes ${1}." @@ -3022,7 +2979,7 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -3032,7 +2989,7 @@ msgstr "" "pourrez peut-être pas utiliser la méthode d'entrée dans emacs à cause d'un " "bogue très ancien d'emacs que l'amont refuse de corriger pendant des années." -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -3040,22 +2997,22 @@ msgstr "" "Votre LC_CTYPE est défini sur ${1} dont l'encodage n'est pas UTF-8. Vous " "pouvez avoir des difficultés à valider des chaînes à l'aide de XIM." -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "Zenkaku" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "Zenkaku Hankaku" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "Zoom avant" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "Zoom arrière" @@ -3068,7 +3025,7 @@ msgstr "exécutable :" msgid "here" msgstr "ici" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/he.po b/po/he.po index 975f5d48..ec0825d0 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e " ", 2021\n" @@ -109,7 +109,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -121,7 +121,7 @@ msgstr "" msgid "Active By Default" msgstr "" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "" @@ -130,19 +130,19 @@ msgstr "" msgid "Add Unicode Typing Support" msgstr "" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "" @@ -151,11 +151,11 @@ msgstr "" msgid "All" msgstr "" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "" @@ -179,7 +179,7 @@ msgstr "" msgid "Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -188,12 +188,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "" @@ -202,36 +202,36 @@ msgstr "" msgid "Applications disabled for long press" msgstr "" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "" @@ -240,15 +240,15 @@ msgstr "" msgid "Backends" msgstr "" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "" @@ -257,7 +257,7 @@ msgstr "" msgid "Bash Version:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "סוללה" @@ -270,69 +270,69 @@ msgstr "" msgid "Behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "תקליטור" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "מחשבון" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "ביטול" @@ -349,28 +349,24 @@ msgstr "" msgid "Cannot determine desktop environment." msgstr "" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "" @@ -378,11 +374,7 @@ msgstr "" msgid "Cannot find DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "" @@ -390,19 +382,19 @@ msgstr "" msgid "Cannot find fcitx5 executable!" msgstr "" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -411,28 +403,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "" @@ -440,7 +432,7 @@ msgstr "" msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "" @@ -452,12 +444,12 @@ msgstr "" msgid "Classic User Interface" msgstr "" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "ניקוי" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "" @@ -469,21 +461,21 @@ msgstr "לוח הגזירים" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "סגירה" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "" @@ -504,35 +496,11 @@ msgstr "" msgid "Completion is enabled." msgstr "" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "הגדרה" @@ -541,12 +509,12 @@ msgstr "הגדרה" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "" @@ -575,7 +543,7 @@ msgstr "" msgid "Custom Xkb Option" msgstr "" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "גזירה" @@ -600,12 +568,12 @@ msgstr "" msgid "DBus interface:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -646,12 +614,12 @@ msgstr "" msgid "Default page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "מחיקה" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "" @@ -686,7 +654,7 @@ msgstr "" msgid "Directories:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "" @@ -699,12 +667,12 @@ msgstr "לא להציג שוב" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "" @@ -713,17 +681,17 @@ msgstr "" msgid "Editor" msgstr "" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "" @@ -736,7 +704,7 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" @@ -752,7 +720,7 @@ msgstr "" msgid "Enable emoji in quickphrase" msgstr "" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -764,7 +732,7 @@ msgstr "" msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -793,7 +761,7 @@ msgstr "" msgid "Enumerate when press trigger key repeatedly" msgstr "" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -803,7 +771,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" @@ -819,26 +787,26 @@ msgstr "" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "יציאה" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "" @@ -846,7 +814,7 @@ msgstr "" msgid "Fallback Spell check language" msgstr "" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "מועדפים" @@ -868,14 +836,10 @@ msgstr "" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "" @@ -906,29 +870,29 @@ msgstr "" msgid "Fcitx4 Frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -936,11 +900,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -951,11 +915,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "" @@ -964,7 +928,7 @@ msgstr "" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -976,56 +940,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1033,26 +992,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "משחק" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "" @@ -1067,15 +1026,15 @@ msgstr "" msgid "Group {}" msgstr "" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "" @@ -1083,77 +1042,77 @@ msgstr "" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "הנגול" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "עזרה" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "תרדמת" @@ -1166,56 +1125,56 @@ msgstr "" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "" @@ -1224,7 +1183,7 @@ msgstr "" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "" @@ -1242,7 +1201,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1278,7 +1237,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "" @@ -1300,31 +1259,31 @@ msgstr "" msgid "Input Method Related Environment Variables: " msgstr "" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1338,7 +1297,7 @@ msgid "" "commonly used by modules like clipboard or quickphrase." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" @@ -1347,11 +1306,11 @@ msgstr "" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1370,26 +1329,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "" @@ -1416,12 +1375,12 @@ msgstr "" msgid "Keyboard - {0} - {1}" msgstr "" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "" @@ -1430,315 +1389,315 @@ msgstr "" msgid "Keyboard Layout:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "" @@ -1747,11 +1706,11 @@ msgstr "" msgid "Locale:" msgstr "" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "" @@ -1760,142 +1719,142 @@ msgstr "" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "" @@ -1904,46 +1863,46 @@ msgstr "" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "מוזיקה" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "חדש" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "" @@ -1952,7 +1911,7 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1968,11 +1927,11 @@ msgstr "" msgid "None" msgstr "" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -1991,7 +1950,7 @@ msgstr "" msgid "Notification" msgstr "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2006,38 +1965,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "פתיחה" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2053,17 +2012,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2071,7 +2030,7 @@ msgstr "" msgid "Page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "" @@ -2080,17 +2039,17 @@ msgstr "" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "תמונות" @@ -2111,12 +2070,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "כיבוי" @@ -2133,7 +2092,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2145,16 +2104,16 @@ msgstr "" msgid "Prev Candidate" msgstr "" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "" @@ -2163,7 +2122,7 @@ msgstr "" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "" @@ -2175,27 +2134,27 @@ msgstr "" msgid "Quick Phrase: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "אדום" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "טעינה מחדש" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "" @@ -2204,62 +2163,62 @@ msgstr "" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "" @@ -2268,22 +2227,22 @@ msgstr "" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "שומר מסך" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "חיפוש" @@ -2292,7 +2251,7 @@ msgstr "חיפוש" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "בחירה" @@ -2309,11 +2268,11 @@ msgstr "" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "שליחה" @@ -2325,11 +2284,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2337,12 +2296,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "" @@ -2355,7 +2314,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2367,7 +2326,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2391,17 +2350,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "" @@ -2409,22 +2368,22 @@ msgstr "" msgid "Spell" msgstr "" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "" @@ -2438,16 +2397,16 @@ msgstr "" msgid "Status Notifier" msgstr "" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "" @@ -2456,17 +2415,17 @@ msgstr "" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "השהיה" @@ -2490,17 +2449,17 @@ msgstr "" msgid "System Info:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "" @@ -2509,12 +2468,12 @@ msgstr "" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "מסוף" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2533,38 +2492,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "" @@ -2581,66 +2540,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "כלים" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "מסע" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2682,7 +2641,7 @@ msgstr "" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "" @@ -2695,7 +2654,7 @@ msgstr "" msgid "Unicode: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2704,19 +2663,19 @@ msgstr "" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2724,7 +2683,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2738,59 +2697,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "וידאו" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2809,7 +2768,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2838,12 +2797,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "מעבד תמלילים" @@ -2860,42 +2819,42 @@ msgstr "" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "צהוב" @@ -2913,11 +2872,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2935,35 +2894,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "" @@ -2976,7 +2935,7 @@ msgstr "" msgid "here" msgstr "" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/ja.po b/po/ja.po index 29a3af09..3b8b7253 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-18 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -110,7 +110,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "DBus ベースの仮想キーボードバックエンド" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "アクセントカラー" @@ -122,7 +122,7 @@ msgstr "入力メソッドを有効にする" msgid "Active By Default" msgstr "デフォルトで有効にする" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "お気に入りに追加する" @@ -131,19 +131,19 @@ msgstr "お気に入りに追加する" msgid "Add Unicode Typing Support" msgstr "ユニコード入力対応を追加します" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "アドオン設定ディレクトリ:" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "アドオンライブラリ:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "アドオン一覧:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "明るさ調整" @@ -152,11 +152,11 @@ msgstr "明るさ調整" msgid "All" msgstr "すべて" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "見つかった Gtk ${1} IMモジュールファイルはすべて存在します。" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "すべてのアドオン用ライブラリが見つかりました。" @@ -180,7 +180,7 @@ msgstr "パスワード欄に入力メソッドを許可する" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -189,12 +189,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "常にレイアウトをグループレイアウトのみにする" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "左側のアプリケーション" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "右側のアプリケーション" @@ -203,36 +203,36 @@ msgstr "右側のアプリケーション" msgid "Applications disabled for long press" msgstr "長押しを無効にするアプリケーション" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "オーディオサイクルトラック" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "オーディオランダム再生" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "オーディオリピート" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "作者" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Away" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Back" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Back Forward" @@ -241,15 +241,15 @@ msgstr "Back Forward" msgid "Backends" msgstr "バックエンド" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "背景" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "背景画像" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "バックスペース" @@ -258,7 +258,7 @@ msgstr "バックスペース" msgid "Bash Version:" msgstr "Bash バージョン:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "バッテリー" @@ -271,69 +271,69 @@ msgstr "ビギナーズガイド" msgid "Behavior" msgstr "動作" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Blue" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "ブラーのマージン" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "ブラーマスク" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Book" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "ボーダーの色" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "ボーダーの幅" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "下" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "中央下" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "左下" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "右下" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "ブラウザー" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "電卓" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "キャンセル" @@ -350,28 +350,24 @@ msgstr "正しく ${1} に接続できません。" msgid "Cannot determine desktop environment." msgstr "デスクトップ環境を決定できません。" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "${1} アドオンの設定ディレクトリが見つかりません。" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "実行可能な ${1} が見つかりません。" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "キャッシュに gtk ${2} の ${1} 入力メソッドモジュールが見つかりません。" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "gtk ${2} の ${1} 入力メソッドモジュールが見つかりません。" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "${2} の ${1} 入力メソッドモジュールが見つかりません。" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "gtk ${1} の ${2} が見つかりません" @@ -379,12 +375,7 @@ msgstr "gtk ${1} の ${2} が見つかりません" msgid "Cannot find DBus name ${1} owner." msgstr "DBus 名 ${1} の所有者が見つかりません。" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"GUI設定ツールが見つかりません。{1} または {2} をインストールしてください。" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "有効な ${1} ユーザーインターフェイスが見つかりません！" @@ -392,19 +383,19 @@ msgstr "有効な ${1} ユーザーインターフェイスが見つかりませ msgid "Cannot find fcitx5 executable!" msgstr "fcitx5 を実行できません！" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "アドオン ${2} のファイル ${1} が見つかりません。" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "アドオン ${2} の ${1} に必要な次のライブラリが見つかりません。" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "gtk ${1} の immodules キャッシュが見つかりません" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -415,28 +406,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "DBus名 ${1} の所有者の pid が見つかりません。" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "root ウィンドウに xim_server が見つかりません。" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "XMODIFIERS を解釈できません: ${1}。" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "CapsLock" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "中央" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "中央左" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "中央右" @@ -444,7 +435,7 @@ msgstr "中央右" msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 設定を変更" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "チェックボックス" @@ -456,12 +447,12 @@ msgstr "キーモディファイアーを選択" msgid "Classic User Interface" msgstr "クラシックユーザーインターフェース" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "クリア" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "クリックマージン" @@ -473,21 +464,21 @@ msgstr "クリップボード" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "クリップボード (BackSpace/Delete で履歴をクリア)" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "閉じる" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "コード入力" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "色" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "コミュニティ" @@ -508,35 +499,11 @@ msgstr "補完は一時的に有効です。" msgid "Completion is enabled." msgstr "補完は有効です。" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "gtk${1} のGUI 設定が見つかりません。" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "gtk${1} のGUI を設定:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "KDE 向け設定 GUI:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "qt に対する設定の GUI が見つかりません。" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "qt 向け設定 GUI:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "設定ツールラッパー:" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "設定:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "設定" @@ -545,12 +512,12 @@ msgstr "設定" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Copy" @@ -579,7 +546,7 @@ msgstr "カスタム" msgid "Custom Xkb Option" msgstr "カスタム XKB オプション" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Cut" @@ -604,12 +571,12 @@ msgstr "DBus ベースの 新しい Freedesktop.org トレイアイコン" msgid "DBus interface:" msgstr "DBus インターフェース:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "ダークテーマ" @@ -650,12 +617,12 @@ msgstr "デフォルトの前ページ" msgid "Default page size" msgstr "デフォルトのページサイズ" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "削除" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "詳細" @@ -698,7 +665,7 @@ msgstr "現在実行中のアプリケーションを検出する（再起動が msgid "Directories:" msgstr "ディレクトリ:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "ディスプレイ" @@ -711,12 +678,12 @@ msgstr "次回から表示しない" msgid "Do not show password from password managers" msgstr "パスワードマネージャーからのパスワードを表示しない" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "ドキュメント" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "下" @@ -725,17 +692,17 @@ msgstr "下" msgid "Editor" msgstr "エディタ" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "英数シフト" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "英数トグル" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Eject" @@ -748,7 +715,7 @@ msgstr "絵文字" msgid "Enable" msgstr "有効" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "KWin でブラーを有効にする" @@ -764,7 +731,7 @@ msgstr "絵文字のヒントを有効にする" msgid "Enable emoji in quickphrase" msgstr "絵文字のクイックフレーズを有効にする" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "Wayland で分数スケールを有効にする" @@ -776,7 +743,7 @@ msgstr "デフォルトでヒントを有効にする" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "End" @@ -805,7 +772,7 @@ msgstr "次の入力メソッドグループに切り替える" msgid "Enumerate when press trigger key repeatedly" msgstr "トリガーキーを押すたびに切り替える" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -817,7 +784,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "環境変数 ${1} が設定されていません。" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "環境変数 ${1} は \"${2}\" に正しく設定されています。" @@ -833,26 +800,26 @@ msgstr "環境:" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "${1} の実行中にエラーが起きました。ロケール設定を確認してください。" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Escape" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "実行" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "閉じる" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "${1} の immodule キャッシュに ${2} が見つかりません。" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "${1} の出力に ${2} が見つかりません。" @@ -860,7 +827,7 @@ msgstr "${1} の出力に ${2} が見つかりません。" msgid "Fallback Spell check language" msgstr "フォールバック時のスペルチェック言語" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "お気に入り" @@ -882,14 +849,10 @@ msgstr "Fcitx5 設定" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland ランチャー（実験的）" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx アドオン:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx 設定 UI:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx 状態:" @@ -929,31 +892,31 @@ msgstr "Fcitx のバージョン: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 フロントエンド" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "ファイナンス" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Find" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "最初の候補" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" "テーマとデスクトップでサポートされている場合は、システムのアクセントカラーに" "従う" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "システムのライト/ダーク配色に従う" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -966,11 +929,11 @@ msgstr "" "によるテキスト入力サポートを使用している場合は、これは重大なエラーではありま" "せん。" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "フォント" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -986,11 +949,11 @@ msgstr "" "詳細については、https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland を参照して" "ください。" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "フォント DPI を Wayland で強制する" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Forward" @@ -1001,7 +964,7 @@ msgstr "" "キーイベントが処理されない場合、テキストをコミットする代わりにキーイベントを" "転送する" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "${1} ${2} モジュールが見つかりました: ${3}。" @@ -1013,56 +976,51 @@ msgstr "${1} ${2} プロセスが見つかりました:" msgid "Found ${1} ${2} processes:" msgstr "${1} ${2} プロセスが見つかりました:" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "${1} アドオンの設定ディレクトリを見つけました: ${2}。" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "${1} を ${2} で見つけました。" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "${1} 個の無効なアドオンが見つかりました:" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "${1} 個の有効なアドオンが見つかりました:" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "${1} が有効なユーザーインターフェイスアドオンが見つかりました:" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "gtk ${2} 用の ${1} 入力メソッドモジュールが見つかりました。" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "${1} kcm モジュールを見つけました。" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "未知のバージョンの gtk 用の ${2} を ${1} に見つけました。" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "gtk ${1} 用の ${3} を ${2} に見つけました。" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "${2}の $3{3} im モジュールが見つかりました: ${1}" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "未知の gtk 用の immodules キャッシュを ${1} に見つけました。" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "gtk ${1} の immodule cache を ${2} に見つけました。" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "不明な ${1} qt モジュールが見つかりました: ${2}。" @@ -1070,26 +1028,26 @@ msgstr "不明な ${1} qt モジュールが見つかりました: ${2}。" msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 通知サポート" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "フロントエンド設定:" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "ゲーム" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Go" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Green" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "グループ" @@ -1104,15 +1062,15 @@ msgstr "グループ {0}: {1}" msgid "Group {}" msgstr "グループ {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Gtk ${1} IMモジュールファイル ${2} がありません。" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Gtk IM モジュールキャッシュ:" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Gtk IM モジュールファイル:" @@ -1120,77 +1078,77 @@ msgstr "Gtk IM モジュールファイル:" msgid "Hall of Shame for Linux IME Support" msgstr "Linux IMEサポートの「恥辱の殿堂」" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "ハングル" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "ハングル Banja" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "ハングル End" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "ハングル Hanja" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "ハングル Jamo" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "ハングル Jeonja" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "ハングル PostHanja" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "ハングル PreHanja" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "ハングル Romaja" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "ハングル Special" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "ハングル Start" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "半角" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "ヘルプ" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "変換" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "ハイバネート" @@ -1203,56 +1161,56 @@ msgstr "隠す通知" msgid "Hidden clipboard content that contains a password" msgstr "パスワードを含んでいる、非表示のクリップボードの内容" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "サイズが合わない場合はオーバーレイを非表示にする" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "ハイライト背景" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "ハイライト背景色" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "ハイライト候補色" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "ハイライトクリックマージン" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "ハイライトテキスト色" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "ひらがな" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "ひらがなカタカナ" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "ヒストリ" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "ホーム" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "ホームオフィス" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "ホームページ" @@ -1261,7 +1219,7 @@ msgstr "ホームページ" msgid "Home:" msgstr "ホーム:" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "ホットリンク" @@ -1279,7 +1237,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "現在の入力コンテキストのみをN番目の入力メソッドに切り替えるホットキー" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1327,7 +1285,7 @@ msgstr "" "${g36_disable_ibus} コマンドを実行してください。詳細は ${link} で確認してくだ" "さい。" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "画像" @@ -1349,31 +1307,31 @@ msgstr "入力メソッドの設定" msgid "Input Method Related Environment Variables: " msgstr "入力メソッド関連の環境変数:" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "入力メソッド:" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "入力パネル" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "入力パネルの背景" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "入力パネルの枠線" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "入力パネルのハイライト" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "入力パネルのハイライト候補の背景" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "入力パネルのハイライト候補の枠線" @@ -1389,7 +1347,7 @@ msgstr "" "入力メソッドは独自の設定の中に異なるセットアップを持つ場合があります。これは" "一般的にクリップボードやクイックフレーズなどのモジュールで使用されます。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "挿入" @@ -1398,11 +1356,11 @@ msgstr "挿入" msgid "Interval of saving user data in minutes" msgstr "ユーザーデータを保存する間隔（分）" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "不正なアドオン設定ファイル ${1} です。" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1429,26 +1387,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "KDE 入力メソッドパネル" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE Plasma（実験的）" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "カナロック" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "かなシフト" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "漢字" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "カタカナ" @@ -1475,12 +1433,12 @@ msgstr "キーボード - {0}" msgid "Keyboard - {0} - {1}" msgstr "キーボード - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "キーボードの輝度を下げる" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "キーボードの輝度を上げる" @@ -1489,315 +1447,315 @@ msgstr "キーボードの輝度を上げる" msgid "Keyboard Layout:" msgstr "キーボードレイアウト:" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "キーボードライトのオン/オフ" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "キーボードメニュー" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "キーパッド *" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "キーパッド +" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "キーパッド ," -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "キーパッド -" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "キーパッド ." -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "キーパッド /" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "キーパッド 0" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "キーパッド 1" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "キーパッド 2" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "キーパッド 3" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "キーパッド 4" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "キーパッド 5" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "キーパッド 6" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "キーパッド 7" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "キーパッド 8" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "キーパッド 9" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "キーパッド =" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "キーパッド Begin" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "キーパッド Delete" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "キーパッド Down" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "キーパッド End" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "キーパッド Enter" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "キーパッド F1" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "キーパッド F2" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "キーパッド F3" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "キーパッド F4" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "キーパッド Home" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "キーパッド Insert" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "キーパッド Left" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "キーパッド Page Down" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "キーパッド Page Up" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "キーパッド Right" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "キーパッド Space" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "キーパッド Tab" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "キーパッド Up" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Kimpanel のプロセス:" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "最後の候補" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "起動 (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "起動 (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "起動 (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "起動 (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "起動 (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "起動 (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "起動 (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "起動 (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "起動 (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "起動 (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "起動 (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "起動 (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "起動 (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "起動 (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "起動 (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "起動 (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "メールの起動" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "左" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "左 Alt" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "左 Control" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "左 Hyper" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "左 Shift" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "左 Super" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "LightBulb" @@ -1806,11 +1764,11 @@ msgstr "LightBulb" msgid "Locale:" msgstr "ロケール:" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "ログ:" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "ログオフ" @@ -1819,142 +1777,142 @@ msgstr "ログオフ" msgid "Long Press behavior" msgstr "長押し時の動作" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "メール転送" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "マージン " -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "下マージン" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "左マージン" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "右マージン" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "上マージン" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "全コンテンツの周りのマージン" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "テキストの周りのマージン" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "マーケット" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "メディア早送り" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "次のメディア" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "メディア一時停止" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "メディア再生" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "前のメディア" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "メディア記録" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "メディア巻き戻し" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "メディア停止" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "ミーティング" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "メニュー" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "メニュー" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "メニューの背景" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "メニューの枠線" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "メニューフォント" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "PB メニュー" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "メニュー選択項目の背景" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "メニュー選択項目の枠線" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "メニューの区切り" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "Messenger" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "メタデータ" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "マイクミュート" @@ -1963,46 +1921,46 @@ msgstr "マイクミュート" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "修飾子のみのホットキーのタイムアウト（ミリ秒）" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "モニターの明るさをダウン" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "モニターの明るさをアップ" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "無変換" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "複数の候補" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "音楽" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "個人用サイト" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "名前" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "New" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "ニュース" @@ -2011,7 +1969,7 @@ msgstr "ニュース" msgid "Next Candidate" msgstr "次の候補" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "次ページボタン" @@ -2027,11 +1985,11 @@ msgstr "クリップボード履歴がありません。" msgid "None" msgstr "なし" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "ノーマルテキスト色" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2053,7 +2011,7 @@ msgstr "GNOME 3.6 以降の注意" msgid "Notification" msgstr "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2070,38 +2028,38 @@ msgstr "" "絵文字のサポートのみが見つかりました。スペルチェックを有効にするには、その言" "語のスペルチェックデータをインストールする必要があります。" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "開く" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "URL を開く" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "オプション" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "クリップマージンのオーバーレイ" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "オーバーレイ画像" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "Xオフセットのオーバーレイ" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "Yオフセットのオーバーレイ" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "オーバーレイの位置" @@ -2117,17 +2075,17 @@ msgstr "DBus 名 ${1} の所有者は ${2} です。" msgid "PID of DBus name ${1} owner is ${2}." msgstr "DBus 名 ${1} の所有者の PID は${2} です。" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "Page Down" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "Page Up" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "ページボタンの垂直方向の配置" @@ -2135,7 +2093,7 @@ msgstr "ページボタンの垂直方向の配置" msgid "Page size" msgstr "ページサイズ" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Paste" @@ -2144,17 +2102,17 @@ msgstr "Paste" msgid "Paste Primary" msgstr "プライマリの貼り付け" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "一時停止" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "電話" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "ピクチャー" @@ -2180,12 +2138,12 @@ msgstr "" "'${value}' を設定するか、直接${2} に ${1} を書き加えてください。詳しくは " "${link} を参照してください" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "パワーダウン" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "電源オフ" @@ -2202,7 +2160,7 @@ msgstr "プリエディット無効" msgid "Preedit enabled" msgstr "プリエディット有効" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "テキストアイコンを優先する" @@ -2214,16 +2172,16 @@ msgstr "Presage" msgid "Prev Candidate" msgstr "前の候補" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "前ページのボタン" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "前の候補" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "プリントスクリーン" @@ -2232,7 +2190,7 @@ msgstr "プリントスクリーン" msgid "Program" msgstr "プログラム" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Qt IM モジュールファイル:" @@ -2244,27 +2202,27 @@ msgstr "クイックフレーズ" msgid "Quick Phrase: " msgstr "クイックフレーズ:" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "赤" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "やり直す" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "更新" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "リロード" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "リプライ" @@ -2273,62 +2231,62 @@ msgstr "リプライ" msgid "Reset state on Focus In" msgstr "フォーカス時に状態をリセット" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "再起動" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "改行" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "右" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "右 Alt" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "右 Control" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "右 Hyper" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "右 Shift" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "右 Super" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "ローマ字" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "ウィンドウ回転" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "ローテーション KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "ローテーション PB" @@ -2337,22 +2295,22 @@ msgstr "ローテーション PB" msgid "Running as root:" msgstr "root として実行:" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "保存" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "スクリーンセーバー" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "ScrollLock" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "検索" @@ -2361,7 +2319,7 @@ msgstr "検索" msgid "Seconds before clearing password" msgstr "パスワードをクリアするまでの秒数" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "選択" @@ -2378,11 +2336,11 @@ msgstr "ローカル入力メソッドを選択:" msgid "Select specific input method via keyboard" msgstr "キーボードで指定の入力メソッドを選択" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "選択した項目の文字色" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "送信" @@ -2398,11 +2356,11 @@ msgstr "" "ドとしてレイアウトを追加することで、Fcitx の内部レイアウト変換を引き続き使用" "できます。" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "セパレーターの背景" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "影のマージン" @@ -2410,12 +2368,12 @@ msgstr "影のマージン" msgid "Share Input State" msgstr "入力状態を共有する" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "シフト" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "ショップ" @@ -2428,7 +2386,7 @@ msgstr "フォーカスを変更する際に入力メソッドの情報を表示 msgid "Show Input Method Information when switch input method" msgstr "入力メソッドを切り替える際に入力メソッドの情報を表示する" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "アイコンにレイアウト名を表示する" @@ -2440,7 +2398,7 @@ msgstr "入力メソッドの情報をコンパクトに表示する" msgid "Show first input method information" msgstr "第1入力メソッドの情報を表示する" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2468,17 +2426,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "切り替え時は第1入力メソッドをスキップする" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "スリープ" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "スペース" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "間隔" @@ -2486,22 +2444,22 @@ msgstr "間隔" msgid "Spell" msgstr "スペル" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "スペルチェッカー" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "画面分割" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "スプレッドシート" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "スタンバイ" @@ -2515,16 +2473,16 @@ msgstr "入力メソッドを開始" msgid "Status Notifier" msgstr "ステータス通知" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "停止" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "サブメニュー" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "サブタイトル" @@ -2533,17 +2491,17 @@ msgstr "サブタイトル" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "サポート" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "サスペンド" @@ -2567,17 +2525,17 @@ msgstr "{0} にグループを切り替えました" msgid "System Info:" msgstr "システム情報;" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "システムリクエスト" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "タブ" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "タスクパネル" @@ -2586,12 +2544,12 @@ msgstr "タスクパネル" msgid "Temporally switch between first and current Input Method" msgstr "一時的に第1入力メソッドに切り替える" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "ターミナル" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2614,31 +2572,31 @@ msgstr "N番目のホットキーでN番目の入力メソッドに切り替え msgid "The script is run as ${1} (${2})." msgstr "${1} (${2})としてスクリプトを実行" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "テーマ" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "これはトレイアイコンが XEmbed の場合のみ有効です。" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "このオプションは画像が設定されていない場合にのみ有効です。" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "このオプションには Wayland コンポジターのサポートが必要です。" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "このオプションは、XWayland では常に無効になります。" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "この値はどのマージンの値よりも小さくする必要があります。" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2647,7 +2605,7 @@ msgstr "" "このような情報は開発者が診断するときに役に立つ場合がありますが、オンラインで" "公開する前に確認して、必要があれば削除してください。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "タイム" @@ -2667,66 +2625,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "埋め込みプリエディットの切り替え" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "ツール" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "上" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "中央上" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "左上" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "トップメニュー" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "右上" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "タッチパッドオフ" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "タッチパッドオン" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "タッチパッドトグル" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "登録" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "トラベル" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "トレイフォント" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "トレイラベルのアウトライン色" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "トレイラベルのテキスト色" @@ -2768,7 +2726,7 @@ msgstr "Fcitx と Kimpanel で入力する" msgid "Unable to find a program to check dbus." msgstr "DBus をチェックするためのプログラムが見つかりません。" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Undo" @@ -2781,7 +2739,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2790,19 +2748,19 @@ msgstr "上" msgid "Use On The Spot Style (Needs restarting)" msgstr "XIM で On The Spot スタイルを使う（再起動が必要）" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "X11 で Per Screen DPI を使用する" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "候補リストが縦の場合は、ハイライト時にすべての水平スペースを使用します" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "入力メソッドの言語を使用してテキストを表示する" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "マウスホイールを使用して前または次のページに移動する" @@ -2810,7 +2768,7 @@ msgstr "マウスホイールを使用して前または次のページに移動 msgid "Use new compose behavior" msgstr "新規入力時の動作を使用する" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "ユーザーインターフェイス:" @@ -2824,59 +2782,59 @@ msgid "" "environment:" msgstr "${1} を使用して、現在の環境で使用される実際の IM モジュールを確認する:" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "バージョン" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "バージョンライン:" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "候補ウィンドウを縦にする" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "ビデオ" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "ビュー" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "ボイドシンボル" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "音量ダウン" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "音量ミュート" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "音量アップ" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Wake Up" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2897,7 +2855,7 @@ msgstr "Wayland 診断" msgid "Wayland Input method frontend" msgstr "Wayland 入力メソッドフロントエンド" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "ウェブカメラ" @@ -2934,12 +2892,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "なぜ root で実行することが危険なのか" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "ワイヤレス" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "ワープロ" @@ -2956,42 +2914,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "XDG SESSION TYPE:" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM エンコーディング:" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "XIM for Emacs:" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "ルートウィンドウでの XIM_SERVERS :" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS が設定されていません" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "環境変数から取得した XIM サーバー名は ${1} です。" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "XIM サーバー名は環境変数で設定されたものと同じです。" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "XIM サーバー名: \"${1}\" は環境変数で設定された \"${2} と異なります。" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "黄" @@ -3014,11 +2972,11 @@ msgstr "" "このスクリプトを実行するために ${1} が使われたようです。スクリプトの結果は正" "確ではない可能性があります。詳細は ${2} で確認してください。" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "XIM を ${1} プログラムで使用しています。" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "Fcitx を使っている プログラム ${1} で問題が発生しています。" @@ -3042,7 +3000,7 @@ msgstr "" "KCModule のパッケージ名は、通常 kcm-fcitx5、kde-config-fcitx5、または fcitx5-" "configtool です。これで設定ディレクトリが開きます。" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -3052,7 +3010,7 @@ msgstr "" "視されている、とても古い emacs のバグにより、emacs 中で入力メソッドを使用でき" "ないかもしれません。 " -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -3060,22 +3018,22 @@ msgstr "" "LC_CTYPE がエンコーディングがUTF-8ではない \"${1}\" に設定されています。 XIM " "を使って文字入力を確定するときに問題が起きる可能性があります。" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "全角" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "全角半角" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "拡大" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "縮小" @@ -3088,7 +3046,7 @@ msgstr "実行可能:" msgid "here" msgstr "ここ" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/ko.po b/po/ko.po index b6f15629..cb3af384 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: JungHee Lee , 2023\n" "Language-Team: Korean (https://app.transifex.com/fcitx/teams/12005/ko/)\n" @@ -111,7 +111,7 @@ msgstr "<할당 안됨>" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -123,7 +123,7 @@ msgstr "입력기 활성화" msgid "Active By Default" msgstr "기본적으로 활성화" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "즐겨찾기 추가" @@ -132,19 +132,19 @@ msgstr "즐겨찾기 추가" msgid "Add Unicode Typing Support" msgstr "유니코드 입력 지원 추가" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "애드온 구성 디렉토리:" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "애드온 라이브러리:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "애드온 목록:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "밝기 조절" @@ -153,11 +153,11 @@ msgstr "밝기 조절" msgid "All" msgstr "모두" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "발견된 모든 GTK ${1} 입력기모듈 파일이 존재합니다." -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "모든 애드온에 대한 모든 라이브러리가 있습니다." @@ -181,7 +181,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -190,12 +190,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "항상 자판을 그룹 자판으로만 지정" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "왼쪽 응용 프로그램" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "오른쪽 응용 프로그램" @@ -204,36 +204,36 @@ msgstr "오른쪽 응용 프로그램" msgid "Applications disabled for long press" msgstr "길게 누르면 응용프로그램이 비활성화됨" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "재생 목록 반복 듣기" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "임의 순서 음원 듣기" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "음원 반복 듣기" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "작성자" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "자리비움" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "뒤로" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "뒤로 앞으로" @@ -242,15 +242,15 @@ msgstr "뒤로 앞으로" msgid "Backends" msgstr "백엔드" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "배경" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "배경 이미지" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "백스페이스" @@ -259,7 +259,7 @@ msgstr "백스페이스" msgid "Bash Version:" msgstr "Bash 버전:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "배터리" @@ -272,69 +272,69 @@ msgstr "초보자 가이드" msgid "Behavior" msgstr "동작방식" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "파랑" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "블루투스" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "블러 여백" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "책" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "테두리 색상" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "테두리 너비" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "하단 중앙" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "왼쪽 하단" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "오른쪽 하단" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "브라우저" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "계산기" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "취소" @@ -351,28 +351,24 @@ msgstr "${1}에 연결할 수 없습니다." msgid "Cannot determine desktop environment." msgstr "데스크톱 환경을 확인할 수 없습니다." -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "${1} 애드온 구성 디렉토리를 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "${1} 실행 파일을 찾을 수 없습니다!" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "캐시에서 GTK ${2}용 ${1} 입력기 모듈을 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "GTK ${2}용 ${1} 입력기 모듈을 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "${1} 입력기 모듈을 ${2}에서 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "gtk ${1} 에서 ${2}를 찾을 수 없습니다." @@ -380,11 +376,7 @@ msgstr "gtk ${1} 에서 ${2}를 찾을 수 없습니다." msgid "Cannot find DBus name ${1} owner." msgstr "DBus 이름 ${1} 소유자를 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "GUI 구성 도구를 찾을 수 없습니다. ${1}, ${2} 중 하나를 설치합니다." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "활성화된 ${1} 사용자 인터페이스를 찾을 수 없습니다!" @@ -392,19 +384,19 @@ msgstr "활성화된 ${1} 사용자 인터페이스를 찾을 수 없습니다!" msgid "Cannot find fcitx5 executable!" msgstr "Fcitx5 실행 파일을 찾을 수 없습니다!" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "${2} 애드온의 ${1} 파일을 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "${2} 애드온의 ${1}을 위한 다음 라이브러리를 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "GTK ${1}용 입력기모듈 캐시를 찾을 수 없습니다" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -415,28 +407,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "DBus 이름 ${1} 소유자의 프로세스 번호를 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "루트 창에서 xim_server를 찾을 수 없습니다." -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "XMODIFIERS를 해석할 수 없음: ${1}" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "캡스락" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "중앙" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "왼쪽 중앙" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "오른쪽 중앙" @@ -444,7 +436,7 @@ msgstr "오른쪽 중앙" msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 구성 변경" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "체크 박스" @@ -456,12 +448,12 @@ msgstr "변환 키 선택" msgid "Classic User Interface" msgstr "클래식 사용자 인터페이스" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "지우기" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "여백 클릭" @@ -473,21 +465,21 @@ msgstr "클립보드" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "클립보드(기록을 지우려면 BackSpace/Delete 키 누르기):" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "닫기" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "코드 입력" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "색상" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "커뮤니티" @@ -508,35 +500,11 @@ msgstr "완성이 일시적으로 활성화되었습니다." msgid "Completion is enabled." msgstr "완성이 활성화되었습니다." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "gtk${1}에 대한 GUI 구성을 찾지 못했습니다." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "gtk${1}에 대한 GUI 구성:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "kde에 대한 GUI 구성:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Qt에 대한 GUI 구성을 찾을 수 없습니다." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "qt에 대한 GUI 구성:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "구성 도구 래퍼:" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "구성:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "구성하기" @@ -545,12 +513,12 @@ msgstr "구성하기" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "복사" @@ -579,7 +547,7 @@ msgstr "사용자 지정" msgid "Custom Xkb Option" msgstr "사용자 지정 Xkb 옵션" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "자르기" @@ -604,12 +572,12 @@ msgstr "DBus 기반 새 Freedesktop.org 트레이 아이콘" msgid "DBus interface:" msgstr "DBus 인터페이스:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "" @@ -650,12 +618,12 @@ msgstr "기본 이전 페이지" msgid "Default page size" msgstr "페이지 크기 기본값" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "삭제" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "설명" @@ -690,7 +658,7 @@ msgstr "" msgid "Directories:" msgstr "디렉토리:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "표시" @@ -703,12 +671,12 @@ msgstr "다시 표시 안함" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "문서" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "아래쪽" @@ -717,17 +685,17 @@ msgstr "아래쪽" msgid "Editor" msgstr "편집기" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "영문/숫자 교체" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "영문/숫자 전환" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "꺼내기" @@ -740,7 +708,7 @@ msgstr "에모지" msgid "Enable" msgstr "활성화" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "KWin에서 블러 활성화" @@ -756,7 +724,7 @@ msgstr "힌트에 에모지 보이기" msgid "Enable emoji in quickphrase" msgstr "상용구에 에모지 활성화" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -768,7 +736,7 @@ msgstr "기본적으로 힌트 사용" msgid "Enchant" msgstr "인챈트" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "종료" @@ -797,7 +765,7 @@ msgstr "입력기 그룹 전환" msgid "Enumerate when press trigger key repeatedly" msgstr "트리거 키를 반복해서 누를 때 열거하기" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -809,7 +777,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "환경 변수 ${1}가 설정되지 않았습니다." -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "환경 변수 ${1}이(가) \"${2}\"로 올바르게 지정되었습니다." @@ -825,26 +793,26 @@ msgstr "환경:" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "${1}을 실행하는 중 오류가 발생하였습니다. 지역 설정을 확인합니다." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Escape" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "실행" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "나가기" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "${2}의 입력기모듈 캐시에서 ${1}를 찾지 못했습니다" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "${1}을 ${2}의 출력 내용에서 찾을 수 없음" @@ -852,7 +820,7 @@ msgstr "${1}을 ${2}의 출력 내용에서 찾을 수 없음" msgid "Fallback Spell check language" msgstr "예비 맞춤법 검사 언어" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "즐겨찾기" @@ -874,14 +842,10 @@ msgstr "Fcitx 5 설정" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx 애드온:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx UI 구성하기:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx 상태:" @@ -914,29 +878,29 @@ msgstr "Fcitx 버전: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 프론트엔드" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "재무" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "찾기" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -944,11 +908,11 @@ msgid "" "using text-input support by Qt under Wayland." msgstr "" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "글꼴" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -962,11 +926,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "앞으로" @@ -975,7 +939,7 @@ msgstr "앞으로" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "${1} ${2}개의 모듈을 찾았습니다: ${3}" @@ -987,56 +951,51 @@ msgstr " ${1} ${2}개의 프로세스를 찾았습니다:" msgid "Found ${1} ${2} processes:" msgstr " ${1} ${2}개의 프로세스를 찾았습니다:" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "${1}애드온 구성 디렉토리를 찾았습니다: ${2}." -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "${1}을(를) ${2}에서 찾았습니다." -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "${1}개의 비활성화된 애드온을 찾았습니다:" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "${1}개의 활성화된 애드온을 찾았습니다:" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "${1}개의 활성화된 사용자 인터페이스 애드온을 찾았습니다:" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "${2}용 ${1} 입력기 모듈을 찾았습니다." -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "${1}개의 kcm 모듈을 찾았습니다." - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "${1}에서 알 수 없는 GTK 버전의 ${2}를 찾았습니다." -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "GTK ${1}에 대한 ${3}을 ${2}에서 찾았습니다." -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "${2}용 ${3}개의 입력기 모듈을 찾았습니다 : ${1}" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "${1}에서 알 수 없는 GTK 버전용 입력기모듈 캐시를 찾았습니다." -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "GTK ${1}용 입력기모듈 캐시를 ${2}에서 찾았습니다." -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "알 수 없는 ${1} Qt 모듈을 찾았습니다: ${2}." @@ -1044,26 +1003,26 @@ msgstr "알 수 없는 ${1} Qt 모듈을 찾았습니다: ${2}." msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 알림 지원" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "프론트엔드 설정:" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "게임" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Go" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "녹색" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "그룹" @@ -1078,15 +1037,15 @@ msgstr "그룹 {0}: {1}" msgid "Group {}" msgstr "그룹 {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "GTK ${1} 입력기모듈 파일 ${2}이 존재하지 않습니다." -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "GTK 입력기 모듈 캐시:" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "GTK 입력기 모듈 파일:" @@ -1094,77 +1053,77 @@ msgstr "GTK 입력기 모듈 파일:" msgid "Hall of Shame for Linux IME Support" msgstr "Linux IME 지원에 대한 불명예의 전당" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "한글" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "한글 반자" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "한글입력 완료" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "한글 한자" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "한글 자모" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "한글 전자" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "한글 포스트한자" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "한글 예약한자" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "한글 로마자" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "한글 특수문자" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "한글입력 시작" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "반각" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "도움말" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "반환" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "하이버네이트" @@ -1177,56 +1136,56 @@ msgstr "숨은 알림" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "크기가 맞지 않으면 오버레이 숨기기" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "배경 강조표시" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "배경 색상 강조표시" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "강조 후보 색상" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "클릭 여백 강조표시" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "텍스트 색상 강조표시" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "히라가나" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "히라가나 가타카나" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "히스토리" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "홈" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "홈 오피스" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "홈페이지" @@ -1235,7 +1194,7 @@ msgstr "홈페이지" msgid "Home:" msgstr "홈:" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "핫 링크" @@ -1253,7 +1212,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "현재 입력 컨텍스트에 대해서만 N번째 입력기로 전환하기 위한 단축키" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "하이퍼" @@ -1294,7 +1253,7 @@ msgstr "" "${g36_disable_ibus} 명령을 사용하여 ${2} 이외의 입력기를 사용하기 위해 IBus " "통합을 비활성화할 수 있습니다.. 자세한 내용은 ${link}를 참조합니다." -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "이미지" @@ -1316,31 +1275,31 @@ msgstr "입력기 구성" msgid "Input Method Related Environment Variables: " msgstr "입력기와 관련된 환경변수: " -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "입력기:" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "입력 패널" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1356,7 +1315,7 @@ msgstr "" "입력기가 별도의 구성을 가질 수 있습니다. 클립보드나 상용구와 같은 모듈에서 일" "반적으로 사용됩니다." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "삽입" @@ -1365,11 +1324,11 @@ msgstr "삽입" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "잘못된 애드온 구성 파일 ${1}." -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1388,26 +1347,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "KDE 입력기 패널" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE 플라즈마 (실험용)" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "카나 고정" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "카나 Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "칸지" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "가타카나" @@ -1434,12 +1393,12 @@ msgstr "키보드 - {0}" msgid "Keyboard - {0} - {1}" msgstr "키보드 - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "키보드 밝기 낮추기" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "키보드 밝기 높이기" @@ -1448,315 +1407,315 @@ msgstr "키보드 밝기 높이기" msgid "Keyboard Layout:" msgstr "키보드 자판:" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "키보드 불빛 켜기/끄기" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "키보드 메뉴" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Kimpanel 프로세스:" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "실행 (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "실행 (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "실행 (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "실행 (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "실행 (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "실행 (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "실행 (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "실행 (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "실행 (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "실행 (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "실행 (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "실행 (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "실행 (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "실행 (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "실행 (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "실행 (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "메일 프로그램 실행" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "왼쪽" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "왼쪽 Alt" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "왼쪽 Control" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "왼쪽 하이퍼" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "왼쪽 Shift" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "왼쪽 윈도우키" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "전구" @@ -1765,11 +1724,11 @@ msgstr "전구" msgid "Locale:" msgstr "로케일:" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "로그:" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "로그오프" @@ -1778,142 +1737,142 @@ msgstr "로그오프" msgid "Long Press behavior" msgstr "길게 누르기 동작" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "이메일 전달" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "여백" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "하단 여백" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "왼쪽 여백" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "오른쪽 여백" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "상단 여백" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "모든 콘텐츠 주변의 여백" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "텍스트 주변 여백" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "마켓" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "빨리감기" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "다음 " -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "일시정지" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "재생" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "이전 " -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "녹음하기" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "되감기" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "정지" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "미팅" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "메뉴" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "메뉴" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "메뉴 글꼴" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "메뉴 PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "메신저" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "메타데이터" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "마이크 끄기" @@ -1922,46 +1881,46 @@ msgstr "마이크 끄기" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "모니터 밝기 낮추기" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "모니터 밝기 높이기" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "Muhenkan" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "다중 후보" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "음악" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "내 사이트" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "이름" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "새로 만들기" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "뉴스" @@ -1970,7 +1929,7 @@ msgstr "뉴스" msgid "Next Candidate" msgstr "다음 후보" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "다음 페이지 버튼" @@ -1986,11 +1945,11 @@ msgstr "클립보드 기록이 없습니다." msgid "None" msgstr "없음" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "일반 텍스트 색상" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2009,7 +1968,7 @@ msgstr "3.6 이후의 GNOME에 대한 참고사항" msgid "Notification" msgstr "알림" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2026,38 +1985,38 @@ msgstr "" "에모지 지원만 있습니다. 철자 검사를 사용하려면 언어에 대한 철자 검사 데이터" "를 설치해야 할 수 있습니다." -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "열기" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "URL 열기" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "선택사항" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "오버레이 클립 여백" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "오버레이 이미지" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "오버레이 X 오프셋" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "오버레이 Y 오프셋" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "오버레이 위치" @@ -2073,17 +2032,17 @@ msgstr "DBus ${1}의 소유자는 ${2}입니다." msgid "PID of DBus name ${1} owner is ${2}." msgstr "DBus 이름 ${1} 소유자의 PID는 ${2}입니다." -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2091,7 +2050,7 @@ msgstr "" msgid "Page size" msgstr "페이지 크기" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "붙이기" @@ -2100,17 +2059,17 @@ msgstr "붙이기" msgid "Paste Primary" msgstr "기본 붙여 넣기" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "중지" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "전화" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "사진" @@ -2134,12 +2093,12 @@ msgstr "" "배포판에서 제공하는 도구를 사용하여 환경 변수 ${env_name}을 \"${value}\"로 지" "정하거나 ${2}에 ${1}를 추가합니다. $ {link} 참조." -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "전원 끄기" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "전원 끄기" @@ -2156,7 +2115,7 @@ msgstr "사전편집 비활성화" msgid "Preedit enabled" msgstr "사전편집 활성화" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "텍스트 아이콘 선호" @@ -2168,16 +2127,16 @@ msgstr "사전 설정" msgid "Prev Candidate" msgstr "이전 후보" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "이전 페이지 버튼" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "이전 후보" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "화면 출력" @@ -2186,7 +2145,7 @@ msgstr "화면 출력" msgid "Program" msgstr "프로그램" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Qt 입력기 모듈 파일:" @@ -2198,27 +2157,27 @@ msgstr "상용구" msgid "Quick Phrase: " msgstr "상용구:" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "빨강" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "재실행" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "새로 고침" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "다시 로드

" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "답장" @@ -2227,62 +2186,62 @@ msgstr "답장" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "재시작" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "반환" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "오른쪽" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "오른쪽 Alt" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "오른쪽 Control" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "오른쪽 하이퍼" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "오른쪽 Shift" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "오른쪽 슈퍼 키" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "로마자" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "창 회전" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "교체 KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "교체 PB" @@ -2291,22 +2250,22 @@ msgstr "교체 PB" msgid "Running as root:" msgstr "root로 실행중:" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "저장" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "화면 보호기" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "스크롤 락" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "검색" @@ -2315,7 +2274,7 @@ msgstr "검색" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "선택" @@ -2332,11 +2291,11 @@ msgstr "로컬 입력기 선택:" msgid "Select specific input method via keyboard" msgstr "키보드를 이용하여 특정 입력기 선택" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "보내기" @@ -2348,11 +2307,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "구분자 배경" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "그림자 여백" @@ -2360,12 +2319,12 @@ msgstr "그림자 여백" msgid "Share Input State" msgstr "입력 상태 공유" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Shift" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "숍" @@ -2378,7 +2337,7 @@ msgstr "포커스를 변경할 때 입력기 정보 표시" msgid "Show Input Method Information when switch input method" msgstr "입력기 변경시 입력기 정보 표시" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "아이콘에 자판 이름 표시" @@ -2390,7 +2349,7 @@ msgstr "간결한 입력기 정보 표시" msgid "Show first input method information" msgstr "첫 번째 입력기 정보 표시" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2416,17 +2375,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "열거하는 동안 첫 번째 입력기 건너뛰기" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "지연시간" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "공백" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "간격" @@ -2434,22 +2393,22 @@ msgstr "간격" msgid "Spell" msgstr "철자" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "철자 검사" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "화면 나누기" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "스프레드시트" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "대기" @@ -2463,16 +2422,16 @@ msgstr "입력기 시작" msgid "Status Notifier" msgstr "상태 표시기" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "중지" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "하위 메뉴" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "부제" @@ -2481,17 +2440,17 @@ msgstr "부제" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "지원" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "중단" @@ -2515,17 +2474,17 @@ msgstr "{0}(으)로 그룹 전환됨" msgid "System Info:" msgstr "시스템 정보:" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "시스템 요청" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "탭" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "작업 패널" @@ -2534,12 +2493,12 @@ msgstr "작업 패널" msgid "Temporally switch between first and current Input Method" msgstr "첫 번째 입력기와 현재 입력기 사이의 임시 전환" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "터미널" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2558,31 +2517,31 @@ msgstr "목록의 n번째 단축키는 n번째 입력기를 선택합니다." msgid "The script is run as ${1} (${2})." msgstr "스크립트는 ${1} (${2}) 계정으로 실행됩니다." -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "테마" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "트레이 아이콘이 xembed인 경우에만 유효합니다." -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "이 옵션은 이미지가 설정되지 않은 경우에만 유효합니다." -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "이 값은 여백 값보다 작아야 합니다." -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2591,7 +2550,7 @@ msgstr "" "이러한 정보는 개발자에게 도움이 될 수 있지만, 온라인에 올리기 전에 꼭 확인하" "고 민감한 정보가 있다면, 제거하세요." -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "시간" @@ -2611,66 +2570,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "내장된 사전편집 전환" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "도구" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "상단 중앙" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "왼쪽 상단" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "최상위 메뉴" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "오른쪽 상단" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "터치패드 끄기" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "터치패드 켜기" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "터치패드 전환" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "등록" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "여행" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "트레이 글꼴" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "트레이 라벨 윤곽선 색상" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "트레이 레이블 텍스트 색상" @@ -2712,7 +2671,7 @@ msgstr "Fcitx 및 Kimpanel로 입력" msgid "Unable to find a program to check dbus." msgstr "dbus를 확인할 프로그램을 찾을 수 없습니다." -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "되돌리기" @@ -2725,7 +2684,7 @@ msgstr "유니코드" msgid "Unicode: " msgstr "유니코드:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "위쪽" @@ -2734,19 +2693,19 @@ msgstr "위쪽" msgid "Use On The Spot Style (Needs restarting)" msgstr "스팟 스타일에서 사용(다시 시작 필요)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "세로 목록 일 때 강조 표시에 모든 가로 공간 사용" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "텍스트 표시할 때 입력기 언어 사용" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "마우스 휠을 사용하여 이전 또는 다음 페이지로 이동" @@ -2754,7 +2713,7 @@ msgstr "마우스 휠을 사용하여 이전 또는 다음 페이지로 이동" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "사용자 인터페이스:" @@ -2768,59 +2727,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "버전" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "버전 줄:" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "세로 후보 목록" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "동영상" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "보기" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "음량 낮추기" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "소리 끄기" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "음량 높이기" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "깨우기" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2841,7 +2800,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "Wayland 입력기 프론트엔드" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "웹캠" @@ -2873,12 +2832,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "root 로 실행하는 것이 나쁜 이유" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "무선" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "워드프로세서" @@ -2895,42 +2854,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "XDG 세션 유형:" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM 인코딩:" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "Emacs용 XIM:" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "루트 창의 XIM_SERVERS:" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS가 설정되지 않음" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "환경 변수의 Xim 서버 이름은 ${1}입니다." -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "Xim 서버 이름은 환경 변수에 설정된 것과 동일합니다." -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "Xim 서버 이름: \"${1}\"은 환경 변수: \"${2}\"에 지정된 것과 다릅니다." -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "노랑" @@ -2953,11 +2912,11 @@ msgstr "" "이 스크립트를 실행하는데 ${1}을 사용하나요? 실행결과가 올바르지 않을 수 있습" "니다. 자세한 정보는 ${2}를 참조하세요." -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "xim을 ${1} 프로그램에서 사용 중입니다." -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "${1} 프로그램에서 Fcitx를 사용하는데 문제가 발생할 수 있습니다." @@ -2975,7 +2934,7 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -2985,7 +2944,7 @@ msgstr "" "를 사용할 수 없을지도 모릅니다. 이것은 수년간 수정하지 않고 버티고 있는 emacs" "의 매우 오랜 버그 때문입니다." -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -2993,22 +2952,22 @@ msgstr "" "LC_CTYPE이 UTF-8을 사용하지 않는 ${1}으로 설정되었습니다. XIM으로 문자열을 전" "송하는데 문제가 발생할 수 있습니다." -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "전각" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "전각 반각" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "크게 보기" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "작게 보기" @@ -3021,7 +2980,7 @@ msgstr "실행파일:" msgid "here" msgstr "여기" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/ru.po b/po/ru.po index 7317d377..45ba4ca5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-19 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -111,7 +111,7 @@ msgstr "<не назначен>" msgid "A virtual keyboard backend based on DBus" msgstr "Серверная часть виртуальной клавиатуры на основе DBus" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "Акцентные цвета" @@ -123,7 +123,7 @@ msgstr "Активировать метод ввода" msgid "Active By Default" msgstr "Активен по умолчанию" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Добавить в избранное" @@ -132,19 +132,19 @@ msgstr "Добавить в избранное" msgid "Add Unicode Typing Support" msgstr "Добавляет поддержку набора с помощью символов Юникод" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "Конфигурационный каталог дополнений:" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "Библиотеки дополнений:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "Список дополнений:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Отрегулировать яркость" @@ -153,11 +153,11 @@ msgstr "Отрегулировать яркость" msgid "All" msgstr "Все" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "Все найденные immodule-файлы Gtk ${1} существуют." -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "Все библиотеки для всех дополнений найдены." @@ -183,7 +183,7 @@ msgstr "Разрешить метод ввода в поле пароля" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -192,12 +192,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "Всегда устанавливайте раскладку только для групповой раскладки" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "Приложение слева" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "Приложение справа" @@ -206,36 +206,36 @@ msgstr "Приложение справа" msgid "Applications disabled for long press" msgstr "Отключение приложений при длительном нажатии" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "Циклическая аудиодорожка" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "Случайное воспроизведение аудио" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Повтор аудио" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "Автор" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Уйти" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Назад" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Переслать Обратно" @@ -244,15 +244,15 @@ msgstr "Переслать Обратно" msgid "Backends" msgstr "Бэкенды" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "Фон" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "Фоновое изображение" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Backspace" @@ -261,7 +261,7 @@ msgstr "Backspace" msgid "Bash Version:" msgstr "Версия Bash:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Аккумулятор" @@ -274,69 +274,69 @@ msgstr "Руководство для начинающих" msgid "Behavior" msgstr "Поведение" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Синий" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Блютус" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "Размытый Край" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "Размытая маска" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Книга" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "Цвет границы" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "Ширина рамки" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "Bottom" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "Bottom Center" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "Bottom Left" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "Bottom Right" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Браузер" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Калькулятор" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Отменить" @@ -353,28 +353,24 @@ msgstr "Не удается подключиться к ${1} правильно. msgid "Cannot determine desktop environment." msgstr "Не удалось определить среду рабочего стола." -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "Не удается найти ${1} каталог конфигурации дополнения." -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "Не удается найти ${1} исполняемый файл!" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "Не удается найти ${1} im-модуль для gtk ${2} в кэше." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "Не удается найти ${1} модуль для gtk ${2}." -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "Не удается найти ${1} модуль метода ввода для ${2}." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "Не удалось найти ${2} для gtk ${1}" @@ -382,13 +378,7 @@ msgstr "Не удалось найти ${2} для gtk ${1}" msgid "Cannot find DBus name ${1} owner." msgstr "Не удается найти владельца имени DBus ${1}." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"Не удается найти инструмент настройки графического интерфейса, пожалуйста, " -"установите ${1}, или ${2}." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "Не удается найти включенный ${1} пользовательский интерфейс!" @@ -396,20 +386,20 @@ msgstr "Не удается найти включенный ${1} пользов msgid "Cannot find fcitx5 executable!" msgstr "Не удается найти исполняемый файл fcitx5!" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "Не удается найти файл ${1} для дополнения ${2}." -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "" "Не удается найти следующие необходимые библиотеки для ${1} дополнения ${2}." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "Не удалось найти immodules-кэш для GTK ${1}" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -420,28 +410,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "Не удается найти PID владельца имени DBus ${1}." -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "Не удалось найти xim_server в окне суперпользователя." -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "Не удалось интерпретировать XMODIFIERS: ${1}." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "CapsLock" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "Center" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "Center Left" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "Center Right" @@ -449,7 +439,7 @@ msgstr "Center Right" msgid "Change Fcitx 5 Configuration" msgstr "Изменить конфигурацию Fcitx 5" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Флажок" @@ -461,12 +451,12 @@ msgstr "Выбрать клавишу-модификатор" msgid "Classic User Interface" msgstr "Классический пользовательский интерфейс" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Очистить" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "Нажмите на Поле" @@ -478,21 +468,21 @@ msgstr "Буфер обмена" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "Буфер обмена (нажмите BackSpace/Delete, чтобы очистить историю):" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Закрыть" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "Ввести код" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "Цвет" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Сообщество" @@ -513,35 +503,11 @@ msgstr "Завершение временно включено." msgid "Completion is enabled." msgstr "Завершение включено." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "Конфигурационный GUI для gtk${1} не найден." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "Конфигурационный GUI для gtk${1}:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "Конфигурационный GUI для kde:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Конфигурационный GUI для qt не найден." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Конфигурационный GUI для qt:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "Оболочка средства настройки:" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "Настройка:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Настроить" @@ -550,12 +516,12 @@ msgstr "Настроить" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Копировать" @@ -584,7 +550,7 @@ msgstr "Пользовательский" msgid "Custom Xkb Option" msgstr "Пользовательский вариант Xkb" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Отрезать" @@ -609,12 +575,12 @@ msgstr "Новая иконка в трее Freedesktop.org на базе DBus" msgid "DBus interface:" msgstr "Интерфейс DBus:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "Тёмная тема" @@ -655,12 +621,12 @@ msgstr "Предыдущая страница по умолчанию" msgid "Default page size" msgstr "Размер страницы по умолчанию" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "Удалить" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "Описание" @@ -703,7 +669,7 @@ msgstr "Определить текущее запущенное приложе msgid "Directories:" msgstr "Каталоги:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "Дисплей" @@ -716,12 +682,12 @@ msgstr "Больше не показывать" msgid "Do not show password from password managers" msgstr "Не показывать пароль от менеджеров паролей" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Документы" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "Вниз" @@ -730,17 +696,17 @@ msgstr "Вниз" msgid "Editor" msgstr "Редактор" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "Eisu Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "Eisu toggle" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Извлечь" @@ -753,7 +719,7 @@ msgstr "Эмодзи" msgid "Enable" msgstr "Включить" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "Включить размытие на KWin" @@ -769,7 +735,7 @@ msgstr "Включить эмодзи в подсказке" msgid "Enable emoji in quickphrase" msgstr "Включить эмодзи в быстрой фразе" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "Включить дробную шкалу в Wayland" @@ -781,7 +747,7 @@ msgstr "Включить подсказку по умолчанию" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Окончание" @@ -810,7 +776,7 @@ msgstr "Перечислить группы методов ввода в пря msgid "Enumerate when press trigger key repeatedly" msgstr "Перечислять при повторном нажатии клавиши-триггера" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -822,7 +788,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "Переменная окружения ${1} не задана." -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "Переменной окружения ${1} правильно присвоено значение \"${2}\"." @@ -840,26 +806,26 @@ msgstr "" "Обнаружена ошибка при запуске ${1}. Пожалуйста, проверьте ваши региональные " "настройки." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Выход" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Выполнить" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Выход" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "Не удалось найти ${1} в кеше immodule в ${2}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "Не удалось найти ${1} в выводе ${2}" @@ -867,7 +833,7 @@ msgstr "Не удалось найти ${1} в выводе ${2}" msgid "Fallback Spell check language" msgstr "Резервный язык проверки орфографии" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Избранное" @@ -889,14 +855,10 @@ msgstr "Конфигурация Fcitx 5" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland Launcher (Экспериментально)" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Дополнения Fcitx:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Конфигурационный интерфейс Fcitx:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Состояние Fcitx:" @@ -937,31 +899,31 @@ msgstr "Версия Fcitx: ${1}" msgid "Fcitx4 Frontend" msgstr "Интерфейс Fcitx4" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Финансы" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Найти" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "Первое слово-кандидат" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" "Следовать цветовому акценту системы, если он поддерживается темой и рабочим " "столом" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "Следовать системной светлой/темной цветовой схеме" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -973,11 +935,11 @@ msgstr "" "ошибка, если вы не используете какое-либо приложение Qt с определенной " "версией Qt или используете поддержку ввода текста Qt под Wayland." -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "Шрифт" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -993,11 +955,11 @@ msgstr "" "Для получения более подробной информации см. https://fcitx-im.org/wiki/" "Using_Fcitx_5_on_Wayland" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "Принудительное изменение DPI шрифта на Wayland" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Пересылать" @@ -1008,7 +970,7 @@ msgstr "" "Пересылать ключевое событие вместо фиксации текста, если оно не " "обрабатывается" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Найден ${1} ${2} модуль: ${3}." @@ -1020,56 +982,51 @@ msgstr "Найден ${1} ${2} процесс:" msgid "Found ${1} ${2} processes:" msgstr "Найденные ${1} ${2} процессы:" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "Найден ${1} конфигурационный каталог дополнения: ${2}." -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "Найден ${1} в ${2}." -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "Найдено ${1} отключенных дополнений:" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "Найдено ${1} включенных дополнений:" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "Найдено ${1} подключенных дополнений пользоватeльских интерфейсов:" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "Найден ${1} im-модуль для gtk ${2}." -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "Найден ${1} kcm-модуль." - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "В ${1} найден ${2} для неизвестной версии gtk." -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "В ${2} найден ${3} для gtk ${1}." -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "Найден ${3} im-модуль для ${2}: ${1}." -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "Найден immodules-кэш для неизвестной версии GTK в ${1}." -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "Найден immodules-кэш для GTK ${1} в ${2}." -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "Найден неизвестный ${1} qt-модуль: ${2}." @@ -1077,26 +1034,26 @@ msgstr "Найден неизвестный ${1} qt-модуль: ${2}." msgid "Freedesktop.org Notification Support" msgstr "Поддержка уведомлений Freedesktop.org" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "Настройка интерфейсов:" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Игра" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Go" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Зеленый" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Группа" @@ -1111,15 +1068,15 @@ msgstr "Группа {0}: {1}" msgid "Group {}" msgstr "Группа {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Immodule-файл ${2} Gtk ${1} не существует." -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Кэш IM-модуля Gtk:" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Файлы IM-модуля Gtk:" @@ -1127,77 +1084,77 @@ msgstr "Файлы IM-модуля Gtk:" msgid "Hall of Shame for Linux IME Support" msgstr "Зал позора за поддержку IME в Linux" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "Hangul" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "Hangul Banja" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "Hangul End" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "Hangul Hanja" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "Hangul Jamo" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "Hangul Jeonja" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "Hangul PostHanja" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "Hangul PreHanja" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "Hangul Romaja" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "Hangul Special" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "Hangul Start" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "Hankaku" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Помощь" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "Henkan" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "Гибернация" @@ -1210,56 +1167,56 @@ msgstr "Скрытые уведомления" msgid "Hidden clipboard content that contains a password" msgstr "Скрытое содержимое буфера обмена, содержащее пароль" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "Скрыть наложение, если размер не подходит" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "Выделить фон" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "Цвет фона выделения" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "Выделить цветом слово-кандидат" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "Выделить поле клика" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "Выделить цветом текст" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "Хирагана" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "Хирагана Катакана" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "История" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "Home" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "Домашний офис" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "Домашняя страница" @@ -1268,7 +1225,7 @@ msgstr "Домашняя страница" msgid "Home:" msgstr "Домашний:" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "Горячие ссылки" @@ -1288,7 +1245,7 @@ msgstr "" "Горячая клавиша для переключения на определённый метод ввода только для " "текущего контекста ввода" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1338,7 +1295,7 @@ msgstr "" "интеграции с IBus, чтобы использовать любой метод ввода, отличный от ${2}. " "Для получения подробной информации см. ${link}." -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "Изображение" @@ -1360,31 +1317,31 @@ msgstr "Настройка метода ввода" msgid "Input Method Related Environment Variables: " msgstr "Относящиеся к методу ввода переменные окружения: " -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "Методы ввода:" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "Поле ввода" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "Фон поля ввода" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "Граница поля ввода" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "Поле ввода выделено" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "В поле ввода выделен фон слова-кандидата" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "Выделение границы слова-кандидата в поле ввода" @@ -1401,7 +1358,7 @@ msgstr "" "конфигурации. Это обычно используется такими модулями, как буфер обмена или " "быстрая фраза." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Вставка" @@ -1410,11 +1367,11 @@ msgstr "Вставка" msgid "Interval of saving user data in minutes" msgstr "Интервал сохранения пользовательских данных в минутах" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "Неверный файл конфигурации дополнения ${1}." -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1440,26 +1397,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Панель метода ввода KDE" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE Plasma (экспериментально)" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "Кана Lock" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "Кана Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "Kanji" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "Катакана" @@ -1488,12 +1445,12 @@ msgstr "Клавиатура - {0}" msgid "Keyboard - {0} - {1}" msgstr "Клавиатура - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "Уменьшить яркость клавиатуры" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "Увеличить яркость клавиатуры" @@ -1502,315 +1459,315 @@ msgstr "Увеличить яркость клавиатуры" msgid "Keyboard Layout:" msgstr "Раскладка клавиатуры:" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "Подсветка клавиатуры вкл./выкл" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "Клавиатура Menu" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "Keypad-блок клавиатуры *" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "Keypad-блок клавиатуры +" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "Keypad-блок клавиатуры ," -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "Keypad-блок клавиатуры -" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "Keypad-блок клавиатуры ." -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "Keypad-блок клавиатуры /" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "Keypad-блок клавиатуры 0" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "Keypad-блок клавиатуры 1" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "Keypad-блок клавиатуры 2" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "Keypad-блок клавиатуры 3" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "Keypad-блок клавиатуры 4" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "Keypad-блок клавиатуры 5" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "Keypad-блок клавиатуры 6" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "Keypad-блок клавиатуры 7" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "Keypad-блок клавиатуры 8" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "Keypad-блок клавиатуры 9" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "Клавиатура =" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "Keypad-блок клавиатуры Begin" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "Keypad-блок клавиатуры Delete" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "Keypad-блок клавиатуры Down" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "Keypad-блок клавиатуры End" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "Keypad-блок клавиатуры Enter" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "Клавиатура F1" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "Клавиатура F2" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "Клавиатура F3" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "Клавиатура F4" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "Keypad-блок клавиатуры Home" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "Keypad-блок клавиатуры Insert" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "Keypad-блок клавиатуры Left" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "Keypad-блок клавиатуры Page Down" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "Keypad-блок клавиатуры Page Up" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "Keypad-блок клавиатуры Right" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "Клавиатура Space" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "Клавиатура Tab" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "Keypad-блок клавиатуры Up" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Процесс Kimpanel:" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "Последнее слово-кандидат" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "Launch (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "Launch (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "Launch (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "Launch (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "Launch (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "Launch (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "Launch (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "Launch (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "Launch (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "Launch (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "Launch (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "Launch (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "Launch (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "Launch (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "Launch (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "Launch (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "Запустить почту" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "Left" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "Левая клавиша Alt" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "Левая клавиша Control" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "Левая клавиша Hyper" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "Левая клавиша Shift" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "Левая клавиша Super" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "LightBulb" @@ -1819,11 +1776,11 @@ msgstr "LightBulb" msgid "Locale:" msgstr "Локаль:" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "Журнал:" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "Выйти" @@ -1832,142 +1789,142 @@ msgstr "Выйти" msgid "Long Press behavior" msgstr "Поведение при длительном нажатии" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "Пересылка почты" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "Поле" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "Поле внизу" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "Поле слева" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "Поле справа" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "Поле сверху" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "Поля вокруг всего содержимого" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "Поле вокруг текста" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "Рынок" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "Быстрая перемотка Медиа вперед" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "Следующее Медиа" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "Медиа на паузе" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "Воспроизведение Медиа" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "Предыдущее Медиа" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "Запись Медиа" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "Перемотка Медиа" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "Остановка Медиа" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "Встреча" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "Меню" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "Меню" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "Фон меню" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "Граница меню" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "Шрифт меню" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "Menu PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "Фон выбранного пункта меню" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "Граница выбранного пункта меню" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "Разделитель меню" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "Мессенджер" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "Метаданные" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "Отключение микрофона" @@ -1976,46 +1933,46 @@ msgstr "Отключение микрофона" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "Тайм-аут только горячей клавиши-модификатора в миллисекундах" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "Уменьшить яркость монитора" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "Увеличить яркость монитора" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "Muhenkan" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "Несколько слов-кандидатов" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "Музыка" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "Мои сайты" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "Имя" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "Новое" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "Новости" @@ -2024,7 +1981,7 @@ msgstr "Новости" msgid "Next Candidate" msgstr "Следующее слово-кандидат" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "Кнопка следующей страницы" @@ -2040,11 +1997,11 @@ msgstr "История буфера обмена отсутствует." msgid "None" msgstr "Нет" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "Обычный цвет текста" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2066,7 +2023,7 @@ msgstr "Заметка для пользователей GNOME старше ве msgid "Notification" msgstr "Уведомление" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2083,38 +2040,38 @@ msgstr "" "Обнаружена только поддержка эмодзи. Чтобы включить проверку орфографии, вам " "может потребоваться установить данные проверки орфографии для языка." -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "Открыть" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "Открыть URL" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "Выбор" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "Наложение поля клипа" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "Наложенное изображение" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "Смещение X" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "Смещение Y" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "Позиция наложения" @@ -2130,17 +2087,17 @@ msgstr "Владелец имени DBus ${1} — ${2}." msgid "PID of DBus name ${1} owner is ${2}." msgstr "PID владельца имени DBus ${1} — ${2}." -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "Страница Вниз" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "Страница Вверх" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "Выравнивание кнопки страницы по вертикали" @@ -2148,7 +2105,7 @@ msgstr "Выравнивание кнопки страницы по вертик msgid "Page size" msgstr "Размер страницы" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "Вставить" @@ -2157,17 +2114,17 @@ msgstr "Вставить" msgid "Paste Primary" msgstr "Вставить основное" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "Пауза" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "Phone" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "Картинки" @@ -2193,12 +2150,12 @@ msgstr "" "помощью инструмента, предоставляемого вашим дистрибутивом, или добавьте ${1}" "к вашему ${2}. Смотрите ${link}." -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "Выключить" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "Выключение" @@ -2215,7 +2172,7 @@ msgstr "Предварительное редактирование отключ msgid "Preedit enabled" msgstr "Предварительное редактирование включено" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "Иконка предпочтительного текста" @@ -2227,16 +2184,16 @@ msgstr "Presage" msgid "Prev Candidate" msgstr "Предыдущее слово-кандидат" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "Кнопка предыдущей страницы" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "Предыдущее слово-кандидат" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "Снимок экрана" @@ -2245,7 +2202,7 @@ msgstr "Снимок экрана" msgid "Program" msgstr "Программа" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Файлы модуля Qt IM:" @@ -2257,27 +2214,27 @@ msgstr "Быстрая фраза" msgid "Quick Phrase: " msgstr "Быстрая фраза: " -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "Red" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "Повторить" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "Обновить" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "Перезагрузить" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "Ответить" @@ -2286,62 +2243,62 @@ msgstr "Ответить" msgid "Reset state on Focus In" msgstr "Сбросить состояние при фокусировке" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Перезапустить" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Возврат каретки" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "Right" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "Правая клавиша Alt" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "Правая клавиша Control" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "Правая клавиша Hyper" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "Правая клавиша Shift" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "Правая клавиша Super" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "Romaji" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "Вращать окна" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "Вращение KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "Вращение PB" @@ -2350,22 +2307,22 @@ msgstr "Вращение PB" msgid "Running as root:" msgstr "Запуск с правами администратора:" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Сохранить" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "Заставка" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "Блокировка прокрутки" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "Поиск" @@ -2374,7 +2331,7 @@ msgstr "Поиск" msgid "Seconds before clearing password" msgstr "Секунд до сброса пароля" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "Выбрать" @@ -2391,11 +2348,11 @@ msgstr "Выбрать локальный метод ввода:" msgid "Select specific input method via keyboard" msgstr "Выберите конкретный метод ввода с клавиатуры" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "Цвет текста выбранного элемента" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "Отправить" @@ -2411,11 +2368,11 @@ msgstr "" "использовать внутреннее преобразование раскладки Fcitx, добавив раскладку в " "качестве метода ввода в группу методов ввода." -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "Фон разделителя" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "Затенённое поле" @@ -2423,12 +2380,12 @@ msgstr "Затенённое поле" msgid "Share Input State" msgstr "Поделиться состоянием ввода" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Shift" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "Магазин" @@ -2441,7 +2398,7 @@ msgstr "Показывать информацию о способе ввода msgid "Show Input Method Information when switch input method" msgstr "Показывать информацию о методе ввода при переключении" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "Показать имя раскладки в значке" @@ -2453,7 +2410,7 @@ msgstr "Показать информацию о компактном метод msgid "Show first input method information" msgstr "Показать информацию о первом методе ввода" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2482,17 +2439,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "Пропустить первый метод ввода при перечислении" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "Sleep" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "Space" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "Расстояние" @@ -2500,22 +2457,22 @@ msgstr "Расстояние" msgid "Spell" msgstr "Подсказки" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "Программа проверки орфографии" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "Разделение экрана" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "Электронная таблица" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "Режим ожидания" @@ -2529,16 +2486,16 @@ msgstr "Запустить метод ввода" msgid "Status Notifier" msgstr "Уведомление о статусе" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "Остановить" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "Подменю" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "Подзаголовок" @@ -2547,17 +2504,17 @@ msgstr "Подзаголовок" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "Поддержка" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "Приостановить" @@ -2581,17 +2538,17 @@ msgstr "Группа переключена на {0}" msgid "System Info:" msgstr "Информация о системе:" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "System Request" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Tab" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "Панель задач" @@ -2600,12 +2557,12 @@ msgstr "Панель задач" msgid "Temporally switch between first and current Input Method" msgstr "Временное переключение между основным и текущим методом ввода" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "Терминал" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2631,32 +2588,32 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "Сценарий запущен пользователем ${1} (${2})." -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "Тема" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "Это эффективно только тогда, когда значок в трее встроен." -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" "Этот параметр эффективен только в том случае, если имидж не установлен." -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "Для этого параметра требуется поддержка wayland compositor." -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "Этот параметр всегда будет отключен в XWayland." -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "Это значение должно быть меньше любого значения разницы." -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2666,7 +2623,7 @@ msgstr "" "целях, пожалуйста, дважды проверьте и удалите при необходимости, прежде чем " "публиковать ее в Интернете публично." -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "Время" @@ -2687,66 +2644,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "Переключение встроенного предварительного редактирования" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "Инструменты" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "Top" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "Top Center" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "Top Left" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "Верхнее меню" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "Top Right" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "Сенсорная Панель Выключена" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "Сенсорная Панель Включена" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "Переключатель сенсорной панели" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "Touroku" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "Ход" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "Шрифт в лотке" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "Цвет контура лейбла лотка" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "Цвет текста лейбла лотка" @@ -2788,7 +2745,7 @@ msgstr "Печатание с помощью Fcitx и Kimpanel" msgid "Unable to find a program to check dbus." msgstr "Не удается найти программу для проверки dbus." -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Отменить" @@ -2801,7 +2758,7 @@ msgstr "Юникод" msgid "Unicode: " msgstr "Юникод: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Вверх" @@ -2810,21 +2767,21 @@ msgstr "Вверх" msgid "Use On The Spot Style (Needs restarting)" msgstr "Использовать стиль On The Spot (требуется перезапуск программы)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "Использовать DPI для каждого экрана на X11" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" "Используйте все горизонтальное пространство для выделения, когда это " "вертикальный список" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "Использовать язык метода ввода для отображения текста" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "Используйте колёсико мыши, для перелистывания страниц" @@ -2832,7 +2789,7 @@ msgstr "Используйте колёсико мыши, для перелис msgid "Use new compose behavior" msgstr "Использовать новое поведение при написании" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "Пользовательский интерфейс:" @@ -2848,59 +2805,59 @@ msgstr "" "Использование ${1} для проверки фактического модуля im, который будет " "использоваться в текущей среде:" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "Версия" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "Версия Line:" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "Вертикальный список слов-кандидатов" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "Видео" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "Вид" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "Пустой Cимвол" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "Уменьшить громкость" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "Отключение звука" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "Увеличить громкость" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "Выход из сна" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2922,7 +2879,7 @@ msgstr "Wayland Диагностика" msgid "Wayland Input method frontend" msgstr "Интерфейс метода ввода Wayland" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Веб-камера" @@ -2960,12 +2917,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "Почему не рекомедуется запускать с правами администратора" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "Беспроводная связь" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "Текстовый редактор" @@ -2982,37 +2939,37 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "XDG SESSION TYPE:" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM encoding:" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "XIM для Emacs:" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "XIM_SERVERS в окне суперпользователя:" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS не заданы" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "Указанное в переменной окружения имя сервера Xim: ${1}." -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" "Имя сервера Xim совпадает с тем, которое задано в переменной окружения." -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." @@ -3020,7 +2977,7 @@ msgstr "" "Имя сервера Xim \"${1}\" отличается от того, которое задано в переменной " "окружения: \"${2}\"." -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "Жёлтое" @@ -3045,11 +3002,11 @@ msgstr "" "выполнения скрипта может быть некорректным. Для подробной информации см. " "${2}." -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "Вы используете xim в ${1} программах." -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "Возможны проблемы при использовании fcitx в ${1} программах." @@ -3073,7 +3030,7 @@ msgstr "" "пакета этого KCModule обычно — kcm-fcitx5, kde-config-fcitx5 или fcitx5-" "configtool. Сейчас откроется каталог конфигурации." -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -3083,7 +3040,7 @@ msgstr "" "вы не сможете использовать метод ввода в Emacs из-за очень старой ошибки в " "Emacs, которую не один год не хотят исправлять в апстриме." -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -3092,22 +3049,22 @@ msgstr "" "отличается от UTF-8. Могут возникнуть проблемы при выполнении строк с " "использованием XIM." -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "Zenkaku" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "Zenkaku Hankaku" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "Увеличить" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "Уменьшить" @@ -3120,7 +3077,7 @@ msgstr "выполняется:" msgid "here" msgstr "здесь" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/vi.po b/po/vi.po index 25a295c3..cc552470 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: zenfas, 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" @@ -107,7 +107,7 @@ msgstr "" msgid "A virtual keyboard backend based on DBus" msgstr "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" @@ -119,7 +119,7 @@ msgstr "Kích hoạt kiểu gõ" msgid "Active By Default" msgstr "Kích hoạt mặc định" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "Thêm vào ưa thích" @@ -128,19 +128,19 @@ msgstr "Thêm vào ưa thích" msgid "Add Unicode Typing Support" msgstr "Thêm hỗ trợ gõ Unicode" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "Addon cấu hình đường đẫn:" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "Thư viện Addon:" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "Danh sách Addon:" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "Điều chỉnh độ sáng" @@ -149,11 +149,11 @@ msgstr "Điều chỉnh độ sáng" msgid "All" msgstr "Tất cả" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "Module Gtk ${1} tồn tại" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "Tất cả thư việc cho add được tìm thấy." @@ -177,7 +177,7 @@ msgstr "" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -186,12 +186,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "Luôn cài đặt bố cục thành bố cục nhóm" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "Ứng dụng còn lại" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "Quyền ứng dụng" @@ -200,36 +200,36 @@ msgstr "Quyền ứng dụng" msgid "Applications disabled for long press" msgstr "Các ứng dụng bị vô hiệu hóa khi nhấn lâu" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "Theo dõi chu kỳ âm thanh" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "Phát ngẫu nhiên âm thanh" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "Lặp lại âm thanh" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "Tác giả" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "Xa" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "Trở lại" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "Lùi về trước" @@ -238,15 +238,15 @@ msgstr "Lùi về trước" msgid "Backends" msgstr "Phụ trợ" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "Nền" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "Hình nền" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Backspace" @@ -255,7 +255,7 @@ msgstr "Backspace" msgid "Bash Version:" msgstr "Phiên bản Bash:" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "Pin" @@ -268,69 +268,69 @@ msgstr "Hướng dẫn sử dụng cho người mới" msgid "Behavior" msgstr "Hành vi" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "Xanh da trời" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "Bluetooth" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "Lề mờ" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "Mặt nạ làm mờ" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "Sách" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "Màu viền" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "Chiều rộng biên" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "Trung tâm ở đáy" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "Trái dưới đáy" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "Phải ở đáy" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "Trình duyệt" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "Máy tính" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "Hủy bỏ" @@ -347,28 +347,24 @@ msgstr "Không thể kết nối đến ${1} bình thường." msgid "Cannot determine desktop environment." msgstr "Không thể xác định môi trường Desktop." -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "Không thể tìm đường dẫn cấu hình addon ${1} " -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "Không thể tìm thực thi ${1}!" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "Không thể tìm thấy module ${1} cho gtk ${2}trong bộ nhớ cache." -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "Không thể tìm thấy module ${1} cho gtk ${2}." -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "Không thể tìm thấy module kiểu gõ ${1} cho ${2}." -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "Không thể tìm thấy ${2}cho gtk ${1}" @@ -376,12 +372,7 @@ msgstr "Không thể tìm thấy ${2}cho gtk ${1}" msgid "Cannot find DBus name ${1} owner." msgstr "Không thể tìm thấy chủ sở hữu ${1} DBus." -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "" -"Không thể tìm thấy công cụ cấu hình GUI, bạn hãy cài cặt ${1} hoặc ${2}." - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "Không thể tìm thấy chỗ bật giao diện người dùng ${1}!" @@ -389,19 +380,19 @@ msgstr "Không thể tìm thấy chỗ bật giao diện người dùng ${1}!" msgid "Cannot find fcitx5 executable!" msgstr "Không thể tìm thấy file thực thi fcitx5! " -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "Không thể tìm thấy file ${1} của addon ${2}. " -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "Không thể tìm thấy thư viện yêu cầu cho ${1} của addon ${2}." -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "Không thể tìm thấy cache immodule cho gtk ${1}" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "" @@ -412,28 +403,28 @@ msgstr "" msgid "Cannot find pid of DBus name ${1} owner." msgstr "Không thể tìm thấy pid của tên DBus ${1} sở hữu." -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "Không thể tìm thấy xim_server trong root window." -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "Không thể thông dịch XMODIFIERS: ${1}." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "CapsLock" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "Trung tâm" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "Trung tâm bên trái" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "Trung tâm bên phải" @@ -441,7 +432,7 @@ msgstr "Trung tâm bên phải" msgid "Change Fcitx 5 Configuration" msgstr "Thay đổi cấu hình Fctix 5" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Hộp kiểm" @@ -453,12 +444,12 @@ msgstr "Chọn phím để sửa đổi" msgid "Classic User Interface" msgstr "Giao diện người dùng truyền thống" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "Xóa" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "Nhấp vào lề" @@ -470,21 +461,21 @@ msgstr "Bảng nhớ tạm" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "Bảng nhớ tạm (Nhấn BackSpace/Delete để xóa lịch sử):" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "Đóng" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "Nhập mã" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "Màu" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "Cộng đồng" @@ -505,35 +496,11 @@ msgstr "Hoàn thành tạm thời được kích hoạt." msgid "Completion is enabled." msgstr "Hoàn thành được kích hoạt." -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "Cấu hình GUI cho gtk${1}không được tìm thấy." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "Cấu hình GUI cho gtk${1}:" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "Cấu hình GUI cho kde:" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "Cấu hình GUI cho qt không được tìm thấy." - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Cấu hình GUI cho qt:" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "Cấu hình công cụ Wrapper:" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "Cấu hình:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "Cấu hình" @@ -542,12 +509,12 @@ msgstr "Cấu hình" msgid "Control" msgstr "Điều khiển" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Điều khiển" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "Chép" @@ -576,7 +543,7 @@ msgstr "Tùy chỉnh" msgid "Custom Xkb Option" msgstr "Tùy chỉnh Xkb" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "Cắt" @@ -601,12 +568,12 @@ msgstr "DBus dựa trên icon mới Freedesktop.org" msgid "DBus interface:" msgstr "Giao diện DBus:" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "Chủ đề tối" @@ -647,12 +614,12 @@ msgstr "Trang mặc định trước đó" msgid "Default page size" msgstr "Kích thướng trang mặc định" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "Xóa" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "Mô tả" @@ -687,7 +654,7 @@ msgstr "Xác định ứng dụng đang chạy (Cần khởi động lại) msgid "Directories:" msgstr "Đường dẫn:" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "Hiển thị" @@ -700,12 +667,12 @@ msgstr "Không hiển thị lại" msgid "Do not show password from password managers" msgstr "" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "Tài liệu" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "Xuống" @@ -714,17 +681,17 @@ msgstr "Xuống" msgid "Editor" msgstr "Biên tập" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "Eisu Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "Eisu toggle" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "Đẩy ra" @@ -737,7 +704,7 @@ msgstr "Emoji" msgid "Enable" msgstr "Cho phép" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "Cho phép mờ trên KWin" @@ -753,7 +720,7 @@ msgstr "Bật gợi ý emoji" msgid "Enable emoji in quickphrase" msgstr "Bật emoji trong cụm từ nhanh" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "" @@ -765,7 +732,7 @@ msgstr "Bật gợi ý mặc định" msgid "Enchant" msgstr "Làm vui thích" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Kết thúc" @@ -794,7 +761,7 @@ msgstr "Liệt kê nhóm phương thức nhập liệu sau" msgid "Enumerate when press trigger key repeatedly" msgstr "Liệt kê khi nhấn phím kích hoạt nhiều lần" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -804,7 +771,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "" @@ -820,26 +787,26 @@ msgstr "Môi trường:" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Thoát ra" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "Thực thi" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "Thoát" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "Không thể tìm ${1} trong cache immodule tại ${2}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "Không thể tìm ${1} trong đầu ra của ${2}" @@ -847,7 +814,7 @@ msgstr "Không thể tìm ${1} trong đầu ra của ${2}" msgid "Fallback Spell check language" msgstr "Kiểm tra chính tả ngôn ngữ dự phòng" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Yêu thích" @@ -869,14 +836,10 @@ msgstr "Cấu hình Fcitx 5" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx Addon:" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Cấu hình UI Fcitx:" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Trạng thái Fcitx:" @@ -910,29 +873,29 @@ msgstr "Phiên bản Fcitx: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "Tài chính" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "Tìm" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -944,11 +907,11 @@ msgstr "" "nếu bạn không sử dụng bất kỳ ứng dụng Qt nào với phiên bản Qt nhất định hoặc " "bạn đang sử dụng hỗ trợ nhập văn bản của Qt trong Wayland." -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "Font" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -962,11 +925,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "Bắt buộc font DPI trên Wayland" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "Tiếp theo" @@ -975,7 +938,7 @@ msgstr "Tiếp theo" msgid "Forward key event instead of commiting text if it is not handled" msgstr "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -987,56 +950,51 @@ msgstr "" msgid "Found ${1} ${2} processes:" msgstr "" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "" @@ -1044,26 +1002,26 @@ msgstr "" msgid "Freedesktop.org Notification Support" msgstr "Hỗ trợ thông báo Freedesktop.org" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "Cấu hình giao diện:" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "Trò chơi" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "Đi" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "Xanh lá" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "Nhóm" @@ -1078,15 +1036,15 @@ msgstr "Nhóm {0}: {1}" msgid "Group {}" msgstr "Nhóm {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "" @@ -1094,77 +1052,77 @@ msgstr "" msgid "Hall of Shame for Linux IME Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "Trợ giúp" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "Hibernate" @@ -1177,56 +1135,56 @@ msgstr "" msgid "Hidden clipboard content that contains a password" msgstr "" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "Hiragana" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "Hiragana Katakana" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "Lịch sử" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "" @@ -1235,7 +1193,7 @@ msgstr "" msgid "Home:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "" @@ -1254,7 +1212,7 @@ msgid "" msgstr "" "Phím tắt để chuyển sang phương thức nhập thứ N chỉ cho ngữ cảnh nhập hiện tại" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "" @@ -1290,7 +1248,7 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "Hình ảnh" @@ -1312,31 +1270,31 @@ msgstr "Cấu hình Kiểu Gõ" msgid "Input Method Related Environment Variables: " msgstr "Biến môi trường liên quan kiểu gõ:" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "Kiểu Gõ:" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "Bảng điều khiển nhập liệu" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "" @@ -1353,7 +1311,7 @@ msgstr "" "chúng. Điều này thường được sử dụng bởi các mô-đun như clipboard hoặc " "quickphrase." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Chèn" @@ -1362,11 +1320,11 @@ msgstr "Chèn" msgid "Interval of saving user data in minutes" msgstr "" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "File cấu hình addon không có giá trị ${1}." -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1385,26 +1343,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "Bảng điều khiển kiểu gõ KDE" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE Plasma (Thử nghiệm)" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "" @@ -1431,12 +1389,12 @@ msgstr "Bàn phím - {0}" msgid "Keyboard - {0} - {1}" msgstr "Bàn phím - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "" @@ -1445,315 +1403,315 @@ msgstr "" msgid "Keyboard Layout:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "" -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "" -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "" @@ -1762,11 +1720,11 @@ msgstr "" msgid "Locale:" msgstr "" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "" @@ -1775,142 +1733,142 @@ msgstr "" msgid "Long Press behavior" msgstr "" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "" @@ -1919,46 +1877,46 @@ msgstr "" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "" @@ -1967,7 +1925,7 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" @@ -1983,11 +1941,11 @@ msgstr "" msgid "None" msgstr "" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2006,7 +1964,7 @@ msgstr "" msgid "Notification" msgstr "Thông báo" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2021,38 +1979,38 @@ msgid "" "install spell check data for the language." msgstr "" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "" @@ -2068,17 +2026,17 @@ msgstr "" msgid "PID of DBus name ${1} owner is ${2}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "" @@ -2086,7 +2044,7 @@ msgstr "" msgid "Page size" msgstr "" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "" @@ -2095,17 +2053,17 @@ msgstr "" msgid "Paste Primary" msgstr "" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "" @@ -2126,12 +2084,12 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "" @@ -2148,7 +2106,7 @@ msgstr "" msgid "Preedit enabled" msgstr "" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "" @@ -2160,16 +2118,16 @@ msgstr "" msgid "Prev Candidate" msgstr "" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "" @@ -2178,7 +2136,7 @@ msgstr "" msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "" @@ -2190,27 +2148,27 @@ msgstr "" msgid "Quick Phrase: " msgstr "" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "" @@ -2219,62 +2177,62 @@ msgstr "" msgid "Reset state on Focus In" msgstr "" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "Khởi động lại" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "" @@ -2283,22 +2241,22 @@ msgstr "" msgid "Running as root:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "Lưu" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "" @@ -2307,7 +2265,7 @@ msgstr "" msgid "Seconds before clearing password" msgstr "" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "" @@ -2324,11 +2282,11 @@ msgstr "" msgid "Select specific input method via keyboard" msgstr "" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "" @@ -2340,11 +2298,11 @@ msgid "" "layout conversion by adding layout as input method to the input method group." msgstr "" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "" @@ -2352,12 +2310,12 @@ msgstr "" msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "" @@ -2370,7 +2328,7 @@ msgstr "" msgid "Show Input Method Information when switch input method" msgstr "" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" @@ -2382,7 +2340,7 @@ msgstr "" msgid "Show first input method information" msgstr "" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2406,17 +2364,17 @@ msgstr "" msgid "Skip first input method while enumerating" msgstr "" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "" @@ -2424,22 +2382,22 @@ msgstr "" msgid "Spell" msgstr "" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "" @@ -2453,16 +2411,16 @@ msgstr "" msgid "Status Notifier" msgstr "" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "" @@ -2471,17 +2429,17 @@ msgstr "" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "" @@ -2505,17 +2463,17 @@ msgstr "" msgid "System Info:" msgstr "Thông tin hệ thống:" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "Yêu cầu hệ thống" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "" @@ -2524,12 +2482,12 @@ msgstr "" msgid "Temporally switch between first and current Input Method" msgstr "" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2548,38 +2506,38 @@ msgstr "" msgid "The script is run as ${1} (${2})." msgstr "" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " "publicly." msgstr "" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "" @@ -2596,66 +2554,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "" @@ -2697,7 +2655,7 @@ msgstr "Gõ với Fcitx và Kimpanel" msgid "Unable to find a program to check dbus." msgstr "" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "Hoàn tác" @@ -2710,7 +2668,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2719,19 +2677,19 @@ msgstr "" msgid "Use On The Spot Style (Needs restarting)" msgstr "" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "" @@ -2739,7 +2697,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2753,59 +2711,59 @@ msgid "" "environment:" msgstr "" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2824,7 +2782,7 @@ msgstr "" msgid "Wayland Input method frontend" msgstr "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2853,12 +2811,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "" @@ -2875,42 +2833,42 @@ msgstr "" msgid "XDG SESSION TYPE:" msgstr "" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "" @@ -2928,11 +2886,11 @@ msgid "" "this script may not be accurate. See ${2} for more information." msgstr "" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "" @@ -2950,35 +2908,35 @@ msgid "" "fcitx5-configtool. Now it will open the configuration directory." msgstr "" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " "upstream refuse to fix for years." msgstr "" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." msgstr "" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "" @@ -2991,7 +2949,7 @@ msgstr "thực thi:" msgid "here" msgstr "ở đây" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index db59f5bb..22be9269 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Yiyu Liu, 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/fcitx/teams/12005/" @@ -111,7 +111,7 @@ msgstr "<未指派>" msgid "A virtual keyboard backend based on DBus" msgstr "一个基于 DBus 的虚拟键盘后端" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "重点色" @@ -123,7 +123,7 @@ msgstr "激活输入法" msgid "Active By Default" msgstr "默认状态为激活" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "添加收藏" @@ -132,19 +132,19 @@ msgstr "添加收藏" msgid "Add Unicode Typing Support" msgstr "添加 Unicode 输入支持" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "插件配置文件目录：" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "插件库: " -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "插件列表：" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "调整亮度" @@ -153,11 +153,11 @@ msgstr "调整亮度" msgid "All" msgstr "所有" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "找到的全部 Gtk ${1} 输入法模块文件均存在。" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "所有插件所需的库都被找到。" @@ -181,7 +181,7 @@ msgstr "允许在密码框中使用输入法" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -190,12 +190,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "总是设置布局为只有分组布局" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "应用程序左" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "应用程序右" @@ -204,36 +204,36 @@ msgstr "应用程序右" msgid "Applications disabled for long press" msgstr "禁用长按的程序" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "音频循环音轨" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "音频随机播放" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "音频重复" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "作者" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "离开" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "后退" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "向后" @@ -242,15 +242,15 @@ msgstr "向后" msgid "Backends" msgstr "后端" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "背景" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "背景图片" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "退格" @@ -259,7 +259,7 @@ msgstr "退格" msgid "Bash Version:" msgstr "Bash 版本：" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "电池" @@ -272,69 +272,69 @@ msgstr "入门指南" msgid "Behavior" msgstr "行为" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "蓝" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "蓝牙" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "模糊区域边距" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "模糊遮罩" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "书" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "边框颜色" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "边框宽度" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "按钮" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "底部居中" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "左下" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "右下" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "浏览器" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "计算器" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "取消" @@ -351,28 +351,24 @@ msgstr "无法连接到 ${1}。" msgid "Cannot determine desktop environment." msgstr "无法确定桌面环境。" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "无法找到 ${1} 的插件配置目录。" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "无法找到 ${1} 的可执行文件！" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "无法在缓存中找到 gtk ${2} 的 ${1} 输入法模块。" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "无法找到 gtk ${2} 的 ${1} 输入法模块。" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "无法找到 ${2} 的 ${1} 输入法模块。" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "无法找到 gtk ${1} 的 ${2}。" @@ -380,11 +376,7 @@ msgstr "无法找到 gtk ${1} 的 ${2}。" msgid "Cannot find DBus name ${1} owner." msgstr "找不到 DBus 名称 ${1} 的所有者。" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "无法找到一个图形界面的配置工具，请安装 ${1} 或 ${2}。" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "无法找到启用的 ${1} 用户界面！" @@ -392,19 +384,19 @@ msgstr "无法找到启用的 ${1} 用户界面！" msgid "Cannot find fcitx5 executable!" msgstr "无法找到 fcitx5 可执行文件!" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "无法找到插件 ${2} 的文件 ${1}。" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "无法找到插件 ${2} 所需的库 ${1}。" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "无法找到 gtk ${1} 的输入法模块缓存" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "无法找到 kimpanel dbus 接口或非 kimpanel 用户界面." @@ -413,28 +405,28 @@ msgstr "无法找到 kimpanel dbus 接口或非 kimpanel 用户界面." msgid "Cannot find pid of DBus name ${1} owner." msgstr "找不到 DBus 名称 ${1} 的 pid 所有者。" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "无法在根窗口找到 xim_server。" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "无法解析 XMODIFIERS: ${1}." -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "大写锁定" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "居中" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "左侧居中" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "右侧居中" @@ -442,7 +434,7 @@ msgstr "右侧居中" msgid "Change Fcitx 5 Configuration" msgstr "修改 Fcitx 5 配置" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "复选框" @@ -454,12 +446,12 @@ msgstr "选词修饰键" msgid "Classic User Interface" msgstr "经典用户界面" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "清空" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "点击区域边距" @@ -471,21 +463,21 @@ msgstr "剪贴板" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "剪贴板 (按退格/删除键清空历史): " -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "关闭" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "代码输入" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "颜色" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "社区" @@ -506,35 +498,11 @@ msgstr "已暂时启用补全。" msgid "Completion is enabled." msgstr "已启用补全。" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "未找到 gtk${1} 的配置界面." - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "用于 gtk${1} 的配置界面：" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "KDE 的配置界面：" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "未找到 qt 的配置界面。" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Qt 的配置界面：" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "配置工具封装：" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "配置:" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "配置" @@ -543,12 +511,12 @@ msgstr "配置" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "复制" @@ -577,7 +545,7 @@ msgstr "自定义" msgid "Custom Xkb Option" msgstr "自定义 Xkb 选项" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "剪切" @@ -602,12 +570,12 @@ msgstr "基于 DBus 的新 Freedesktop.org 托盘图标" msgid "DBus interface:" msgstr "DBus 界面：" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "深色主题" @@ -648,12 +616,12 @@ msgstr "默认上一页" msgid "Default page size" msgstr "默认页大小" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "删除" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "描述" @@ -693,7 +661,7 @@ msgstr "检测当前运行的程序 (需要重启)" msgid "Directories:" msgstr "目录：" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "显示" @@ -706,12 +674,12 @@ msgstr "不要再显示" msgid "Do not show password from password managers" msgstr "不要显示密码管理工具中的密码" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "文档" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "下" @@ -720,17 +688,17 @@ msgstr "下" msgid "Editor" msgstr "编辑器" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "英数 Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "英数切换" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "弹出" @@ -743,7 +711,7 @@ msgstr "颜文字" msgid "Enable" msgstr "启用" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "KWin 下启用模糊" @@ -759,7 +727,7 @@ msgstr "在输入提示中启用 Emoji" msgid "Enable emoji in quickphrase" msgstr "在快速输入中启用颜文字" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "在 Wayland 下启用分数缩放" @@ -771,7 +739,7 @@ msgstr "默认启用提示" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "行尾" @@ -800,7 +768,7 @@ msgstr "向前切换输入分组" msgid "Enumerate when press trigger key repeatedly" msgstr "反复按切换键时进行轮换" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -812,7 +780,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "环境变量 ${1} 没有设定。" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "环境变量 ${1} 已经正确地设为了“${2}”。" @@ -828,26 +796,26 @@ msgstr "环境：" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "运行 ${1} 时发生错误. 请检查您的区域设置." -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Escape" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "执行" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "退出" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "无法输入法模块缓存 ${2} 中找到 ${1}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "无法在 ${2} 的输出中找到 ${1}。" @@ -855,7 +823,7 @@ msgstr "无法在 ${2} 的输出中找到 ${1}。" msgid "Fallback Spell check language" msgstr "备选拼写检查语言" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "收藏" @@ -877,14 +845,10 @@ msgstr "Fcitx 5 配置" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland 启动器 (实验性)" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx 插件：" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx 配置界面：" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx 状态:" @@ -922,29 +886,29 @@ msgstr "Fcitx 版本: ${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 前端" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "金融" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "查找" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "第一候选词" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "当被主题和桌面支持时使用系统的重点色" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "跟随系统浅色/深色设置" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -955,11 +919,11 @@ msgstr "" "Qt。如果您不使用任何对应版本的 Qt 程序，或者在 Wayland 下使用 Qt 的 text-" "input 支持，下列错误也不是严重问题。" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "字体" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -972,11 +936,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "更多细节请参见 https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "固定 Wayland 的字体 DPI" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "向前" @@ -985,7 +949,7 @@ msgstr "向前" msgid "Forward key event instead of commiting text if it is not handled" msgstr "按键事件未处理时转发按键而不是提交文本" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "找到了 ${1} ${2} 模块：${3}。" @@ -997,56 +961,51 @@ msgstr "找到了 ${1} 个 ${2} 进程：" msgid "Found ${1} ${2} processes:" msgstr "找到了 ${1} 个 ${2} 进程：" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "找到了 ${1} 的插件配置目录：${2}。" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "在 ${2} 找到了 ${1}。" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "找到了 ${1} 个被禁用的插件：" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "找到了 ${1} 个已启用的插件：" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "找到了 ${1} 个已启用的用户界面插件：" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "已找到 gtk ${2} 的 ${1} 输入法模块。" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "找到了 ${1} 的 kcm 模块。" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "在 ${1} 找到了未知 gtk 版本的 ${2}。" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "在 ${2} 找到了 gtk ${1} 的 ${3}。" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "找到了 ${3} 的 ${2} 输入法模块：${1}。" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "在 ${1} 找到了未知 gtk 版本的输入法模块缓存." -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "在 ${2} 找到了 gtk ${1} 的输入法模块缓存。" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "找到了未知的 ${1} qt 模块：${2}。" @@ -1054,26 +1013,26 @@ msgstr "找到了未知的 ${1} qt 模块：${2}。" msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 桌面通知支持" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "前端设置：" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "游戏" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "去" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "绿" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "分组" @@ -1088,15 +1047,15 @@ msgstr "分组 {0}：{1}" msgid "Group {}" msgstr "分组 {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Gtk ${1} 输入法模块文件 ${2} 不存在。" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Gtk 输入法模块缓存：" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Gtk 输入法模块文件：" @@ -1104,77 +1063,77 @@ msgstr "Gtk 输入法模块文件：" msgid "Hall of Shame for Linux IME Support" msgstr "Linux 输入法支持耻辱堂" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "韩文" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "韩文半角" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "谚文结束" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "谚文汉字" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "谚文字母" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "韩文前" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "韩文后汉字" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "韩文预汉字" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "韩文罗马字" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "韩文特殊" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "韩文开始" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "半角" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "帮助" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "变换" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "休眠" @@ -1187,56 +1146,56 @@ msgstr "隐藏通知" msgid "Hidden clipboard content that contains a password" msgstr "隐藏剪贴板中包含密码的内容" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "显示区域不足时隐藏覆盖图片" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "高亮背景" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "高亮背景颜色" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "高亮候选词颜色" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "高亮点击边距" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "高亮文字颜色" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "平假名" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "平假名片假名" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "历史" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "行首" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "主办公室" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "主页" @@ -1245,7 +1204,7 @@ msgstr "主页" msgid "Home:" msgstr "主目录：" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "热门链接" @@ -1263,7 +1222,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "切换到当前局部输入法到第...个输入法的按键" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper" @@ -1304,7 +1263,7 @@ msgstr "" "${g36_disable_ibus} 禁用 IBus 集成已使用除 ${2} 之外的任何输入法. 更多细节参" "见 ${link}。" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "图片" @@ -1326,31 +1285,31 @@ msgstr "输入法配置" msgid "Input Method Related Environment Variables: " msgstr "输入法相关的环境变量：" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "输入法：" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "输入面板" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "输入框背景" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "输入框边框" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "输入框高亮" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "输入框高亮候选词背景" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "输入框高亮候选词边框" @@ -1366,7 +1325,7 @@ msgstr "" "输入法也许在自身配置中有不同的设置。 这个选项主要用于模块例如剪贴板和快速输" "入。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "插入" @@ -1375,11 +1334,11 @@ msgstr "插入" msgid "Interval of saving user data in minutes" msgstr "保存用户数据的时间间隔（以分钟为单位）" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "无效的插件配置文件: ${1}。" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1403,26 +1362,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "KDE 输入法面板" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE Plasma (实验性)" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "假名锁定" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "假名 Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "汉字" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "片假名" @@ -1449,12 +1408,12 @@ msgstr "键盘 - {0}" msgid "Keyboard - {0} - {1}" msgstr "键盘 - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "减小键盘背光亮度" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "增加键盘背光亮度" @@ -1463,315 +1422,315 @@ msgstr "增加键盘背光亮度" msgid "Keyboard Layout:" msgstr "键盘布局：" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "键盘背光开关" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "键盘菜单" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "小键盘 *" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "小键盘 +" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "小键盘 ," -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "小键盘 -" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "小键盘 ." -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "小键盘 /" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "小键盘 0" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "小键盘 1" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "小键盘 2" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "小键盘 3" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "小键盘 4" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "小键盘 5" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "小键盘 6" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "小键盘 7" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "小键盘 8" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "小键盘 9" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "小键盘 =" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "小键盘开始" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "小键盘删除" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "小键盘下" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "小键盘行尾" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "小键盘回车" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "小键盘 F1" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "小键盘 F2" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "小键盘 F3" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "小键盘 F4" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "小键盘行首" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "小键盘插入" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "小键盘左" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "小键盘下一页" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "小键盘上一页" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "小键盘右" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "小键盘空格" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "小键盘 Tab" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "小键盘上" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Kimpanel 进程:" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "上一个候选词" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "启动 (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "启动 (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "启动 (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "启动 (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "启动 (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "启动 (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "启动 (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "启动 (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "启动 (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "启动 (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "启动 (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "启动 (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "启动 (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "启动 (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "启动 (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "启动 (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "启动邮件" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "左" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "左 Alt" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "左 Control" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "左 Hyper" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "左 Shift" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "左 Super" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "灯泡" @@ -1780,11 +1739,11 @@ msgstr "灯泡" msgid "Locale:" msgstr "Locale：" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "日志：" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "注销" @@ -1793,142 +1752,142 @@ msgstr "注销" msgid "Long Press behavior" msgstr "长按行为" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "转发邮件" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "边距" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "底部边距" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "左侧边距" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "右侧边距" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "顶部边距" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "内容周围边界" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "文本周围边距" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "市场" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "抹消" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "媒体快进" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "媒体下一首" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "媒体暂停" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "媒体播放" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "媒体上一首" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "媒体录制" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "媒体倒带" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "媒体停止" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "会议" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "菜单" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "菜单" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "菜单背景" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "菜单边框" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "菜单字体" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "菜单 PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "菜单选中项背景" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "菜单选中项边框" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "菜单分隔符" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "即时通信" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "元数据" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "麦克风静音" @@ -1937,46 +1896,46 @@ msgstr "麦克风静音" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "减小屏幕亮度" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "增加屏幕亮度" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "无变换" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "多个候选" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "音乐" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "我的站点" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "名称" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "新建" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "新闻" @@ -1985,7 +1944,7 @@ msgstr "新闻" msgid "Next Candidate" msgstr "下一个候选词" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "下一页按钮" @@ -2001,11 +1960,11 @@ msgstr "无剪贴板历史。" msgid "None" msgstr "无" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "一般文字颜色" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2026,7 +1985,7 @@ msgstr "有关 3.6 之后版本 GNOME 的备注" msgid "Notification" msgstr "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "数字锁定" @@ -2042,38 +2001,38 @@ msgid "" msgstr "" "只找到了颜文字支持。想要启用拼写检查，您需要安装语言对应的拼写检查数据。" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "打开" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "打开 URL" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "选项" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "覆盖图片裁剪边界" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "覆盖图片" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "覆盖图片 X 偏移" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "覆盖图片 Y 偏移" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "覆盖图片位置" @@ -2089,17 +2048,17 @@ msgstr "DBus 名称 ${1} 的所有者是 ${2}。" msgid "PID of DBus name ${1} owner is ${2}." msgstr "DBus 名称 ${1} 的 PID 所有者是 ${2}。" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "下一页" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "上一页" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "页面按钮垂直对齐" @@ -2107,7 +2066,7 @@ msgstr "页面按钮垂直对齐" msgid "Page size" msgstr "页大小" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "粘贴" @@ -2116,17 +2075,17 @@ msgstr "粘贴" msgid "Paste Primary" msgstr "粘贴主选区" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "暂停" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "电话" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "图片" @@ -2149,12 +2108,12 @@ msgstr "" "请使用您发行版提供的工具将环境变量 ${env_name} 设为 \"${value}\" 或者将 ${1} " "添加到您的 ${2} 中。参见 ${link}。" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "关机" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "关机" @@ -2171,7 +2130,7 @@ msgstr "预编辑已禁用" msgid "Preedit enabled" msgstr "预编辑已启用" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "优先使用文字图标" @@ -2183,16 +2142,16 @@ msgstr "Presage" msgid "Prev Candidate" msgstr "上一个候选词" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "上一页按钮" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "上一个候选词" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "截屏" @@ -2201,7 +2160,7 @@ msgstr "截屏" msgid "Program" msgstr "程序" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Qt 输入法模块文件：" @@ -2213,27 +2172,27 @@ msgstr "快速输入" msgid "Quick Phrase: " msgstr "快速输入: " -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "红" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "重做" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "刷新" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "重载" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "回复" @@ -2242,62 +2201,62 @@ msgstr "回复" msgid "Reset state on Focus In" msgstr "重新聚焦时重置状态" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "重新启动" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "回车" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "右" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "右 Alt" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "右 Control" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "右 Hyper" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "右 Shift" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "右 Super" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "罗马字" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "旋转窗口" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "Rotation KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "Rotation PB" @@ -2306,22 +2265,22 @@ msgstr "Rotation PB" msgid "Running as root:" msgstr "以管理员运行：" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "保存" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "屏保" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "滚动锁定" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "搜索" @@ -2330,7 +2289,7 @@ msgstr "搜索" msgid "Seconds before clearing password" msgstr "自动清除密码的秒数" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "选择" @@ -2347,11 +2306,11 @@ msgstr "选择局部输入法：" msgid "Select specific input method via keyboard" msgstr "通过键盘选择特定的输入法" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "选中项文本颜色" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "发送" @@ -2365,11 +2324,11 @@ msgstr "" "当前桌面不支持由 Fcitx 将键盘布局配置发送给 wayland 混成器。您仍可以通过将布" "局作为输入法添加到输入法分组来使用 Fcitx 内部的布局转换。" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "分隔符背景" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "阴影边距" @@ -2377,12 +2336,12 @@ msgstr "阴影边距" msgid "Share Input State" msgstr "共享输入状态" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Shift" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "购物" @@ -2395,7 +2354,7 @@ msgstr "在焦点更改时显示输入法信息" msgid "Show Input Method Information when switch input method" msgstr "切换输入法时显示输入法信息" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "在图标中显示布局名称" @@ -2407,7 +2366,7 @@ msgstr "显示紧凑的输入法信息" msgid "Show first input method information" msgstr "显示第一个输入法的信息" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2433,17 +2392,17 @@ msgstr "使用组合键时显示预编辑，并且在没有匹配序列时提交 msgid "Skip first input method while enumerating" msgstr "轮换输入法时跳过第一个输入法" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "睡眠" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "空格" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "间隔" @@ -2451,22 +2410,22 @@ msgstr "间隔" msgid "Spell" msgstr "拼写" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "拼写检查" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "分割屏幕" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "电子表格" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "待机" @@ -2480,16 +2439,16 @@ msgstr "启动输入法" msgid "Status Notifier" msgstr "状态提示器" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "停止" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "子菜单" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "副标题" @@ -2498,17 +2457,17 @@ msgstr "副标题" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "支持" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "睡眠" @@ -2532,17 +2491,17 @@ msgstr "已切换到分组 {0}" msgid "System Info:" msgstr "系统信息:" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "系统请求" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "Tab" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "任务栏" @@ -2551,12 +2510,12 @@ msgstr "任务栏" msgid "Temporally switch between first and current Input Method" msgstr "临时在当前和第一个输入法之间切换" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "终端" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2578,31 +2537,31 @@ msgstr "列表中第 n 个按键选择第 n 个对应输入法。" msgid "The script is run as ${1} (${2})." msgstr "脚本作为 ${1} (${2}) 运行。" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "主题" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "这只在托盘为 xembed 时有效。" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "此选项仅在图片没有设置时生效。" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "此选项需要 Wayland 混成器 (Wayland compositor) 支持。" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "在 XWayland 上，此选项将始终被禁用。" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "这个值应该小于任何边距。" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2611,7 +2570,7 @@ msgstr "" "尽管这些信息对于开发者诊断问题有帮助，请在公开发送到在线网站前检查并且根据需" "要移除的对应信息。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "时间" @@ -2630,66 +2589,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "切换是否使用嵌入预编辑" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "工具" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "顶部" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "顶部居中" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "左上" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "顶部菜单" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "右上" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "关闭触摸板" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "启用触摸板" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "切换触摸板" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "注册" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "旅行" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "托盘字体" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "托盘标签轮廓颜色" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "托盘标签文本颜色" @@ -2731,7 +2690,7 @@ msgstr "用 Fcitx 和 Kimpanel 输入" msgid "Unable to find a program to check dbus." msgstr "无法找到程序检查 dbus。" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "撤销" @@ -2744,7 +2703,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode：" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2753,19 +2712,19 @@ msgstr "上" msgid "Use On The Spot Style (Needs restarting)" msgstr "使用 On The Spot 风格 (需要重启)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "在 X11 上针对不同屏幕使用单独的 DPI" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "竖排列表时使用所有横向空间高亮" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "使用输入法的语言来显示文字" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "使用鼠标滚轮翻页" @@ -2773,7 +2732,7 @@ msgstr "使用鼠标滚轮翻页" msgid "Use new compose behavior" msgstr "使用新的组合键行为" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "用户界面：" @@ -2787,59 +2746,59 @@ msgid "" "environment:" msgstr "使用 ${1} 来检查在当前环境下将被实际使用的输入法模块：" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "版本" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "版本行：" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "垂直候选列表" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "视频" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "查看" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "空符号" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "音量减小" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "静音" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "音量增大" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "WWW" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "唤醒" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2860,7 +2819,7 @@ msgstr "Wayland 诊断" msgid "Wayland Input method frontend" msgstr "Wayland 输入法前端" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "摄像头" @@ -2891,12 +2850,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "以 root 身份运行不好的原因" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "无线" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "文字处理器" @@ -2913,42 +2872,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "XDG 会话类型：" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM 编码：" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "用于 Emacs 的 XIM：" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "根窗口上的 XIM_SERVERS：" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS 没有设置" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "从环境变量中获取的 Xim 服务名称为 ${1}." -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "Xim 服务的名称与环境变量中设置的相同。" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "Xim 服务名称：“${1}”与环境变量中设置的值“${2}”不同。" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "黄" @@ -2970,11 +2929,11 @@ msgstr "" "你可能正在使用 ${1} 运行此脚本。这意味着这个脚本的结果可能不准确。见 ${2} 以" "获取更多信息。" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "您正在 ${1} 程序中使用 xim。" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "您可能会在 ${1} 程序中使用 fcitx 时遇到问题." @@ -2996,7 +2955,7 @@ msgstr "" "您正在使用 KDE，但是 fcitx 的 KCModule 未被找到，此 KCModule 的软件包名称通常" "是 kcm-fcitx5、kde-config-fcitx5 或 fcitx5-configtool。现在将打开配置目录。" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -3005,7 +2964,7 @@ msgstr "" "您的 LC_CTYPE 设置为 ${1} 而不是 zh, ja, ko 之一。您可能无法在 Emacs 中使用输" "入法，其根本是源自上游拒绝修复多年的一个超老的故障。" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -3013,22 +2972,22 @@ msgstr "" "您的 LC_CTYPE 设置为 ${1}，它的编码不是 UTF-8。您可能会在使用 XIM 提交字符串" "时遇到问题。" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "全角" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "全角半角" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "放大" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "缩小" @@ -3041,7 +3000,7 @@ msgstr "可执行文件：" msgid "here" msgstr "这里" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" diff --git a/po/zh_TW.po b/po/zh_TW.po index aac03a17..c4fb3f47 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-17 20:24+0000\n" +"POT-Creation-Date: 2024-12-31 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Kisaragi Hiu , 2024\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/fcitx/teams/12005/" @@ -117,7 +117,7 @@ msgstr "<未指定>" msgid "A virtual keyboard backend based on DBus" msgstr "一個基於 DBus 的虛擬鍵盤後端" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "強調色" @@ -129,7 +129,7 @@ msgstr "啟用輸入法" msgid "Active By Default" msgstr "預設啟用" -#: src/lib/fcitx-utils/key.cpp:144 +#: src/lib/fcitx-utils/key.cpp:152 msgctxt "Key name" msgid "Add Favorite" msgstr "加入收藏" @@ -138,19 +138,19 @@ msgstr "加入收藏" msgid "Add Unicode Typing Support" msgstr "加入 Unicode 輸入支援" -#: data/fcitx5-diagnose.sh:1565 +#: data/fcitx5-diagnose.sh:1465 msgid "Addon Config Dir:" msgstr "附加元件設定目錄：" -#: data/fcitx5-diagnose.sh:1650 +#: data/fcitx5-diagnose.sh:1550 msgid "Addon Libraries:" msgstr "附加元件函式庫：" -#: data/fcitx5-diagnose.sh:1593 +#: data/fcitx5-diagnose.sh:1493 msgid "Addon List:" msgstr "附加元件清單：" -#: src/lib/fcitx-utils/key.cpp:146 +#: src/lib/fcitx-utils/key.cpp:154 msgctxt "Key name" msgid "Adjust Brightness" msgstr "調整亮度" @@ -159,11 +159,11 @@ msgstr "調整亮度" msgid "All" msgstr "全部" -#: data/fcitx5-diagnose.sh:1367 +#: data/fcitx5-diagnose.sh:1267 msgid "All found Gtk ${1} immodule files exist." msgstr "所有找到的 gtk ${1} 輸入法模組檔案皆存在。" -#: data/fcitx5-diagnose.sh:1676 +#: data/fcitx5-diagnose.sh:1576 msgid "All libraries for all addons are found." msgstr "找到了所有附加元件的函式庫。" @@ -187,7 +187,7 @@ msgstr "允許在密碼輸入框中使用輸入法" msgid "Alt" msgstr "Alt" -#: src/lib/fcitx-utils/key.cpp:563 +#: src/lib/fcitx-utils/key.cpp:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -196,12 +196,12 @@ msgstr "Alt" msgid "Always set layout to be only group layout" msgstr "總是設定佈局為僅有分組佈局" -#: src/lib/fcitx-utils/key.cpp:151 +#: src/lib/fcitx-utils/key.cpp:159 msgctxt "Key name" msgid "Application Left" msgstr "應用程式左" -#: src/lib/fcitx-utils/key.cpp:152 +#: src/lib/fcitx-utils/key.cpp:160 msgctxt "Key name" msgid "Application Right" msgstr "應用程式右" @@ -210,36 +210,36 @@ msgstr "應用程式右" msgid "Applications disabled for long press" msgstr "禁用長按的應用程式" -#: src/lib/fcitx-utils/key.cpp:211 +#: src/lib/fcitx-utils/key.cpp:219 msgctxt "Key name" msgid "Audio Cycle Track" msgstr "音訊循環音軌" -#: src/lib/fcitx-utils/key.cpp:209 +#: src/lib/fcitx-utils/key.cpp:217 msgctxt "Key name" msgid "Audio Random Play" msgstr "音訊隨機播放" -#: src/lib/fcitx-utils/key.cpp:208 +#: src/lib/fcitx-utils/key.cpp:216 msgctxt "Key name" msgid "Audio Repeat" msgstr "音訊重複" -#: src/ui/classic/theme.h:191 +#: src/ui/classic/theme.h:199 msgid "Author" msgstr "作者" -#: src/lib/fcitx-utils/key.cpp:198 +#: src/lib/fcitx-utils/key.cpp:206 msgctxt "Key name" msgid "Away" msgstr "離開" -#: src/lib/fcitx-utils/key.cpp:93 +#: src/lib/fcitx-utils/key.cpp:101 msgctxt "Key name" msgid "Back" msgstr "返回" -#: src/lib/fcitx-utils/key.cpp:150 +#: src/lib/fcitx-utils/key.cpp:158 msgctxt "Key name" msgid "Back Forward" msgstr "往後" @@ -248,15 +248,15 @@ msgstr "往後" msgid "Backends" msgstr "後端" -#: src/ui/classic/theme.h:156 src/ui/classic/theme.h:176 +#: src/ui/classic/theme.h:164 src/ui/classic/theme.h:184 msgid "Background" msgstr "背景" -#: src/ui/classic/theme.h:83 +#: src/ui/classic/theme.h:91 msgid "Background Image" msgstr "背景圖片" -#: src/lib/fcitx-utils/key.cpp:42 +#: src/lib/fcitx-utils/key.cpp:50 msgctxt "Key name" msgid "Backspace" msgstr "Backspace" @@ -265,7 +265,7 @@ msgstr "Backspace" msgid "Bash Version:" msgstr "Bash 版本：" -#: src/lib/fcitx-utils/key.cpp:204 +#: src/lib/fcitx-utils/key.cpp:212 msgctxt "Key name" msgid "Battery" msgstr "電池" @@ -278,69 +278,69 @@ msgstr "新手指南" msgid "Behavior" msgstr "行為" -#: src/lib/fcitx-utils/key.cpp:222 +#: src/lib/fcitx-utils/key.cpp:230 msgctxt "Key name" msgid "Blue" msgstr "藍色" -#: src/lib/fcitx-utils/key.cpp:205 +#: src/lib/fcitx-utils/key.cpp:213 msgctxt "Key name" msgid "Bluetooth" msgstr "藍牙" -#: src/ui/classic/theme.h:146 +#: src/ui/classic/theme.h:154 msgid "Blur Margin" msgstr "模糊邊緣" -#: src/ui/classic/theme.h:145 +#: src/ui/classic/theme.h:153 msgid "Blur mask" msgstr "遮罩模糊" -#: src/lib/fcitx-utils/key.cpp:153 +#: src/lib/fcitx-utils/key.cpp:161 msgctxt "Key name" msgid "Book" msgstr "書籍" -#: src/ui/classic/theme.h:95 +#: src/ui/classic/theme.h:103 msgid "Border Color" msgstr "邊框顏色" -#: src/ui/classic/theme.h:103 +#: src/ui/classic/theme.h:111 msgid "Border width" msgstr "邊框寬度" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Bottom" msgstr "按鈕" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Center" msgstr "底部居中" -#: src/ui/classic/theme.h:36 +#: src/ui/classic/theme.h:44 msgid "Bottom Left" msgstr "左下" -#: src/ui/classic/theme.h:37 +#: src/ui/classic/theme.h:45 msgid "Bottom Right" msgstr "右下" -#: src/lib/fcitx-utils/key.cpp:164 +#: src/lib/fcitx-utils/key.cpp:172 msgctxt "Key name" msgid "Browser" msgstr "瀏覽器" -#: src/lib/fcitx-utils/key.cpp:154 +#: src/lib/fcitx-utils/key.cpp:162 msgctxt "Key name" msgid "CD" msgstr "CD 光碟" -#: src/lib/fcitx-utils/key.cpp:155 +#: src/lib/fcitx-utils/key.cpp:163 msgctxt "Key name" msgid "Calculator" msgstr "計算機" -#: src/lib/fcitx-utils/key.cpp:264 +#: src/lib/fcitx-utils/key.cpp:272 msgctxt "Key name" msgid "Cancel" msgstr "取消" @@ -357,28 +357,24 @@ msgstr "無法正確連接 ${1}。" msgid "Cannot determine desktop environment." msgstr "無法確認桌面環境。" -#: data/fcitx5-diagnose.sh:1584 +#: data/fcitx5-diagnose.sh:1484 msgid "Cannot find ${1} addon config directory." msgstr "找不到附加元件 ${1} 設定目錄。" -#: data/fcitx5-diagnose.sh:1099 -msgid "Cannot find ${1} executable!" -msgstr "找不到 ${1} 可執行檔！" - -#: data/fcitx5-diagnose.sh:1517 +#: data/fcitx5-diagnose.sh:1417 msgid "Cannot find ${1} im module for gtk ${2} in cache." msgstr "在快取中找不到 gtk ${2} 的 ${1} 輸入法模組。" -#: data/fcitx5-diagnose.sh:1434 +#: data/fcitx5-diagnose.sh:1334 msgid "Cannot find ${1} im module for gtk ${2}." msgstr "找不到 gtk ${2} 的 ${1} 輸入法模組。" -#: data/fcitx5-diagnose.sh:1288 data/fcitx5-diagnose.sh:1293 -#: data/fcitx5-diagnose.sh:1298 +#: data/fcitx5-diagnose.sh:1188 data/fcitx5-diagnose.sh:1193 +#: data/fcitx5-diagnose.sh:1198 msgid "Cannot find ${1} input method module for ${2}." msgstr "找不到 ${2} 的 ${1} 輸入法模組。" -#: data/fcitx5-diagnose.sh:1428 +#: data/fcitx5-diagnose.sh:1328 msgid "Cannot find ${2} for gtk ${1}" msgstr "找不到 gtk ${1} 的 ${2}" @@ -386,11 +382,7 @@ msgstr "找不到 gtk ${1} 的 ${2}" msgid "Cannot find DBus name ${1} owner." msgstr "找不到 DBus 名稱 ${1} 的擁有者。" -#: data/fcitx5-diagnose.sh:1109 -msgid "Cannot find a GUI config tool, please install one of ${1}, or ${2}." -msgstr "找不到設定介面，請安裝 ${1} 或 ${2} 其中之一。" - -#: data/fcitx5-diagnose.sh:1679 +#: data/fcitx5-diagnose.sh:1579 msgid "Cannot find enabled ${1} user interface!" msgstr "找不到啟用的 ${1} 使用者介面！" @@ -398,19 +390,19 @@ msgstr "找不到啟用的 ${1} 使用者介面！" msgid "Cannot find fcitx5 executable!" msgstr "找不到 fcitx5 可執行檔！" -#: data/fcitx5-diagnose.sh:1658 +#: data/fcitx5-diagnose.sh:1558 msgid "Cannot find file ${1} of addon ${2}." msgstr "找不到附加元件 ${2} 的檔案 ${1}。" -#: data/fcitx5-diagnose.sh:1668 +#: data/fcitx5-diagnose.sh:1568 msgid "Cannot find following required libraries for ${1} of addon ${2}." msgstr "找不到附加元件 ${2} 的 ${1} 所需之以下函式庫。" -#: data/fcitx5-diagnose.sh:1512 +#: data/fcitx5-diagnose.sh:1412 msgid "Cannot find immodules cache for gtk ${1}" msgstr "找不到 gtk ${1} 的輸入法模組快取" -#: data/fcitx5-diagnose.sh:1698 +#: data/fcitx5-diagnose.sh:1598 msgid "" "Cannot find kimpanel dbus interface or enabled non-kimpanel user interface." msgstr "找不到 kimpanel dbus 介面或非 kimpanel 使用者介面。" @@ -419,28 +411,28 @@ msgstr "找不到 kimpanel dbus 介面或非 kimpanel 使用者介面。" msgid "Cannot find pid of DBus name ${1} owner." msgstr "找不到 DBus 名稱 ${1} PID 的擁有者。" -#: data/fcitx5-diagnose.sh:1175 +#: data/fcitx5-diagnose.sh:1075 msgid "Cannot find xim_server on root window." msgstr "在 root 視窗找不到 xim_server。" -#: data/fcitx5-diagnose.sh:1149 +#: data/fcitx5-diagnose.sh:1049 msgid "Cannot interpret XMODIFIERS: ${1}." msgstr "無法解析 XMODIFIERS：${1}。" -#: src/lib/fcitx-utils/key.cpp:53 +#: src/lib/fcitx-utils/key.cpp:61 msgctxt "Key name" msgid "CapsLock" msgstr "大寫鎖定 (CapsLock)" -#: src/ui/classic/theme.h:35 src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:43 src/ui/classic/theme.h:55 msgid "Center" msgstr "正中" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Center Left" msgstr "左側居中" -#: src/ui/classic/theme.h:35 +#: src/ui/classic/theme.h:43 msgid "Center Right" msgstr "右側居中" @@ -448,7 +440,7 @@ msgstr "右側居中" msgid "Change Fcitx 5 Configuration" msgstr "變更 Fcitx 5 設定" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "複選框" @@ -460,12 +452,12 @@ msgstr "選擇輔助按鍵" msgid "Classic User Interface" msgstr "經典使用者介面" -#: src/lib/fcitx-utils/key.cpp:156 +#: src/lib/fcitx-utils/key.cpp:164 msgctxt "Key name" msgid "Clear" msgstr "清空" -#: src/ui/classic/theme.h:129 +#: src/ui/classic/theme.h:137 msgid "Click Margin" msgstr "按區域邊距" @@ -477,21 +469,21 @@ msgstr "剪貼簿" msgid "Clipboard (Press BackSpace/Delete to clear history):" msgstr "剪貼簿（按 BackSpace/Delete 清除歷史記錄）：" -#: src/lib/fcitx-utils/key.cpp:157 +#: src/lib/fcitx-utils/key.cpp:165 msgctxt "Key name" msgid "Close" msgstr "關閉" -#: src/lib/fcitx-utils/key.cpp:250 +#: src/lib/fcitx-utils/key.cpp:258 msgctxt "Key name" msgid "Code input" msgstr "字碼輸入" -#: src/ui/classic/theme.h:87 +#: src/ui/classic/theme.h:95 msgid "Color" msgstr "顏色" -#: src/lib/fcitx-utils/key.cpp:148 +#: src/lib/fcitx-utils/key.cpp:156 msgctxt "Key name" msgid "Community" msgstr "社群" @@ -512,35 +504,11 @@ msgstr "補全暫時啟用。" msgid "Completion is enabled." msgstr "已啟用補全。" -#: data/fcitx5-diagnose.sh:1051 -msgid "Config GUI for gtk${1} not found." -msgstr "找不到 gtk${1} 的設定介面。" - -#: data/fcitx5-diagnose.sh:1047 -msgid "Config GUI for gtk${1}:" -msgstr "gtk${1} 的設定介面：" - -#: data/fcitx5-diagnose.sh:1081 -msgid "Config GUI for kde:" -msgstr "KDE 的設定介面：" - -#: data/fcitx5-diagnose.sh:1070 -msgid "Config GUI for qt not found." -msgstr "找不到 Qt 的設定介面。" - -#: data/fcitx5-diagnose.sh:1068 -msgid "Config GUI for qt:" -msgstr "Qt 的設定介面：" - -#: data/fcitx5-diagnose.sh:1097 -msgid "Config Tool Wrapper:" -msgstr "設定工具封裝：" - -#: data/fcitx5-diagnose.sh:1793 +#: data/fcitx5-diagnose.sh:1692 msgid "Configuration:" msgstr "設定：" -#: src/ui/classic/xcbtraywindow.cpp:38 +#: src/ui/classic/xcbtraywindow.cpp:55 #: src/modules/notificationitem/dbusmenu.cpp:253 msgid "Configure" msgstr "設定" @@ -549,12 +517,12 @@ msgstr "設定" msgid "Control" msgstr "控制" -#: src/lib/fcitx-utils/key.cpp:562 +#: src/lib/fcitx-utils/key.cpp:570 msgctxt "Key name" msgid "Control" msgstr "Control 鍵" -#: src/lib/fcitx-utils/key.cpp:158 +#: src/lib/fcitx-utils/key.cpp:166 msgctxt "Key name" msgid "Copy" msgstr "複製" @@ -583,7 +551,7 @@ msgstr "自訂" msgid "Custom Xkb Option" msgstr "自定 Xkb 選項" -#: src/lib/fcitx-utils/key.cpp:159 +#: src/lib/fcitx-utils/key.cpp:167 msgctxt "Key name" msgid "Cut" msgstr "剪下" @@ -608,12 +576,12 @@ msgstr "基於 DBus 的新 Freedesktop.org 工具列圖示" msgid "DBus interface:" msgstr "DBus 介面：" -#: src/lib/fcitx-utils/key.cpp:161 +#: src/lib/fcitx-utils/key.cpp:169 msgctxt "Key name" msgid "DOS" msgstr "DOS" -#: src/ui/classic/classicui.h:155 +#: src/ui/classic/classicui.h:164 msgid "Dark Theme" msgstr "深色模式" @@ -654,12 +622,12 @@ msgstr "預設上一頁" msgid "Default page size" msgstr "預設頁面大小" -#: src/lib/fcitx-utils/key.cpp:230 +#: src/lib/fcitx-utils/key.cpp:238 msgctxt "Key name" msgid "Delete" msgstr "刪除" -#: src/ui/classic/theme.h:193 +#: src/ui/classic/theme.h:201 msgid "Description" msgstr "說明" @@ -701,7 +669,7 @@ msgstr "檢測當前運行的程式 (需要重新啟動)" msgid "Directories:" msgstr "目錄：" -#: src/lib/fcitx-utils/key.cpp:160 +#: src/lib/fcitx-utils/key.cpp:168 msgctxt "Key name" msgid "Display" msgstr "顯示" @@ -714,12 +682,12 @@ msgstr "不再顯示" msgid "Do not show password from password managers" msgstr "不要顯示密碼管理工具中的密碼" -#: src/lib/fcitx-utils/key.cpp:162 +#: src/lib/fcitx-utils/key.cpp:170 msgctxt "Key name" msgid "Documents" msgstr "文件" -#: src/lib/fcitx-utils/key.cpp:50 +#: src/lib/fcitx-utils/key.cpp:58 msgctxt "Key name" msgid "Down" msgstr "下" @@ -728,17 +696,17 @@ msgstr "下" msgid "Editor" msgstr "編輯器" -#: src/lib/fcitx-utils/key.cpp:248 +#: src/lib/fcitx-utils/key.cpp:256 msgctxt "Key name" msgid "Eisu Shift" msgstr "英數 Shift" -#: src/lib/fcitx-utils/key.cpp:249 +#: src/lib/fcitx-utils/key.cpp:257 msgctxt "Key name" msgid "Eisu toggle" msgstr "英數切換" -#: src/lib/fcitx-utils/key.cpp:137 +#: src/lib/fcitx-utils/key.cpp:145 msgctxt "Key name" msgid "Eject" msgstr "退出" @@ -751,7 +719,7 @@ msgstr "顏文字" msgid "Enable" msgstr "啟用" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "在 KWin 啟用模糊" @@ -767,7 +735,7 @@ msgstr "在提示中啟用表情符號" msgid "Enable emoji in quickphrase" msgstr "在快速片語中啟用表情符號" -#: src/ui/classic/classicui.h:187 +#: src/ui/classic/classicui.h:196 msgid "Enable fractional scale under Wayland" msgstr "在 Wayland 下啟用分數縮放" @@ -779,7 +747,7 @@ msgstr "預設啟用提示" msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "End 鍵" @@ -808,7 +776,7 @@ msgstr "枚舉輸入法群組向前" msgid "Enumerate when press trigger key repeatedly" msgstr "重複觸發鍵時枚舉輸入法" -#: data/fcitx5-diagnose.sh:1127 +#: data/fcitx5-diagnose.sh:1027 msgid "" "Environment variable ${1} is \"${2}\" instead of \"${3}\". Please check if " "you have exported it incorrectly in any of your init files." @@ -820,7 +788,7 @@ msgstr "" msgid "Environment variable ${1} is not set." msgstr "環境變數 ${1} 未設定。" -#: data/fcitx5-diagnose.sh:1121 +#: data/fcitx5-diagnose.sh:1021 msgid "Environment variable ${1} is set to \"${2}\" correctly." msgstr "環境變數 ${1} 正確地設定為「${2}」。" @@ -836,26 +804,26 @@ msgstr "環境：" msgid "Error occurs when running ${1}. Please check your locale settings." msgstr "執行 ${1} 時發生錯誤。請檢查您的地區設定。" -#: src/lib/fcitx-utils/key.cpp:231 +#: src/lib/fcitx-utils/key.cpp:239 msgctxt "Key name" msgid "Escape" msgstr "Esc 鍵" -#: src/lib/fcitx-utils/key.cpp:265 +#: src/lib/fcitx-utils/key.cpp:273 msgctxt "Key name" msgid "Execute" msgstr "執行" -#: src/ui/classic/xcbtraywindow.cpp:40 +#: src/ui/classic/xcbtraywindow.cpp:57 #: src/modules/notificationitem/dbusmenu.cpp:267 msgid "Exit" msgstr "離開" -#: data/fcitx5-diagnose.sh:1506 +#: data/fcitx5-diagnose.sh:1406 msgid "Failed to find ${1} in immodule cache at ${2}" msgstr "無法在 ${2} 的輸入法模組快取中找到 ${1}" -#: data/fcitx5-diagnose.sh:1422 +#: data/fcitx5-diagnose.sh:1322 msgid "Failed to find ${1} in the output of ${2}" msgstr "無法在 ${2} 的輸出中找到 ${1}。" @@ -863,7 +831,7 @@ msgstr "無法在 ${2} 的輸出中找到 ${1}。" msgid "Fallback Spell check language" msgstr "備用拼字檢查語言" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "收藏" @@ -885,14 +853,10 @@ msgstr "Fcitx 5 設定" msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland 啟動器（實驗性）" -#: data/fcitx5-diagnose.sh:1564 +#: data/fcitx5-diagnose.sh:1464 msgid "Fcitx Addons:" msgstr "Fcitx 附加元件：" -#: data/fcitx5-diagnose.sh:1096 -msgid "Fcitx Configure UI:" -msgstr "Fcitx 設定介面：" - #: data/fcitx5-diagnose.sh:935 msgid "Fcitx State:" msgstr "Fcitx 狀態：" @@ -930,29 +894,29 @@ msgstr "Fcitx 版本：${1}" msgid "Fcitx4 Frontend" msgstr "Fcitx4 前端" -#: src/lib/fcitx-utils/key.cpp:147 +#: src/lib/fcitx-utils/key.cpp:155 msgctxt "Key name" msgid "Finance" msgstr "金融" -#: src/lib/fcitx-utils/key.cpp:225 +#: src/lib/fcitx-utils/key.cpp:233 msgctxt "Key name" msgid "Find" msgstr "尋找" -#: src/ui/classic/theme.h:47 +#: src/ui/classic/theme.h:55 msgid "First Candidate" msgstr "第一候選詞" -#: src/ui/classic/classicui.h:161 +#: src/ui/classic/classicui.h:170 msgid "Follow system accent color if it is supported by theme and desktop" msgstr "在主題與桌面支援時使用系統強調色" -#: src/ui/classic/classicui.h:157 +#: src/ui/classic/classicui.h:166 msgid "Follow system light/dark color scheme" msgstr "跟隨系統淺色/深色設定" -#: data/fcitx5-diagnose.sh:1284 +#: data/fcitx5-diagnose.sh:1184 msgid "" "Following error may not be accurate because guessing Qt version from path " "depends on how your distribution packages Qt. It is not a critical error if " @@ -963,11 +927,11 @@ msgstr "" "用任何對應版本的 Qt 應用程式，或者您在 Wayland 下使用 Qt 的 text-input 支援，" "那麼下列錯誤不是嚴重問題。" -#: src/ui/classic/classicui.h:117 +#: src/ui/classic/classicui.h:126 msgid "Font" msgstr "字型" -#: src/ui/classic/classicui.h:147 +#: src/ui/classic/classicui.h:156 msgid "" "For example, display character with Chinese variant when using Pinyin and " "Japanese variant when using Anthy. The font configuration needs to support " @@ -980,11 +944,11 @@ msgstr "" msgid "For more details see https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" msgstr "更多細節請參見 https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" -#: src/ui/classic/classicui.h:175 +#: src/ui/classic/classicui.h:184 msgid "Force font DPI on Wayland" msgstr "在 Wayland 上強制使用字型 DPI" -#: src/lib/fcitx-utils/key.cpp:94 +#: src/lib/fcitx-utils/key.cpp:102 msgctxt "Key name" msgid "Forward" msgstr "轉遞按鍵事件" @@ -993,7 +957,7 @@ msgstr "轉遞按鍵事件" msgid "Forward key event instead of commiting text if it is not handled" msgstr "在按鍵事件未處理時轉遞按鍵事件而非提交文本" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "找到了 ${1} 的 ${2} 模組：${3}。" @@ -1005,56 +969,51 @@ msgstr "找到 ${1} 個 ${2} 程序：" msgid "Found ${1} ${2} processes:" msgstr "找到 ${1} 個 ${2} 程序：" -#: data/fcitx5-diagnose.sh:1587 +#: data/fcitx5-diagnose.sh:1487 msgid "Found ${1} addon config directory: ${2}." msgstr "找到 ${1} 附加元件設定目錄：${2}。" -#: data/fcitx5-diagnose.sh:944 data/fcitx5-diagnose.sh:1060 -#: data/fcitx5-diagnose.sh:1073 data/fcitx5-diagnose.sh:1101 +#: data/fcitx5-diagnose.sh:944 msgid "Found ${1} at ${2}." msgstr "在 ${2} 找到了 ${1}。" -#: data/fcitx5-diagnose.sh:1640 +#: data/fcitx5-diagnose.sh:1540 msgid "Found ${1} disabled addons:" msgstr "找到 ${1} 個停用的附加元件：" -#: data/fcitx5-diagnose.sh:1631 +#: data/fcitx5-diagnose.sh:1531 msgid "Found ${1} enabled addons:" msgstr "找到 ${1} 個啟用的附加元件：" -#: data/fcitx5-diagnose.sh:1681 +#: data/fcitx5-diagnose.sh:1581 msgid "Found ${1} enabled user interface addons:" msgstr "找到 ${1} 個啟用的使用者介面附加元件：" -#: data/fcitx5-diagnose.sh:1416 data/fcitx5-diagnose.sh:1500 +#: data/fcitx5-diagnose.sh:1316 data/fcitx5-diagnose.sh:1400 msgid "Found ${1} im modules for gtk ${2}." msgstr "找到了 gtk ${2} 的 ${1} 輸入法模組。" -#: data/fcitx5-diagnose.sh:1087 -msgid "Found ${1} kcm module." -msgstr "找到了 ${1} 的 kcm 模組。" - -#: data/fcitx5-diagnose.sh:1408 +#: data/fcitx5-diagnose.sh:1308 msgid "Found ${2} for unknown gtk version at ${1}." msgstr "在 ${1} 找到未知 gtk 版本的 ${2}。" -#: data/fcitx5-diagnose.sh:1400 +#: data/fcitx5-diagnose.sh:1300 msgid "Found ${3} for gtk ${1} at ${2}." msgstr "在 ${2} 找到 gtk ${1} 的 ${3}。" -#: data/fcitx5-diagnose.sh:1263 data/fcitx5-diagnose.sh:1268 +#: data/fcitx5-diagnose.sh:1163 data/fcitx5-diagnose.sh:1168 msgid "Found ${3} im module for ${2}: ${1}." msgstr "找到了 ${2} 的 ${3} 輸入法模組：${1}。" -#: data/fcitx5-diagnose.sh:1493 +#: data/fcitx5-diagnose.sh:1393 msgid "Found immodule cache for unknown gtk version at ${1}." msgstr "在 ${1} 找到未知 gtk 版本的輸入法模組快取。" -#: data/fcitx5-diagnose.sh:1485 +#: data/fcitx5-diagnose.sh:1385 msgid "Found immodules cache for gtk ${1} at ${2}." msgstr "在 ${2} 找到 gtk ${1} 的輸入法模組快取。" -#: data/fcitx5-diagnose.sh:1279 +#: data/fcitx5-diagnose.sh:1179 msgid "Found unknown ${1} qt module: ${2}." msgstr "找到未知的 ${1} qt 模組：${2}。" @@ -1062,26 +1021,26 @@ msgstr "找到未知的 ${1} qt 模組：${2}。" msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 通知支援" -#: data/fcitx5-diagnose.sh:1785 +#: data/fcitx5-diagnose.sh:1684 msgid "Frontends setup:" msgstr "前端設定：" -#: src/lib/fcitx-utils/key.cpp:165 +#: src/lib/fcitx-utils/key.cpp:173 msgctxt "Key name" msgid "Game" msgstr "遊戲" -#: src/lib/fcitx-utils/key.cpp:166 +#: src/lib/fcitx-utils/key.cpp:174 msgctxt "Key name" msgid "Go" msgstr "前往" -#: src/lib/fcitx-utils/key.cpp:220 +#: src/lib/fcitx-utils/key.cpp:228 msgctxt "Key name" msgid "Green" msgstr "綠色" -#: src/ui/classic/xcbtraywindow.cpp:36 +#: src/ui/classic/xcbtraywindow.cpp:53 #: src/modules/notificationitem/dbusmenu.cpp:243 msgid "Group" msgstr "群組" @@ -1096,15 +1055,15 @@ msgstr "群組 {0}：{1}" msgid "Group {}" msgstr "群組 {}" -#: data/fcitx5-diagnose.sh:1361 +#: data/fcitx5-diagnose.sh:1261 msgid "Gtk ${1} immodule file ${2} does not exist." msgstr "Gtk ${1} 輸入法模組檔案 ${2} 不存在。" -#: data/fcitx5-diagnose.sh:1545 +#: data/fcitx5-diagnose.sh:1445 msgid "Gtk IM module cache:" msgstr "Gtk 輸入法模組快取：" -#: data/fcitx5-diagnose.sh:1550 +#: data/fcitx5-diagnose.sh:1450 msgid "Gtk IM module files:" msgstr "Gtk 輸入法模組檔案：" @@ -1112,77 +1071,77 @@ msgstr "Gtk 輸入法模組檔案：" msgid "Hall of Shame for Linux IME Support" msgstr "Linux 程式的輸入法支援問題" -#: src/lib/fcitx-utils/key.cpp:253 +#: src/lib/fcitx-utils/key.cpp:261 msgctxt "Key name" msgid "Hangul" msgstr "諺文" -#: src/lib/fcitx-utils/key.cpp:260 +#: src/lib/fcitx-utils/key.cpp:268 msgctxt "Key name" msgid "Hangul Banja" msgstr "諺文半形" -#: src/lib/fcitx-utils/key.cpp:255 +#: src/lib/fcitx-utils/key.cpp:263 msgctxt "Key name" msgid "Hangul End" msgstr "諺文結束" -#: src/lib/fcitx-utils/key.cpp:256 +#: src/lib/fcitx-utils/key.cpp:264 msgctxt "Key name" msgid "Hangul Hanja" msgstr "諺文漢字" -#: src/lib/fcitx-utils/key.cpp:257 +#: src/lib/fcitx-utils/key.cpp:265 msgctxt "Key name" msgid "Hangul Jamo" msgstr "諺文字母" -#: src/lib/fcitx-utils/key.cpp:259 +#: src/lib/fcitx-utils/key.cpp:267 msgctxt "Key name" msgid "Hangul Jeonja" msgstr "諺文前" -#: src/lib/fcitx-utils/key.cpp:262 +#: src/lib/fcitx-utils/key.cpp:270 msgctxt "Key name" msgid "Hangul PostHanja" msgstr "諺文後漢字" -#: src/lib/fcitx-utils/key.cpp:261 +#: src/lib/fcitx-utils/key.cpp:269 msgctxt "Key name" msgid "Hangul PreHanja" msgstr "諺文預先漢字" -#: src/lib/fcitx-utils/key.cpp:258 +#: src/lib/fcitx-utils/key.cpp:266 msgctxt "Key name" msgid "Hangul Romaja" msgstr "諺文羅馬字" -#: src/lib/fcitx-utils/key.cpp:263 +#: src/lib/fcitx-utils/key.cpp:271 msgctxt "Key name" msgid "Hangul Special" msgstr "諺文特殊" -#: src/lib/fcitx-utils/key.cpp:254 +#: src/lib/fcitx-utils/key.cpp:262 msgctxt "Key name" msgid "Hangul Start" msgstr "諺文開始" -#: src/lib/fcitx-utils/key.cpp:242 +#: src/lib/fcitx-utils/key.cpp:250 msgctxt "Key name" msgid "Hankaku" msgstr "半形" -#: src/lib/fcitx-utils/key.cpp:92 +#: src/lib/fcitx-utils/key.cpp:100 msgctxt "Key name" msgid "Help" msgstr "說明" -#: src/lib/fcitx-utils/key.cpp:236 +#: src/lib/fcitx-utils/key.cpp:244 msgctxt "Key name" msgid "Henkan" msgstr "變換" -#: src/lib/fcitx-utils/key.cpp:213 +#: src/lib/fcitx-utils/key.cpp:221 msgctxt "Key name" msgid "Hibernate" msgstr "休眠" @@ -1195,56 +1154,56 @@ msgstr "隱藏通知" msgid "Hidden clipboard content that contains a password" msgstr "隱藏剪貼簿中包含密碼的內容" -#: src/ui/classic/theme.h:114 +#: src/ui/classic/theme.h:122 msgid "Hide overlay if size does not fit" msgstr "如果尺寸不合適，隱藏疊加層" -#: src/ui/classic/theme.h:158 src/ui/classic/theme.h:178 +#: src/ui/classic/theme.h:166 src/ui/classic/theme.h:186 msgid "Highlight Background" msgstr "高亮背景" -#: src/ui/classic/theme.h:138 +#: src/ui/classic/theme.h:146 msgid "Highlight Background color" msgstr "高亮背景顏色" -#: src/ui/classic/theme.h:141 +#: src/ui/classic/theme.h:149 msgid "Highlight Candidate Color" msgstr "高亮候選詞顏色" -#: src/ui/classic/theme.h:124 +#: src/ui/classic/theme.h:132 msgid "Highlight Click Margin" msgstr "高亮點擊邊距" -#: src/ui/classic/theme.h:136 +#: src/ui/classic/theme.h:144 msgid "Highlight text color" msgstr "高亮文字顏色" -#: src/lib/fcitx-utils/key.cpp:238 +#: src/lib/fcitx-utils/key.cpp:246 msgctxt "Key name" msgid "Hiragana" msgstr "平假名" -#: src/lib/fcitx-utils/key.cpp:240 +#: src/lib/fcitx-utils/key.cpp:248 msgctxt "Key name" msgid "Hiragana Katakana" msgstr "平假名片假名" -#: src/lib/fcitx-utils/key.cpp:143 +#: src/lib/fcitx-utils/key.cpp:151 msgctxt "Key name" msgid "History" msgstr "歷史記錄" -#: src/lib/fcitx-utils/key.cpp:45 +#: src/lib/fcitx-utils/key.cpp:53 msgctxt "Key name" msgid "Home" msgstr "Home 鍵" -#: src/lib/fcitx-utils/key.cpp:175 +#: src/lib/fcitx-utils/key.cpp:183 msgctxt "Key name" msgid "Home Office" msgstr "家庭辦公室" -#: src/lib/fcitx-utils/key.cpp:106 +#: src/lib/fcitx-utils/key.cpp:114 msgctxt "Key name" msgid "Home Page" msgstr "首頁" @@ -1253,7 +1212,7 @@ msgstr "首頁" msgid "Home:" msgstr "家目錄：" -#: src/lib/fcitx-utils/key.cpp:145 +#: src/lib/fcitx-utils/key.cpp:153 msgctxt "Key name" msgid "Hot Links" msgstr "熱門連結" @@ -1271,7 +1230,7 @@ msgid "" "Hotkey for switching to the N-th input method for only current input context" msgstr "僅用於目前輸入上下文切換到第 N 種輸入法的快捷鍵" -#: src/lib/fcitx-utils/key.cpp:567 +#: src/lib/fcitx-utils/key.cpp:575 msgctxt "Key name" msgid "Hyper" msgstr "Hyper 鍵" @@ -1312,7 +1271,7 @@ msgstr "" "${g36_disable_ibus} 指令停用 IBus 整合以使用 ${2} 以外的任何輸入法。更多細節" "參見 ${link}。" -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 msgid "Image" msgstr "圖片" @@ -1334,31 +1293,31 @@ msgstr "輸入法設定" msgid "Input Method Related Environment Variables: " msgstr "輸入法相關環境變數：" -#: data/fcitx5-diagnose.sh:1704 +#: data/fcitx5-diagnose.sh:1604 msgid "Input Methods:" msgstr "輸入法：" -#: src/ui/classic/theme.h:199 +#: src/ui/classic/theme.h:207 msgid "Input Panel" msgstr "輸入面板" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Background" msgstr "輸入框背景" -#: src/ui/classic/theme.h:63 +#: src/ui/classic/theme.h:71 msgid "Input Panel Border" msgstr "輸入框邊框" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight" msgstr "輸入框高亮" -#: src/ui/classic/theme.h:64 +#: src/ui/classic/theme.h:72 msgid "Input Panel Highlight Candidate Background" msgstr "輸入框高亮候選詞背景" -#: src/ui/classic/theme.h:65 +#: src/ui/classic/theme.h:73 msgid "Input Panel Highlight Candidate Border" msgstr "輸入框高亮候選詞邊框" @@ -1374,7 +1333,7 @@ msgstr "" "輸入法在它們自己的設定中可能有不同的設定。這通常由剪貼板或快速短語等模塊使" "用。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "插入" @@ -1383,11 +1342,11 @@ msgstr "插入" msgid "Interval of saving user data in minutes" msgstr "儲存使用者數據的時間間隔（以分鐘為單位）" -#: data/fcitx5-diagnose.sh:1599 +#: data/fcitx5-diagnose.sh:1499 msgid "Invalid addon config file ${1}." msgstr "不正確的附加元件設定檔：${1}。" -#: data/fcitx5-diagnose.sh:1205 +#: data/fcitx5-diagnose.sh:1105 msgid "" "It is OK to use ${1} built-in Wayland im module if your compositor fully " "supports text-input protocol used by ${1}." @@ -1412,26 +1371,26 @@ msgstr "" msgid "KDE Input Method Panel" msgstr "KDE 輸入法面板" -#: src/ui/classic/classicui.cpp:278 +#: src/ui/classic/classicui.cpp:302 msgid "KDE Plasma (Experimental)" msgstr "KDE Plasma (實驗性)" -#: src/lib/fcitx-utils/key.cpp:246 +#: src/lib/fcitx-utils/key.cpp:254 msgctxt "Key name" msgid "Kana Lock" msgstr "假名鎖定" -#: src/lib/fcitx-utils/key.cpp:247 +#: src/lib/fcitx-utils/key.cpp:255 msgctxt "Key name" msgid "Kana Shift" msgstr "假名 Shift" -#: src/lib/fcitx-utils/key.cpp:234 +#: src/lib/fcitx-utils/key.cpp:242 msgctxt "Key name" msgid "Kanji" msgstr "漢字" -#: src/lib/fcitx-utils/key.cpp:239 +#: src/lib/fcitx-utils/key.cpp:247 msgctxt "Key name" msgid "Katakana" msgstr "片假名" @@ -1458,12 +1417,12 @@ msgstr "鍵盤 - {0}" msgid "Keyboard - {0} - {1}" msgstr "鍵盤 - {0} - {1}" -#: src/lib/fcitx-utils/key.cpp:134 +#: src/lib/fcitx-utils/key.cpp:142 msgctxt "Key name" msgid "Keyboard Brightness Down" msgstr "鍵盤亮度降低" -#: src/lib/fcitx-utils/key.cpp:132 +#: src/lib/fcitx-utils/key.cpp:140 msgctxt "Key name" msgid "Keyboard Brightness Up" msgstr "鍵盤亮度增加" @@ -1472,315 +1431,315 @@ msgstr "鍵盤亮度增加" msgid "Keyboard Layout:" msgstr "鍵盤配置：" -#: src/lib/fcitx-utils/key.cpp:131 +#: src/lib/fcitx-utils/key.cpp:139 msgctxt "Key name" msgid "Keyboard Light On/Off" msgstr "鍵盤背光開關" -#: src/lib/fcitx-utils/key.cpp:171 +#: src/lib/fcitx-utils/key.cpp:179 msgctxt "Key name" msgid "Keyboard Menu" msgstr "鍵盤選單" -#: src/lib/fcitx-utils/key.cpp:74 +#: src/lib/fcitx-utils/key.cpp:82 msgctxt "Key name" msgid "Keypad *" msgstr "數字鍵盤 *" -#: src/lib/fcitx-utils/key.cpp:75 +#: src/lib/fcitx-utils/key.cpp:83 msgctxt "Key name" msgid "Keypad +" msgstr "數字鍵盤 +" -#: src/lib/fcitx-utils/key.cpp:76 +#: src/lib/fcitx-utils/key.cpp:84 msgctxt "Key name" msgid "Keypad ," msgstr "數字鍵盤 ," -#: src/lib/fcitx-utils/key.cpp:77 +#: src/lib/fcitx-utils/key.cpp:85 msgctxt "Key name" msgid "Keypad -" msgstr "數字鍵盤 -" -#: src/lib/fcitx-utils/key.cpp:78 +#: src/lib/fcitx-utils/key.cpp:86 msgctxt "Key name" msgid "Keypad ." msgstr "數字鍵盤 ." -#: src/lib/fcitx-utils/key.cpp:79 +#: src/lib/fcitx-utils/key.cpp:87 msgctxt "Key name" msgid "Keypad /" msgstr "數字鍵盤 /" -#: src/lib/fcitx-utils/key.cpp:80 +#: src/lib/fcitx-utils/key.cpp:88 msgctxt "Key name" msgid "Keypad 0" msgstr "數字鍵盤 0" -#: src/lib/fcitx-utils/key.cpp:81 +#: src/lib/fcitx-utils/key.cpp:89 msgctxt "Key name" msgid "Keypad 1" msgstr "數字鍵盤 1" -#: src/lib/fcitx-utils/key.cpp:82 +#: src/lib/fcitx-utils/key.cpp:90 msgctxt "Key name" msgid "Keypad 2" msgstr "數字鍵盤 2" -#: src/lib/fcitx-utils/key.cpp:83 +#: src/lib/fcitx-utils/key.cpp:91 msgctxt "Key name" msgid "Keypad 3" msgstr "數字鍵盤 3" -#: src/lib/fcitx-utils/key.cpp:84 +#: src/lib/fcitx-utils/key.cpp:92 msgctxt "Key name" msgid "Keypad 4" msgstr "數字鍵盤 4" -#: src/lib/fcitx-utils/key.cpp:85 +#: src/lib/fcitx-utils/key.cpp:93 msgctxt "Key name" msgid "Keypad 5" msgstr "數字鍵盤 5" -#: src/lib/fcitx-utils/key.cpp:86 +#: src/lib/fcitx-utils/key.cpp:94 msgctxt "Key name" msgid "Keypad 6" msgstr "數字鍵盤 6" -#: src/lib/fcitx-utils/key.cpp:87 +#: src/lib/fcitx-utils/key.cpp:95 msgctxt "Key name" msgid "Keypad 7" msgstr "數字鍵盤 7" -#: src/lib/fcitx-utils/key.cpp:88 +#: src/lib/fcitx-utils/key.cpp:96 msgctxt "Key name" msgid "Keypad 8" msgstr "數字鍵盤 8" -#: src/lib/fcitx-utils/key.cpp:89 +#: src/lib/fcitx-utils/key.cpp:97 msgctxt "Key name" msgid "Keypad 9" msgstr "數字鍵盤 9" -#: src/lib/fcitx-utils/key.cpp:73 +#: src/lib/fcitx-utils/key.cpp:81 msgctxt "Key name" msgid "Keypad =" msgstr "數字鍵盤 =" -#: src/lib/fcitx-utils/key.cpp:70 +#: src/lib/fcitx-utils/key.cpp:78 msgctxt "Key name" msgid "Keypad Begin" msgstr "數字鍵盤開始鍵" -#: src/lib/fcitx-utils/key.cpp:72 +#: src/lib/fcitx-utils/key.cpp:80 msgctxt "Key name" msgid "Keypad Delete" msgstr "數字鍵盤刪除鍵" -#: src/lib/fcitx-utils/key.cpp:66 +#: src/lib/fcitx-utils/key.cpp:74 msgctxt "Key name" msgid "Keypad Down" msgstr "數字鍵盤向上鍵" -#: src/lib/fcitx-utils/key.cpp:69 +#: src/lib/fcitx-utils/key.cpp:77 msgctxt "Key name" msgid "Keypad End" msgstr "數字鍵盤 End 鍵" -#: src/lib/fcitx-utils/key.cpp:57 +#: src/lib/fcitx-utils/key.cpp:65 msgctxt "Key name" msgid "Keypad Enter" msgstr "數字鍵盤確認鍵" -#: src/lib/fcitx-utils/key.cpp:58 +#: src/lib/fcitx-utils/key.cpp:66 msgctxt "Key name" msgid "Keypad F1" msgstr "數字鍵盤 F1" -#: src/lib/fcitx-utils/key.cpp:59 +#: src/lib/fcitx-utils/key.cpp:67 msgctxt "Key name" msgid "Keypad F2" msgstr "數字鍵盤 F2" -#: src/lib/fcitx-utils/key.cpp:60 +#: src/lib/fcitx-utils/key.cpp:68 msgctxt "Key name" msgid "Keypad F3" msgstr "數字鍵盤 F3" -#: src/lib/fcitx-utils/key.cpp:61 +#: src/lib/fcitx-utils/key.cpp:69 msgctxt "Key name" msgid "Keypad F4" msgstr "數字鍵盤 F4" -#: src/lib/fcitx-utils/key.cpp:62 +#: src/lib/fcitx-utils/key.cpp:70 msgctxt "Key name" msgid "Keypad Home" msgstr "數字鍵盤 Home 鍵" -#: src/lib/fcitx-utils/key.cpp:71 +#: src/lib/fcitx-utils/key.cpp:79 msgctxt "Key name" msgid "Keypad Insert" msgstr "數字鍵盤插入鍵" -#: src/lib/fcitx-utils/key.cpp:63 +#: src/lib/fcitx-utils/key.cpp:71 msgctxt "Key name" msgid "Keypad Left" msgstr "數字鍵盤向左鍵" -#: src/lib/fcitx-utils/key.cpp:68 +#: src/lib/fcitx-utils/key.cpp:76 msgctxt "Key name" msgid "Keypad Page Down" msgstr "數字鍵盤下一頁" -#: src/lib/fcitx-utils/key.cpp:67 +#: src/lib/fcitx-utils/key.cpp:75 msgctxt "Key name" msgid "Keypad Page Up" msgstr "數字鍵盤上一頁" -#: src/lib/fcitx-utils/key.cpp:65 +#: src/lib/fcitx-utils/key.cpp:73 msgctxt "Key name" msgid "Keypad Right" msgstr "數字鍵盤向右鍵" -#: src/lib/fcitx-utils/key.cpp:55 +#: src/lib/fcitx-utils/key.cpp:63 msgctxt "Key name" msgid "Keypad Space" msgstr "數字鍵盤空格" -#: src/lib/fcitx-utils/key.cpp:56 +#: src/lib/fcitx-utils/key.cpp:64 msgctxt "Key name" msgid "Keypad Tab" msgstr "數字鍵盤 Tab" -#: src/lib/fcitx-utils/key.cpp:64 +#: src/lib/fcitx-utils/key.cpp:72 msgctxt "Key name" msgid "Keypad Up" msgstr "數字鍵盤向上鍵" -#: data/fcitx5-diagnose.sh:1690 +#: data/fcitx5-diagnose.sh:1590 msgid "Kimpanel process:" msgstr "Kimpanel 程序：" -#: src/ui/classic/theme.h:48 +#: src/ui/classic/theme.h:56 msgid "Last Candidate" msgstr "上一個候選詞" -#: src/lib/fcitx-utils/key.cpp:112 +#: src/lib/fcitx-utils/key.cpp:120 msgctxt "Key name" msgid "Launch (0)" msgstr "啟動 (0)" -#: src/lib/fcitx-utils/key.cpp:113 +#: src/lib/fcitx-utils/key.cpp:121 msgctxt "Key name" msgid "Launch (1)" msgstr "啟動 (1)" -#: src/lib/fcitx-utils/key.cpp:114 +#: src/lib/fcitx-utils/key.cpp:122 msgctxt "Key name" msgid "Launch (2)" msgstr "啟動 (2)" -#: src/lib/fcitx-utils/key.cpp:115 +#: src/lib/fcitx-utils/key.cpp:123 msgctxt "Key name" msgid "Launch (3)" msgstr "啟動 (3)" -#: src/lib/fcitx-utils/key.cpp:116 +#: src/lib/fcitx-utils/key.cpp:124 msgctxt "Key name" msgid "Launch (4)" msgstr "啟動 (4)" -#: src/lib/fcitx-utils/key.cpp:117 +#: src/lib/fcitx-utils/key.cpp:125 msgctxt "Key name" msgid "Launch (5)" msgstr "啟動 (5)" -#: src/lib/fcitx-utils/key.cpp:118 +#: src/lib/fcitx-utils/key.cpp:126 msgctxt "Key name" msgid "Launch (6)" msgstr "啟動 (6)" -#: src/lib/fcitx-utils/key.cpp:119 +#: src/lib/fcitx-utils/key.cpp:127 msgctxt "Key name" msgid "Launch (7)" msgstr "啟動 (7)" -#: src/lib/fcitx-utils/key.cpp:120 +#: src/lib/fcitx-utils/key.cpp:128 msgctxt "Key name" msgid "Launch (8)" msgstr "啟動 (8)" -#: src/lib/fcitx-utils/key.cpp:121 +#: src/lib/fcitx-utils/key.cpp:129 msgctxt "Key name" msgid "Launch (9)" msgstr "啟動 (9)" -#: src/lib/fcitx-utils/key.cpp:122 +#: src/lib/fcitx-utils/key.cpp:130 msgctxt "Key name" msgid "Launch (A)" msgstr "啟動 (A)" -#: src/lib/fcitx-utils/key.cpp:123 +#: src/lib/fcitx-utils/key.cpp:131 msgctxt "Key name" msgid "Launch (B)" msgstr "啟動 (B)" -#: src/lib/fcitx-utils/key.cpp:124 +#: src/lib/fcitx-utils/key.cpp:132 msgctxt "Key name" msgid "Launch (C)" msgstr "啟動 (C)" -#: src/lib/fcitx-utils/key.cpp:125 +#: src/lib/fcitx-utils/key.cpp:133 msgctxt "Key name" msgid "Launch (D)" msgstr "啟動 (D)" -#: src/lib/fcitx-utils/key.cpp:126 +#: src/lib/fcitx-utils/key.cpp:134 msgctxt "Key name" msgid "Launch (E)" msgstr "啟動 (E)" -#: src/lib/fcitx-utils/key.cpp:127 +#: src/lib/fcitx-utils/key.cpp:135 msgctxt "Key name" msgid "Launch (F)" msgstr "啟動 (F)" -#: src/lib/fcitx-utils/key.cpp:111 +#: src/lib/fcitx-utils/key.cpp:119 msgctxt "Key name" msgid "Launch Mail" msgstr "啟動郵件程式" -#: src/lib/fcitx-utils/key.cpp:47 +#: src/lib/fcitx-utils/key.cpp:55 msgctxt "Key name" msgid "Left" msgstr "左" -#: src/lib/fcitx-utils/key.cpp:30 +#: src/lib/fcitx-utils/key.cpp:38 msgctxt "Key name" msgid "Left Alt" msgstr "左 Alt 鍵" -#: src/lib/fcitx-utils/key.cpp:34 +#: src/lib/fcitx-utils/key.cpp:42 msgctxt "Key name" msgid "Left Control" msgstr "左 Control 鍵" -#: src/lib/fcitx-utils/key.cpp:38 +#: src/lib/fcitx-utils/key.cpp:46 msgctxt "Key name" msgid "Left Hyper" msgstr "左 Hyper 鍵" -#: src/lib/fcitx-utils/key.cpp:32 +#: src/lib/fcitx-utils/key.cpp:40 msgctxt "Key name" msgid "Left Shift" msgstr "左 Shift 鍵" -#: src/lib/fcitx-utils/key.cpp:36 +#: src/lib/fcitx-utils/key.cpp:44 msgctxt "Key name" msgid "Left Super" msgstr "左 Super 鍵" -#: src/lib/fcitx-utils/key.cpp:141 +#: src/lib/fcitx-utils/key.cpp:149 msgctxt "Key name" msgid "LightBulb" msgstr "燈泡" @@ -1789,11 +1748,11 @@ msgstr "燈泡" msgid "Locale:" msgstr "地區設定：" -#: data/fcitx5-diagnose.sh:1799 +#: data/fcitx5-diagnose.sh:1698 msgid "Log:" msgstr "日誌：" -#: src/lib/fcitx-utils/key.cpp:168 +#: src/lib/fcitx-utils/key.cpp:176 msgctxt "Key name" msgid "Logoff" msgstr "登出" @@ -1802,142 +1761,142 @@ msgstr "登出" msgid "Long Press behavior" msgstr "長按行為" -#: src/lib/fcitx-utils/key.cpp:201 +#: src/lib/fcitx-utils/key.cpp:209 msgctxt "Key name" msgid "Mail Forward" msgstr "轉寄信件" -#: src/ui/classic/theme.h:116 +#: src/ui/classic/theme.h:124 msgid "Margin" msgstr "邊距" -#: src/ui/classic/theme.h:78 +#: src/ui/classic/theme.h:86 msgid "Margin Bottom" msgstr "底部邊距" -#: src/ui/classic/theme.h:72 +#: src/ui/classic/theme.h:80 msgid "Margin Left" msgstr "左側邊距" -#: src/ui/classic/theme.h:74 +#: src/ui/classic/theme.h:82 msgid "Margin Right" msgstr "右側邊距" -#: src/ui/classic/theme.h:76 +#: src/ui/classic/theme.h:84 msgid "Margin Top" msgstr "頂部邊距" -#: src/ui/classic/theme.h:160 src/ui/classic/theme.h:184 +#: src/ui/classic/theme.h:168 src/ui/classic/theme.h:192 msgid "Margin around all content" msgstr "內容周圍邊界" -#: src/ui/classic/theme.h:162 src/ui/classic/theme.h:186 +#: src/ui/classic/theme.h:170 src/ui/classic/theme.h:194 msgid "Margin around text" msgstr "內容周圍邊界" -#: src/lib/fcitx-utils/key.cpp:169 +#: src/lib/fcitx-utils/key.cpp:177 msgctxt "Key name" msgid "Market" msgstr "市場" -#: src/lib/fcitx-utils/key.cpp:245 +#: src/lib/fcitx-utils/key.cpp:253 msgctxt "Key name" msgid "Massyo" msgstr "Massyo" -#: src/lib/fcitx-utils/key.cpp:207 +#: src/lib/fcitx-utils/key.cpp:215 msgctxt "Key name" msgid "Media Fast Forward" msgstr "媒體快轉" -#: src/lib/fcitx-utils/key.cpp:103 +#: src/lib/fcitx-utils/key.cpp:111 msgctxt "Key name" msgid "Media Next" msgstr "媒體下一首" -#: src/lib/fcitx-utils/key.cpp:105 +#: src/lib/fcitx-utils/key.cpp:113 msgctxt "Key name" msgid "Media Pause" msgstr "媒體暫停" -#: src/lib/fcitx-utils/key.cpp:100 +#: src/lib/fcitx-utils/key.cpp:108 msgctxt "Key name" msgid "Media Play" msgstr "媒體播放" -#: src/lib/fcitx-utils/key.cpp:102 +#: src/lib/fcitx-utils/key.cpp:110 msgctxt "Key name" msgid "Media Previous" msgstr "媒體上一首" -#: src/lib/fcitx-utils/key.cpp:104 +#: src/lib/fcitx-utils/key.cpp:112 msgctxt "Key name" msgid "Media Record" msgstr "媒體錄影" -#: src/lib/fcitx-utils/key.cpp:149 +#: src/lib/fcitx-utils/key.cpp:157 msgctxt "Key name" msgid "Media Rewind" msgstr "媒體倒轉" -#: src/lib/fcitx-utils/key.cpp:101 +#: src/lib/fcitx-utils/key.cpp:109 msgctxt "Key name" msgid "Media Stop" msgstr "媒體停止" -#: src/lib/fcitx-utils/key.cpp:170 +#: src/lib/fcitx-utils/key.cpp:178 msgctxt "Key name" msgid "Meeting" msgstr "會議" -#: src/ui/classic/theme.h:200 +#: src/ui/classic/theme.h:208 msgid "Menu" msgstr "選單" -#: src/lib/fcitx-utils/key.cpp:91 +#: src/lib/fcitx-utils/key.cpp:99 msgctxt "Key name" msgid "Menu" msgstr "選單" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Background" msgstr "選單背景" -#: src/ui/classic/theme.h:66 +#: src/ui/classic/theme.h:74 msgid "Menu Border" msgstr "選單邊框" -#: src/ui/classic/classicui.h:119 +#: src/ui/classic/classicui.h:128 msgid "Menu Font" msgstr "功能表字體" -#: src/lib/fcitx-utils/key.cpp:172 +#: src/lib/fcitx-utils/key.cpp:180 msgctxt "Key name" msgid "Menu PB" msgstr "選單 PB" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Background" msgstr "選單選中項背景" -#: src/ui/classic/theme.h:67 +#: src/ui/classic/theme.h:75 msgid "Menu Selected Item Border" msgstr "選單選中項邊框" -#: src/ui/classic/theme.h:68 +#: src/ui/classic/theme.h:76 msgid "Menu Separator" msgstr "選單分隔符" -#: src/lib/fcitx-utils/key.cpp:199 +#: src/lib/fcitx-utils/key.cpp:207 msgctxt "Key name" msgid "Messenger" msgstr "即時通訊工具" -#: src/ui/classic/theme.h:197 +#: src/ui/classic/theme.h:205 msgid "Metadata" msgstr "元數據" -#: src/lib/fcitx-utils/key.cpp:218 +#: src/lib/fcitx-utils/key.cpp:226 msgctxt "Key name" msgid "Microphone Mute" msgstr "靜音麥克風" @@ -1946,46 +1905,46 @@ msgstr "靜音麥克風" msgid "Modifier Only Hotkey Timeout in Milliseconds" msgstr "" -#: src/lib/fcitx-utils/key.cpp:130 +#: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" msgstr "顯示器亮度降低" -#: src/lib/fcitx-utils/key.cpp:128 +#: src/lib/fcitx-utils/key.cpp:136 msgctxt "Key name" msgid "Monitor Brightness Up" msgstr "顯示器亮度增加" -#: src/lib/fcitx-utils/key.cpp:235 +#: src/lib/fcitx-utils/key.cpp:243 msgctxt "Key name" msgid "Muhenkan" msgstr "無變換" -#: src/lib/fcitx-utils/key.cpp:251 +#: src/lib/fcitx-utils/key.cpp:259 msgctxt "Key name" msgid "Multiple Candidate" msgstr "多個候選字" -#: src/lib/fcitx-utils/key.cpp:203 +#: src/lib/fcitx-utils/key.cpp:211 msgctxt "Key name" msgid "Music" msgstr "音樂" -#: src/lib/fcitx-utils/key.cpp:173 +#: src/lib/fcitx-utils/key.cpp:181 msgctxt "Key name" msgid "My Sites" msgstr "個人站台" -#: src/ui/classic/theme.h:189 +#: src/ui/classic/theme.h:197 msgid "Name" msgstr "名稱" -#: src/lib/fcitx-utils/key.cpp:223 +#: src/lib/fcitx-utils/key.cpp:231 msgctxt "Key name" msgid "New" msgstr "新增" -#: src/lib/fcitx-utils/key.cpp:174 +#: src/lib/fcitx-utils/key.cpp:182 msgctxt "Key name" msgid "News" msgstr "新聞" @@ -1994,7 +1953,7 @@ msgstr "新聞" msgid "Next Candidate" msgstr "下一個候選字" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "下一頁按鈕" @@ -2010,11 +1969,11 @@ msgstr "沒有輸入法歷史" msgid "None" msgstr "無" -#: src/ui/classic/theme.h:133 src/ui/classic/theme.h:169 +#: src/ui/classic/theme.h:141 src/ui/classic/theme.h:177 msgid "Normal text color" msgstr "一般文字顏色" -#: src/ui/classic/classicui.h:179 +#: src/ui/classic/classicui.h:188 msgid "" "Normally Wayland uses 96 as font DPI in combinition with the screen scale " "factor. This option allows you to override the font DPI. If the value is 0, " @@ -2035,7 +1994,7 @@ msgstr "給 GNOME 3.6 以上版本的註記" msgid "Notification" msgstr "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "數字鎖定 (NumLock)" @@ -2050,38 +2009,38 @@ msgid "" "install spell check data for the language." msgstr "只找到表情符號支持。要啟用拼寫檢查，您需要安裝該語言的拼寫檢查資料。" -#: src/lib/fcitx-utils/key.cpp:224 +#: src/lib/fcitx-utils/key.cpp:232 msgctxt "Key name" msgid "Open" msgstr "開啟" -#: src/lib/fcitx-utils/key.cpp:110 +#: src/lib/fcitx-utils/key.cpp:118 msgctxt "Key name" msgid "Open URL" msgstr "開啟網址" -#: src/lib/fcitx-utils/key.cpp:176 +#: src/lib/fcitx-utils/key.cpp:184 msgctxt "Key name" msgid "Option" msgstr "選項" -#: src/ui/classic/theme.h:118 +#: src/ui/classic/theme.h:126 msgid "Overlay Clip Margin" msgstr "覆蓋圖片裁剪邊界" -#: src/ui/classic/theme.h:108 +#: src/ui/classic/theme.h:116 msgid "Overlay Image" msgstr "覆蓋圖片" -#: src/ui/classic/theme.h:111 +#: src/ui/classic/theme.h:119 msgid "Overlay X offset" msgstr "覆蓋 X 位移" -#: src/ui/classic/theme.h:112 +#: src/ui/classic/theme.h:120 msgid "Overlay Y offset" msgstr "覆蓋 Y 位移" -#: src/ui/classic/theme.h:110 +#: src/ui/classic/theme.h:118 msgid "Overlay position" msgstr "覆蓋圖片位置" @@ -2097,17 +2056,17 @@ msgstr "DBus 名稱 ${1} 的擁有者是 ${2}。" msgid "PID of DBus name ${1} owner is ${2}." msgstr "DBus 名稱 ${1} PID 的擁有者是 ${2}。" -#: src/lib/fcitx-utils/key.cpp:52 +#: src/lib/fcitx-utils/key.cpp:60 msgctxt "Key name" msgid "Page Down" msgstr "下一頁" -#: src/lib/fcitx-utils/key.cpp:51 +#: src/lib/fcitx-utils/key.cpp:59 msgctxt "Key name" msgid "Page Up" msgstr "上一頁" -#: src/ui/classic/theme.h:153 +#: src/ui/classic/theme.h:161 msgid "Page button vertical alignment" msgstr "頁面按鈕垂直對齊" @@ -2115,7 +2074,7 @@ msgstr "頁面按鈕垂直對齊" msgid "Page size" msgstr "頁面大小" -#: src/lib/fcitx-utils/key.cpp:177 +#: src/lib/fcitx-utils/key.cpp:185 msgctxt "Key name" msgid "Paste" msgstr "貼上" @@ -2124,17 +2083,17 @@ msgstr "貼上" msgid "Paste Primary" msgstr "貼上主選區" -#: src/lib/fcitx-utils/key.cpp:44 +#: src/lib/fcitx-utils/key.cpp:52 msgctxt "Key name" msgid "Pause" msgstr "暫停" -#: src/lib/fcitx-utils/key.cpp:178 +#: src/lib/fcitx-utils/key.cpp:186 msgctxt "Key name" msgid "Phone" msgstr "電話" -#: src/lib/fcitx-utils/key.cpp:202 +#: src/lib/fcitx-utils/key.cpp:210 msgctxt "Key name" msgid "Pictures" msgstr "圖片" @@ -2157,12 +2116,12 @@ msgstr "" "請設定環境變數 ${env_name} 到「${value}」，使用您的發行版提供的工具或加入 " "${1} 到您的 ${2}。請參閱 ${link}。" -#: src/lib/fcitx-utils/key.cpp:216 +#: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" msgid "Power Down" msgstr "關機" -#: src/lib/fcitx-utils/key.cpp:135 +#: src/lib/fcitx-utils/key.cpp:143 msgctxt "Key name" msgid "Power Off" msgstr "關機" @@ -2179,7 +2138,7 @@ msgstr "預編輯已停用" msgid "Preedit enabled" msgstr "預編輯已啟用" -#: src/ui/classic/classicui.h:127 src/ui/kimpanel/kimpanel.h:28 +#: src/ui/classic/classicui.h:136 src/ui/kimpanel/kimpanel.h:28 msgid "Prefer Text Icon" msgstr "首選文字圖示" @@ -2191,16 +2150,16 @@ msgstr "Presage" msgid "Prev Candidate" msgstr "上一個候選字" -#: src/ui/classic/theme.h:163 +#: src/ui/classic/theme.h:171 msgid "Prev Page Button" msgstr "上一頁按鈕" -#: src/lib/fcitx-utils/key.cpp:252 +#: src/lib/fcitx-utils/key.cpp:260 msgctxt "Key name" msgid "Previous Candidate" msgstr "上一個候選字" -#: src/lib/fcitx-utils/key.cpp:228 +#: src/lib/fcitx-utils/key.cpp:236 msgctxt "Key name" msgid "Print Screen" msgstr "截圖 (PrtSc)" @@ -2209,7 +2168,7 @@ msgstr "截圖 (PrtSc)" msgid "Program" msgstr "程式" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 msgid "Qt IM module files:" msgstr "Qt IM 模組檔案：" @@ -2221,27 +2180,27 @@ msgstr "快速片語" msgid "Quick Phrase: " msgstr "快速輸入：" -#: src/lib/fcitx-utils/key.cpp:219 +#: src/lib/fcitx-utils/key.cpp:227 msgctxt "Key name" msgid "Red" msgstr "紅色" -#: src/lib/fcitx-utils/key.cpp:227 +#: src/lib/fcitx-utils/key.cpp:235 msgctxt "Key name" msgid "Redo" msgstr "重作" -#: src/lib/fcitx-utils/key.cpp:96 +#: src/lib/fcitx-utils/key.cpp:104 msgctxt "Key name" msgid "Refresh" msgstr "重新整理" -#: src/lib/fcitx-utils/key.cpp:180 +#: src/lib/fcitx-utils/key.cpp:188 msgctxt "Key name" msgid "Reload" msgstr "重新載入" -#: src/lib/fcitx-utils/key.cpp:179 +#: src/lib/fcitx-utils/key.cpp:187 msgctxt "Key name" msgid "Reply" msgstr "回覆" @@ -2250,62 +2209,62 @@ msgstr "回覆" msgid "Reset state on Focus In" msgstr "重新聚焦時重設狀態" -#: src/ui/classic/xcbtraywindow.cpp:39 +#: src/ui/classic/xcbtraywindow.cpp:56 #: src/modules/notificationitem/dbusmenu.cpp:261 msgid "Restart" msgstr "重新啟動" -#: src/lib/fcitx-utils/key.cpp:43 +#: src/lib/fcitx-utils/key.cpp:51 msgctxt "Key name" msgid "Return" msgstr "Return 鍵" -#: src/lib/fcitx-utils/key.cpp:49 +#: src/lib/fcitx-utils/key.cpp:57 msgctxt "Key name" msgid "Right" msgstr "右" -#: src/lib/fcitx-utils/key.cpp:31 +#: src/lib/fcitx-utils/key.cpp:39 msgctxt "Key name" msgid "Right Alt" msgstr "右 Alt 鍵" -#: src/lib/fcitx-utils/key.cpp:35 +#: src/lib/fcitx-utils/key.cpp:43 msgctxt "Key name" msgid "Right Control" msgstr "右 Control 鍵" -#: src/lib/fcitx-utils/key.cpp:39 +#: src/lib/fcitx-utils/key.cpp:47 msgctxt "Key name" msgid "Right Hyper" msgstr "右 Hyper" -#: src/lib/fcitx-utils/key.cpp:33 +#: src/lib/fcitx-utils/key.cpp:41 msgctxt "Key name" msgid "Right Shift" msgstr "右 Shift 鍵" -#: src/lib/fcitx-utils/key.cpp:37 +#: src/lib/fcitx-utils/key.cpp:45 msgctxt "Key name" msgid "Right Super" msgstr "右 Super 鍵" -#: src/lib/fcitx-utils/key.cpp:237 +#: src/lib/fcitx-utils/key.cpp:245 msgctxt "Key name" msgid "Romaji" msgstr "羅馬音" -#: src/lib/fcitx-utils/key.cpp:181 +#: src/lib/fcitx-utils/key.cpp:189 msgctxt "Key name" msgid "Rotate Windows" msgstr "旋轉視窗" -#: src/lib/fcitx-utils/key.cpp:183 +#: src/lib/fcitx-utils/key.cpp:191 msgctxt "Key name" msgid "Rotation KB" msgstr "旋轉 KB" -#: src/lib/fcitx-utils/key.cpp:182 +#: src/lib/fcitx-utils/key.cpp:190 msgctxt "Key name" msgid "Rotation PB" msgstr "旋轉 PB" @@ -2314,22 +2273,22 @@ msgstr "旋轉 PB" msgid "Running as root:" msgstr "以 root 執行：" -#: src/lib/fcitx-utils/key.cpp:184 +#: src/lib/fcitx-utils/key.cpp:192 msgctxt "Key name" msgid "Save" msgstr "儲存" -#: src/lib/fcitx-utils/key.cpp:138 +#: src/lib/fcitx-utils/key.cpp:146 msgctxt "Key name" msgid "Screensaver" msgstr "螢幕保護程式" -#: src/lib/fcitx-utils/key.cpp:90 +#: src/lib/fcitx-utils/key.cpp:98 msgctxt "Key name" msgid "ScrollLock" msgstr "捲動鎖定 (ScrollLock)" -#: src/lib/fcitx-utils/key.cpp:108 +#: src/lib/fcitx-utils/key.cpp:116 msgctxt "Key name" msgid "Search" msgstr "搜尋" @@ -2338,7 +2297,7 @@ msgstr "搜尋" msgid "Seconds before clearing password" msgstr "自動清除密碼的時間間隔（單位：秒）" -#: src/lib/fcitx-utils/key.cpp:233 +#: src/lib/fcitx-utils/key.cpp:241 msgctxt "Key name" msgid "Select" msgstr "選取" @@ -2355,11 +2314,11 @@ msgstr "選擇區域輸入法：" msgid "Select specific input method via keyboard" msgstr "通過鍵盤選擇特定的輸入法" -#: src/ui/classic/theme.h:172 +#: src/ui/classic/theme.h:180 msgid "Selected Item text color" msgstr "選中項文本顏色" -#: src/lib/fcitx-utils/key.cpp:185 +#: src/lib/fcitx-utils/key.cpp:193 msgctxt "Key name" msgid "Send" msgstr "傳送" @@ -2373,11 +2332,11 @@ msgstr "" "目前桌面不支援由 Fcitx 將鍵盤佈局配置傳送給 wayland 混成器。您仍可以透過將佈" "局作為輸入法添加至輸入法分組以使用 Fcitx 內的佈局轉換。" -#: src/ui/classic/theme.h:180 +#: src/ui/classic/theme.h:188 msgid "Separator Background" msgstr "分隔符背景" -#: src/ui/classic/theme.h:166 +#: src/ui/classic/theme.h:174 msgid "Shadow Margin" msgstr "陰影邊緣" @@ -2385,12 +2344,12 @@ msgstr "陰影邊緣" msgid "Share Input State" msgstr "共享輸入法狀態" -#: src/lib/fcitx-utils/key.cpp:564 +#: src/lib/fcitx-utils/key.cpp:572 msgctxt "Key name" msgid "Shift" msgstr "Shift 鍵" -#: src/lib/fcitx-utils/key.cpp:142 +#: src/lib/fcitx-utils/key.cpp:150 msgctxt "Key name" msgid "Shop" msgstr "商店" @@ -2403,7 +2362,7 @@ msgstr "當切換輸入焦點時顯示輸入法資訊" msgid "Show Input Method Information when switch input method" msgstr "當切換輸入法時顯示輸入法資訊" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "在圖示顯示佈局名稱" @@ -2415,7 +2374,7 @@ msgstr "顯示緊湊的輸入法訊息" msgid "Show first input method information" msgstr "顯示第一個輸入法資訊" -#: src/ui/classic/classicui.h:136 +#: src/ui/classic/classicui.h:145 msgid "" "Show layout name in icon if there is more than one active layout. If prefer " "text icon is set to true, this option will be ignored." @@ -2441,17 +2400,17 @@ msgstr "使用組合鍵時顯示預編輯，並且在沒有匹配序列時提交 msgid "Skip first input method while enumerating" msgstr "枚舉時略過第一個輸入法" -#: src/lib/fcitx-utils/key.cpp:140 +#: src/lib/fcitx-utils/key.cpp:148 msgctxt "Key name" msgid "Sleep" msgstr "睡眠" -#: src/lib/fcitx-utils/key.cpp:40 +#: src/lib/fcitx-utils/key.cpp:48 msgctxt "Key name" msgid "Space" msgstr "空格" -#: src/ui/classic/theme.h:174 +#: src/ui/classic/theme.h:182 msgid "Spacing" msgstr "間隔" @@ -2459,22 +2418,22 @@ msgstr "間隔" msgid "Spell" msgstr "拼寫" -#: src/lib/fcitx-utils/key.cpp:186 +#: src/lib/fcitx-utils/key.cpp:194 msgctxt "Key name" msgid "Spellchecker" msgstr "拼字檢查" -#: src/lib/fcitx-utils/key.cpp:187 +#: src/lib/fcitx-utils/key.cpp:195 msgctxt "Key name" msgid "Split Screen" msgstr "分割螢幕" -#: src/lib/fcitx-utils/key.cpp:163 +#: src/lib/fcitx-utils/key.cpp:171 msgctxt "Key name" msgid "Spreadsheet" msgstr "試算表" -#: src/lib/fcitx-utils/key.cpp:109 +#: src/lib/fcitx-utils/key.cpp:117 msgctxt "Key name" msgid "Standby" msgstr "待機" @@ -2488,16 +2447,16 @@ msgstr "啟動輸入法" msgid "Status Notifier" msgstr "狀態指示器" -#: src/lib/fcitx-utils/key.cpp:95 +#: src/lib/fcitx-utils/key.cpp:103 msgctxt "Key name" msgid "Stop" msgstr "停止" -#: src/ui/classic/theme.h:182 +#: src/ui/classic/theme.h:190 msgid "Sub Menu" msgstr "子功能表" -#: src/lib/fcitx-utils/key.cpp:210 +#: src/lib/fcitx-utils/key.cpp:218 msgctxt "Key name" msgid "Subtitle" msgstr "副標題" @@ -2506,17 +2465,17 @@ msgstr "副標題" msgid "Super" msgstr "超級" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:573 msgctxt "Key name" msgid "Super" msgstr "Super 鍵" -#: src/lib/fcitx-utils/key.cpp:188 +#: src/lib/fcitx-utils/key.cpp:196 msgctxt "Key name" msgid "Support" msgstr "支援" -#: src/lib/fcitx-utils/key.cpp:217 +#: src/lib/fcitx-utils/key.cpp:225 msgctxt "Key name" msgid "Suspend" msgstr "暫停" @@ -2540,17 +2499,17 @@ msgstr "已切換分組到 {0}" msgid "System Info:" msgstr "系統資訊：" -#: src/lib/fcitx-utils/key.cpp:232 +#: src/lib/fcitx-utils/key.cpp:240 msgctxt "Key name" msgid "System Request" msgstr "系統請求" -#: src/lib/fcitx-utils/key.cpp:41 +#: src/lib/fcitx-utils/key.cpp:49 msgctxt "Key name" msgid "Tab" msgstr "定格鍵 (Tab)" -#: src/lib/fcitx-utils/key.cpp:189 +#: src/lib/fcitx-utils/key.cpp:197 msgctxt "Key name" msgid "Task Panel" msgstr "工作列" @@ -2559,12 +2518,12 @@ msgstr "工作列" msgid "Temporally switch between first and current Input Method" msgstr "臨時在第一個與當前輸入法中切換" -#: src/lib/fcitx-utils/key.cpp:190 +#: src/lib/fcitx-utils/key.cpp:198 msgctxt "Key name" msgid "Terminal" msgstr "終端機" -#: data/fcitx5-diagnose.sh:1786 +#: data/fcitx5-diagnose.sh:1685 #, sh-format msgid "" "The environment variable checked by this script only shows the environment " @@ -2586,31 +2545,31 @@ msgstr "列表中第 n 個快速鍵選擇第 n 個輸入法。" msgid "The script is run as ${1} (${2})." msgstr "此腳本以 ${1} (${2}) 執行。" -#: src/ui/classic/classicui.h:152 +#: src/ui/classic/classicui.h:161 msgid "Theme" msgstr "主題" -#: src/ui/classic/classicui.h:98 +#: src/ui/classic/classicui.h:107 msgid "This is only effective when the tray icon is xembed." msgstr "這只在托盤圖示為 xembed 時有效。" -#: src/ui/classic/theme.h:91 src/ui/classic/theme.h:99 +#: src/ui/classic/theme.h:99 src/ui/classic/theme.h:107 msgid "This option is only effective if image is not set." msgstr "此選項僅在圖片沒有設定時有效。" -#: src/ui/classic/classicui.h:191 +#: src/ui/classic/classicui.h:200 msgid "This option require support from wayland compositor." msgstr "此選項需要 Wayland 混成器 (Wayland compositor) 支援。" -#: src/ui/classic/classicui.h:170 +#: src/ui/classic/classicui.h:179 msgid "This option will be always disabled on XWayland." msgstr "在 XWayland 上，此選項將始終被禁用。" -#: src/ui/classic/theme.h:107 +#: src/ui/classic/theme.h:115 msgid "This value should be less than any of margin value." msgstr "這個值應該小於任何邊距值。" -#: data/fcitx5-diagnose.sh:1805 +#: data/fcitx5-diagnose.sh:1704 msgid "" "Though such information can be helpful to developers for diagnostic purpose, " "please double check and remove as necessary before posting it online " @@ -2619,7 +2578,7 @@ msgstr "" "儘管這些訊息對開發人員的診斷有幫助，但在公開發佈到網上之前，請仔細檢查並根據" "需要刪除信息。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 msgctxt "Key name" msgid "Time" msgstr "時間" @@ -2638,66 +2597,66 @@ msgstr "" msgid "Toggle embedded preedit" msgstr "切換內嵌預編輯區域" -#: src/lib/fcitx-utils/key.cpp:191 +#: src/lib/fcitx-utils/key.cpp:199 msgctxt "Key name" msgid "Tools" msgstr "工具" -#: src/ui/classic/theme.h:46 +#: src/ui/classic/theme.h:54 msgid "Top" msgstr "頂部" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Center" msgstr "頂部居中" -#: src/ui/classic/theme.h:33 +#: src/ui/classic/theme.h:41 msgid "Top Left" msgstr "左上" -#: src/lib/fcitx-utils/key.cpp:215 +#: src/lib/fcitx-utils/key.cpp:223 msgctxt "Key name" msgid "Top Menu" msgstr "頂部選單" -#: src/ui/classic/theme.h:34 +#: src/ui/classic/theme.h:42 msgid "Top Right" msgstr "右上" -#: src/lib/fcitx-utils/key.cpp:268 +#: src/lib/fcitx-utils/key.cpp:276 msgctxt "Key name" msgid "Touchpad Off" msgstr "關閉觸控板" -#: src/lib/fcitx-utils/key.cpp:267 +#: src/lib/fcitx-utils/key.cpp:275 msgctxt "Key name" msgid "Touchpad On" msgstr "啟用觸控板" -#: src/lib/fcitx-utils/key.cpp:266 +#: src/lib/fcitx-utils/key.cpp:274 msgctxt "Key name" msgid "Touchpad Toggle" msgstr "切換觸控板" -#: src/lib/fcitx-utils/key.cpp:244 +#: src/lib/fcitx-utils/key.cpp:252 msgctxt "Key name" msgid "Touroku" msgstr "登錄" -#: src/lib/fcitx-utils/key.cpp:192 +#: src/lib/fcitx-utils/key.cpp:200 msgctxt "Key name" msgid "Travel" msgstr "旅行" -#: src/ui/classic/classicui.h:121 +#: src/ui/classic/classicui.h:130 msgid "Tray Font" msgstr "托盤字體" -#: src/ui/classic/classicui.h:123 +#: src/ui/classic/classicui.h:132 msgid "Tray Label Outline Color" msgstr "托盤標簽輪廓顏色" -#: src/ui/classic/classicui.h:126 +#: src/ui/classic/classicui.h:135 msgid "Tray Label Text Color" msgstr "托盤標簽文字顏色" @@ -2739,7 +2698,7 @@ msgstr "使用 Fcitx 和 Kimpanel 輸入" msgid "Unable to find a program to check dbus." msgstr "找不到程式檢查 dbus。" -#: src/lib/fcitx-utils/key.cpp:226 +#: src/lib/fcitx-utils/key.cpp:234 msgctxt "Key name" msgid "Undo" msgstr "復原" @@ -2752,7 +2711,7 @@ msgstr "Unicode" msgid "Unicode: " msgstr "Unicode：" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2761,19 +2720,19 @@ msgstr "上" msgid "Use On The Spot Style (Needs restarting)" msgstr "使用 On The Spot 風格 (需要重新啟動)" -#: src/ui/classic/classicui.h:166 +#: src/ui/classic/classicui.h:175 msgid "Use Per Screen DPI on X11" msgstr "在 X11 上對不同螢幕使用單獨的 DPI" -#: src/ui/classic/theme.h:149 +#: src/ui/classic/theme.h:157 msgid "Use all horizontal space for highlight when it is vertical list" msgstr "當它是垂直列表時，使用所有橫向空間高亮顯示" -#: src/ui/classic/classicui.h:143 +#: src/ui/classic/classicui.h:152 msgid "Use input method language to display text" msgstr "使用輸入法語言來顯示文字" -#: src/ui/classic/classicui.h:113 +#: src/ui/classic/classicui.h:122 msgid "Use mouse wheel to go to prev or next page" msgstr "使用滑鼠滾輪到上一頁或下一頁" @@ -2781,7 +2740,7 @@ msgstr "使用滑鼠滾輪到上一頁或下一頁" msgid "Use new compose behavior" msgstr "使用新的撰寫行為" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "使用者介面：" @@ -2795,59 +2754,59 @@ msgid "" "environment:" msgstr "使用 ${1} 檢查目前環境下將被實際使用的輸入法模塊：" -#: src/ui/classic/theme.h:190 +#: src/ui/classic/theme.h:198 msgid "Version" msgstr "版本" -#: data/fcitx5-diagnose.sh:1405 data/fcitx5-diagnose.sh:1489 +#: data/fcitx5-diagnose.sh:1305 data/fcitx5-diagnose.sh:1389 msgid "Version Line:" msgstr "版本行：" -#: src/ui/classic/classicui.h:111 +#: src/ui/classic/classicui.h:120 msgid "Vertical Candidate List" msgstr "垂直候選字列表" -#: src/lib/fcitx-utils/key.cpp:193 +#: src/lib/fcitx-utils/key.cpp:201 msgctxt "Key name" msgid "Video" msgstr "影片" -#: src/lib/fcitx-utils/key.cpp:214 +#: src/lib/fcitx-utils/key.cpp:222 msgctxt "Key name" msgid "View" msgstr "檢視" -#: src/lib/fcitx-utils/key.cpp:269 +#: src/lib/fcitx-utils/key.cpp:277 msgctxt "Key name" msgid "Void Symbol" msgstr "空符號" -#: src/lib/fcitx-utils/key.cpp:97 +#: src/lib/fcitx-utils/key.cpp:105 msgctxt "Key name" msgid "Volume Down" msgstr "音量降低" -#: src/lib/fcitx-utils/key.cpp:98 +#: src/lib/fcitx-utils/key.cpp:106 msgctxt "Key name" msgid "Volume Mute" msgstr "靜音" -#: src/lib/fcitx-utils/key.cpp:99 +#: src/lib/fcitx-utils/key.cpp:107 msgctxt "Key name" msgid "Volume Up" msgstr "音量提高" -#: src/lib/fcitx-utils/key.cpp:139 +#: src/lib/fcitx-utils/key.cpp:147 msgctxt "Key name" msgid "WWW" msgstr "全球資訊網 (WWW)" -#: src/lib/fcitx-utils/key.cpp:136 +#: src/lib/fcitx-utils/key.cpp:144 msgctxt "Key name" msgid "Wake Up" msgstr "喚醒" -#: data/fcitx5-diagnose.sh:1804 +#: data/fcitx5-diagnose.sh:1703 msgid "" "Warning: the output of fcitx5-diagnose contains sensitive information, " "including the distribution name, kernel version, name of currently running " @@ -2868,7 +2827,7 @@ msgstr "Wayland 診斷" msgid "Wayland Input method frontend" msgstr "Wayland 輸入法前端" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "網路攝影機" @@ -2899,12 +2858,12 @@ msgstr "" msgid "Why is it bad to run as root" msgstr "以 root 執行是不好的原因" -#: src/lib/fcitx-utils/key.cpp:206 +#: src/lib/fcitx-utils/key.cpp:214 msgctxt "Key name" msgid "Wireless" msgstr "無線" -#: src/lib/fcitx-utils/key.cpp:194 +#: src/lib/fcitx-utils/key.cpp:202 msgctxt "Key name" msgid "Word Processor" msgstr "文書處理器" @@ -2921,42 +2880,42 @@ msgstr "XCB" msgid "XDG SESSION TYPE:" msgstr "XDG 會話類型：" -#: src/lib/fcitx-utils/key.cpp:195 +#: src/lib/fcitx-utils/key.cpp:203 msgctxt "Key name" msgid "XFer" msgstr "XFer" -#: data/fcitx5-diagnose.sh:1188 +#: data/fcitx5-diagnose.sh:1088 msgid "XIM encoding:" msgstr "XIM 編碼：" -#: data/fcitx5-diagnose.sh:1183 +#: data/fcitx5-diagnose.sh:1083 msgid "XIM for Emacs:" msgstr "用於 Emacs 的 XIM：" -#: data/fcitx5-diagnose.sh:1159 +#: data/fcitx5-diagnose.sh:1059 msgid "XIM_SERVERS on root window:" msgstr "在根視窗的 XIM_SERVERS：" -#: data/fcitx5-diagnose.sh:1136 +#: data/fcitx5-diagnose.sh:1036 msgid "XMODIFIERS is not set" msgstr "XMODIFIERS 未設定" -#: data/fcitx5-diagnose.sh:1157 +#: data/fcitx5-diagnose.sh:1057 msgid "Xim Server Name from Environment variable is ${1}." msgstr "從環境變數中取得的 Xim 伺服器名稱為 ${1}。" -#: data/fcitx5-diagnose.sh:1169 +#: data/fcitx5-diagnose.sh:1069 msgid "Xim server name is the same with that set in the environment variable." msgstr "Xim 伺服器名稱與環境變數中設定的名稱相同。" -#: data/fcitx5-diagnose.sh:1171 +#: data/fcitx5-diagnose.sh:1071 msgid "" "Xim server name: \"${1}\" is different from that set in the environment " "variable: \"${2}\"." msgstr "xim 伺服器名稱：\"${1}\" 與環境變量中設置的不同：\"${2}\"。" -#: src/lib/fcitx-utils/key.cpp:221 +#: src/lib/fcitx-utils/key.cpp:229 msgctxt "Key name" msgid "Yellow" msgstr "黃色" @@ -2977,11 +2936,11 @@ msgid "" msgstr "" "您可能正以 ${1} 執行這個腳本。這表示此腳本的結果可能不準確。詳情請參照 ${2}。" -#: data/fcitx5-diagnose.sh:1213 +#: data/fcitx5-diagnose.sh:1113 msgid "You are using xim in ${1} programs." msgstr "您正在 ${1}程式中使用 xim。" -#: data/fcitx5-diagnose.sh:1218 +#: data/fcitx5-diagnose.sh:1118 msgid "You may have trouble using fcitx in ${1} programs." msgstr "您可能會在 ${1}程式中使用 fcitx 時遇到問題。" @@ -3003,7 +2962,7 @@ msgstr "" "您正在使用 KDE，但是 fcitx 的 KCModule 未被找到。此 KCModule 軟體包的名稱通常" "是 kcm-fcitx5、kde-config-fcitx5 或 fcitx5-configtool。現在將打開設定目錄。" -#: data/fcitx5-diagnose.sh:1185 +#: data/fcitx5-diagnose.sh:1085 msgid "" "Your LC_CTYPE is set to ${1} instead of one of zh, ja, ko. You may not be " "able to use input method in emacs because of an really old emacs bug that " @@ -3012,7 +2971,7 @@ msgstr "" "您的 LC_CTYPE 設定為 ${1} 而不是 zh, ja, ko 其中之一。您可能無法在 Emacs 中使" "用輸入法，原因是上游多年來拒絕修復的一個古老 bug。" -#: data/fcitx5-diagnose.sh:1190 +#: data/fcitx5-diagnose.sh:1090 msgid "" "Your LC_CTYPE is set to ${1} whose encoding is not UTF-8. You may have " "trouble committing strings using XIM." @@ -3020,22 +2979,22 @@ msgstr "" "您的 LC_CTYPE 設定為 ${1}，它的編碼不是 UTF-8。您可能會在使用 XIM 提交字串時" "遇到問題。" -#: src/lib/fcitx-utils/key.cpp:241 +#: src/lib/fcitx-utils/key.cpp:249 msgctxt "Key name" msgid "Zenkaku" msgstr "全形" -#: src/lib/fcitx-utils/key.cpp:243 +#: src/lib/fcitx-utils/key.cpp:251 msgctxt "Key name" msgid "Zenkaku Hankaku" msgstr "全形半形" -#: src/lib/fcitx-utils/key.cpp:196 +#: src/lib/fcitx-utils/key.cpp:204 msgctxt "Key name" msgid "Zoom In" msgstr "放大" -#: src/lib/fcitx-utils/key.cpp:197 +#: src/lib/fcitx-utils/key.cpp:205 msgctxt "Key name" msgid "Zoom Out" msgstr "縮小" @@ -3048,7 +3007,7 @@ msgstr "可執行檔：" msgid "here" msgstr "這裡" -#: src/lib/fcitx-utils/key.cpp:167 +#: src/lib/fcitx-utils/key.cpp:175 msgctxt "Key name" msgid "iTouch" msgstr "iTouch" -- Gitee From 535b06c0862512531efc279382c3fe7acbcbb236 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 10 Jan 2025 15:31:35 -0800 Subject: [PATCH 54/69] Add IWYU pragma to keysymgen.h --- src/lib/fcitx-utils/keysymgen.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/fcitx-utils/keysymgen.h b/src/lib/fcitx-utils/keysymgen.h index c70b0b99..eabfad22 100644 --- a/src/lib/fcitx-utils/keysymgen.h +++ b/src/lib/fcitx-utils/keysymgen.h @@ -11,6 +11,8 @@ #include +// IWYU pragma: private, include "fcitx-utils/keysym.h" + FCITX_C_DECL_BEGIN typedef enum _FcitxKeySym // NOLINT(modernize-use-using) -- Gitee From 9b7bb069e63da378f2f301c3f0f5292d89361ce3 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 10 Jan 2025 15:38:28 -0800 Subject: [PATCH 55/69] Make key pad digit also work with unicode's direct mode. --- src/modules/unicode/unicode.cpp | 47 +++++++++++++++++++++++++++++---- test/testunicode.cpp | 7 ++++- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/modules/unicode/unicode.cpp b/src/modules/unicode/unicode.cpp index 04b84bb0..4cabf1c3 100644 --- a/src/modules/unicode/unicode.cpp +++ b/src/modules/unicode/unicode.cpp @@ -5,18 +5,54 @@ * */ #include "unicode.h" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "fcitx-utils/capabilityflags.h" #include "fcitx-utils/charutils.h" #include "fcitx-utils/i18n.h" #include "fcitx-utils/inputbuffer.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" +#include "fcitx-utils/stringutils.h" +#include "fcitx-utils/textformatflags.h" #include "fcitx-utils/utf8.h" +#include "fcitx/addonfactory.h" +#include "fcitx/addoninstance.h" #include "fcitx/addonmanager.h" +#include "fcitx/candidatelist.h" +#include "fcitx/event.h" #include "fcitx/inputcontext.h" #include "fcitx/inputcontextmanager.h" #include "fcitx/inputpanel.h" +#include "fcitx/instance.h" +#include "fcitx/text.h" +#include "fcitx/userinterface.h" +#include "clipboard_public.h" namespace fcitx { +namespace { + +bool isHexKey(const Key &key) { + if (key.isDigit()) { + return true; + } + if (key.isUAZ() || key.isLAZ()) { + // sym is in valid range. + return charutils::isxdigit(key.sym()); + } + return false; +} + +} // namespace + enum class UnicodeMode { Off = 0, Search, @@ -307,11 +343,12 @@ void Unicode::handleDirect(KeyEvent &keyEvent) { return; } - if ((keyEvent.key().isDigit() || keyEvent.key().isLAZ() || - keyEvent.key().isUAZ()) && - isxdigit(keyEvent.key().sym())) { - keyEvent.accept(); - if (!state->buffer_.type(keyEvent.key().sym())) { + if (isHexKey(keyEvent.key())) { + const auto keyStr = Key::keySymToUTF8(keyEvent.key().sym()); + if (keyStr.empty()) { + return; + } + if (!state->buffer_.type(keyStr)) { return; } if (bufferIsValid(state->buffer_.userInput(), nullptr)) { diff --git a/test/testunicode.cpp b/test/testunicode.cpp index 122d84fd..d2346122 100644 --- a/test/testunicode.cpp +++ b/test/testunicode.cpp @@ -5,6 +5,10 @@ * */ #include "fcitx-utils/eventdispatcher.h" +#include "fcitx-utils/key.h" +#include "fcitx-utils/keysym.h" +#include "fcitx-utils/log.h" +#include "fcitx-utils/macros.h" #include "fcitx-utils/testing.h" #include "fcitx/addonmanager.h" #include "fcitx/instance.h" @@ -58,7 +62,8 @@ void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { testfrontend->call(uuid, Key("p"), false); // ignored testfrontend->call(uuid, Key("1"), false); - testfrontend->call(uuid, Key("8"), false); + testfrontend->call(uuid, Key(FcitxKey_KP_8), + false); testfrontend->call( uuid, Key(FcitxKey_BackSpace), false); testfrontend->call(uuid, Key("9"), false); -- Gitee From 564b6c992ad5b4ce20221c8ca4092b4df698a887 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Mon, 13 Jan 2025 14:22:23 -0800 Subject: [PATCH 56/69] Fix clang-format with AttributeMacros --- .clang-format | 1 + src/lib/fcitx-config/rawconfig.h | 4 +- src/lib/fcitx-utils/cutf8.h | 37 ++++------ src/lib/fcitx-utils/dbus/variant.h | 4 +- src/lib/fcitx-utils/i18n.h | 38 +++++----- src/lib/fcitx-utils/stringutils.h | 3 +- .../blur/org_kde_kwin_blur_manager.cpp | 4 +- src/lib/fcitx-wayland/core/wl_buffer.cpp | 4 +- src/lib/fcitx-wayland/core/wl_callback.cpp | 8 ++- src/lib/fcitx-wayland/core/wl_compositor.cpp | 4 +- src/lib/fcitx-wayland/core/wl_data_device.cpp | 12 +++- .../core/wl_data_device_manager.cpp | 4 +- src/lib/fcitx-wayland/core/wl_data_offer.cpp | 12 +++- src/lib/fcitx-wayland/core/wl_data_source.cpp | 24 +++++-- src/lib/fcitx-wayland/core/wl_keyboard.cpp | 12 +++- src/lib/fcitx-wayland/core/wl_output.cpp | 12 +++- src/lib/fcitx-wayland/core/wl_pointer.cpp | 28 ++++++-- src/lib/fcitx-wayland/core/wl_registry.cpp | 12 +++- src/lib/fcitx-wayland/core/wl_seat.cpp | 8 ++- src/lib/fcitx-wayland/core/wl_shell.cpp | 4 +- .../fcitx-wayland/core/wl_shell_surface.cpp | 16 +++-- src/lib/fcitx-wayland/core/wl_shm.cpp | 8 ++- src/lib/fcitx-wayland/core/wl_touch.cpp | 24 +++++-- .../wp_fractional_scale_v1.cpp | 4 +- .../zwp_input_method_keyboard_grab_v2.cpp | 12 +++- .../input-method-v2/zwp_input_method_v2.cpp | 28 ++++++-- .../zwp_input_popup_surface_v2.cpp | 4 +- .../zwp_virtual_keyboard_manager_v1.cpp | 4 +- .../zwp_input_method_context_v1.cpp | 24 +++++-- .../input-method/zwp_input_method_v1.cpp | 4 +- .../zwp_input_panel_surface_v1.cpp | 4 +- .../input-method/zwp_input_panel_v1.cpp | 4 +- .../org_kde_plasma_window.cpp | 64 ++++++++++++----- .../org_kde_plasma_window_management.cpp | 24 +++++-- .../tablet-v2/zwp_tablet_pad_group_v2.cpp | 16 +++-- .../tablet-v2/zwp_tablet_pad_ring_v2.cpp | 16 +++-- .../tablet-v2/zwp_tablet_pad_strip_v2.cpp | 16 +++-- .../tablet-v2/zwp_tablet_pad_v2.cpp | 20 ++++-- .../tablet-v2/zwp_tablet_tool_v2.cpp | 72 ++++++++++++++----- .../fcitx-wayland/tablet-v2/zwp_tablet_v2.cpp | 20 ++++-- .../zwlr_data_control_device_v1.cpp | 4 +- .../zwlr_data_control_offer_v1.cpp | 4 +- .../zwlr_data_control_source_v1.cpp | 8 ++- .../zwlr_foreign_toplevel_handle_v1.cpp | 20 ++++-- .../zwlr_foreign_toplevel_manager_v1.cpp | 8 ++- src/lib/fcitx/addoninstance.h | 7 +- src/lib/fcitx/surroundingtext.h | 5 +- test/testlibrary.cpp | 6 +- 48 files changed, 476 insertions(+), 205 deletions(-) diff --git a/.clang-format b/.clang-format index 5d94bf99..74df40fb 100644 --- a/.clang-format +++ b/.clang-format @@ -51,6 +51,7 @@ SpaceBeforeAssignmentOperators: true ContinuationIndentWidth: 4 CommentPragmas: '^ IWYU pragma:' ForEachMacros: [ Q_FOREACH, BOOST_FOREACH ] +AttributeMacros: [ FCITXCORE_EXPORT, FCITXUTILS_EXPORT, FCITXCONFIG_EXPORT ] SpaceBeforeParens: ControlStatements DisableFormat: false SortIncludes: true diff --git a/src/lib/fcitx-config/rawconfig.h b/src/lib/fcitx-config/rawconfig.h index b94999c0..96106826 100644 --- a/src/lib/fcitx-config/rawconfig.h +++ b/src/lib/fcitx-config/rawconfig.h @@ -108,8 +108,8 @@ private: std::unique_ptr d_ptr; }; -FCITXCONFIG_EXPORT -LogMessageBuilder &operator<<(LogMessageBuilder &log, const RawConfig &config); +FCITXCONFIG_EXPORT LogMessageBuilder &operator<<(LogMessageBuilder &log, + const RawConfig &config); } // namespace fcitx #endif // _FCITX_CONFIG_RAWCONFIG_H_ diff --git a/src/lib/fcitx-utils/cutf8.h b/src/lib/fcitx-utils/cutf8.h index 94c97623..8b608e7f 100644 --- a/src/lib/fcitx-utils/cutf8.h +++ b/src/lib/fcitx-utils/cutf8.h @@ -21,53 +21,46 @@ #define FCITX_UTF8_MAX_LENGTH 6 /// \brief Get utf8 string length -FCITXUTILS_EXPORT -size_t fcitx_utf8_strlen(const char *s); +FCITXUTILS_EXPORT size_t fcitx_utf8_strlen(const char *s); /// \brief Get UCS-4 char in the utf8 string -FCITXUTILS_EXPORT -char *fcitx_utf8_get_char(const char *in, uint32_t *chr); +FCITXUTILS_EXPORT char *fcitx_utf8_get_char(const char *in, uint32_t *chr); /// \brief Get the number of bytes of next character. -FCITXUTILS_EXPORT -unsigned int fcitx_utf8_char_len(const char *in); +FCITXUTILS_EXPORT unsigned int fcitx_utf8_char_len(const char *in); /// \brief Get the pointer to the nth character. /// /// This function will not touch the content for s, so const pointer /// can be safely passed and converted. -FCITXUTILS_EXPORT -char *fcitx_utf8_get_nth_char(const char *s, uint32_t n); +FCITXUTILS_EXPORT char *fcitx_utf8_get_nth_char(const char *s, uint32_t n); /// \brief Check if the string is valid utf8 string. -FCITXUTILS_EXPORT -bool fcitx_utf8_check_string(const char *s); +FCITXUTILS_EXPORT bool fcitx_utf8_check_string(const char *s); /// \brief Get validated character. /// /// Returns the UCS-4 value if its valid character. Returns (uint32_t) -1 if /// it is not a valid char, (uint32_t)-2 if length is not enough. -FCITXUTILS_EXPORT -uint32_t fcitx_utf8_get_char_validated(const char *p, int max_len, int *plen); +FCITXUTILS_EXPORT uint32_t fcitx_utf8_get_char_validated(const char *p, + int max_len, + int *plen); /// \brief Copy most byte length, but keep utf8 valid. -FCITXUTILS_EXPORT -void fcitx_utf8_strncpy(char *str, const char *s, size_t byte); +FCITXUTILS_EXPORT void fcitx_utf8_strncpy(char *str, const char *s, + size_t byte); /// \brief Count most byte length, utf8 string length. -FCITXUTILS_EXPORT -size_t fcitx_utf8_strnlen(const char *str, size_t byte); +FCITXUTILS_EXPORT size_t fcitx_utf8_strnlen(const char *str, size_t byte); /// \brief Count most byte length, utf8 string length and validates the string -FCITXUTILS_EXPORT -size_t fcitx_utf8_strnlen_validated(const char *str, size_t byte); +FCITXUTILS_EXPORT size_t fcitx_utf8_strnlen_validated(const char *str, + size_t byte); /// \brief Return the utf8 bytes of a UCS4 char. -FCITXUTILS_EXPORT -int fcitx_ucs4_char_len(uint32_t c); +FCITXUTILS_EXPORT int fcitx_ucs4_char_len(uint32_t c); /// \brief Convert ucs4 char to utf8, need to have enough memory for it. -FCITXUTILS_EXPORT -int fcitx_ucs4_to_utf8(uint32_t c, char *output); +FCITXUTILS_EXPORT int fcitx_ucs4_to_utf8(uint32_t c, char *output); #endif diff --git a/src/lib/fcitx-utils/dbus/variant.h b/src/lib/fcitx-utils/dbus/variant.h index d0feecbb..065b235e 100644 --- a/src/lib/fcitx-utils/dbus/variant.h +++ b/src/lib/fcitx-utils/dbus/variant.h @@ -53,8 +53,8 @@ private: FCITX_DECLARE_PRIVATE(VariantTypeRegistry); }; -std::shared_ptr - FCITXUTILS_EXPORT lookupVariantType(const std::string &signature); +std::shared_ptr FCITXUTILS_EXPORT +lookupVariantType(const std::string &signature); template inline void registerVariantType() { diff --git a/src/lib/fcitx-utils/i18n.h b/src/lib/fcitx-utils/i18n.h index e52e19d5..1f07f55c 100644 --- a/src/lib/fcitx-utils/i18n.h +++ b/src/lib/fcitx-utils/i18n.h @@ -12,28 +12,22 @@ namespace fcitx { -FCITXUTILS_EXPORT -std::string translate(const std::string &s); -FCITXUTILS_EXPORT -const char *translate(const char *s); -FCITXUTILS_EXPORT -std::string translateCtx(const char *ctx, const std::string &s); -FCITXUTILS_EXPORT -const char *translateCtx(const char *ctx, const char *s); - -FCITXUTILS_EXPORT -std::string translateDomain(const char *domain, const std::string &s); -FCITXUTILS_EXPORT -const char *translateDomain(const char *domain, const char *s); -FCITXUTILS_EXPORT -std::string translateDomainCtx(const char *domain, const char *ctx, - const std::string &s); - -FCITXUTILS_EXPORT -const char *translateDomainCtx(const char *domain, const char *ctx, - const char *s); -FCITXUTILS_EXPORT -void registerDomain(const char *domain, const char *dir); +FCITXUTILS_EXPORT std::string translate(const std::string &s); +FCITXUTILS_EXPORT const char *translate(const char *s); +FCITXUTILS_EXPORT std::string translateCtx(const char *ctx, + const std::string &s); +FCITXUTILS_EXPORT const char *translateCtx(const char *ctx, const char *s); + +FCITXUTILS_EXPORT std::string translateDomain(const char *domain, + const std::string &s); +FCITXUTILS_EXPORT const char *translateDomain(const char *domain, + const char *s); +FCITXUTILS_EXPORT std::string +translateDomainCtx(const char *domain, const char *ctx, const std::string &s); + +FCITXUTILS_EXPORT const char * +translateDomainCtx(const char *domain, const char *ctx, const char *s); +FCITXUTILS_EXPORT void registerDomain(const char *domain, const char *dir); } // namespace fcitx #ifndef FCITX_NO_I18N_MACRO diff --git a/src/lib/fcitx-utils/stringutils.h b/src/lib/fcitx-utils/stringutils.h index f74cd17f..b1e8a626 100644 --- a/src/lib/fcitx-utils/stringutils.h +++ b/src/lib/fcitx-utils/stringutils.h @@ -59,8 +59,7 @@ trimInplace(std::string_view str); /// \brief Trim the white space in string view /// \see trimInplace /// \since 5.0.16 -FCITXUTILS_EXPORT -std::string_view trimView(std::string_view); +FCITXUTILS_EXPORT std::string_view trimView(std::string_view); /// \brief Trim the white space in str. /// \see trimInplace diff --git a/src/lib/fcitx-wayland/blur/org_kde_kwin_blur_manager.cpp b/src/lib/fcitx-wayland/blur/org_kde_kwin_blur_manager.cpp index 4d17c63e..b1507d49 100644 --- a/src/lib/fcitx-wayland/blur/org_kde_kwin_blur_manager.cpp +++ b/src/lib/fcitx-wayland/blur/org_kde_kwin_blur_manager.cpp @@ -7,7 +7,9 @@ OrgKdeKwinBlurManager::OrgKdeKwinBlurManager(org_kde_kwin_blur_manager *data) org_kde_kwin_blur_manager_set_user_data(*this, this); } void OrgKdeKwinBlurManager::destructor(org_kde_kwin_blur_manager *data) { - { return org_kde_kwin_blur_manager_destroy(data); } + { + return org_kde_kwin_blur_manager_destroy(data); + } } OrgKdeKwinBlur *OrgKdeKwinBlurManager::create(WlSurface *surface) { return new OrgKdeKwinBlur( diff --git a/src/lib/fcitx-wayland/core/wl_buffer.cpp b/src/lib/fcitx-wayland/core/wl_buffer.cpp index 9ca840d2..0518c4a0 100644 --- a/src/lib/fcitx-wayland/core/wl_buffer.cpp +++ b/src/lib/fcitx-wayland/core/wl_buffer.cpp @@ -5,7 +5,9 @@ const struct wl_buffer_listener WlBuffer::listener = { [](void *data, wl_buffer *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->release()(); } + { + return obj->release()(); + } }, }; WlBuffer::WlBuffer(wl_buffer *data) diff --git a/src/lib/fcitx-wayland/core/wl_callback.cpp b/src/lib/fcitx-wayland/core/wl_callback.cpp index ad69bc4e..0e90b992 100644 --- a/src/lib/fcitx-wayland/core/wl_callback.cpp +++ b/src/lib/fcitx-wayland/core/wl_callback.cpp @@ -5,7 +5,9 @@ const struct wl_callback_listener WlCallback::listener = { [](void *data, wl_callback *wldata, uint32_t callbackData) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(callbackData); } + { + return obj->done()(callbackData); + } }, }; WlCallback::WlCallback(wl_callback *data) @@ -14,6 +16,8 @@ WlCallback::WlCallback(wl_callback *data) wl_callback_add_listener(*this, &WlCallback::listener, this); } void WlCallback::destructor(wl_callback *data) { - { return wl_callback_destroy(data); } + { + return wl_callback_destroy(data); + } } } // namespace fcitx::wayland diff --git a/src/lib/fcitx-wayland/core/wl_compositor.cpp b/src/lib/fcitx-wayland/core/wl_compositor.cpp index a3b6e5c5..57cae193 100644 --- a/src/lib/fcitx-wayland/core/wl_compositor.cpp +++ b/src/lib/fcitx-wayland/core/wl_compositor.cpp @@ -7,7 +7,9 @@ WlCompositor::WlCompositor(wl_compositor *data) wl_compositor_set_user_data(*this, this); } void WlCompositor::destructor(wl_compositor *data) { - { return wl_compositor_destroy(data); } + { + return wl_compositor_destroy(data); + } } WlSurface *WlCompositor::createSurface() { return new WlSurface(wl_compositor_create_surface(*this)); diff --git a/src/lib/fcitx-wayland/core/wl_data_device.cpp b/src/lib/fcitx-wayland/core/wl_data_device.cpp index f9089f3d..a06173e8 100644 --- a/src/lib/fcitx-wayland/core/wl_data_device.cpp +++ b/src/lib/fcitx-wayland/core/wl_data_device.cpp @@ -32,18 +32,24 @@ const struct wl_data_device_listener WlDataDevice::listener = { [](void *data, wl_data_device *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->leave()(); } + { + return obj->leave()(); + } }, [](void *data, wl_data_device *wldata, uint32_t time, wl_fixed_t x, wl_fixed_t y) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->motion()(time, x, y); } + { + return obj->motion()(time, x, y); + } }, [](void *data, wl_data_device *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->drop()(); } + { + return obj->drop()(); + } }, [](void *data, wl_data_device *wldata, wl_data_offer *id) { auto *obj = static_cast(data); diff --git a/src/lib/fcitx-wayland/core/wl_data_device_manager.cpp b/src/lib/fcitx-wayland/core/wl_data_device_manager.cpp index 75dae7fe..74087b76 100644 --- a/src/lib/fcitx-wayland/core/wl_data_device_manager.cpp +++ b/src/lib/fcitx-wayland/core/wl_data_device_manager.cpp @@ -8,7 +8,9 @@ WlDataDeviceManager::WlDataDeviceManager(wl_data_device_manager *data) wl_data_device_manager_set_user_data(*this, this); } void WlDataDeviceManager::destructor(wl_data_device_manager *data) { - { return wl_data_device_manager_destroy(data); } + { + return wl_data_device_manager_destroy(data); + } } WlDataSource *WlDataDeviceManager::createDataSource() { return new WlDataSource(wl_data_device_manager_create_data_source(*this)); diff --git a/src/lib/fcitx-wayland/core/wl_data_offer.cpp b/src/lib/fcitx-wayland/core/wl_data_offer.cpp index 02fbebf4..8f89c7a7 100644 --- a/src/lib/fcitx-wayland/core/wl_data_offer.cpp +++ b/src/lib/fcitx-wayland/core/wl_data_offer.cpp @@ -5,17 +5,23 @@ const struct wl_data_offer_listener WlDataOffer::listener = { [](void *data, wl_data_offer *wldata, const char *mimeType) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->offer()(mimeType); } + { + return obj->offer()(mimeType); + } }, [](void *data, wl_data_offer *wldata, uint32_t sourceActions) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->sourceActions()(sourceActions); } + { + return obj->sourceActions()(sourceActions); + } }, [](void *data, wl_data_offer *wldata, uint32_t dndAction) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->action()(dndAction); } + { + return obj->action()(dndAction); + } }, }; WlDataOffer::WlDataOffer(wl_data_offer *data) diff --git a/src/lib/fcitx-wayland/core/wl_data_source.cpp b/src/lib/fcitx-wayland/core/wl_data_source.cpp index fd942050..6c1e72a9 100644 --- a/src/lib/fcitx-wayland/core/wl_data_source.cpp +++ b/src/lib/fcitx-wayland/core/wl_data_source.cpp @@ -5,32 +5,44 @@ const struct wl_data_source_listener WlDataSource::listener = { [](void *data, wl_data_source *wldata, const char *mimeType) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->target()(mimeType); } + { + return obj->target()(mimeType); + } }, [](void *data, wl_data_source *wldata, const char *mimeType, int32_t fd) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->send()(mimeType, fd); } + { + return obj->send()(mimeType, fd); + } }, [](void *data, wl_data_source *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->cancelled()(); } + { + return obj->cancelled()(); + } }, [](void *data, wl_data_source *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->dndDropPerformed()(); } + { + return obj->dndDropPerformed()(); + } }, [](void *data, wl_data_source *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->dndFinished()(); } + { + return obj->dndFinished()(); + } }, [](void *data, wl_data_source *wldata, uint32_t dndAction) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->action()(dndAction); } + { + return obj->action()(dndAction); + } }, }; WlDataSource::WlDataSource(wl_data_source *data) diff --git a/src/lib/fcitx-wayland/core/wl_keyboard.cpp b/src/lib/fcitx-wayland/core/wl_keyboard.cpp index d6f50192..c5314796 100644 --- a/src/lib/fcitx-wayland/core/wl_keyboard.cpp +++ b/src/lib/fcitx-wayland/core/wl_keyboard.cpp @@ -6,7 +6,9 @@ const struct wl_keyboard_listener WlKeyboard::listener = { uint32_t size) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->keymap()(format, fd, size); } + { + return obj->keymap()(format, fd, size); + } }, [](void *data, wl_keyboard *wldata, uint32_t serial, wl_surface *surface, wl_array *keys) { @@ -37,7 +39,9 @@ const struct wl_keyboard_listener WlKeyboard::listener = { uint32_t key, uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->key()(serial, time, key, state); } + { + return obj->key()(serial, time, key, state); + } }, [](void *data, wl_keyboard *wldata, uint32_t serial, uint32_t modsDepressed, uint32_t modsLatched, uint32_t modsLocked, uint32_t group) { @@ -51,7 +55,9 @@ const struct wl_keyboard_listener WlKeyboard::listener = { [](void *data, wl_keyboard *wldata, int32_t rate, int32_t delay) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->repeatInfo()(rate, delay); } + { + return obj->repeatInfo()(rate, delay); + } }, }; WlKeyboard::WlKeyboard(wl_keyboard *data) diff --git a/src/lib/fcitx-wayland/core/wl_output.cpp b/src/lib/fcitx-wayland/core/wl_output.cpp index 104e4e04..820d5935 100644 --- a/src/lib/fcitx-wayland/core/wl_output.cpp +++ b/src/lib/fcitx-wayland/core/wl_output.cpp @@ -16,17 +16,23 @@ const struct wl_output_listener WlOutput::listener = { int32_t height, int32_t refresh) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->mode()(flags, width, height, refresh); } + { + return obj->mode()(flags, width, height, refresh); + } }, [](void *data, wl_output *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, wl_output *wldata, int32_t factor) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->scale()(factor); } + { + return obj->scale()(factor); + } }, }; WlOutput::WlOutput(wl_output *data) diff --git a/src/lib/fcitx-wayland/core/wl_pointer.cpp b/src/lib/fcitx-wayland/core/wl_pointer.cpp index 27c6f956..a4539295 100644 --- a/src/lib/fcitx-wayland/core/wl_pointer.cpp +++ b/src/lib/fcitx-wayland/core/wl_pointer.cpp @@ -32,39 +32,53 @@ const struct wl_pointer_listener WlPointer::listener = { wl_fixed_t surfaceY) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->motion()(time, surfaceX, surfaceY); } + { + return obj->motion()(time, surfaceX, surfaceY); + } }, [](void *data, wl_pointer *wldata, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->button()(serial, time, button, state); } + { + return obj->button()(serial, time, button, state); + } }, [](void *data, wl_pointer *wldata, uint32_t time, uint32_t axis, wl_fixed_t value) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->axis()(time, axis, value); } + { + return obj->axis()(time, axis, value); + } }, [](void *data, wl_pointer *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->frame()(); } + { + return obj->frame()(); + } }, [](void *data, wl_pointer *wldata, uint32_t axisSource) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->axisSource()(axisSource); } + { + return obj->axisSource()(axisSource); + } }, [](void *data, wl_pointer *wldata, uint32_t time, uint32_t axis) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->axisStop()(time, axis); } + { + return obj->axisStop()(time, axis); + } }, [](void *data, wl_pointer *wldata, uint32_t axis, int32_t discrete) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->axisDiscrete()(axis, discrete); } + { + return obj->axisDiscrete()(axis, discrete); + } }, }; WlPointer::WlPointer(wl_pointer *data) diff --git a/src/lib/fcitx-wayland/core/wl_registry.cpp b/src/lib/fcitx-wayland/core/wl_registry.cpp index a7af3414..f2bfa6d5 100644 --- a/src/lib/fcitx-wayland/core/wl_registry.cpp +++ b/src/lib/fcitx-wayland/core/wl_registry.cpp @@ -6,12 +6,16 @@ const struct wl_registry_listener WlRegistry::listener = { uint32_t version) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->global()(name, interface, version); } + { + return obj->global()(name, interface, version); + } }, [](void *data, wl_registry *wldata, uint32_t name) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->globalRemove()(name); } + { + return obj->globalRemove()(name); + } }, }; WlRegistry::WlRegistry(wl_registry *data) @@ -20,6 +24,8 @@ WlRegistry::WlRegistry(wl_registry *data) wl_registry_add_listener(*this, &WlRegistry::listener, this); } void WlRegistry::destructor(wl_registry *data) { - { return wl_registry_destroy(data); } + { + return wl_registry_destroy(data); + } } } // namespace fcitx::wayland diff --git a/src/lib/fcitx-wayland/core/wl_seat.cpp b/src/lib/fcitx-wayland/core/wl_seat.cpp index 2b0cb08e..acdba6d5 100644 --- a/src/lib/fcitx-wayland/core/wl_seat.cpp +++ b/src/lib/fcitx-wayland/core/wl_seat.cpp @@ -8,12 +8,16 @@ const struct wl_seat_listener WlSeat::listener = { [](void *data, wl_seat *wldata, uint32_t capabilities) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->capabilities()(capabilities); } + { + return obj->capabilities()(capabilities); + } }, [](void *data, wl_seat *wldata, const char *name) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->name()(name); } + { + return obj->name()(name); + } }, }; WlSeat::WlSeat(wl_seat *data) diff --git a/src/lib/fcitx-wayland/core/wl_shell.cpp b/src/lib/fcitx-wayland/core/wl_shell.cpp index 21fc8d0f..469c3867 100644 --- a/src/lib/fcitx-wayland/core/wl_shell.cpp +++ b/src/lib/fcitx-wayland/core/wl_shell.cpp @@ -8,7 +8,9 @@ WlShell::WlShell(wl_shell *data) wl_shell_set_user_data(*this, this); } void WlShell::destructor(wl_shell *data) { - { return wl_shell_destroy(data); } + { + return wl_shell_destroy(data); + } } WlShellSurface *WlShell::getShellSurface(WlSurface *surface) { return new WlShellSurface( diff --git a/src/lib/fcitx-wayland/core/wl_shell_surface.cpp b/src/lib/fcitx-wayland/core/wl_shell_surface.cpp index 39303aef..9b54aebd 100644 --- a/src/lib/fcitx-wayland/core/wl_shell_surface.cpp +++ b/src/lib/fcitx-wayland/core/wl_shell_surface.cpp @@ -8,18 +8,24 @@ const struct wl_shell_surface_listener WlShellSurface::listener = { [](void *data, wl_shell_surface *wldata, uint32_t serial) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->ping()(serial); } + { + return obj->ping()(serial); + } }, [](void *data, wl_shell_surface *wldata, uint32_t edges, int32_t width, int32_t height) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->configure()(edges, width, height); } + { + return obj->configure()(edges, width, height); + } }, [](void *data, wl_shell_surface *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->popupDone()(); } + { + return obj->popupDone()(); + } }, }; WlShellSurface::WlShellSurface(wl_shell_surface *data) @@ -28,7 +34,9 @@ WlShellSurface::WlShellSurface(wl_shell_surface *data) wl_shell_surface_add_listener(*this, &WlShellSurface::listener, this); } void WlShellSurface::destructor(wl_shell_surface *data) { - { return wl_shell_surface_destroy(data); } + { + return wl_shell_surface_destroy(data); + } } void WlShellSurface::pong(uint32_t serial) { return wl_shell_surface_pong(*this, serial); diff --git a/src/lib/fcitx-wayland/core/wl_shm.cpp b/src/lib/fcitx-wayland/core/wl_shm.cpp index 74a5411b..68ff1ebd 100644 --- a/src/lib/fcitx-wayland/core/wl_shm.cpp +++ b/src/lib/fcitx-wayland/core/wl_shm.cpp @@ -6,7 +6,9 @@ const struct wl_shm_listener WlShm::listener = { [](void *data, wl_shm *wldata, uint32_t format) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->format()(format); } + { + return obj->format()(format); + } }, }; WlShm::WlShm(wl_shm *data) : version_(wl_shm_get_version(data)), data_(data) { @@ -14,7 +16,9 @@ WlShm::WlShm(wl_shm *data) : version_(wl_shm_get_version(data)), data_(data) { wl_shm_add_listener(*this, &WlShm::listener, this); } void WlShm::destructor(wl_shm *data) { - { return wl_shm_destroy(data); } + { + return wl_shm_destroy(data); + } } WlShmPool *WlShm::createPool(int32_t fd, int32_t size) { return new WlShmPool(wl_shm_create_pool(*this, fd, size)); diff --git a/src/lib/fcitx-wayland/core/wl_touch.cpp b/src/lib/fcitx-wayland/core/wl_touch.cpp index be831a09..2bf11951 100644 --- a/src/lib/fcitx-wayland/core/wl_touch.cpp +++ b/src/lib/fcitx-wayland/core/wl_touch.cpp @@ -20,34 +20,46 @@ const struct wl_touch_listener WlTouch::listener = { int32_t id) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->up()(serial, time, id); } + { + return obj->up()(serial, time, id); + } }, [](void *data, wl_touch *wldata, uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->motion()(time, id, x, y); } + { + return obj->motion()(time, id, x, y); + } }, [](void *data, wl_touch *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->frame()(); } + { + return obj->frame()(); + } }, [](void *data, wl_touch *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->cancel()(); } + { + return obj->cancel()(); + } }, [](void *data, wl_touch *wldata, int32_t id, wl_fixed_t major, wl_fixed_t minor) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->shape()(id, major, minor); } + { + return obj->shape()(id, major, minor); + } }, [](void *data, wl_touch *wldata, int32_t id, wl_fixed_t orientation) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->orientation()(id, orientation); } + { + return obj->orientation()(id, orientation); + } }, }; WlTouch::WlTouch(wl_touch *data) diff --git a/src/lib/fcitx-wayland/fractional-scale-v1/wp_fractional_scale_v1.cpp b/src/lib/fcitx-wayland/fractional-scale-v1/wp_fractional_scale_v1.cpp index 3681e1fd..947195d3 100644 --- a/src/lib/fcitx-wayland/fractional-scale-v1/wp_fractional_scale_v1.cpp +++ b/src/lib/fcitx-wayland/fractional-scale-v1/wp_fractional_scale_v1.cpp @@ -5,7 +5,9 @@ const struct wp_fractional_scale_v1_listener WpFractionalScaleV1::listener = { [](void *data, wp_fractional_scale_v1 *wldata, uint32_t scale) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->preferredScale()(scale); } + { + return obj->preferredScale()(scale); + } }, }; WpFractionalScaleV1::WpFractionalScaleV1(wp_fractional_scale_v1 *data) diff --git a/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_keyboard_grab_v2.cpp b/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_keyboard_grab_v2.cpp index 59bd11e7..425cf236 100644 --- a/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_keyboard_grab_v2.cpp +++ b/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_keyboard_grab_v2.cpp @@ -7,13 +7,17 @@ const struct zwp_input_method_keyboard_grab_v2_listener uint32_t format, int32_t fd, uint32_t size) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->keymap()(format, fd, size); } + { + return obj->keymap()(format, fd, size); + } }, [](void *data, zwp_input_method_keyboard_grab_v2 *wldata, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->key()(serial, time, key, state); } + { + return obj->key()(serial, time, key, state); + } }, [](void *data, zwp_input_method_keyboard_grab_v2 *wldata, uint32_t serial, uint32_t modsDepressed, uint32_t modsLatched, @@ -29,7 +33,9 @@ const struct zwp_input_method_keyboard_grab_v2_listener int32_t delay) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->repeatInfo()(rate, delay); } + { + return obj->repeatInfo()(rate, delay); + } }, }; ZwpInputMethodKeyboardGrabV2::ZwpInputMethodKeyboardGrabV2( diff --git a/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_v2.cpp b/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_v2.cpp index 69cbf0ae..5e5b7f43 100644 --- a/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_v2.cpp +++ b/src/lib/fcitx-wayland/input-method-v2/zwp_input_method_v2.cpp @@ -8,39 +8,53 @@ const struct zwp_input_method_v2_listener ZwpInputMethodV2::listener = { [](void *data, zwp_input_method_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->activate()(); } + { + return obj->activate()(); + } }, [](void *data, zwp_input_method_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->deactivate()(); } + { + return obj->deactivate()(); + } }, [](void *data, zwp_input_method_v2 *wldata, const char *text, uint32_t cursor, uint32_t anchor) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->surroundingText()(text, cursor, anchor); } + { + return obj->surroundingText()(text, cursor, anchor); + } }, [](void *data, zwp_input_method_v2 *wldata, uint32_t cause) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->textChangeCause()(cause); } + { + return obj->textChangeCause()(cause); + } }, [](void *data, zwp_input_method_v2 *wldata, uint32_t hint, uint32_t purpose) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->contentType()(hint, purpose); } + { + return obj->contentType()(hint, purpose); + } }, [](void *data, zwp_input_method_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwp_input_method_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->unavailable()(); } + { + return obj->unavailable()(); + } }, }; ZwpInputMethodV2::ZwpInputMethodV2(zwp_input_method_v2 *data) diff --git a/src/lib/fcitx-wayland/input-method-v2/zwp_input_popup_surface_v2.cpp b/src/lib/fcitx-wayland/input-method-v2/zwp_input_popup_surface_v2.cpp index dd3e2cc9..fdd37c06 100644 --- a/src/lib/fcitx-wayland/input-method-v2/zwp_input_popup_surface_v2.cpp +++ b/src/lib/fcitx-wayland/input-method-v2/zwp_input_popup_surface_v2.cpp @@ -7,7 +7,9 @@ const struct zwp_input_popup_surface_v2_listener int32_t width, int32_t height) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->textInputRectangle()(x, y, width, height); } + { + return obj->textInputRectangle()(x, y, width, height); + } }, }; ZwpInputPopupSurfaceV2::ZwpInputPopupSurfaceV2(zwp_input_popup_surface_v2 *data) diff --git a/src/lib/fcitx-wayland/input-method-v2/zwp_virtual_keyboard_manager_v1.cpp b/src/lib/fcitx-wayland/input-method-v2/zwp_virtual_keyboard_manager_v1.cpp index 22bbc478..407f71b7 100644 --- a/src/lib/fcitx-wayland/input-method-v2/zwp_virtual_keyboard_manager_v1.cpp +++ b/src/lib/fcitx-wayland/input-method-v2/zwp_virtual_keyboard_manager_v1.cpp @@ -9,7 +9,9 @@ ZwpVirtualKeyboardManagerV1::ZwpVirtualKeyboardManagerV1( } void ZwpVirtualKeyboardManagerV1::destructor( zwp_virtual_keyboard_manager_v1 *data) { - { return zwp_virtual_keyboard_manager_v1_destroy(data); } + { + return zwp_virtual_keyboard_manager_v1_destroy(data); + } } ZwpVirtualKeyboardV1 * ZwpVirtualKeyboardManagerV1::createVirtualKeyboard(WlSeat *seat) { diff --git a/src/lib/fcitx-wayland/input-method/zwp_input_method_context_v1.cpp b/src/lib/fcitx-wayland/input-method/zwp_input_method_context_v1.cpp index b428837c..ead63748 100644 --- a/src/lib/fcitx-wayland/input-method/zwp_input_method_context_v1.cpp +++ b/src/lib/fcitx-wayland/input-method/zwp_input_method_context_v1.cpp @@ -8,35 +8,47 @@ const struct zwp_input_method_context_v1_listener uint32_t cursor, uint32_t anchor) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->surroundingText()(text, cursor, anchor); } + { + return obj->surroundingText()(text, cursor, anchor); + } }, [](void *data, zwp_input_method_context_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->reset()(); } + { + return obj->reset()(); + } }, [](void *data, zwp_input_method_context_v1 *wldata, uint32_t hint, uint32_t purpose) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->contentType()(hint, purpose); } + { + return obj->contentType()(hint, purpose); + } }, [](void *data, zwp_input_method_context_v1 *wldata, uint32_t button, uint32_t index) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->invokeAction()(button, index); } + { + return obj->invokeAction()(button, index); + } }, [](void *data, zwp_input_method_context_v1 *wldata, uint32_t serial) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->commitState()(serial); } + { + return obj->commitState()(serial); + } }, [](void *data, zwp_input_method_context_v1 *wldata, const char *language) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->preferredLanguage()(language); } + { + return obj->preferredLanguage()(language); + } }, }; ZwpInputMethodContextV1::ZwpInputMethodContextV1( diff --git a/src/lib/fcitx-wayland/input-method/zwp_input_method_v1.cpp b/src/lib/fcitx-wayland/input-method/zwp_input_method_v1.cpp index 875a49ef..78c90621 100644 --- a/src/lib/fcitx-wayland/input-method/zwp_input_method_v1.cpp +++ b/src/lib/fcitx-wayland/input-method/zwp_input_method_v1.cpp @@ -32,6 +32,8 @@ ZwpInputMethodV1::ZwpInputMethodV1(zwp_input_method_v1 *data) zwp_input_method_v1_add_listener(*this, &ZwpInputMethodV1::listener, this); } void ZwpInputMethodV1::destructor(zwp_input_method_v1 *data) { - { return zwp_input_method_v1_destroy(data); } + { + return zwp_input_method_v1_destroy(data); + } } } // namespace fcitx::wayland diff --git a/src/lib/fcitx-wayland/input-method/zwp_input_panel_surface_v1.cpp b/src/lib/fcitx-wayland/input-method/zwp_input_panel_surface_v1.cpp index bd7eafa8..eb0603f3 100644 --- a/src/lib/fcitx-wayland/input-method/zwp_input_panel_surface_v1.cpp +++ b/src/lib/fcitx-wayland/input-method/zwp_input_panel_surface_v1.cpp @@ -6,7 +6,9 @@ ZwpInputPanelSurfaceV1::ZwpInputPanelSurfaceV1(zwp_input_panel_surface_v1 *data) zwp_input_panel_surface_v1_set_user_data(*this, this); } void ZwpInputPanelSurfaceV1::destructor(zwp_input_panel_surface_v1 *data) { - { return zwp_input_panel_surface_v1_destroy(data); } + { + return zwp_input_panel_surface_v1_destroy(data); + } } void ZwpInputPanelSurfaceV1::setToplevel(WlOutput *output, uint32_t position) { return zwp_input_panel_surface_v1_set_toplevel(*this, rawPointer(output), diff --git a/src/lib/fcitx-wayland/input-method/zwp_input_panel_v1.cpp b/src/lib/fcitx-wayland/input-method/zwp_input_panel_v1.cpp index b94ae507..17dadee2 100644 --- a/src/lib/fcitx-wayland/input-method/zwp_input_panel_v1.cpp +++ b/src/lib/fcitx-wayland/input-method/zwp_input_panel_v1.cpp @@ -7,7 +7,9 @@ ZwpInputPanelV1::ZwpInputPanelV1(zwp_input_panel_v1 *data) zwp_input_panel_v1_set_user_data(*this, this); } void ZwpInputPanelV1::destructor(zwp_input_panel_v1 *data) { - { return zwp_input_panel_v1_destroy(data); } + { + return zwp_input_panel_v1_destroy(data); + } } ZwpInputPanelSurfaceV1 * ZwpInputPanelV1::getInputPanelSurface(WlSurface *surface) { diff --git a/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window.cpp b/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window.cpp index 3c19cc6a..9999fe8d 100644 --- a/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window.cpp +++ b/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window.cpp @@ -7,37 +7,51 @@ const struct org_kde_plasma_window_listener OrgKdePlasmaWindow::listener = { [](void *data, org_kde_plasma_window *wldata, const char *title) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->titleChanged()(title); } + { + return obj->titleChanged()(title); + } }, [](void *data, org_kde_plasma_window *wldata, const char *appId) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->appIdChanged()(appId); } + { + return obj->appIdChanged()(appId); + } }, [](void *data, org_kde_plasma_window *wldata, uint32_t flags) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->stateChanged()(flags); } + { + return obj->stateChanged()(flags); + } }, [](void *data, org_kde_plasma_window *wldata, int32_t number) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->virtualDesktopChanged()(number); } + { + return obj->virtualDesktopChanged()(number); + } }, [](void *data, org_kde_plasma_window *wldata, const char *name) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->themedIconNameChanged()(name); } + { + return obj->themedIconNameChanged()(name); + } }, [](void *data, org_kde_plasma_window *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->unmapped()(); } + { + return obj->unmapped()(); + } }, [](void *data, org_kde_plasma_window *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->initialState()(); } + { + return obj->initialState()(); + } }, [](void *data, org_kde_plasma_window *wldata, org_kde_plasma_window *parent) { @@ -55,48 +69,66 @@ const struct org_kde_plasma_window_listener OrgKdePlasmaWindow::listener = { uint32_t width, uint32_t height) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->geometry()(x, y, width, height); } + { + return obj->geometry()(x, y, width, height); + } }, [](void *data, org_kde_plasma_window *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->iconChanged()(); } + { + return obj->iconChanged()(); + } }, [](void *data, org_kde_plasma_window *wldata, uint32_t pid) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->pidChanged()(pid); } + { + return obj->pidChanged()(pid); + } }, [](void *data, org_kde_plasma_window *wldata, const char *id) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->virtualDesktopEntered()(id); } + { + return obj->virtualDesktopEntered()(id); + } }, [](void *data, org_kde_plasma_window *wldata, const char *is) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->virtualDesktopLeft()(is); } + { + return obj->virtualDesktopLeft()(is); + } }, [](void *data, org_kde_plasma_window *wldata, const char *serviceName, const char *objectPath) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->applicationMenu()(serviceName, objectPath); } + { + return obj->applicationMenu()(serviceName, objectPath); + } }, [](void *data, org_kde_plasma_window *wldata, const char *id) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->activityEntered()(id); } + { + return obj->activityEntered()(id); + } }, [](void *data, org_kde_plasma_window *wldata, const char *id) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->activityLeft()(id); } + { + return obj->activityLeft()(id); + } }, [](void *data, org_kde_plasma_window *wldata, const char *resourceName) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->resourceNameChanged()(resourceName); } + { + return obj->resourceNameChanged()(resourceName); + } }, }; OrgKdePlasmaWindow::OrgKdePlasmaWindow(org_kde_plasma_window *data) diff --git a/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window_management.cpp b/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window_management.cpp index c2a55012..6090b81f 100644 --- a/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window_management.cpp +++ b/src/lib/fcitx-wayland/plasma-window-management/org_kde_plasma_window_management.cpp @@ -8,30 +8,40 @@ const struct org_kde_plasma_window_management_listener uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->showDesktopChanged()(state); } + { + return obj->showDesktopChanged()(state); + } }, [](void *data, org_kde_plasma_window_management *wldata, uint32_t id) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->window()(id); } + { + return obj->window()(id); + } }, [](void *data, org_kde_plasma_window_management *wldata, wl_array *ids) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->stackingOrderChanged()(ids); } + { + return obj->stackingOrderChanged()(ids); + } }, [](void *data, org_kde_plasma_window_management *wldata, const char *uuids) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->stackingOrderUuidChanged()(uuids); } + { + return obj->stackingOrderUuidChanged()(uuids); + } }, [](void *data, org_kde_plasma_window_management *wldata, uint32_t id, const char *uuid) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->windowWithUuid()(id, uuid); } + { + return obj->windowWithUuid()(id, uuid); + } }, }; OrgKdePlasmaWindowManagement::OrgKdePlasmaWindowManagement( @@ -44,7 +54,9 @@ OrgKdePlasmaWindowManagement::OrgKdePlasmaWindowManagement( } void OrgKdePlasmaWindowManagement::destructor( org_kde_plasma_window_management *data) { - { return org_kde_plasma_window_management_destroy(data); } + { + return org_kde_plasma_window_management_destroy(data); + } } void OrgKdePlasmaWindowManagement::showDesktop(uint32_t state) { return org_kde_plasma_window_management_show_desktop(*this, state); diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_group_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_group_v2.cpp index 64286518..43f398b3 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_group_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_group_v2.cpp @@ -7,7 +7,9 @@ const struct zwp_tablet_pad_group_v2_listener ZwpTabletPadGroupV2::listener = { [](void *data, zwp_tablet_pad_group_v2 *wldata, wl_array *buttons) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->buttons()(buttons); } + { + return obj->buttons()(buttons); + } }, [](void *data, zwp_tablet_pad_group_v2 *wldata, zwp_tablet_pad_ring_v2 *ring) { @@ -30,18 +32,24 @@ const struct zwp_tablet_pad_group_v2_listener ZwpTabletPadGroupV2::listener = { [](void *data, zwp_tablet_pad_group_v2 *wldata, uint32_t modes) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->modes()(modes); } + { + return obj->modes()(modes); + } }, [](void *data, zwp_tablet_pad_group_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwp_tablet_pad_group_v2 *wldata, uint32_t time, uint32_t serial, uint32_t mode) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->modeSwitch()(time, serial, mode); } + { + return obj->modeSwitch()(time, serial, mode); + } }, }; ZwpTabletPadGroupV2::ZwpTabletPadGroupV2(zwp_tablet_pad_group_v2 *data) diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_ring_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_ring_v2.cpp index 06cba7d5..a344cf32 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_ring_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_ring_v2.cpp @@ -5,22 +5,30 @@ const struct zwp_tablet_pad_ring_v2_listener ZwpTabletPadRingV2::listener = { [](void *data, zwp_tablet_pad_ring_v2 *wldata, uint32_t source) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->source()(source); } + { + return obj->source()(source); + } }, [](void *data, zwp_tablet_pad_ring_v2 *wldata, wl_fixed_t degrees) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->angle()(degrees); } + { + return obj->angle()(degrees); + } }, [](void *data, zwp_tablet_pad_ring_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->stop()(); } + { + return obj->stop()(); + } }, [](void *data, zwp_tablet_pad_ring_v2 *wldata, uint32_t time) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->frame()(time); } + { + return obj->frame()(time); + } }, }; ZwpTabletPadRingV2::ZwpTabletPadRingV2(zwp_tablet_pad_ring_v2 *data) diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_strip_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_strip_v2.cpp index c672f614..a7f8c810 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_strip_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_strip_v2.cpp @@ -5,22 +5,30 @@ const struct zwp_tablet_pad_strip_v2_listener ZwpTabletPadStripV2::listener = { [](void *data, zwp_tablet_pad_strip_v2 *wldata, uint32_t source) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->source()(source); } + { + return obj->source()(source); + } }, [](void *data, zwp_tablet_pad_strip_v2 *wldata, uint32_t position) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->position()(position); } + { + return obj->position()(position); + } }, [](void *data, zwp_tablet_pad_strip_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->stop()(); } + { + return obj->stop()(); + } }, [](void *data, zwp_tablet_pad_strip_v2 *wldata, uint32_t time) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->frame()(time); } + { + return obj->frame()(time); + } }, }; ZwpTabletPadStripV2::ZwpTabletPadStripV2(zwp_tablet_pad_strip_v2 *data) diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_v2.cpp index 5111febe..f3813721 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_pad_v2.cpp @@ -17,23 +17,31 @@ const struct zwp_tablet_pad_v2_listener ZwpTabletPadV2::listener = { [](void *data, zwp_tablet_pad_v2 *wldata, const char *path) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->path()(path); } + { + return obj->path()(path); + } }, [](void *data, zwp_tablet_pad_v2 *wldata, uint32_t buttons) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->buttons()(buttons); } + { + return obj->buttons()(buttons); + } }, [](void *data, zwp_tablet_pad_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwp_tablet_pad_v2 *wldata, uint32_t time, uint32_t button, uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->button()(time, button, state); } + { + return obj->button()(time, button, state); + } }, [](void *data, zwp_tablet_pad_v2 *wldata, uint32_t serial, zwp_tablet_v2 *tablet, wl_surface *surface) { @@ -69,7 +77,9 @@ const struct zwp_tablet_pad_v2_listener ZwpTabletPadV2::listener = { [](void *data, zwp_tablet_pad_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->removed()(); } + { + return obj->removed()(); + } }, }; ZwpTabletPadV2::ZwpTabletPadV2(zwp_tablet_pad_v2 *data) diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_tool_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_tool_v2.cpp index 6fc8b7a3..3973456a 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_tool_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_tool_v2.cpp @@ -7,34 +7,46 @@ const struct zwp_tablet_tool_v2_listener ZwpTabletToolV2::listener = { [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t toolType) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->type()(toolType); } + { + return obj->type()(toolType); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t hardwareSerialHi, uint32_t hardwareSerialLo) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->hardwareSerial()(hardwareSerialHi, hardwareSerialLo); } + { + return obj->hardwareSerial()(hardwareSerialHi, hardwareSerialLo); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t hardwareIdHi, uint32_t hardwareIdLo) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->hardwareIdWacom()(hardwareIdHi, hardwareIdLo); } + { + return obj->hardwareIdWacom()(hardwareIdHi, hardwareIdLo); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t capability) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->capability()(capability); } + { + return obj->capability()(capability); + } }, [](void *data, zwp_tablet_tool_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwp_tablet_tool_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->removed()(); } + { + return obj->removed()(); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t serial, zwp_tablet_v2 *tablet, wl_surface *surface) { @@ -57,65 +69,89 @@ const struct zwp_tablet_tool_v2_listener ZwpTabletToolV2::listener = { [](void *data, zwp_tablet_tool_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->proximityOut()(); } + { + return obj->proximityOut()(); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t serial) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->down()(serial); } + { + return obj->down()(serial); + } }, [](void *data, zwp_tablet_tool_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->up()(); } + { + return obj->up()(); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, wl_fixed_t x, wl_fixed_t y) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->motion()(x, y); } + { + return obj->motion()(x, y); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t pressure) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->pressure()(pressure); } + { + return obj->pressure()(pressure); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t distance) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->distance()(distance); } + { + return obj->distance()(distance); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, wl_fixed_t tiltX, wl_fixed_t tiltY) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->tilt()(tiltX, tiltY); } + { + return obj->tilt()(tiltX, tiltY); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, wl_fixed_t degrees) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->rotation()(degrees); } + { + return obj->rotation()(degrees); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, int32_t position) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->slider()(position); } + { + return obj->slider()(position); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, wl_fixed_t degrees, int32_t clicks) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->wheel()(degrees, clicks); } + { + return obj->wheel()(degrees, clicks); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t serial, uint32_t button, uint32_t state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->button()(serial, button, state); } + { + return obj->button()(serial, button, state); + } }, [](void *data, zwp_tablet_tool_v2 *wldata, uint32_t time) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->frame()(time); } + { + return obj->frame()(time); + } }, }; ZwpTabletToolV2::ZwpTabletToolV2(zwp_tablet_tool_v2 *data) diff --git a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_v2.cpp b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_v2.cpp index 756d1e34..a720e864 100644 --- a/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_v2.cpp +++ b/src/lib/fcitx-wayland/tablet-v2/zwp_tablet_v2.cpp @@ -4,27 +4,37 @@ const struct zwp_tablet_v2_listener ZwpTabletV2::listener = { [](void *data, zwp_tablet_v2 *wldata, const char *name) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->name()(name); } + { + return obj->name()(name); + } }, [](void *data, zwp_tablet_v2 *wldata, uint32_t vid, uint32_t pid) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->id()(vid, pid); } + { + return obj->id()(vid, pid); + } }, [](void *data, zwp_tablet_v2 *wldata, const char *path) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->path()(path); } + { + return obj->path()(path); + } }, [](void *data, zwp_tablet_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwp_tablet_v2 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->removed()(); } + { + return obj->removed()(); + } }, }; ZwpTabletV2::ZwpTabletV2(zwp_tablet_v2 *data) diff --git a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_device_v1.cpp b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_device_v1.cpp index 2eb4fefe..3862df51 100644 --- a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_device_v1.cpp +++ b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_device_v1.cpp @@ -29,7 +29,9 @@ const struct zwlr_data_control_device_v1_listener [](void *data, zwlr_data_control_device_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->finished()(); } + { + return obj->finished()(); + } }, [](void *data, zwlr_data_control_device_v1 *wldata, zwlr_data_control_offer_v1 *id) { diff --git a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_offer_v1.cpp b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_offer_v1.cpp index 837671c7..f453ee45 100644 --- a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_offer_v1.cpp +++ b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_offer_v1.cpp @@ -7,7 +7,9 @@ const struct zwlr_data_control_offer_v1_listener const char *mimeType) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->offer()(mimeType); } + { + return obj->offer()(mimeType); + } }, }; ZwlrDataControlOfferV1::ZwlrDataControlOfferV1(zwlr_data_control_offer_v1 *data) diff --git a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_source_v1.cpp b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_source_v1.cpp index 41e47bad..705675cf 100644 --- a/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_source_v1.cpp +++ b/src/lib/fcitx-wayland/wlr-data-control/zwlr_data_control_source_v1.cpp @@ -7,12 +7,16 @@ const struct zwlr_data_control_source_v1_listener const char *mimeType, int32_t fd) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->send()(mimeType, fd); } + { + return obj->send()(mimeType, fd); + } }, [](void *data, zwlr_data_control_source_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->cancelled()(); } + { + return obj->cancelled()(); + } }, }; ZwlrDataControlSourceV1::ZwlrDataControlSourceV1( diff --git a/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_handle_v1.cpp b/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_handle_v1.cpp index 0ae93b20..801b93f8 100644 --- a/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_handle_v1.cpp +++ b/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_handle_v1.cpp @@ -10,13 +10,17 @@ const struct zwlr_foreign_toplevel_handle_v1_listener const char *title) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->title()(title); } + { + return obj->title()(title); + } }, [](void *data, zwlr_foreign_toplevel_handle_v1 *wldata, const char *appId) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->appId()(appId); } + { + return obj->appId()(appId); + } }, [](void *data, zwlr_foreign_toplevel_handle_v1 *wldata, wl_output *output) { @@ -48,17 +52,23 @@ const struct zwlr_foreign_toplevel_handle_v1_listener wl_array *state) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->state()(state); } + { + return obj->state()(state); + } }, [](void *data, zwlr_foreign_toplevel_handle_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->done()(); } + { + return obj->done()(); + } }, [](void *data, zwlr_foreign_toplevel_handle_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->closed()(); } + { + return obj->closed()(); + } }, [](void *data, zwlr_foreign_toplevel_handle_v1 *wldata, zwlr_foreign_toplevel_handle_v1 *parent) { diff --git a/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_manager_v1.cpp b/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_manager_v1.cpp index bf6d7039..af73c2a9 100644 --- a/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_manager_v1.cpp +++ b/src/lib/fcitx-wayland/wlr-foreign-toplevel-management-unstable-v1/zwlr_foreign_toplevel_manager_v1.cpp @@ -16,7 +16,9 @@ const struct zwlr_foreign_toplevel_manager_v1_listener [](void *data, zwlr_foreign_toplevel_manager_v1 *wldata) { auto *obj = static_cast(data); assert(*obj == wldata); - { return obj->finished()(); } + { + return obj->finished()(); + } }, }; ZwlrForeignToplevelManagerV1::ZwlrForeignToplevelManagerV1( @@ -29,7 +31,9 @@ ZwlrForeignToplevelManagerV1::ZwlrForeignToplevelManagerV1( } void ZwlrForeignToplevelManagerV1::destructor( zwlr_foreign_toplevel_manager_v1 *data) { - { return zwlr_foreign_toplevel_manager_v1_destroy(data); } + { + return zwlr_foreign_toplevel_manager_v1_destroy(data); + } } void ZwlrForeignToplevelManagerV1::stop() { return zwlr_foreign_toplevel_manager_v1_stop(*this); diff --git a/src/lib/fcitx/addoninstance.h b/src/lib/fcitx/addoninstance.h index 58b27d8f..80a1fa88 100644 --- a/src/lib/fcitx/addoninstance.h +++ b/src/lib/fcitx/addoninstance.h @@ -192,8 +192,7 @@ private: #define FCITX_ADDON_FACTORY(ClassName) \ extern "C" { \ - FCITXCORE_EXPORT \ - ::fcitx::AddonFactory *fcitx_addon_factory_instance() { \ + FCITXCORE_EXPORT ::fcitx::AddonFactory *fcitx_addon_factory_instance() { \ static ClassName factory; \ return &factory; \ } \ @@ -201,8 +200,8 @@ private: #define FCITX_ADDON_FACTORY_V2(AddonName, ClassName) \ extern "C" { \ - FCITXCORE_EXPORT \ - ::fcitx::AddonFactory *fcitx_addon_factory_instance_##AddonName() { \ + FCITXCORE_EXPORT ::fcitx::AddonFactory * \ + fcitx_addon_factory_instance_##AddonName() { \ static ClassName factory; \ return &factory; \ } \ diff --git a/src/lib/fcitx/surroundingtext.h b/src/lib/fcitx/surroundingtext.h index a776d6b0..e98a3b4f 100644 --- a/src/lib/fcitx/surroundingtext.h +++ b/src/lib/fcitx/surroundingtext.h @@ -79,9 +79,8 @@ private: FCITX_DECLARE_PRIVATE(SurroundingText); }; -FCITXCORE_EXPORT -LogMessageBuilder &operator<<(LogMessageBuilder &log, - const SurroundingText &surroundingText); +FCITXCORE_EXPORT LogMessageBuilder & +operator<<(LogMessageBuilder &log, const SurroundingText &surroundingText); } // namespace fcitx diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp index f969b34c..03fac6d0 100644 --- a/test/testlibrary.cpp +++ b/test/testlibrary.cpp @@ -14,11 +14,9 @@ #define MAGIC "MAGIC_TEST_DATA" extern "C" { -FCITXUTILS_EXPORT -char magic_test[] = MAGIC DATA; +FCITXUTILS_EXPORT char magic_test[] = MAGIC DATA; -FCITXUTILS_EXPORT -int func() { return 0; } +FCITXUTILS_EXPORT int func() { return 0; } } void parser(const char *data) { FCITX_ASSERT(strcmp(data, DATA) == 0); } -- Gitee From 7c21217f4a7e0cc3d87891e758860e3b6f41b948 Mon Sep 17 00:00:00 2001 From: Aaron Muir Hamilton Date: Mon, 28 Oct 2024 18:25:42 -0400 Subject: [PATCH 57/69] Allow XIM XNArea for client preedit area in OnTheSpot mode. --- src/frontend/xim/xim.cpp | 20 +++++++++++++++----- test/testxim.cpp | 14 ++++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/frontend/xim/xim.cpp b/src/frontend/xim/xim.cpp index 2dc18d7c..99f80206 100644 --- a/src/frontend/xim/xim.cpp +++ b/src/frontend/xim/xim.cpp @@ -303,10 +303,7 @@ public: void updateCursorLocation() { // kinds of like notification for position moving - bool hasSpotLocation = - xcb_im_input_context_get_preedit_attr_mask(xic_) & - XCB_XIM_XNSpotLocation_MASK; - auto p = xcb_im_input_context_get_preedit_attr(xic_)->spot_location; + auto mask = xcb_im_input_context_get_preedit_attr_mask(xic_); auto w = xcb_im_input_context_get_focus_window(xic_); if (!w) { w = xcb_im_input_context_get_client_window(xic_); @@ -314,7 +311,20 @@ public: if (!w) { return; } - if (hasSpotLocation) { + if (mask & XCB_XIM_XNArea_MASK) { + auto a = xcb_im_input_context_get_preedit_attr(xic_)->area; + auto trans_cookie = xcb_translate_coordinates( + server_->conn(), w, server_->root(), a.x, a.y); + auto reply = makeUniqueCPtr(xcb_translate_coordinates_reply( + server_->conn(), trans_cookie, nullptr)); + if (!reply) { + return; + } + setCursorRect(Rect() + .setPosition(reply->dst_x, reply->dst_y) + .setSize(a.width, a.height)); + } else if (mask & XCB_XIM_XNSpotLocation_MASK) { + auto p = xcb_im_input_context_get_preedit_attr(xic_)->spot_location; auto trans_cookie = xcb_translate_coordinates( server_->conn(), w, server_->root(), p.x, p.y); auto reply = makeUniqueCPtr(xcb_translate_coordinates_reply( diff --git a/test/testxim.cpp b/test/testxim.cpp index 64e0210b..39ac32bc 100644 --- a/test/testxim.cpp +++ b/test/testxim.cpp @@ -52,10 +52,16 @@ public: 1, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, screen_->root_visual, 0, NULL); uint32_t input_style = XCB_IM_PreeditPosition | XCB_IM_StatusArea; xcb_point_t spot; - spot.x = 0; - spot.y = 0; - xcb_xim_nested_list nested = xcb_xim_create_nested_list( - im.get(), XCB_XIM_XNSpotLocation, &spot, NULL); + spot.x = 5; + spot.y = 10; + xcb_rectangle_t area; + area.x = 0; + area.y = 0; + area.width = 5; + area.height = 10; + xcb_xim_nested_list nested = + xcb_xim_create_nested_list(im.get(), XCB_XIM_XNSpotLocation, &spot, + XCB_XIM_XNArea, &area, NULL); xcb_xim_create_ic(im.get(), create_ic_callback, this, XCB_XIM_XNInputStyle, &input_style, XCB_XIM_XNClientWindow, &w_, XCB_XIM_XNFocusWindow, -- Gitee From ed5c8e537bb7e8265962693b394a40b95cad4008 Mon Sep 17 00:00:00 2001 From: hantengc <42177714+hantengc@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:19:58 +0800 Subject: [PATCH 58/69] optimize code (#1155) * optimize icon acquisition logic to prepare for customizing icons for other desktop environments in the future --- .../notificationitem/notificationitem.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/modules/notificationitem/notificationitem.cpp b/src/modules/notificationitem/notificationitem.cpp index 19500701..57c835c6 100644 --- a/src/modules/notificationitem/notificationitem.cpp +++ b/src/modules/notificationitem/notificationitem.cpp @@ -55,20 +55,24 @@ public: } void activate(int, int) { parent_->instance()->toggle(); } void secondaryActivate(int, int) {} - std::string iconName() { - static bool preferSymbolic = !isKDE(); - std::string icon; - if (preferSymbolic) { - icon = "input-keyboard-symbolic"; + std::string keyboardIconName() const { + if (isKDE()) { + return "input-keyboard"; } else { - icon = "input-keyboard"; + return "input-keyboard-symbolic"; } + } + std::string iconName() { + std::string icon; + if (auto *ic = parent_->menu()->lastRelevantIc()) { icon = parent_->instance()->inputMethodIcon(ic); } - if (icon == "input-keyboard" && preferSymbolic) { - return "input-keyboard-symbolic"; + + if (icon.empty() || icon == "input-keyboard") { + icon = keyboardIconName(); } + return IconTheme::iconName(icon); } -- Gitee From e787b8569ce095ba4b0cd374404a84f45eba8c6b Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Thu, 16 Jan 2025 03:19:32 -0500 Subject: [PATCH 59/69] fix: iterator is not pointer (#1230) Co-authored-by: Weng Xuetian --- src/lib/fcitx-utils/semver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/fcitx-utils/semver.cpp b/src/lib/fcitx-utils/semver.cpp index 057fae8f..867f1372 100644 --- a/src/lib/fcitx-utils/semver.cpp +++ b/src/lib/fcitx-utils/semver.cpp @@ -33,7 +33,7 @@ bool isIdChar(char c) { } std::optional consumeNumericIdentifier(std::string_view &str) { - const auto *endOfNum = + std::string_view::iterator endOfNum = std::find_if_not(str.begin(), str.end(), charutils::isdigit); auto length = std::distance(str.begin(), endOfNum); if (length == 0) { @@ -45,8 +45,8 @@ std::optional consumeNumericIdentifier(std::string_view &str) { auto numberStr = str.substr(0, length); uint32_t number; - if (auto [p, ec] = - std::from_chars(numberStr.begin(), numberStr.end(), number); + if (auto [p, ec] = std::from_chars( + numberStr.data(), numberStr.data() + numberStr.size(), number); ec == std::errc()) { str.remove_prefix(length); return number; -- Gitee From e185ab8cc1aebf31c5a13b55b2cfdee86371b665 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Fri, 17 Jan 2025 22:17:18 -0800 Subject: [PATCH 60/69] Rephrase the modifier key timeout option --- src/lib/fcitx/globalconfig.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lib/fcitx/globalconfig.cpp b/src/lib/fcitx/globalconfig.cpp index 2c800f5e..23ebc57a 100644 --- a/src/lib/fcitx/globalconfig.cpp +++ b/src/lib/fcitx/globalconfig.cpp @@ -7,13 +7,19 @@ #include "globalconfig.h" #include +#include +#include +#include #include "fcitx-config/configuration.h" #include "fcitx-config/enum.h" #include "fcitx-config/iniparser.h" #include "fcitx-config/option.h" +#include "fcitx-config/rawconfig.h" #include "fcitx-utils/eventloopinterface.h" #include "fcitx-utils/i18n.h" +#include "fcitx-utils/key.h" #include "fcitx-utils/macros.h" +#include "fcitx-utils/misc.h" #include "config.h" #include "inputcontextmanager.h" @@ -141,14 +147,15 @@ FCITX_CONFIGURATION( modifierOnlyKeyTimeout{ this, "ModifierOnlyKeyTimeout", - _("Modifier Only Hotkey Timeout in Milliseconds"), + _("Time limit in milliseconds for triggering modifier key " + "shortcuts"), 250, IntConstrain{-1, 5000}, {}, ToolTipAnnotation{ _("When using modifier only hotkey, the action may " - "only be triggered if it is released within the timeout. -1 " - "means there is no timeout.")}};); + "only be triggered if the modifier key is released within " + "the timeout. -1 means there is no limit.")}};); FCITX_CONFIGURATION( BehaviorConfig, Option activeByDefault{this, "ActiveByDefault", -- Gitee From c52876da52e7b3d2b32334bf8641dda268d98095 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Sat, 18 Jan 2025 20:25:17 +0000 Subject: [PATCH 61/69] [trans] Update Translation --- po/ca.po | 170 ++++++++++++++++++++++---------------------- po/da.po | 174 ++++++++++++++++++++++----------------------- po/de.po | 170 ++++++++++++++++++++++---------------------- po/es.po | 170 ++++++++++++++++++++++---------------------- po/fcitx5.pot | 170 ++++++++++++++++++++++---------------------- po/fr.po | 170 ++++++++++++++++++++++---------------------- po/he.po | 170 ++++++++++++++++++++++---------------------- po/ja.po | 190 +++++++++++++++++++++++++------------------------- po/ko.po | 180 +++++++++++++++++++++++------------------------ po/ru.po | 181 +++++++++++++++++++++++------------------------ po/vi.po | 170 ++++++++++++++++++++++---------------------- po/zh_CN.po | 183 ++++++++++++++++++++++++------------------------ po/zh_TW.po | 182 +++++++++++++++++++++++------------------------ 13 files changed, 1139 insertions(+), 1141 deletions(-) diff --git a/po/ca.po b/po/ca.po index a4903097..8c67f516 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch , 2020\n" "Language-Team: Catalan (https://app.transifex.com/fcitx/teams/12005/ca/)\n" @@ -52,7 +52,7 @@ msgstr "" msgid "(Not available)" msgstr "(no disponible)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -104,7 +104,7 @@ msgstr "<Ús privat>" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Activa el mètode d'entrada" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Activa per defecte" @@ -125,7 +125,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Afegeix un preferit" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Afegeix la compatibilitat amb l'escriptura unicode" @@ -146,7 +146,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajusta la brillantor" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "" @@ -170,7 +170,7 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -265,7 +265,7 @@ msgstr "Bateria" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Comportament" @@ -427,7 +427,7 @@ msgstr "" msgid "Center Right" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" @@ -439,7 +439,7 @@ msgstr "" msgid "Choose key modifier" msgstr "Escolliu el modificador de tecla" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "" @@ -452,7 +452,7 @@ msgstr "Neteja" msgid "Click Margin" msgstr "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Porta-retalls" @@ -538,7 +538,7 @@ msgstr "" msgid "Custom" msgstr "Personalitzat" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "" @@ -547,19 +547,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Retalla" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "Frontal DBus" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "" @@ -576,7 +576,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Desactiva el mètode d'entrada" @@ -585,31 +585,31 @@ msgid "Debug information from dbus:" msgstr "" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "Per defecte" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Av Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Re Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Mida de pàgina predeterminada" @@ -695,7 +695,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Expulsa" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -740,23 +740,23 @@ msgstr "Fi" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -822,16 +822,16 @@ msgstr "Preferits" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Configuració de fcitx 5" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -865,7 +865,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "" @@ -987,7 +987,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "" @@ -1187,7 +1187,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Drecera de teclat" @@ -1205,7 +1205,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "Frontal DBus" @@ -1216,7 +1216,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1242,15 +1242,15 @@ msgstr "" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Mètode d'entrada" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "" @@ -1286,11 +1286,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1301,7 +1301,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1324,7 +1324,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Tauler del mètode d'entrada de KDE" @@ -1360,7 +1360,7 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Teclat" @@ -1858,10 +1858,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Silencia el micròfon" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1914,7 +1910,7 @@ msgstr "Següent candidat" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1945,7 +1941,7 @@ msgstr "No disponible" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Notificació" @@ -1999,7 +1995,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2117,7 +2113,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Impr Pant" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2125,7 +2121,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Frase ràpida" @@ -2158,7 +2154,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Respon" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2263,7 +2259,7 @@ msgstr "" msgid "Select local input method:" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2291,7 +2287,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2305,11 +2301,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2317,11 +2313,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2331,11 +2327,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2345,7 +2341,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2363,7 +2359,7 @@ msgstr "Espai" msgid "Spacing" msgstr "" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "Ortografia" @@ -2387,12 +2383,12 @@ msgctxt "Key name" msgid "Standby" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "Mètode d'entrada estàndard" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "Notificador d'estat" @@ -2463,7 +2459,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Tauler de tasques" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2527,6 +2523,10 @@ msgctxt "Key name" msgid "Time" msgstr "Hora" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2535,7 +2535,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2602,7 +2602,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Activa el mètode d'entrada" @@ -2645,11 +2645,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Desfés" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode: " @@ -2755,7 +2755,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2763,7 +2763,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "" @@ -2779,13 +2779,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2806,11 +2806,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "Processador de text" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/da.po b/po/da.po index 7bf09153..547978c4 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://app.transifex.com/fcitx/teams/12005/da/)\n" @@ -52,7 +52,7 @@ msgstr "${1} virker korrekt." msgid "(Not available)" msgstr "(ikke tilgængelig)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(skriv for at søge i unicode efter kode eller beskrivelse)" @@ -104,7 +104,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Aktivér inputmetode" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Aktivér som standard" @@ -125,7 +125,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Tilføj favorit" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Tilføj understøttelse af unicode-indtastning" @@ -146,7 +146,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Juster lysstyrke" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "" @@ -170,7 +170,7 @@ msgstr "Tillad tilsidesættelse af systemets XKB-indstillinger" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -265,7 +265,7 @@ msgstr "Batteri" msgid "Beginner's Guide" msgstr "Begyndervejledning" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Opførsel" @@ -430,7 +430,7 @@ msgstr "I midten til venstre" msgid "Center Right" msgstr "I midten til højre" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Skift Fcitx 5-konfiguration" @@ -442,7 +442,7 @@ msgstr "Afkrydsningsboks" msgid "Choose key modifier" msgstr "Vælg ændringstast" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "" @@ -455,7 +455,7 @@ msgstr "Ryd" msgid "Click Margin" msgstr "Klikmargen" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Udklipsholder" @@ -541,7 +541,7 @@ msgstr "Nuværende værdi af ${1} er ${2} (${3})." msgid "Custom" msgstr "Tilpasset" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "" @@ -550,19 +550,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Kliip" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "DBus-frontend" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "DBus-baseret nyt Freedesktop.org-bakkeikon" @@ -579,7 +579,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Deaktivér inputmetode" @@ -588,31 +588,31 @@ msgid "Debug information from dbus:" msgstr "" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "Standard" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Standard næste kandidat" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Standard-næste side" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Standard forrige kandidat" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Standard-forrige side" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Standardsidestørrelse" @@ -698,7 +698,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Skub ud" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -743,23 +743,23 @@ msgstr "End" msgid "Entries" msgstr "Poster" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Gennemløb inputmetode baglæns" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Gennemløb inputmetode forlæns" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Gennemløb inputmetode-gruppe baglæns" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Gennemløb inputmetode-gruppe forlæns" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "Gennemløb når der trykkes på udløsertast gentagne gange" @@ -829,16 +829,16 @@ msgstr "Favoritter" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx 5-konfiguration" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -875,7 +875,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx-version: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4-frontend" @@ -997,7 +997,7 @@ msgstr "Fandt im-modulers mellemlager til gtk ${1} ved ${2}." msgid "Found unknown ${1} qt module: ${2}." msgstr "Fandt ukendt ${1} qt-modul: ${2}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Understøttelse af Freedesktop.org-underretning" @@ -1197,7 +1197,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Hotlinks" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Hottast" @@ -1217,7 +1217,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus-frontend" @@ -1228,7 +1228,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1260,15 +1260,15 @@ msgstr "Billede" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Inputmetode" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "Konfiguration af inputmetode" @@ -1304,11 +1304,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "Valg af inputmetode" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1319,7 +1319,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Indsæt" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1342,7 +1342,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Panel til KDE-inputmetode" @@ -1378,7 +1378,7 @@ msgstr "" msgid "Key" msgstr "Tast" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Tastatur" @@ -1876,10 +1876,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon mute" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1932,7 +1928,7 @@ msgstr "Næste kandidat" msgid "Next Page Button" msgstr "Knap for næste side" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1963,7 +1959,7 @@ msgstr "Ikke tilgængelig" msgid "Note for GNOME Later than 3.6" msgstr "Bemærkning til GNOME senere end 3.6" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Underretning" @@ -2019,7 +2015,7 @@ msgstr "Y-forskydning for overlægning" msgid "Overlay position" msgstr "Placering for overlægning" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2091,8 +2087,8 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" "Sæt venligst miljøvariablen ${env_name} til \"${value}\" ved brug af " -"værktøjet som din distribution leverer eller tilføj ${1} til din ${2}. Se " -"${link}." +"værktøjet som din distribution leverer eller tilføj ${1} til din ${2}. Se $" +"{link}." #: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" @@ -2142,7 +2138,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Print Screen" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2150,7 +2146,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "Filer for Qt IM-modul:" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Hurtigfrase" @@ -2183,7 +2179,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Svar" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2288,7 +2284,7 @@ msgstr "Vælg inputmetode:" msgid "Select local input method:" msgstr "Vælg lokal inputmetode:" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "Vælg bestemt inputmetode via tastatur" @@ -2316,7 +2312,7 @@ msgstr "Baggrund for separator" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "Del inputtilstand" @@ -2330,11 +2326,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Butik" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "Vis information om inputmetode når der skiftes fokus" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "Vis information om inputmetode når der skiftes inputmetode" @@ -2342,11 +2338,11 @@ msgstr "Vis information om inputmetode når der skiftes inputmetode" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "Vis kompakt information om inputmetode" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "Vis første information om inputmetode" @@ -2356,11 +2352,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Vis preedit i program" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2370,7 +2366,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "Spring over første inputmetode under gennemløb" @@ -2388,7 +2384,7 @@ msgstr "Mellemrum" msgid "Spacing" msgstr "Afstand" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "Stav" @@ -2412,12 +2408,12 @@ msgctxt "Key name" msgid "Standby" msgstr "Standby" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "Start inputmetode" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "Statusunderretter" @@ -2488,7 +2484,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Opgavepanel" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "Skift midlertidigt mellem første og nuværende inputmetode" @@ -2552,6 +2548,10 @@ msgctxt "Key name" msgid "Time" msgstr "Klokkeslæt" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2563,7 +2563,7 @@ msgstr "" "når du bruger xim. Se ${link2}, for andre generelle problemer med at bruge " "XIM, inklusiv programfrysninger." -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "Indlejret preedit til/fra" @@ -2630,7 +2630,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Udløs inputmetode" @@ -2673,11 +2673,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Fortryd" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode: " @@ -2783,7 +2783,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2791,7 +2791,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland-inputmetode-frontend" @@ -2807,13 +2807,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2834,11 +2834,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "Tekstbehandling" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X-inputmetode-frontend" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/de.po b/po/de.po index d1fde3d9..de21e28a 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: mar well , 2023\n" "Language-Team: German (https://app.transifex.com/fcitx/teams/12005/de/)\n" @@ -54,7 +54,7 @@ msgstr "${1} funktioniert ordnungsgemäß." msgid "(Not available)" msgstr "(nicht vorhanden)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -106,7 +106,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "Eine virtuelle Tastatur basierend auf DBus" @@ -114,11 +114,11 @@ msgstr "Eine virtuelle Tastatur basierend auf DBus" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Eingabemethode aktivieren" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Per Voreinstellung aktiviert" @@ -127,7 +127,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Favorit hinzufügen" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Unicode-Unterstützung hinzufügen" @@ -148,7 +148,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Helligkeit einstellen" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "Alle" @@ -172,7 +172,7 @@ msgstr "Erlauben, die XKB-Einstellungen außer Kraft zu setzen" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "Übergehen der XKB-Einstellungen erlauben (nur für KDE5 unterstützt)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -267,7 +267,7 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Anleitung für Anfänger" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Verhalten" @@ -432,7 +432,7 @@ msgstr "Zentrum links" msgid "Center Right" msgstr "Zentrum rehts" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Fcitx 5 Konfiguration ändern" @@ -444,7 +444,7 @@ msgstr "Checkbox" msgid "Choose key modifier" msgstr "Funktionstaste wählen" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "Klassisches User Interface" @@ -457,7 +457,7 @@ msgstr "Löschen" msgid "Click Margin" msgstr "Rand Clickbereich" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Clipboard" @@ -543,7 +543,7 @@ msgstr "Aktueller Wert von ${1} ist ${2} (${3})." msgid "Custom" msgstr "Anwenderspezifisch" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "Benutzerdefinierte xkb Option" @@ -552,19 +552,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Ausschneiden" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "Fcitx DBus Schnittstelle" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "DBus Virtuelle Tastatur" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "DBus basiertes, neues Freedesktop.org tray icon" @@ -581,7 +581,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Dunkles Thema" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Eingabemethode deaktivieren" @@ -590,31 +590,31 @@ msgid "Debug information from dbus:" msgstr "Debug Informationen vom dbus:" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "Standard" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "Standard Dunkel" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Nächster Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Vorgabe für nächste Seite" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Vorheriger Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Vorgabe für vorherige Seite" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Standard Seitengröße" @@ -700,7 +700,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Auswerfen" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -745,23 +745,23 @@ msgstr "Ende" msgid "Entries" msgstr "Einträge" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Eingabemethoden umgekehrt nummerieren" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -829,16 +829,16 @@ msgstr "Favoriten" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx 5 Konfiguration" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -875,7 +875,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx-Version: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" @@ -997,7 +997,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org Notification Unterstützung" @@ -1197,7 +1197,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Wichtige Links" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Kurzbefehl" @@ -1215,7 +1215,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus Schnittstelle" @@ -1226,7 +1226,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1252,15 +1252,15 @@ msgstr "Bild" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Eingabemethode" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "Konfiguration Eingabemethode" @@ -1296,11 +1296,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "Auswahl Eingabemethode" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1311,7 +1311,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Einfügen" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1334,7 +1334,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Einstellungen KDE Eingabemethode" @@ -1370,7 +1370,7 @@ msgstr "" msgid "Key" msgstr "Taste" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Tastatur" @@ -1868,10 +1868,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Mikrofon Mute" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1924,7 +1920,7 @@ msgstr "Nächster Kandidat" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Nein" @@ -1958,7 +1954,7 @@ msgstr "Nicht verfügbar" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Benachrichtigung" @@ -2012,7 +2008,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2130,7 +2126,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Bildschirm drucken" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "Programm" @@ -2138,7 +2134,7 @@ msgstr "Programm" msgid "Qt IM module files:" msgstr "Qt-IM-Moduldateien:" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Quick Phrase" @@ -2171,7 +2167,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Antworten" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2276,7 +2272,7 @@ msgstr "Eingabemethode auswählen:" msgid "Select local input method:" msgstr "Lokale Eingabemethode auswählen:" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2304,7 +2300,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2318,11 +2314,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Shop" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "Hinweis zur Eingabemethode zeigen, nachdem sie gewechselt wurde" @@ -2330,11 +2326,11 @@ msgstr "Hinweis zur Eingabemethode zeigen, nachdem sie gewechselt wurde" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2344,11 +2340,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2358,7 +2354,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2376,7 +2372,7 @@ msgstr "Leerzeichen" msgid "Spacing" msgstr "Abstand" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "Rechtschreibung" @@ -2400,12 +2396,12 @@ msgctxt "Key name" msgid "Standby" msgstr "Standby" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "Eingabemethode starten" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "Hinweis Status" @@ -2476,7 +2472,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2540,6 +2536,10 @@ msgctxt "Key name" msgid "Time" msgstr "Zeit" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2548,7 +2548,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2615,7 +2615,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Eingabemethode aktivieren" @@ -2658,11 +2658,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Rückgängig" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode: " @@ -2768,7 +2768,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2776,7 +2776,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland Eingabemethodenfrontend" @@ -2792,13 +2792,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2819,11 +2819,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "Word Processor" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X Eingabemethode Frontend" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/es.po b/po/es.po index b5181ad7..39f4a805 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:22+0000\n" +"POT-Creation-Date: 2025-01-18 20:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: csslayer , 2017\n" "Language-Team: Spanish (https://www.transifex.com/fcitx/teams/12005/es/)\n" @@ -50,7 +50,7 @@ msgstr "" msgid "(Not available)" msgstr "" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -102,7 +102,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "" @@ -123,7 +123,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "" @@ -144,7 +144,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "" @@ -168,7 +168,7 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -263,7 +263,7 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "" @@ -425,7 +425,7 @@ msgstr "" msgid "Center Right" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" @@ -437,7 +437,7 @@ msgstr "" msgid "Choose key modifier" msgstr "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "" @@ -450,7 +450,7 @@ msgstr "" msgid "Click Margin" msgstr "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "" @@ -537,7 +537,7 @@ msgstr "" msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "" @@ -546,19 +546,19 @@ msgctxt "Key name" msgid "Cut" msgstr "" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "" @@ -575,7 +575,7 @@ msgstr "" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -584,31 +584,31 @@ msgid "Debug information from dbus:" msgstr "" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "" @@ -694,7 +694,7 @@ msgctxt "Key name" msgid "Eject" msgstr "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -739,23 +739,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -821,16 +821,16 @@ msgstr "" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -864,7 +864,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "" @@ -986,7 +986,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "" @@ -1186,7 +1186,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1204,7 +1204,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "" @@ -1215,7 +1215,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1241,15 +1241,15 @@ msgstr "" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "" @@ -1285,11 +1285,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1300,7 +1300,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1323,7 +1323,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "" @@ -1359,7 +1359,7 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "" @@ -1857,10 +1857,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1913,7 +1909,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1944,7 +1940,7 @@ msgstr "" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "" @@ -1998,7 +1994,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2116,7 +2112,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2124,7 +2120,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "" @@ -2157,7 +2153,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2262,7 +2258,7 @@ msgstr "" msgid "Select local input method:" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2290,7 +2286,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2304,11 +2300,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2316,11 +2312,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2330,11 +2326,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2344,7 +2340,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2362,7 +2358,7 @@ msgstr "" msgid "Spacing" msgstr "" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "" @@ -2386,12 +2382,12 @@ msgctxt "Key name" msgid "Standby" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "" @@ -2462,7 +2458,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2526,6 +2522,10 @@ msgctxt "Key name" msgid "Time" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2534,7 +2534,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2601,7 +2601,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "" @@ -2644,11 +2644,11 @@ msgctxt "Key name" msgid "Undo" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "" @@ -2754,7 +2754,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2762,7 +2762,7 @@ msgstr "" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "" @@ -2778,13 +2778,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2805,11 +2805,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "" diff --git a/po/fcitx5.pot b/po/fcitx5.pot index 4824d878..ae2ebab7 100644 --- a/po/fcitx5.pot +++ b/po/fcitx5.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "" msgid "(Not available)" msgstr "" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -99,7 +99,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -107,11 +107,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "" @@ -120,7 +120,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "" @@ -141,7 +141,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "" @@ -165,7 +165,7 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -260,7 +260,7 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "" @@ -422,7 +422,7 @@ msgstr "" msgid "Center Right" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" @@ -434,7 +434,7 @@ msgstr "" msgid "Choose key modifier" msgstr "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "" @@ -447,7 +447,7 @@ msgstr "" msgid "Click Margin" msgstr "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "" @@ -533,7 +533,7 @@ msgstr "" msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "" @@ -542,19 +542,19 @@ msgctxt "Key name" msgid "Cut" msgstr "" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "" @@ -571,7 +571,7 @@ msgstr "" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -580,31 +580,31 @@ msgid "Debug information from dbus:" msgstr "" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "" @@ -690,7 +690,7 @@ msgctxt "Key name" msgid "Eject" msgstr "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -735,23 +735,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -817,16 +817,16 @@ msgstr "" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -860,7 +860,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "" @@ -982,7 +982,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "" @@ -1182,7 +1182,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1200,7 +1200,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "" @@ -1211,7 +1211,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1237,15 +1237,15 @@ msgstr "" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "" @@ -1281,11 +1281,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1296,7 +1296,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1319,7 +1319,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "" @@ -1355,7 +1355,7 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "" @@ -1853,10 +1853,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1909,7 +1905,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1940,7 +1936,7 @@ msgstr "" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "" @@ -1994,7 +1990,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2112,7 +2108,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2120,7 +2116,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "" @@ -2153,7 +2149,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2258,7 +2254,7 @@ msgstr "" msgid "Select local input method:" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2286,7 +2282,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2300,11 +2296,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2312,11 +2308,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2326,11 +2322,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2340,7 +2336,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2358,7 +2354,7 @@ msgstr "" msgid "Spacing" msgstr "" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "" @@ -2382,12 +2378,12 @@ msgctxt "Key name" msgid "Standby" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "" @@ -2458,7 +2454,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2522,6 +2518,10 @@ msgctxt "Key name" msgid "Time" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2530,7 +2530,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2597,7 +2597,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "" @@ -2640,11 +2640,11 @@ msgctxt "Key name" msgid "Undo" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "" @@ -2750,7 +2750,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2758,7 +2758,7 @@ msgstr "" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "" @@ -2774,13 +2774,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2801,11 +2801,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "" diff --git a/po/fr.po b/po/fr.po index 33cb8e81..2a277f74 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: csslayer , 2022\n" "Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" @@ -53,7 +53,7 @@ msgstr "${1} fonctionne correctement." msgid "(Not available)" msgstr "(Non disponible)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(Taper pour rechercher unicode par code ou description)" @@ -105,7 +105,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Activer la méthode de saisie" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Actif par défaut" @@ -126,7 +126,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Ajouter un favori" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Ajouter la prise en charge de la saisie Unicode" @@ -147,7 +147,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Ajuster la luminosité" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "Tout" @@ -173,7 +173,7 @@ msgstr "" "Autoriser le remplacement des paramètres système XKB (uniquement compatible " "avec KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -270,7 +270,7 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Guide du débutant" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Comportement" @@ -437,7 +437,7 @@ msgstr "Centre gauche" msgid "Center Right" msgstr "Centre droit" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Modifier la configuration de Fcitx 5" @@ -449,7 +449,7 @@ msgstr "Case à cocher" msgid "Choose key modifier" msgstr "Choisir le modificateur de clé" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "Interface utilisateur classique" @@ -462,7 +462,7 @@ msgstr "Effacer" msgid "Click Margin" msgstr "Cliquer sur la marge" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Presse-papiers" @@ -549,7 +549,7 @@ msgstr "La valeur actuelle de ${1} est ${2} (${3})." msgid "Custom" msgstr "Personnalisé" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "Option Xkb personnalisée" @@ -558,19 +558,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Couper" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "Interface DBus" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "" "Nouvelle icône de la barre d'état système Freedesktop.org basée sur DBus" @@ -588,7 +588,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Désactiver la méthode de saisie" @@ -597,31 +597,31 @@ msgid "Debug information from dbus:" msgstr "Informations de débogage de dbus :" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "Par défaut" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Candidat suivant par défaut" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Page suivante par défaut" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Candidat précédent par défaut" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Page précédente par défaut" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Taille de page par défaut" @@ -707,7 +707,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Éjecter" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -752,23 +752,23 @@ msgstr "Fin" msgid "Entries" msgstr "Entrées" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Énumérer la méthode d'entrée vers l'arrière" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Énumérer la méthode d'entrée vers l'avant" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Énumérer le groupe de méthodes d'entrée vers l'arrière" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Énumérer le groupe de méthodes d'entrée vers l'avant" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" "Énumérer lorsque vous appuyez plusieurs fois sur la touche de déclenchement" @@ -841,16 +841,16 @@ msgstr "Favoris" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Configuration Fcitx 5" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -887,7 +887,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Version Fcitx : ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" @@ -1013,7 +1013,7 @@ msgstr "Cache immodules trouvé pour gtk ${1} à ${2}." msgid "Found unknown ${1} qt module: ${2}." msgstr "Module ${1} qt inconnu trouvé : ${2}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Prise en charge des notifications de Freedesktop.org" @@ -1213,7 +1213,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Liens dynamiques" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Raccourci clavier" @@ -1233,7 +1233,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "Interface IBus" @@ -1244,7 +1244,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1277,15 +1277,15 @@ msgstr "Image" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Méthode de saisie" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "Configuration de la méthode d'entrée" @@ -1321,11 +1321,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "Sélecteur de méthode d'entrée" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1339,7 +1339,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Insérer" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1362,7 +1362,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Panneau de méthode de saisie KDE" @@ -1398,7 +1398,7 @@ msgstr "" msgid "Key" msgstr "Clé" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Clavier" @@ -1896,10 +1896,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Microphone muet" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1952,7 +1948,7 @@ msgstr "Candidat suivant" msgid "Next Page Button" msgstr "Bouton de page suivante" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Non" @@ -1983,7 +1979,7 @@ msgstr "Non disponible" msgid "Note for GNOME Later than 3.6" msgstr "Remarque pour GNOME ultérieur à 3.6" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Notification" @@ -2040,7 +2036,7 @@ msgstr "Superposer le décalage Y" msgid "Overlay position" msgstr "Position de superposition" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Ignorer l'option Xkb" @@ -2163,7 +2159,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Impression d'écran" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "Programme" @@ -2171,7 +2167,7 @@ msgstr "Programme" msgid "Qt IM module files:" msgstr "Fichiers du module Qt IM :" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Expression rapide" @@ -2204,7 +2200,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Répondre" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2309,7 +2305,7 @@ msgstr "Sélectionner la méthode de saisie :" msgid "Select local input method:" msgstr "Sélectionner la méthode de saisie locale :" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "Sélectionner une méthode de saisie spécifique via le clavier" @@ -2337,7 +2333,7 @@ msgstr "Arrière-plan du séparateur" msgid "Shadow Margin" msgstr "Marge d'ombre" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "Partager l'état de l'entrée" @@ -2351,12 +2347,12 @@ msgctxt "Key name" msgid "Shop" msgstr "Boutique" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" "Afficher les informations sur la méthode d'entrée lors du changement de focus" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" "Afficher les informations sur la méthode d'entrée lors du changement de " @@ -2366,11 +2362,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "Afficher le nom de la mise en page dans l'icône" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "Afficher les informations sur la méthode d'entrée compacte" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "Afficher les informations de la première méthode d'entrée" @@ -2383,11 +2379,11 @@ msgstr "" "page active. Si l'icône de texte préféré est définie sur true, cette option " "sera ignorée." -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Afficher la pré-édition dans l'application" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2399,7 +2395,7 @@ msgstr "" "Afficher la pré-édition lors de la composition et valider la clé morte s'il " "n'y a pas de séquence correspondante." -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "Ignorer la première méthode de saisie lors de l'énumération" @@ -2417,7 +2413,7 @@ msgstr "Espace" msgid "Spacing" msgstr "Espacement" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "Épeler" @@ -2441,12 +2437,12 @@ msgctxt "Key name" msgid "Standby" msgstr "Veille" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "Démarrer la méthode de saisie" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "Notification d'état" @@ -2517,7 +2513,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Panneau de tâches" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" "Basculer temporairement entre la première méthode de saisie et la méthode de " @@ -2588,6 +2584,10 @@ msgctxt "Key name" msgid "Time" msgstr "Heure" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2600,7 +2600,7 @@ msgstr "" "problèmes plus généraux liés à l'utilisation de XIM, notamment le gel des " "applications, consultez ${link2}." -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "Basculer la pré-édition intégrée" @@ -2667,7 +2667,7 @@ msgstr "Couleur du contour de l'étiquette du plateau" msgid "Tray Label Text Color" msgstr "Couleur du texte de l'étiquette du plateau" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Méthode d'entrée du déclencheur" @@ -2710,11 +2710,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Annuler" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode  : " @@ -2826,7 +2826,7 @@ msgstr "" "sensibles, notamment le nom de la distribution, la version du noyau, le nom " "des programmes en cours d'exécution, etc." -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2834,7 +2834,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Interface de la méthode Wayland Input" @@ -2850,13 +2850,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2880,11 +2880,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "Traitement de texte" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X Input Method Frontend" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/he.po b/po/he.po index ec0825d0..adb95896 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e " ", 2021\n" @@ -53,7 +53,7 @@ msgstr "" msgid "(Not available)" msgstr "" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -105,7 +105,7 @@ msgstr "<שימוש פרטי>" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "" @@ -126,7 +126,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "" @@ -147,7 +147,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "" @@ -171,7 +171,7 @@ msgstr "" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -266,7 +266,7 @@ msgstr "סוללה" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "" @@ -428,7 +428,7 @@ msgstr "" msgid "Center Right" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" @@ -440,7 +440,7 @@ msgstr "" msgid "Choose key modifier" msgstr "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "" @@ -453,7 +453,7 @@ msgstr "ניקוי" msgid "Click Margin" msgstr "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "לוח הגזירים" @@ -539,7 +539,7 @@ msgstr "" msgid "Custom" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "" @@ -548,19 +548,19 @@ msgctxt "Key name" msgid "Cut" msgstr "גזירה" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "" @@ -577,7 +577,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -586,31 +586,31 @@ msgid "Debug information from dbus:" msgstr "" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "" @@ -696,7 +696,7 @@ msgctxt "Key name" msgid "Eject" msgstr "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -741,23 +741,23 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "" @@ -823,16 +823,16 @@ msgstr "מועדפים" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -866,7 +866,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "" @@ -988,7 +988,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "" @@ -1188,7 +1188,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1206,7 +1206,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "" @@ -1217,7 +1217,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1243,15 +1243,15 @@ msgstr "" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "" @@ -1287,11 +1287,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1302,7 +1302,7 @@ msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1325,7 +1325,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "" @@ -1361,7 +1361,7 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "" @@ -1859,10 +1859,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1915,7 +1911,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1946,7 +1942,7 @@ msgstr "" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "" @@ -2000,7 +1996,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2118,7 +2114,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2126,7 +2122,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "" @@ -2159,7 +2155,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2264,7 +2260,7 @@ msgstr "" msgid "Select local input method:" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2292,7 +2288,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2306,11 +2302,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2318,11 +2314,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2332,11 +2328,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2346,7 +2342,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2364,7 +2360,7 @@ msgstr "" msgid "Spacing" msgstr "" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "" @@ -2388,12 +2384,12 @@ msgctxt "Key name" msgid "Standby" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "" @@ -2464,7 +2460,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2528,6 +2524,10 @@ msgctxt "Key name" msgid "Time" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2536,7 +2536,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2603,7 +2603,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "" @@ -2646,11 +2646,11 @@ msgctxt "Key name" msgid "Undo" msgstr "" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "" @@ -2756,7 +2756,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2764,7 +2764,7 @@ msgstr "" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "" @@ -2780,13 +2780,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2807,11 +2807,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "מעבד תמלילים" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "" diff --git a/po/ja.po b/po/ja.po index 3b8b7253..37798e69 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: UTUMI Hirosi , 2024\n" "Language-Team: Japanese (https://app.transifex.com/fcitx/teams/12005/ja/)\n" @@ -54,7 +54,7 @@ msgstr "${1} は正常に動作しています。" msgid "(Not available)" msgstr "(使用不可)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(コードまたは説明からUnicodeを検索する)" @@ -106,7 +106,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "DBus ベースの仮想キーボードバックエンド" @@ -114,11 +114,11 @@ msgstr "DBus ベースの仮想キーボードバックエンド" msgid "Accent Colors" msgstr "アクセントカラー" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "入力メソッドを有効にする" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "デフォルトで有効にする" @@ -127,7 +127,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "お気に入りに追加する" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "ユニコード入力対応を追加します" @@ -148,7 +148,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "明るさ調整" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "すべて" @@ -172,7 +172,7 @@ msgstr "システム XKB 設定のオーバーライドを許可する" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "システムの XKB 設定より優先する (KDE 5 のみサポート)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "パスワード欄に入力メソッドを許可する" @@ -267,7 +267,7 @@ msgstr "バッテリー" msgid "Beginner's Guide" msgstr "ビギナーズガイド" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "動作" @@ -431,7 +431,7 @@ msgstr "中央左" msgid "Center Right" msgstr "中央右" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 設定を変更" @@ -443,7 +443,7 @@ msgstr "チェックボックス" msgid "Choose key modifier" msgstr "キーモディファイアーを選択" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "クラシックユーザーインターフェース" @@ -456,7 +456,7 @@ msgstr "クリア" msgid "Click Margin" msgstr "クリックマージン" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "クリップボード" @@ -542,7 +542,7 @@ msgstr "現在の ${1} の値は ${2} (${3}) です。" msgid "Custom" msgstr "カスタム" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "カスタム XKB オプション" @@ -551,19 +551,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Cut" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "DBus フロントエンド" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "DBus ベースの仮想キーボード" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "DBus ベースの 新しい Freedesktop.org トレイアイコン" @@ -580,7 +580,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "ダークテーマ" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "入力メソッドをオフにする" @@ -589,31 +589,31 @@ msgid "Debug information from dbus:" msgstr "dbus からのデバッグ情報:" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "デフォルト" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "デフォルトのダーク" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "デフォルトの次候補" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "デフォルトの次ページ" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "デフォルトの前候補" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "デフォルトの前ページ" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "デフォルトのページサイズ" @@ -707,7 +707,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Eject" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "絵文字" @@ -752,23 +752,23 @@ msgstr "End" msgid "Entries" msgstr "エントリー" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "前の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "次の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "前の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "次の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "トリガーキーを押すたびに切り替える" @@ -836,16 +836,16 @@ msgstr "お気に入り" msgid "Fcitx" msgstr "Fcitx" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx5 設定" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland ランチャー（実験的）" @@ -888,7 +888,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx のバージョン: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 フロントエンド" @@ -1024,7 +1024,7 @@ msgstr "gtk ${1} の immodule cache を ${2} に見つけました。" msgid "Found unknown ${1} qt module: ${2}." msgstr "不明な ${1} qt モジュールが見つかりました: ${2}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 通知サポート" @@ -1224,7 +1224,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "ホットリンク" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "ホットキー" @@ -1242,7 +1242,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus フロントエンド" @@ -1256,7 +1256,7 @@ msgstr "" "に、zwp_virtual_keyboard_v1 の作成・破棄を行いません。これにより、Sway<=1.9、" "RiverWM<=0.3.0 を含む特定のコンポジターのバグを回避できる可能性があります。" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1281,8 +1281,8 @@ msgid "" "any input method other than ${2}. See ${link} for more detail." msgstr "" "もしあなたが ${1} を使用中で、${2} をアンインストールしたい場合、${2} 以外の" -"入力メソッドを使用するための IBus 統合を無効化するために、${3} を削除するか " -"${g36_disable_ibus} コマンドを実行してください。詳細は ${link} で確認してくだ" +"入力メソッドを使用するための IBus 統合を無効化するために、${3} を削除するか $" +"{g36_disable_ibus} コマンドを実行してください。詳細は ${link} で確認してくだ" "さい。" #: src/ui/classic/theme.h:135 @@ -1291,15 +1291,15 @@ msgstr "画像" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "入力メソッド" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "入力メソッドの設定" @@ -1335,11 +1335,11 @@ msgstr "入力パネルのハイライト候補の背景" msgid "Input Panel Highlight Candidate Border" msgstr "入力パネルのハイライト候補の枠線" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "入力メソッドセレクター" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1352,7 +1352,7 @@ msgctxt "Key name" msgid "Insert" msgstr "挿入" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "ユーザーデータを保存する間隔（分）" @@ -1377,13 +1377,13 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" "入力メソッドのポップアップを提供するために、Input Method Panel GNOME Shell " -"Extensions をインストールすることをお勧めします。https://extensions.gnome." -"org/extension/261/kimpanel/ そうしないと、GNOME Shell のアクティビティ検索" -"ボックスで入力するときに、入力メソッドのポップアップが表示されないことがあり" -"ます。詳細は https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME を参照" -"してください。" +"Extensions をインストールすることをお勧めします。https://" +"extensions.gnome.org/extension/261/kimpanel/ そうしないと、GNOME Shell のアク" +"ティビティ検索ボックスで入力するときに、入力メソッドのポップアップが表示され" +"ないことがあります。詳細は https://fcitx-im.org/wiki/" +"Using_Fcitx_5_on_Wayland#GNOME を参照してください。" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "KDE 入力メソッドパネル" @@ -1419,7 +1419,7 @@ msgstr "V2 プロトコルの仮想キーボードオブジェクトを維持す msgid "Key" msgstr "キー" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "キーボード" @@ -1917,10 +1917,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "マイクミュート" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "修飾子のみのホットキーのタイムアウト（ミリ秒）" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1973,7 +1969,7 @@ msgstr "次の候補" msgid "Next Page Button" msgstr "次ページボタン" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "いいえ" @@ -2007,7 +2003,7 @@ msgstr "使用不可" msgid "Note for GNOME Later than 3.6" msgstr "GNOME 3.6 以降の注意" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "通知" @@ -2063,7 +2059,7 @@ msgstr "Yオフセットのオーバーレイ" msgid "Overlay position" msgstr "オーバーレイの位置" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "XKB オプションより優先する" @@ -2135,8 +2131,8 @@ msgid "" "your distribution provides or add ${1} to your ${2}. See ${link}." msgstr "" "お使いのディストリビューションが用意しているツールで環境変数 ${env_name} に " -"'${value}' を設定するか、直接${2} に ${1} を書き加えてください。詳しくは " -"${link} を参照してください" +"'${value}' を設定するか、直接${2} に ${1} を書き加えてください。詳しくは $" +"{link} を参照してください" #: src/lib/fcitx-utils/key.cpp:224 msgctxt "Key name" @@ -2186,7 +2182,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "プリントスクリーン" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "プログラム" @@ -2194,7 +2190,7 @@ msgstr "プログラム" msgid "Qt IM module files:" msgstr "Qt IM モジュールファイル:" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "クイックフレーズ" @@ -2227,7 +2223,7 @@ msgctxt "Key name" msgid "Reply" msgstr "リプライ" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "フォーカス時に状態をリセット" @@ -2332,7 +2328,7 @@ msgstr "入力メソッドを選択:" msgid "Select local input method:" msgstr "ローカル入力メソッドを選択:" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "キーボードで指定の入力メソッドを選択" @@ -2364,7 +2360,7 @@ msgstr "セパレーターの背景" msgid "Shadow Margin" msgstr "影のマージン" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "入力状態を共有する" @@ -2378,11 +2374,11 @@ msgctxt "Key name" msgid "Shop" msgstr "ショップ" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "フォーカスを変更する際に入力メソッドの情報を表示する" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "入力メソッドを切り替える際に入力メソッドの情報を表示する" @@ -2390,11 +2386,11 @@ msgstr "入力メソッドを切り替える際に入力メソッドの情報を msgid "Show Layout Name In Icon" msgstr "アイコンにレイアウト名を表示する" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "入力メソッドの情報をコンパクトに表示する" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "第1入力メソッドの情報を表示する" @@ -2406,11 +2402,11 @@ msgstr "" "アクティブなレイアウトが複数ある場合はアイコンにレイアウト名を表示します。オ" "プションでテキストアイコンを優先している場合はこのオプションを無視します。" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "アプリケーションにプリエディットを表示する" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "パスワード入力時にプリエディットテキストを表示する" @@ -2422,7 +2418,7 @@ msgstr "" "入力時にプリエディットを表示し、一致するシーケンスがない場合はデッドキーをコ" "ミットします。" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "切り替え時は第1入力メソッドをスキップする" @@ -2440,7 +2436,7 @@ msgstr "スペース" msgid "Spacing" msgstr "間隔" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "スペル" @@ -2464,12 +2460,12 @@ msgctxt "Key name" msgid "Standby" msgstr "スタンバイ" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "入力メソッドを開始" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "ステータス通知" @@ -2540,7 +2536,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "タスクパネル" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "一時的に第1入力メソッドに切り替える" @@ -2610,6 +2606,10 @@ msgctxt "Key name" msgid "Time" msgstr "タイム" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2621,7 +2621,7 @@ msgstr "" "あります。 ${link1} を参照してください。 アプリケーションのフリーズを含むXIM" "による一般的な問題については ${link2} を参照してください。" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "埋め込みプリエディットの切り替え" @@ -2688,7 +2688,7 @@ msgstr "トレイラベルのアウトライン色" msgid "Tray Label Text Color" msgstr "トレイラベルのテキスト色" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "入力メソッドの切り替え" @@ -2731,11 +2731,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Undo" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode:" @@ -2843,7 +2843,7 @@ msgstr "" "警告: fcitx5-diagnose の出力には、ディストリビューション名、カーネルバージョ" "ン、現在実行中のプログラムなどの機密情報が含まれています。" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2851,7 +2851,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "Wayland 診断" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland 入力メソッドフロントエンド" @@ -2870,15 +2870,13 @@ msgstr "" "ジャーがクリップボードの内容をパスワードとしてマークした場合は、クリップボー" "ドの更新が無視されます。" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -"修飾子のみのホットキーを使用する場合、タイムアウト内にリリースされた場合のみ" -"アクションがトリガーされます。-1 はタイムアウトなしを意味します。" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2902,11 +2900,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "ワープロ" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X Input Method フロントエンド" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/ko.po b/po/ko.po index cb3af384..a3933807 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,15 +7,15 @@ # heavyuser , 2018 # Bon Keun Seo , 2021 # perillamint , 2022 -# JungHee Lee , 2023 +# Junghee Lee , 2023 # msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" -"Last-Translator: JungHee Lee , 2023\n" +"Last-Translator: Junghee Lee , 2023\n" "Language-Team: Korean (https://app.transifex.com/fcitx/teams/12005/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "${1}이(가) 제대로 작동합니다." msgid "(Not available)" msgstr "(사용할 수 없음)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(코드 또는 설명으로 유니코드를 검색하는 유형)" @@ -107,7 +107,7 @@ msgstr "" msgid "" msgstr "<할당 안됨>" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -115,11 +115,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "입력기 활성화" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "기본적으로 활성화" @@ -128,7 +128,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "즐겨찾기 추가" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "유니코드 입력 지원 추가" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "밝기 조절" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "모두" @@ -173,7 +173,7 @@ msgstr "시스템 XKB 설정을 덮어쓰도록 허용" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "시스템 XKB 설정 무시 허용(KDE 5만 지원)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -268,7 +268,7 @@ msgstr "배터리" msgid "Beginner's Guide" msgstr "초보자 가이드" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "동작방식" @@ -432,7 +432,7 @@ msgstr "왼쪽 중앙" msgid "Center Right" msgstr "오른쪽 중앙" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 구성 변경" @@ -444,7 +444,7 @@ msgstr "체크 박스" msgid "Choose key modifier" msgstr "변환 키 선택" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "클래식 사용자 인터페이스" @@ -457,7 +457,7 @@ msgstr "지우기" msgid "Click Margin" msgstr "여백 클릭" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "클립보드" @@ -543,7 +543,7 @@ msgstr "${1}의 현재 값은 ${2}(${3})입니다." msgid "Custom" msgstr "사용자 지정" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "사용자 지정 Xkb 옵션" @@ -552,19 +552,19 @@ msgctxt "Key name" msgid "Cut" msgstr "자르기" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "DBus 프론트엔드" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "DBus 기반 새 Freedesktop.org 트레이 아이콘" @@ -581,7 +581,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "입력기 비활성화" @@ -590,31 +590,31 @@ msgid "Debug information from dbus:" msgstr "dbus의 디버그 정보:" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "기본값" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "기본 다음 후보" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "기본 다음 페이지" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "기본 이전 후보" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "기본 이전 페이지" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "페이지 크기 기본값" @@ -700,7 +700,7 @@ msgctxt "Key name" msgid "Eject" msgstr "꺼내기" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "에모지" @@ -745,23 +745,23 @@ msgstr "종료" msgid "Entries" msgstr "항목" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "입력기 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "입력기 전환" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "입력기 그룹 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "입력기 그룹 전환" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "트리거 키를 반복해서 누를 때 열거하기" @@ -829,16 +829,16 @@ msgstr "즐겨찾기" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx 5 설정" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -874,7 +874,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx 버전: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 프론트엔드" @@ -999,7 +999,7 @@ msgstr "GTK ${1}용 입력기모듈 캐시를 ${2}에서 찾았습니다." msgid "Found unknown ${1} qt module: ${2}." msgstr "알 수 없는 ${1} Qt 모듈을 찾았습니다: ${2}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 알림 지원" @@ -1199,7 +1199,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "핫 링크" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "단축키" @@ -1217,7 +1217,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "하이퍼" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus 전처리기" @@ -1228,7 +1228,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1249,9 +1249,9 @@ msgid "" "the command ${g36_disable_ibus} to disable IBus integration in order to use " "any input method other than ${2}. See ${link} for more detail." msgstr "" -"${1}를 사용하는 경우, ${2}를 제거하거나, ${3}를 제거하거나 " -"${g36_disable_ibus} 명령을 사용하여 ${2} 이외의 입력기를 사용하기 위해 IBus " -"통합을 비활성화할 수 있습니다.. 자세한 내용은 ${link}를 참조합니다." +"${1}를 사용하는 경우, ${2}를 제거하거나, ${3}를 제거하거나 $" +"{g36_disable_ibus} 명령을 사용하여 ${2} 이외의 입력기를 사용하기 위해 IBus 통" +"합을 비활성화할 수 있습니다.. 자세한 내용은 ${link}를 참조합니다." #: src/ui/classic/theme.h:135 msgid "Image" @@ -1259,15 +1259,15 @@ msgstr "이미지" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "입력기" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "입력기 구성" @@ -1303,11 +1303,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "입력기 선택" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1320,7 +1320,7 @@ msgctxt "Key name" msgid "Insert" msgstr "삽입" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1343,7 +1343,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "KDE 입력기 패널" @@ -1379,7 +1379,7 @@ msgstr "" msgid "Key" msgstr "키" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "키보드" @@ -1877,10 +1877,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "마이크 끄기" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1933,7 +1929,7 @@ msgstr "다음 후보" msgid "Next Page Button" msgstr "다음 페이지 버튼" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "아니오" @@ -1964,7 +1960,7 @@ msgstr "사용할 수 없음" msgid "Note for GNOME Later than 3.6" msgstr "3.6 이후의 GNOME에 대한 참고사항" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "알림" @@ -2020,7 +2016,7 @@ msgstr "오버레이 Y 오프셋" msgid "Overlay position" msgstr "오버레이 위치" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Xkb 옵션 재정의" @@ -2141,7 +2137,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "화면 출력" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "프로그램" @@ -2149,7 +2145,7 @@ msgstr "프로그램" msgid "Qt IM module files:" msgstr "Qt 입력기 모듈 파일:" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "상용구" @@ -2182,7 +2178,7 @@ msgctxt "Key name" msgid "Reply" msgstr "답장" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2287,7 +2283,7 @@ msgstr "입력기 선택:" msgid "Select local input method:" msgstr "로컬 입력기 선택:" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "키보드를 이용하여 특정 입력기 선택" @@ -2315,7 +2311,7 @@ msgstr "구분자 배경" msgid "Shadow Margin" msgstr "그림자 여백" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "입력 상태 공유" @@ -2329,11 +2325,11 @@ msgctxt "Key name" msgid "Shop" msgstr "숍" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "포커스를 변경할 때 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "입력기 변경시 입력기 정보 표시" @@ -2341,11 +2337,11 @@ msgstr "입력기 변경시 입력기 정보 표시" msgid "Show Layout Name In Icon" msgstr "아이콘에 자판 이름 표시" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "간결한 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "첫 번째 입력기 정보 표시" @@ -2357,11 +2353,11 @@ msgstr "" "활성 자판이 두 개 이상 있는 경우, 아이콘에 자판 이름을 표시합니다. 텍스트 선" "호 아이콘이 참으로 설정된 경우, 이 옵션은 무시됩니다." -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "응용프로그램에서 사전편집 표시" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2371,7 +2367,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "열거하는 동안 첫 번째 입력기 건너뛰기" @@ -2389,7 +2385,7 @@ msgstr "공백" msgid "Spacing" msgstr "간격" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "철자" @@ -2413,12 +2409,12 @@ msgctxt "Key name" msgid "Standby" msgstr "대기" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "입력기 시작" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "상태 표시기" @@ -2489,7 +2485,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "작업 패널" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "첫 번째 입력기와 현재 입력기 사이의 임시 전환" @@ -2555,6 +2551,10 @@ msgctxt "Key name" msgid "Time" msgstr "시간" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2566,7 +2566,7 @@ msgstr "" "확인합니다. 응용 프로그램 멈춤을 포함하여 XIM을 사용하는 다른 일반적인 문제" "는 ${link2}를 참조합니다." -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "내장된 사전편집 전환" @@ -2633,7 +2633,7 @@ msgstr "트레이 라벨 윤곽선 색상" msgid "Tray Label Text Color" msgstr "트레이 레이블 텍스트 색상" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "트리거 입력기" @@ -2676,11 +2676,11 @@ msgctxt "Key name" msgid "Undo" msgstr "되돌리기" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "유니코드" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "유니코드:" @@ -2788,7 +2788,7 @@ msgstr "" "경고: fcitx5-diagnose의 출력에는 배포판 이름, 커널 버전, 현재 실행 중인 프로" "그램 등 민감한 정보가 포함되어 있습니다." -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2796,7 +2796,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland 입력기 프론트엔드" @@ -2812,13 +2812,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2842,11 +2842,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "워드프로세서" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X 입력기 프론트엔드" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/ru.po b/po/ru.po index 45ba4ca5..5f46fec3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2024\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -55,7 +55,7 @@ msgstr "${1} работает правильно." msgid "(Not available)" msgstr "(Недоступно)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(Введите для поиска юникода по коду или описанию)" @@ -107,7 +107,7 @@ msgstr "<Для личного использования>" msgid "" msgstr "<не назначен>" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "Серверная часть виртуальной клавиатуры на основе DBus" @@ -115,11 +115,11 @@ msgstr "Серверная часть виртуальной клавиатур msgid "Accent Colors" msgstr "Акцентные цвета" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Активировать метод ввода" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Активен по умолчанию" @@ -128,7 +128,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Добавить в избранное" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Добавляет поддержку набора с помощью символов Юникод" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Отрегулировать яркость" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "Все" @@ -175,7 +175,7 @@ msgstr "" "Разрешить переопределение системных настроек XKB (поддерживается только KDE " "5)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "Разрешить метод ввода в поле пароля" @@ -270,7 +270,7 @@ msgstr "Аккумулятор" msgid "Beginner's Guide" msgstr "Руководство для начинающих" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Поведение" @@ -435,7 +435,7 @@ msgstr "Center Left" msgid "Center Right" msgstr "Center Right" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Изменить конфигурацию Fcitx 5" @@ -447,7 +447,7 @@ msgstr "Флажок" msgid "Choose key modifier" msgstr "Выбрать клавишу-модификатор" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "Классический пользовательский интерфейс" @@ -460,7 +460,7 @@ msgstr "Очистить" msgid "Click Margin" msgstr "Нажмите на Поле" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Буфер обмена" @@ -546,7 +546,7 @@ msgstr "Текущее значение ${1}: ${2} (${3})." msgid "Custom" msgstr "Пользовательский" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "Пользовательский вариант Xkb" @@ -555,19 +555,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Отрезать" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "Интерфейс DBus" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "Виртуальная клавиатура DBus" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "Новая иконка в трее Freedesktop.org на базе DBus" @@ -584,7 +584,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Тёмная тема" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Деактивация метода ввода" @@ -593,31 +593,31 @@ msgid "Debug information from dbus:" msgstr "Отладочная информация от dbus:" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "По умолчанию" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "Тёмная по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Следующее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Следующая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Предыдущее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Предыдущая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Размер страницы по умолчанию" @@ -711,7 +711,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Извлечь" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Эмодзи" @@ -756,23 +756,23 @@ msgstr "Окончание" msgid "Entries" msgstr "Записи" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Перечислить методы ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Перечислить методы ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Перечислить группы методов ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Перечислить группы методов ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "Перечислять при повторном нажатии клавиши-триггера" @@ -842,16 +842,16 @@ msgstr "Избранное" msgid "Fcitx" msgstr "Fcitx" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Конфигурация Fcitx 5" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland Launcher (Экспериментально)" @@ -895,7 +895,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Версия Fcitx: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Интерфейс Fcitx4" @@ -1030,7 +1030,7 @@ msgstr "Найден immodules-кэш для GTK ${1} в ${2}." msgid "Found unknown ${1} qt module: ${2}." msgstr "Найден неизвестный ${1} qt-модуль: ${2}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Поддержка уведомлений Freedesktop.org" @@ -1230,7 +1230,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "Горячие ссылки" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Горячая клавиша" @@ -1250,7 +1250,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "Интерфейс IBus" @@ -1265,7 +1265,7 @@ msgstr "" "может помочь обойти некоторые ошибки в определенных Compositor, включая " "Sway<=1.9, RiverWM<=0.3.0." -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1281,8 +1281,8 @@ msgid "" msgstr "" "Если вы используете ${1}, вам, возможно, понадобится деинсталлировать ${2} " "или удалить ${3}, чтобы использовать любой метод ввода, отличный от ${2}. " -"Для получения подробной информации,а также поиска других решений, см. " -"${link}." +"Для получения подробной информации,а также поиска других решений, см. $" +"{link}." #: data/fcitx5-diagnose.sh:740 msgid "" @@ -1301,15 +1301,15 @@ msgstr "Изображение" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Метод ввода" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "Настройка метода ввода" @@ -1345,11 +1345,11 @@ msgstr "В поле ввода выделен фон слова-кандидат msgid "Input Panel Highlight Candidate Border" msgstr "Выделение границы слова-кандидата в поле ввода" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "Выбор метода ввода" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1363,7 +1363,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Вставка" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "Интервал сохранения пользовательских данных в минутах" @@ -1393,7 +1393,7 @@ msgstr "" "поиска действий GNOME Shell. Для получения более подробной информации см. " "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Панель метода ввода KDE" @@ -1431,7 +1431,7 @@ msgstr "" msgid "Key" msgstr "Клавиша" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Клавиатура" @@ -1929,10 +1929,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "Отключение микрофона" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "Тайм-аут только горячей клавиши-модификатора в миллисекундах" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1985,7 +1981,7 @@ msgstr "Следующее слово-кандидат" msgid "Next Page Button" msgstr "Кнопка следующей страницы" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Нет" @@ -2019,7 +2015,7 @@ msgstr "Недоступно" msgid "Note for GNOME Later than 3.6" msgstr "Заметка для пользователей GNOME старше версии 3.6" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Уведомление" @@ -2075,7 +2071,7 @@ msgstr "Смещение Y" msgid "Overlay position" msgstr "Позиция наложения" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Переопределить параметр Xkb" @@ -2198,7 +2194,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "Снимок экрана" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "Программа" @@ -2206,7 +2202,7 @@ msgstr "Программа" msgid "Qt IM module files:" msgstr "Файлы модуля Qt IM:" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Быстрая фраза" @@ -2239,7 +2235,7 @@ msgctxt "Key name" msgid "Reply" msgstr "Ответить" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "Сбросить состояние при фокусировке" @@ -2344,7 +2340,7 @@ msgstr "Выбрать метод ввода:" msgid "Select local input method:" msgstr "Выбрать локальный метод ввода:" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "Выберите конкретный метод ввода с клавиатуры" @@ -2376,7 +2372,7 @@ msgstr "Фон разделителя" msgid "Shadow Margin" msgstr "Затенённое поле" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "Поделиться состоянием ввода" @@ -2390,11 +2386,11 @@ msgctxt "Key name" msgid "Shop" msgstr "Магазин" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "Показывать информацию о способе ввода при изменении фокуса" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "Показывать информацию о методе ввода при переключении" @@ -2402,11 +2398,11 @@ msgstr "Показывать информацию о методе ввода п msgid "Show Layout Name In Icon" msgstr "Показать имя раскладки в значке" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "Показать информацию о компактном методе ввода" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "Показать информацию о первом методе ввода" @@ -2419,11 +2415,11 @@ msgstr "" "для значка предпочтительного текста установлено значение true, этот параметр " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Показать предварительное редактирование в приложении" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "Показывать предварительно редактируемый текст при вводе пароля" @@ -2435,7 +2431,7 @@ msgstr "" "Показывать предварительное редактирование при составлении и фиксировать " "мертвую клавишу, если нет подходящей последовательности." -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "Пропустить первый метод ввода при перечислении" @@ -2453,7 +2449,7 @@ msgstr "Space" msgid "Spacing" msgstr "Расстояние" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "Подсказки" @@ -2477,12 +2473,12 @@ msgctxt "Key name" msgid "Standby" msgstr "Режим ожидания" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "Запустить метод ввода" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "Уведомление о статусе" @@ -2553,7 +2549,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "Панель задач" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "Временное переключение между основным и текущим методом ввода" @@ -2574,8 +2570,8 @@ msgstr "" "Переменная окружения, проверенная этим сценарием, показывает окружение " "только в текущей оболочке. Все еще есть вероятность, что вы не установили " "среду для всего сеанса графического рабочего стола. Вы можете проверить " -"фактическую переменную среды определенного процесса, используя `xargs -0 -" -"L1 /proc/$PID/environ` для определенного процесса, который вы считаете " +"фактическую переменную среды определенного процесса, используя `xargs -0 " +"-L1 /proc/$PID/environ` для определенного процесса, который вы считаете " "неработающим." #: src/modules/imselector/imselector.h:45 @@ -2628,6 +2624,10 @@ msgctxt "Key name" msgid "Time" msgstr "Время" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2640,7 +2640,7 @@ msgstr "" "Для других более общих проблем, связанных с использованием XIM, включая " "замораживание приложений, см. ${link2}." -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "Переключение встроенного предварительного редактирования" @@ -2707,7 +2707,7 @@ msgstr "Цвет контура лейбла лотка" msgid "Tray Label Text Color" msgstr "Цвет текста лейбла лотка" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Активация метода ввода" @@ -2750,11 +2750,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Отменить" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Юникод" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Юникод: " @@ -2867,7 +2867,7 @@ msgstr "" "информацию, включая имя дистрибутива, версию ядра, имя запущенных в данный " "момент программ и т. д." -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2875,7 +2875,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "Wayland Диагностика" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Интерфейс метода ввода Wayland" @@ -2894,16 +2894,13 @@ msgstr "" "пометку содержимого буфера обмена как пароля, это обновление буфера обмена " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -"При использовании только горячей клавиши-модификатора действие может быть " -"инициировано только в том случае, если она будет отпущена в течение тайм-" -"аута. -1 означает, что тайм-аут отсутствует." -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2927,11 +2924,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "Текстовый редактор" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "Интерфейс метода ввода X" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/vi.po b/po/vi.po index cc552470..e28247cd 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: zenfas, 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" @@ -51,7 +51,7 @@ msgstr "${1} chạy bình thường." msgid "(Not available)" msgstr "(Không khả dụng)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(Nhập để tìm kiếm theo mã unicode hoặc mô tả)" @@ -103,7 +103,7 @@ msgstr "" msgid "" msgstr "" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "" @@ -111,11 +111,11 @@ msgstr "" msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Kích hoạt kiểu gõ" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "Kích hoạt mặc định" @@ -124,7 +124,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "Thêm vào ưa thích" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "Thêm hỗ trợ gõ Unicode" @@ -145,7 +145,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "Điều chỉnh độ sáng" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "Tất cả" @@ -169,7 +169,7 @@ msgstr "Cho phép ghi đè cài đặt hệ thống XKB" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "Cho phép ghi đè cài đặt hệ thống XKB (chỉ hỗ trợ KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "" @@ -264,7 +264,7 @@ msgstr "Pin" msgid "Beginner's Guide" msgstr "Hướng dẫn sử dụng cho người mới" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "Hành vi" @@ -428,7 +428,7 @@ msgstr "Trung tâm bên trái" msgid "Center Right" msgstr "Trung tâm bên phải" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Thay đổi cấu hình Fctix 5" @@ -440,7 +440,7 @@ msgstr "Hộp kiểm" msgid "Choose key modifier" msgstr "Chọn phím để sửa đổi" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "Giao diện người dùng truyền thống" @@ -453,7 +453,7 @@ msgstr "Xóa" msgid "Click Margin" msgstr "Nhấp vào lề" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Bảng nhớ tạm" @@ -539,7 +539,7 @@ msgstr "Giá trị hiện tại của ${1} là ${2} (${3})." msgid "Custom" msgstr "Tùy chỉnh" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "Tùy chỉnh Xkb" @@ -548,19 +548,19 @@ msgctxt "Key name" msgid "Cut" msgstr "Cắt" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "Giao diện người dùng DBus" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "DBus dựa trên icon mới Freedesktop.org" @@ -577,7 +577,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "Chủ đề tối" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Vô hiệu hóa bộ gõ" @@ -586,31 +586,31 @@ msgid "Debug information from dbus:" msgstr "Thông tin gỡ lỗi từ dbus:" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "Mặc định" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "Mặc định tối" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Ứng viên mặc định tiếp theo" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Trang mặc định tiếp theo" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Ứng viên mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Trang mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "Kích thướng trang mặc định" @@ -696,7 +696,7 @@ msgctxt "Key name" msgid "Eject" msgstr "Đẩy ra" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -741,23 +741,23 @@ msgstr "Kết thúc" msgid "Entries" msgstr "Các mục" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Liệt kê phương thức nhập liệu trước" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Liệt kê phương thức nhập sau" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Liệt kê nhóm phương thức nhập liệu trước" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Liệt kê nhóm phương thức nhập liệu sau" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "Liệt kê khi nhấn phím kích hoạt nhiều lần" @@ -823,16 +823,16 @@ msgstr "Yêu thích" msgid "Fcitx" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Cấu hình Fcitx 5" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "" @@ -869,7 +869,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Phiên bản Fcitx: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 Frontend" @@ -998,7 +998,7 @@ msgstr "" msgid "Found unknown ${1} qt module: ${2}." msgstr "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Hỗ trợ thông báo Freedesktop.org" @@ -1198,7 +1198,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Phím tắt" @@ -1217,7 +1217,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus Frontend" @@ -1228,7 +1228,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1254,15 +1254,15 @@ msgstr "Hình ảnh" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "Kiểu Gõ" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "Cấu hình Kiểu Gõ" @@ -1298,11 +1298,11 @@ msgstr "" msgid "Input Panel Highlight Candidate Border" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "Chọn kiểu gõ" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1316,7 +1316,7 @@ msgctxt "Key name" msgid "Insert" msgstr "Chèn" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "" @@ -1339,7 +1339,7 @@ msgid "" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "Bảng điều khiển kiểu gõ KDE" @@ -1375,7 +1375,7 @@ msgstr "" msgid "Key" msgstr "" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "Bàn phím" @@ -1873,10 +1873,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1929,7 +1925,7 @@ msgstr "" msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1960,7 +1956,7 @@ msgstr "" msgid "Note for GNOME Later than 3.6" msgstr "" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "Thông báo" @@ -2014,7 +2010,7 @@ msgstr "" msgid "Overlay position" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2132,7 +2128,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" @@ -2140,7 +2136,7 @@ msgstr "" msgid "Qt IM module files:" msgstr "" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "" @@ -2173,7 +2169,7 @@ msgctxt "Key name" msgid "Reply" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "" @@ -2278,7 +2274,7 @@ msgstr "" msgid "Select local input method:" msgstr "" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "" @@ -2306,7 +2302,7 @@ msgstr "" msgid "Shadow Margin" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" @@ -2320,11 +2316,11 @@ msgctxt "Key name" msgid "Shop" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "" @@ -2332,11 +2328,11 @@ msgstr "" msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "" @@ -2346,11 +2342,11 @@ msgid "" "text icon is set to true, this option will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2360,7 +2356,7 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "" @@ -2378,7 +2374,7 @@ msgstr "" msgid "Spacing" msgstr "" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "" @@ -2402,12 +2398,12 @@ msgctxt "Key name" msgid "Standby" msgstr "" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "" @@ -2478,7 +2474,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "" @@ -2542,6 +2538,10 @@ msgctxt "Key name" msgid "Time" msgstr "" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2550,7 +2550,7 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "" @@ -2617,7 +2617,7 @@ msgstr "" msgid "Tray Label Text Color" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "" @@ -2660,11 +2660,11 @@ msgctxt "Key name" msgid "Undo" msgstr "Hoàn tác" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode:" @@ -2770,7 +2770,7 @@ msgid "" "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2778,7 +2778,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "" @@ -2794,13 +2794,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2821,11 +2821,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 22be9269..841b56a6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,16 +5,16 @@ # Translators: # wwj402 , 2017 # rocka, 2023 -# csslayer , 2024 # Yiyu Liu, 2024 +# csslayer , 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" -"Last-Translator: Yiyu Liu, 2024\n" +"Last-Translator: csslayer , 2025\n" "Language-Team: Chinese (China) (https://app.transifex.com/fcitx/teams/12005/" "zh_CN/)\n" "Language: zh_CN\n" @@ -55,7 +55,7 @@ msgstr "${1} 工作正常。" msgid "(Not available)" msgstr "(不可用)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(输入编码或者描述来搜索 Unicode 字符)" @@ -107,7 +107,7 @@ msgstr "<专用区>" msgid "" msgstr "<未指派>" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "一个基于 DBus 的虚拟键盘后端" @@ -115,11 +115,11 @@ msgstr "一个基于 DBus 的虚拟键盘后端" msgid "Accent Colors" msgstr "重点色" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "激活输入法" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "默认状态为激活" @@ -128,7 +128,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "添加收藏" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "添加 Unicode 输入支持" @@ -149,7 +149,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "调整亮度" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "所有" @@ -173,7 +173,7 @@ msgstr "允许重写系统 XKB 设置" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "允许重写系统 XKB 设置 (仅支持 KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "允许在密码框中使用输入法" @@ -268,7 +268,7 @@ msgstr "电池" msgid "Beginner's Guide" msgstr "入门指南" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "行为" @@ -430,7 +430,7 @@ msgstr "左侧居中" msgid "Center Right" msgstr "右侧居中" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "修改 Fcitx 5 配置" @@ -442,7 +442,7 @@ msgstr "复选框" msgid "Choose key modifier" msgstr "选词修饰键" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "经典用户界面" @@ -455,7 +455,7 @@ msgstr "清空" msgid "Click Margin" msgstr "点击区域边距" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "剪贴板" @@ -541,7 +541,7 @@ msgstr "${1} 的当前值是 ${2} (${3})。" msgid "Custom" msgstr "自定义" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "自定义 Xkb 选项" @@ -550,19 +550,19 @@ msgctxt "Key name" msgid "Cut" msgstr "剪切" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "DBus 前端" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "DBus 虚拟键盘" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "基于 DBus 的新 Freedesktop.org 托盘图标" @@ -579,7 +579,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "深色主题" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "取消激活输入法" @@ -588,31 +588,31 @@ msgid "Debug information from dbus:" msgstr "来自 dbus 的调试信息：" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "默认" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "默认深色" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "默认跳转下一个候选词" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "默认下一页" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "默认跳转前一个候选词" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "默认上一页" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "默认页大小" @@ -703,7 +703,7 @@ msgctxt "Key name" msgid "Eject" msgstr "弹出" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "颜文字" @@ -748,23 +748,23 @@ msgstr "行尾" msgid "Entries" msgstr "项目" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "向后切换输入法" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "向前切换输入法" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "向后切换输入法分组" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "向前切换输入分组" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "反复按切换键时进行轮换" @@ -832,16 +832,16 @@ msgstr "收藏" msgid "Fcitx" msgstr "Fcitx" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx 5 配置" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland 启动器 (实验性)" @@ -882,7 +882,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx 版本: ${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 前端" @@ -1009,7 +1009,7 @@ msgstr "在 ${2} 找到了 gtk ${1} 的输入法模块缓存。" msgid "Found unknown ${1} qt module: ${2}." msgstr "找到了未知的 ${1} qt 模块：${2}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 桌面通知支持" @@ -1209,7 +1209,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "热门链接" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "快捷键" @@ -1227,7 +1227,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus 前端" @@ -1237,8 +1237,11 @@ msgid "" "zwp_virtual_keyboard_v1 on activate and deactivate. This may workaround some " "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" +"启用时，当使用 zwp_input_method_v2 协议时，激活和停用时不创建和销毁 " +"zwp_virtual_keyboard_v1 对象。这可以绕过某些混成器的问题，包括 Sway<=1.9，" +"RiverWM<=0.3.0。" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1259,8 +1262,8 @@ msgid "" "the command ${g36_disable_ibus} to disable IBus integration in order to use " "any input method other than ${2}. See ${link} for more detail." msgstr "" -"如果您正在使用 ${1}, 您可能需要卸载 ${2}, 删除 ${3} 或者使用命令 " -"${g36_disable_ibus} 禁用 IBus 集成已使用除 ${2} 之外的任何输入法. 更多细节参" +"如果您正在使用 ${1}, 您可能需要卸载 ${2}, 删除 ${3} 或者使用命令 $" +"{g36_disable_ibus} 禁用 IBus 集成已使用除 ${2} 之外的任何输入法. 更多细节参" "见 ${link}。" #: src/ui/classic/theme.h:135 @@ -1269,15 +1272,15 @@ msgstr "图片" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "输入法" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "输入法配置" @@ -1313,11 +1316,11 @@ msgstr "输入框高亮候选词背景" msgid "Input Panel Highlight Candidate Border" msgstr "输入框高亮候选词边框" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "输入法选择器" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1330,7 +1333,7 @@ msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "保存用户数据的时间间隔（以分钟为单位）" @@ -1358,7 +1361,7 @@ msgstr "" "extension/261/kimpanel/ 否则您可能无法在 GNOME Shell 的活动界面看到输入法窗" "口。更多细节请参见 https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "KDE 输入法面板" @@ -1388,13 +1391,13 @@ msgstr "片假名" #: src/frontend/waylandim/waylandim.h:43 msgid "Keep virtual keyboard object for V2 Protocol (Need restart)" -msgstr "" +msgstr "对 V2 协议保持虚拟键盘对象 (需要重启)" #: src/im/keyboard/longpress.h:20 msgid "Key" msgstr "按键" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "键盘" @@ -1892,10 +1895,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "麦克风静音" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1948,7 +1947,7 @@ msgstr "下一个候选词" msgid "Next Page Button" msgstr "下一页按钮" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "否" @@ -1981,7 +1980,7 @@ msgstr "不可用" msgid "Note for GNOME Later than 3.6" msgstr "有关 3.6 之后版本 GNOME 的备注" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "通知" @@ -2036,7 +2035,7 @@ msgstr "覆盖图片 Y 偏移" msgid "Overlay position" msgstr "覆盖图片位置" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "覆盖 Xkb 选项" @@ -2156,7 +2155,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "截屏" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "程序" @@ -2164,7 +2163,7 @@ msgstr "程序" msgid "Qt IM module files:" msgstr "Qt 输入法模块文件：" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "快速输入" @@ -2197,7 +2196,7 @@ msgctxt "Key name" msgid "Reply" msgstr "回复" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "重新聚焦时重置状态" @@ -2302,7 +2301,7 @@ msgstr "选择输入法：" msgid "Select local input method:" msgstr "选择局部输入法：" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "通过键盘选择特定的输入法" @@ -2332,7 +2331,7 @@ msgstr "分隔符背景" msgid "Shadow Margin" msgstr "阴影边距" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "共享输入状态" @@ -2346,11 +2345,11 @@ msgctxt "Key name" msgid "Shop" msgstr "购物" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "在焦点更改时显示输入法信息" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "切换输入法时显示输入法信息" @@ -2358,11 +2357,11 @@ msgstr "切换输入法时显示输入法信息" msgid "Show Layout Name In Icon" msgstr "在图标中显示布局名称" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "显示紧凑的输入法信息" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "显示第一个输入法的信息" @@ -2374,11 +2373,11 @@ msgstr "" "如果有超过一个活动布局，则在图标中显示布局名称。如果优先使用文字图标已启用，" "这个选项将会被忽略" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "在程序中显示预编辑文本" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "输入密码时显示预编辑文本" @@ -2388,7 +2387,7 @@ msgid "" "sequence." msgstr "使用组合键时显示预编辑，并且在没有匹配序列时提交死键对应符号" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "轮换输入法时跳过第一个输入法" @@ -2406,7 +2405,7 @@ msgstr "空格" msgid "Spacing" msgstr "间隔" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "拼写" @@ -2430,12 +2429,12 @@ msgctxt "Key name" msgid "Standby" msgstr "待机" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "启动输入法" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "状态提示器" @@ -2506,7 +2505,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "任务栏" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "临时在当前和第一个输入法之间切换" @@ -2575,6 +2574,10 @@ msgctxt "Key name" msgid "Time" msgstr "时间" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2585,7 +2588,7 @@ msgstr "" "您可以在 ${link1} 找到一些会在使用 xim 时出现问题的应用程序。包括应用程序卡死" "在内的更多使用 xim 可能出现的普遍问题请参见 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "切换是否使用嵌入预编辑" @@ -2652,7 +2655,7 @@ msgstr "托盘标签轮廓颜色" msgid "Tray Label Text Color" msgstr "托盘标签文本颜色" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "切换启用/禁用输入法" @@ -2695,11 +2698,11 @@ msgctxt "Key name" msgid "Undo" msgstr "撤销" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode：" @@ -2807,7 +2810,7 @@ msgstr "" "警告：fcitx5-diagnose 的输出可能包含敏感信息，包括发行版名称，内核版本，正在" "运行的程序名称等。" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2815,7 +2818,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "Wayland 诊断" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland 输入法前端" @@ -2831,13 +2834,13 @@ msgid "" "will be ignored." msgstr "如果密码管理工具支持，那么剪贴板会忽略从密码管理工具复制的密码。" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2860,11 +2863,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "文字处理器" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X 输入法前端" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" diff --git a/po/zh_TW.po b/po/zh_TW.po index c4fb3f47..8fb837c5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2024-12-31 20:24+0000\n" +"POT-Creation-Date: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Kisaragi Hiu , 2024\n" "Language-Team: Chinese (Taiwan) (https://app.transifex.com/fcitx/teams/12005/" @@ -61,7 +61,7 @@ msgstr "${1} 運作正常。" msgid "(Not available)" msgstr "（無法使用）" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "(輸入編碼或者描述來搜尋 Unicode 字元)" @@ -113,7 +113,7 @@ msgstr "<專用區>" msgid "" msgstr "<未指定>" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:4 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 msgid "A virtual keyboard backend based on DBus" msgstr "一個基於 DBus 的虛擬鍵盤後端" @@ -121,11 +121,11 @@ msgstr "一個基於 DBus 的虛擬鍵盤後端" msgid "Accent Colors" msgstr "強調色" -#: src/lib/fcitx/globalconfig.cpp:87 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "啟用輸入法" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:162 msgid "Active By Default" msgstr "預設啟用" @@ -134,7 +134,7 @@ msgctxt "Key name" msgid "Add Favorite" msgstr "加入收藏" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 msgid "Add Unicode Typing Support" msgstr "加入 Unicode 輸入支援" @@ -155,7 +155,7 @@ msgctxt "Key name" msgid "Adjust Brightness" msgstr "調整亮度" -#: src/lib/fcitx/globalconfig.cpp:30 +#: src/lib/fcitx/globalconfig.cpp:36 msgid "All" msgstr "全部" @@ -179,7 +179,7 @@ msgstr "允許覆寫系統 XKB 設定" msgid "Allow Overriding System XKB Settings (Only support KDE 5)" msgstr "允許覆寫系統 XKB 設定 (僅支援 KDE 5)" -#: src/lib/fcitx/globalconfig.cpp:208 +#: src/lib/fcitx/globalconfig.cpp:215 msgid "Allow input method in the password field" msgstr "允許在密碼輸入框中使用輸入法" @@ -274,7 +274,7 @@ msgstr "電池" msgid "Beginner's Guide" msgstr "新手指南" -#: src/lib/fcitx/globalconfig.cpp:225 +#: src/lib/fcitx/globalconfig.cpp:232 msgid "Behavior" msgstr "行為" @@ -436,7 +436,7 @@ msgstr "左側居中" msgid "Center Right" msgstr "右側居中" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "變更 Fcitx 5 設定" @@ -448,7 +448,7 @@ msgstr "複選框" msgid "Choose key modifier" msgstr "選擇輔助按鍵" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 msgid "Classic User Interface" msgstr "經典使用者介面" @@ -461,7 +461,7 @@ msgstr "清空" msgid "Click Margin" msgstr "按區域邊距" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "剪貼簿" @@ -547,7 +547,7 @@ msgstr "${1} 目前的值為 ${2} (${3})。" msgid "Custom" msgstr "自訂" -#: src/lib/fcitx/globalconfig.cpp:198 +#: src/lib/fcitx/globalconfig.cpp:205 msgid "Custom Xkb Option" msgstr "自定 Xkb 選項" @@ -556,19 +556,19 @@ msgctxt "Key name" msgid "Cut" msgstr "剪下" -#: src/modules/dbus/dbus.conf.in.in:3 +#: src/modules/dbus/dbus.conf.in.in:2 msgid "DBus" msgstr "DBus" -#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:3 +#: src/frontend/dbusfrontend/dbusfrontend.conf.in.in:2 msgid "DBus Frontend" msgstr "DBus 前端" -#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:3 +#: src/ui/virtualkeyboard/virtualkeyboard.conf.in.in:2 msgid "DBus Virtual Keyboard" msgstr "DBus 虛擬鍵盤" -#: src/modules/notificationitem/notificationitem.conf.in.in:4 +#: src/modules/notificationitem/notificationitem.conf.in.in:3 msgid "DBus based new Freedesktop.org tray icon" msgstr "基於 DBus 的新 Freedesktop.org 工具列圖示" @@ -585,7 +585,7 @@ msgstr "DOS" msgid "Dark Theme" msgstr "深色模式" -#: src/lib/fcitx/globalconfig.cpp:96 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "停用輸入法" @@ -594,31 +594,31 @@ msgid "Debug information from dbus:" msgstr "來自 dbus 的除錯訊息：" #: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/ui/classic/themes/default/theme.conf.in:2 msgid "Default" msgstr "預設" -#: src/ui/classic/themes/default-dark/theme-dark.conf.in:3 +#: src/ui/classic/themes/default-dark/theme-dark.conf.in:2 msgid "Default Dark" msgstr "預設深色" -#: src/lib/fcitx/globalconfig.cpp:132 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "預設下一個候選字" -#: src/lib/fcitx/globalconfig.cpp:116 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "預設下一頁" -#: src/lib/fcitx/globalconfig.cpp:126 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "預設上一個候選字" -#: src/lib/fcitx/globalconfig.cpp:104 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "預設上一頁" -#: src/lib/fcitx/globalconfig.cpp:182 +#: src/lib/fcitx/globalconfig.cpp:189 msgid "Default page size" msgstr "預設頁面大小" @@ -711,7 +711,7 @@ msgctxt "Key name" msgid "Eject" msgstr "退出" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "顏文字" @@ -756,23 +756,23 @@ msgstr "End 鍵" msgid "Entries" msgstr "項目" -#: src/lib/fcitx/globalconfig.cpp:63 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "枚舉輸入法向後" -#: src/lib/fcitx/globalconfig.cpp:56 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "枚舉輸入法向前" -#: src/lib/fcitx/globalconfig.cpp:80 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "枚舉輸入法群組向後" -#: src/lib/fcitx/globalconfig.cpp:73 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "枚舉輸入法群組向前" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:51 msgid "Enumerate when press trigger key repeatedly" msgstr "重複觸發鍵時枚舉輸入法" @@ -840,16 +840,16 @@ msgstr "收藏" msgid "Fcitx" msgstr "Fcitx" -#: data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/org.fcitx.Fcitx5.desktop.in.in:2 #: data/org.fcitx.Fcitx5.metainfo.xml.in:6 msgid "Fcitx 5" msgstr "Fcitx 5" -#: data/fcitx5-configtool.desktop.in.in:3 +#: data/fcitx5-configtool.desktop.in.in:2 msgid "Fcitx 5 Configuration" msgstr "Fcitx 5 設定" -#: data/fcitx5-wayland-launcher.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:2 msgid "Fcitx 5 Wayland Launcher (Experimental)" msgstr "Fcitx 5 Wayland 啟動器（實驗性）" @@ -890,7 +890,7 @@ msgstr "" msgid "Fcitx version: ${1}" msgstr "Fcitx 版本：${1}" -#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:3 +#: src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in:2 msgid "Fcitx4 Frontend" msgstr "Fcitx4 前端" @@ -1017,7 +1017,7 @@ msgstr "在 ${2} 找到 gtk ${1} 的輸入法模組快取。" msgid "Found unknown ${1} qt module: ${2}." msgstr "找到未知的 ${1} qt 模組：${2}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 msgid "Freedesktop.org Notification Support" msgstr "Freedesktop.org 通知支援" @@ -1217,7 +1217,7 @@ msgctxt "Key name" msgid "Hot Links" msgstr "熱門連結" -#: src/lib/fcitx/globalconfig.cpp:223 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "快捷鍵" @@ -1235,7 +1235,7 @@ msgctxt "Key name" msgid "Hyper" msgstr "Hyper 鍵" -#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:3 +#: src/frontend/ibusfrontend/ibusfrontend.conf.in.in:2 msgid "IBus Frontend" msgstr "IBus 前端" @@ -1246,7 +1246,7 @@ msgid "" "bug in certain Compositor, including Sway<=1.9, RiverWM<=0.3.0." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:219 +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1267,9 +1267,9 @@ msgid "" "the command ${g36_disable_ibus} to disable IBus integration in order to use " "any input method other than ${2}. See ${link} for more detail." msgstr "" -"如果您正在使用 ${1}，您可能需要反安裝 ${2}、移除 ${3} 或使用 " -"${g36_disable_ibus} 指令停用 IBus 整合以使用 ${2} 以外的任何輸入法。更多細節" -"參見 ${link}。" +"如果您正在使用 ${1}，您可能需要反安裝 ${2}、移除 ${3} 或使用 $" +"{g36_disable_ibus} 指令停用 IBus 整合以使用 ${2} 以外的任何輸入法。更多細節參" +"見 ${link}。" #: src/ui/classic/theme.h:135 msgid "Image" @@ -1277,15 +1277,15 @@ msgstr "圖片" #: src/im/keyboard/keyboard.cpp:708 src/lib/fcitx/instance.cpp:461 #: src/lib/fcitx/instance.cpp:690 src/lib/fcitx/instance.cpp:859 -#: src/modules/notificationitem/notificationitem.cpp:144 -#: src/modules/notificationitem/notificationitem.cpp:232 -#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:4 -#: data/fcitx5-wayland-launcher.desktop.in.in:4 +#: src/modules/notificationitem/notificationitem.cpp:148 +#: src/modules/notificationitem/notificationitem.cpp:236 +#: src/modules/xcb/xcbconnection.cpp:565 data/org.fcitx.Fcitx5.desktop.in.in:3 +#: data/fcitx5-wayland-launcher.desktop.in.in:3 #: data/org.fcitx.Fcitx5.metainfo.xml.in:7 msgid "Input Method" msgstr "輸入法" -#: data/fcitx5-configtool.desktop.in.in:4 +#: data/fcitx5-configtool.desktop.in.in:3 msgid "Input Method Configuration" msgstr "輸入法設定" @@ -1321,11 +1321,11 @@ msgstr "輸入框高亮候選詞背景" msgid "Input Panel Highlight Candidate Border" msgstr "輸入框高亮候選詞邊框" -#: src/modules/imselector/imselector.conf.in.in:3 +#: src/modules/imselector/imselector.conf.in.in:2 msgid "Input method selector" msgstr "輸入法選擇器" -#: src/lib/fcitx/globalconfig.cpp:108 src/lib/fcitx/globalconfig.cpp:120 +#: src/lib/fcitx/globalconfig.cpp:114 src/lib/fcitx/globalconfig.cpp:126 msgid "" "Input methods may have different setup in their own configuration. This is " "commonly used by modules like clipboard or quickphrase." @@ -1338,7 +1338,7 @@ msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:215 +#: src/lib/fcitx/globalconfig.cpp:222 msgid "Interval of saving user data in minutes" msgstr "儲存使用者數據的時間間隔（以分鐘為單位）" @@ -1362,12 +1362,12 @@ msgid "" "typing in GNOME Shell's activities search box. For more details see https://" "fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME" msgstr "" -"推薦安裝輸入法面板 GNOME Shell 擴充套件以提供輸入法顯示。https://extensions." -"gnome.org/extension/261/kimpanel/ 否則您可能無法在 GNOME Shell 的活動界面看到" -"輸入法窗口。更多細節請參見 https://fcitx-im.org/wiki/" +"推薦安裝輸入法面板 GNOME Shell 擴充套件以提供輸入法顯示。https://" +"extensions.gnome.org/extension/261/kimpanel/ 否則您可能無法在 GNOME Shell 的" +"活動界面看到輸入法窗口。更多細節請參見 https://fcitx-im.org/wiki/" "Using_Fcitx_5_on_Wayland#GNOME" -#: src/ui/kimpanel/kimpanel.conf.in.in:3 +#: src/ui/kimpanel/kimpanel.conf.in.in:2 msgid "KDE Input Method Panel" msgstr "KDE 輸入法面板" @@ -1403,7 +1403,7 @@ msgstr "" msgid "Key" msgstr "按鍵" -#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:3 +#: src/im/keyboard/keyboard.cpp:336 src/im/keyboard/keyboard.conf.in.in:2 msgid "Keyboard" msgstr "鍵盤" @@ -1901,10 +1901,6 @@ msgctxt "Key name" msgid "Microphone Mute" msgstr "靜音麥克風" -#: src/lib/fcitx/globalconfig.cpp:144 -msgid "Modifier Only Hotkey Timeout in Milliseconds" -msgstr "" - #: src/lib/fcitx-utils/key.cpp:138 msgctxt "Key name" msgid "Monitor Brightness Down" @@ -1957,7 +1953,7 @@ msgstr "下一個候選字" msgid "Next Page Button" msgstr "下一頁按鈕" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "否" @@ -1990,7 +1986,7 @@ msgstr "無法使用" msgid "Note for GNOME Later than 3.6" msgstr "給 GNOME 3.6 以上版本的註記" -#: src/modules/notifications/notifications.conf.in.in:3 +#: src/modules/notifications/notifications.conf.in.in:2 msgid "Notification" msgstr "通知" @@ -2044,7 +2040,7 @@ msgstr "覆蓋 Y 位移" msgid "Overlay position" msgstr "覆蓋圖片位置" -#: src/lib/fcitx/globalconfig.cpp:189 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "覆蓋 Xkb 選項" @@ -2164,7 +2160,7 @@ msgctxt "Key name" msgid "Print Screen" msgstr "截圖 (PrtSc)" -#: src/lib/fcitx/globalconfig.cpp:31 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "程式" @@ -2172,7 +2168,7 @@ msgstr "程式" msgid "Qt IM module files:" msgstr "Qt IM 模組檔案：" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "快速片語" @@ -2205,7 +2201,7 @@ msgctxt "Key name" msgid "Reply" msgstr "回覆" -#: src/lib/fcitx/globalconfig.cpp:159 +#: src/lib/fcitx/globalconfig.cpp:166 msgid "Reset state on Focus In" msgstr "重新聚焦時重設狀態" @@ -2310,7 +2306,7 @@ msgstr "選擇輸入法：" msgid "Select local input method:" msgstr "選擇區域輸入法：" -#: src/modules/imselector/imselector.conf.in.in:4 +#: src/modules/imselector/imselector.conf.in.in:3 msgid "Select specific input method via keyboard" msgstr "通過鍵盤選擇特定的輸入法" @@ -2340,7 +2336,7 @@ msgstr "分隔符背景" msgid "Shadow Margin" msgstr "陰影邊緣" -#: src/lib/fcitx/globalconfig.cpp:163 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "共享輸入法狀態" @@ -2354,11 +2350,11 @@ msgctxt "Key name" msgid "Shop" msgstr "商店" -#: src/lib/fcitx/globalconfig.cpp:174 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "當切換輸入焦點時顯示輸入法資訊" -#: src/lib/fcitx/globalconfig.cpp:171 +#: src/lib/fcitx/globalconfig.cpp:178 msgid "Show Input Method Information when switch input method" msgstr "當切換輸入法時顯示輸入法資訊" @@ -2366,11 +2362,11 @@ msgstr "當切換輸入法時顯示輸入法資訊" msgid "Show Layout Name In Icon" msgstr "在圖示顯示佈局名稱" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "顯示緊湊的輸入法訊息" -#: src/lib/fcitx/globalconfig.cpp:180 +#: src/lib/fcitx/globalconfig.cpp:187 msgid "Show first input method information" msgstr "顯示第一個輸入法資訊" @@ -2382,11 +2378,11 @@ msgstr "" "如果有多個活動佈局，則在圖示中顯示佈局名稱。如果首選文字圖示設定為 true，則此" "選項將被忽略。" -#: src/lib/fcitx/globalconfig.cpp:167 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "在應用程式中顯示預編輯" -#: src/lib/fcitx/globalconfig.cpp:211 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "輸入密碼時顯示預編輯文本" @@ -2396,7 +2392,7 @@ msgid "" "sequence." msgstr "使用組合鍵時顯示預編輯，並且在沒有匹配序列時提交死鍵對應符號" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:75 msgid "Skip first input method while enumerating" msgstr "枚舉時略過第一個輸入法" @@ -2414,7 +2410,7 @@ msgstr "空格" msgid "Spacing" msgstr "間隔" -#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:3 +#: src/im/keyboard/keyboard.h:91 src/modules/spell/spell.conf.in.in:2 msgid "Spell" msgstr "拼寫" @@ -2438,12 +2434,12 @@ msgctxt "Key name" msgid "Standby" msgstr "待機" -#: data/org.fcitx.Fcitx5.desktop.in.in:5 -#: data/fcitx5-wayland-launcher.desktop.in.in:5 +#: data/org.fcitx.Fcitx5.desktop.in.in:4 +#: data/fcitx5-wayland-launcher.desktop.in.in:4 msgid "Start Input Method" msgstr "啟動輸入法" -#: src/modules/notificationitem/notificationitem.conf.in.in:3 +#: src/modules/notificationitem/notificationitem.conf.in.in:2 msgid "Status Notifier" msgstr "狀態指示器" @@ -2514,7 +2510,7 @@ msgctxt "Key name" msgid "Task Panel" msgstr "工作列" -#: src/lib/fcitx/globalconfig.cpp:49 +#: src/lib/fcitx/globalconfig.cpp:55 msgid "Temporally switch between first and current Input Method" msgstr "臨時在第一個與當前輸入法中切換" @@ -2583,6 +2579,10 @@ msgctxt "Key name" msgid "Time" msgstr "時間" +#: src/lib/fcitx/globalconfig.cpp:150 +msgid "Time limit in milliseconds for triggering modifier key shortcuts" +msgstr "" + #: data/fcitx5-diagnose.sh:750 #, sh-format msgid "" @@ -2593,7 +2593,7 @@ msgstr "" "若要查看您在使用 xim 時，一些應用程式的特定問題，請檢查 ${link1}。使用 XIM 的" "其他一般性的問題包括應用程式凍結，請參閱 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:137 +#: src/lib/fcitx/globalconfig.cpp:143 msgid "Toggle embedded preedit" msgstr "切換內嵌預編輯區域" @@ -2660,7 +2660,7 @@ msgstr "托盤標簽輪廓顏色" msgid "Tray Label Text Color" msgstr "托盤標簽文字顏色" -#: src/lib/fcitx/globalconfig.cpp:38 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "切換啟用或非啟用輸入法" @@ -2703,11 +2703,11 @@ msgctxt "Key name" msgid "Undo" msgstr "復原" -#: src/modules/unicode/unicode.conf.in.in:3 +#: src/modules/unicode/unicode.conf.in.in:2 msgid "Unicode" msgstr "Unicode" -#: src/modules/unicode/unicode.cpp:455 +#: src/modules/unicode/unicode.cpp:492 msgid "Unicode: " msgstr "Unicode：" @@ -2815,7 +2815,7 @@ msgstr "" "警告：fcitx5-diagnose 輸出包含敏感訊息，包括發行版名稱、內核版本、正在執行程" "式的名稱... 等。" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2823,7 +2823,7 @@ msgstr "Wayland" msgid "Wayland Diagnose" msgstr "Wayland 診斷" -#: src/frontend/waylandim/waylandim.conf.in.in:3 +#: src/frontend/waylandim/waylandim.conf.in.in:2 msgid "Wayland Input method frontend" msgstr "Wayland 輸入法前端" @@ -2839,13 +2839,13 @@ msgid "" "will be ignored." msgstr "密碼管理員支援時，讓剪貼簿忽略從密碼管理員複製的密碼。" -#: src/lib/fcitx/globalconfig.cpp:149 +#: src/lib/fcitx/globalconfig.cpp:156 msgid "" -"When using modifier only hotkey, the action may only be triggered if it is " -"released within the timeout. -1 means there is no timeout." +"When using modifier only hotkey, the action may only be triggered if the " +"modifier key is released within the timeout. -1 means there is no limit." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:193 +#: src/lib/fcitx/globalconfig.cpp:200 msgid "" "Whether to override the xkb option from display server. It will not affect " "the xkb option send to display, but just the xkb options for custom xkb " @@ -2868,11 +2868,11 @@ msgctxt "Key name" msgid "Word Processor" msgstr "文書處理器" -#: src/frontend/xim/xim.conf.in.in:3 +#: src/frontend/xim/xim.conf.in.in:2 msgid "X Input Method Frontend" msgstr "X 輸入法前端" -#: src/modules/xcb/xcb.conf.in.in:3 +#: src/modules/xcb/xcb.conf.in.in:2 msgid "XCB" msgstr "XCB" -- Gitee From 4eb3946dc7e7b7bf15ffffbf0f9941175c545de9 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sat, 18 Jan 2025 23:59:42 -0800 Subject: [PATCH 62/69] Add a new API setBufferWithRestoreCallback to quickphrase (#1232) Whenever an input method want to temporarily enter quickphrase, we allow quickphrase to restore to engine, if user change buffer into a specified state. --- src/modules/quickphrase/quickphrase.cpp | 47 +++++++++++++++++--- src/modules/quickphrase/quickphrase.h | 4 ++ src/modules/quickphrase/quickphrase_public.h | 10 +++++ test/testquickphrase.cpp | 24 ++++++++++ testing/testfrontend/testfrontend_public.h | 1 + 5 files changed, 80 insertions(+), 6 deletions(-) diff --git a/src/modules/quickphrase/quickphrase.cpp b/src/modules/quickphrase/quickphrase.cpp index e7f8a11b..00340214 100644 --- a/src/modules/quickphrase/quickphrase.cpp +++ b/src/modules/quickphrase/quickphrase.cpp @@ -41,6 +41,9 @@ public: InputBuffer buffer_; QuickPhrase *q_; + std::string originalBuffer_; + QuickPhraseRestoreCallback restoreCallback_; + bool typed_ = false; std::string text_; std::string prefix_; @@ -57,6 +60,8 @@ public: prefix_.clear(); str_.clear(); alt_.clear(); + originalBuffer_.clear(); + restoreCallback_ = nullptr; key_ = Key(FcitxKey_None); ic->inputPanel().reset(); ic->updatePreedit(); @@ -222,10 +227,22 @@ QuickPhrase::QuickPhrase(Instance *instance) return; } if (keyEvent.key().check(FcitxKey_BackSpace)) { + keyEvent.accept(); if (state->buffer_.empty()) { state->reset(inputContext); } else { if (state->buffer_.backspace()) { + if (state->restoreCallback_ && + state->buffer_.cursor() == state->buffer_.size() && + state->buffer_.userInput() == + state->originalBuffer_) { + auto callback = std::move(state->restoreCallback_); + auto original = std::move(state->originalBuffer_); + state->reset(inputContext); + callback(inputContext, original); + return; + } + if (state->buffer_.empty()) { state->reset(inputContext); } else { @@ -233,7 +250,6 @@ QuickPhrase::QuickPhrase(Instance *instance) } } } - keyEvent.accept(); return; } if (keyEvent.key().check(FcitxKey_Delete)) { @@ -256,12 +272,14 @@ QuickPhrase::QuickPhrase(Instance *instance) if (key.check(FcitxKey_Home) || key.check(FcitxKey_KP_Home)) { state->buffer_.setCursor(0); keyEvent.accept(); - return updateUI(inputContext); + updateUI(inputContext); + return; } if (key.check(FcitxKey_End) || key.check(FcitxKey_KP_End)) { state->buffer_.setCursor(state->buffer_.size()); keyEvent.accept(); - return updateUI(inputContext); + updateUI(inputContext); + return; } if (key.check(FcitxKey_Left) || key.check(FcitxKey_KP_Left)) { auto cursor = state->buffer_.cursor(); @@ -269,7 +287,8 @@ QuickPhrase::QuickPhrase(Instance *instance) state->buffer_.setCursor(cursor - 1); } keyEvent.accept(); - return updateUI(inputContext); + updateUI(inputContext); + return; } if (key.check(FcitxKey_Right) || key.check(FcitxKey_KP_Right)) { auto cursor = state->buffer_.cursor(); @@ -277,7 +296,8 @@ QuickPhrase::QuickPhrase(Instance *instance) state->buffer_.setCursor(cursor + 1); } keyEvent.accept(); - return updateUI(inputContext); + updateUI(inputContext); + return; } } if (!state->typed_ && !state->str_.empty() && @@ -294,7 +314,8 @@ QuickPhrase::QuickPhrase(Instance *instance) // compose is invalid, ignore it. if (!compose) { - return event.accept(); + event.accept(); + return; } if (!compose->empty()) { @@ -539,6 +560,20 @@ void QuickPhrase::setBuffer(InputContext *ic, const std::string &text) { updateUI(ic); } +void QuickPhrase::setBufferWithRestoreCallback( + InputContext *ic, const std::string &text, const std::string &original, + QuickPhraseRestoreCallback callback) { + auto *state = ic->propertyFor(&factory_); + if (!state->enabled_) { + return; + } + state->buffer_.clear(); + state->buffer_.type(text); + state->originalBuffer_ = original; + state->restoreCallback_ = std::move(callback); + updateUI(ic); +} + class QuickPhraseModuleFactory : public AddonFactory { AddonInstance *create(AddonManager *manager) override { return new QuickPhrase(manager->instance()); diff --git a/src/modules/quickphrase/quickphrase.h b/src/modules/quickphrase/quickphrase.h index d47f7d8f..262fd6ee 100644 --- a/src/modules/quickphrase/quickphrase.h +++ b/src/modules/quickphrase/quickphrase.h @@ -78,6 +78,9 @@ public: const std::string &prefix, const std::string &str, const std::string &alt, const Key &key); void setBuffer(InputContext *ic, const std::string &text); + void setBufferWithRestoreCallback(InputContext *ic, const std::string &text, + const std::string &original, + QuickPhraseRestoreCallback callback); std::unique_ptr> addProvider(QuickPhraseProviderCallback); @@ -90,6 +93,7 @@ private: FCITX_ADDON_EXPORT_FUNCTION(QuickPhrase, addProvider); FCITX_ADDON_EXPORT_FUNCTION(QuickPhrase, addProviderV2); FCITX_ADDON_EXPORT_FUNCTION(QuickPhrase, setBuffer); + FCITX_ADDON_EXPORT_FUNCTION(QuickPhrase, setBufferWithRestoreCallback); void setSelectionKeys(QuickPhraseAction action); diff --git a/src/modules/quickphrase/quickphrase_public.h b/src/modules/quickphrase/quickphrase_public.h index 8da49a3a..1ebc6283 100644 --- a/src/modules/quickphrase/quickphrase_public.h +++ b/src/modules/quickphrase/quickphrase_public.h @@ -40,6 +40,8 @@ using QuickPhraseAddCandidateCallbackV2 = using QuickPhraseProviderCallbackV2 = std::function; +using QuickPhraseRestoreCallback = + std::function; } // namespace fcitx @@ -52,6 +54,14 @@ FCITX_ADDON_DECLARE_FUNCTION(QuickPhrase, trigger, const std::string &alt, const Key &key)); FCITX_ADDON_DECLARE_FUNCTION(QuickPhrase, setBuffer, void(InputContext *ic, const std::string &text)); +// Set buffer with a restore callback. +// If after "backspace", the current buffer is restore to the original value, +// the callback will be invoked, to allow input method to restore the buffer to +// original state. +FCITX_ADDON_DECLARE_FUNCTION(QuickPhrase, setBufferWithRestoreCallback, + void(InputContext *ic, const std::string &text, + const std::string &original, + QuickPhraseRestoreCallback callback)); FCITX_ADDON_DECLARE_FUNCTION( QuickPhrase, addProvider, diff --git a/test/testquickphrase.cpp b/test/testquickphrase.cpp index f4773727..c0c28551 100644 --- a/test/testquickphrase.cpp +++ b/test/testquickphrase.cpp @@ -14,6 +14,7 @@ #include "fcitx-utils/macros.h" #include "fcitx-utils/testing.h" #include "fcitx/addonmanager.h" +#include "fcitx/inputcontext.h" #include "fcitx/instance.h" #include "fcitx/userinterface.h" #include "quickphrase_public.h" @@ -194,6 +195,28 @@ void testProviderV2(Instance *instance) { }); } +void testRestoreCallback(Instance *instance) { + instance->eventDispatcher().schedule([instance]() { + auto *testfrontend = instance->addonManager().addon("testfrontend"); + auto uuid = + testfrontend->call("testapp"); + auto *ic = instance->inputContextManager().findByUUID(uuid); + auto *quickphrase = instance->addonManager().addon("quickphrase"); + quickphrase->call(ic, "", "", "", "", Key()); + bool restore = false; + quickphrase->call( + ic, "ABC.", "ABC", + [&restore](InputContext * /*ic*/, const std::string &origin) { + FCITX_ASSERT(origin == "ABC"); + restore = true; + }); + FCITX_ASSERT(!restore); + FCITX_ASSERT(testfrontend->call( + uuid, Key(FcitxKey_BackSpace), false)); + FCITX_ASSERT(restore); + }); +} + int main() { setupTestingEnvironment( FCITX5_BINARY_DIR, @@ -210,6 +233,7 @@ int main() { testInit(&instance); testBasic(&instance); testProviderV2(&instance); + testRestoreCallback(&instance); instance.eventDispatcher().schedule([&instance]() { handle.reset(); instance.exit(); diff --git a/testing/testfrontend/testfrontend_public.h b/testing/testfrontend/testfrontend_public.h index eaa88d0b..678edb9c 100644 --- a/testing/testfrontend/testfrontend_public.h +++ b/testing/testfrontend/testfrontend_public.h @@ -8,6 +8,7 @@ #define _TESTFRONTEND_TESTFRONTEND_PUBLIC_H_ #include +#include #include #include -- Gitee From 8b93f2053b9f517adaf0758c7b43848afae5867a Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Sun, 19 Jan 2025 20:24:10 +0000 Subject: [PATCH 63/69] [trans] Update Translation --- po/ru.po | 13 +++++++++---- po/zh_CN.po | 8 +++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5f46fec3..82f8620f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,15 +5,15 @@ # Translators: # csslayer , 2017 # TotalCaesar659 , 2017 -# Dmitry , 2024 +# Dmitry , 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2025-01-18 20:25+0000\n" +"POT-Creation-Date: 2025-01-19 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" -"Last-Translator: Dmitry , 2024\n" +"Last-Translator: Dmitry , 2025\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -2206,7 +2206,7 @@ msgstr "Файлы модуля Qt IM:" msgid "Quick Phrase" msgstr "Быстрая фраза" -#: src/modules/quickphrase/quickphrase.cpp:488 +#: src/modules/quickphrase/quickphrase.cpp:509 msgid "Quick Phrase: " msgstr "Быстрая фраза: " @@ -2627,6 +2627,8 @@ msgstr "Время" #: src/lib/fcitx/globalconfig.cpp:150 msgid "Time limit in milliseconds for triggering modifier key shortcuts" msgstr "" +"Ограничение по времени в миллисекундах для запуска сочетаний клавиш-" +"модификаторов" #: data/fcitx5-diagnose.sh:750 #, sh-format @@ -2899,6 +2901,9 @@ msgid "" "When using modifier only hotkey, the action may only be triggered if the " "modifier key is released within the timeout. -1 means there is no limit." msgstr "" +"При использовании только горячей клавиши-модификатора действие может быть " +"запущено только в том случае, если клавиша-модификатор отпущена в течение " +"тайм-аута. -1 означает, что ограничений нет." #: src/lib/fcitx/globalconfig.cpp:200 msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 841b56a6..0f3287a0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2025-01-18 20:25+0000\n" +"POT-Creation-Date: 2025-01-19 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: csslayer , 2025\n" "Language-Team: Chinese (China) (https://app.transifex.com/fcitx/teams/12005/" @@ -2167,7 +2167,7 @@ msgstr "Qt 输入法模块文件：" msgid "Quick Phrase" msgstr "快速输入" -#: src/modules/quickphrase/quickphrase.cpp:488 +#: src/modules/quickphrase/quickphrase.cpp:509 msgid "Quick Phrase: " msgstr "快速输入: " @@ -2576,7 +2576,7 @@ msgstr "时间" #: src/lib/fcitx/globalconfig.cpp:150 msgid "Time limit in milliseconds for triggering modifier key shortcuts" -msgstr "" +msgstr "触发修饰键快捷键的时限 (毫秒)" #: data/fcitx5-diagnose.sh:750 #, sh-format @@ -2839,6 +2839,8 @@ msgid "" "When using modifier only hotkey, the action may only be triggered if the " "modifier key is released within the timeout. -1 means there is no limit." msgstr "" +"当使用只有修饰键的快捷键时，对应动作只会在修饰键在时限内松开时触发。-1 表示没" +"有时限。" #: src/lib/fcitx/globalconfig.cpp:200 msgid "" -- Gitee From c83b47192db97fd3937aba6581f9f6ea641e9061 Mon Sep 17 00:00:00 2001 From: Fcitx Transifex Bot Date: Mon, 20 Jan 2025 20:24:08 +0000 Subject: [PATCH 64/69] [trans] Update Translation --- po/ru.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 82f8620f..1e8f2490 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fcitx5\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2025-01-19 20:24+0000\n" +"POT-Creation-Date: 2025-01-20 20:24+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: Dmitry , 2025\n" "Language-Team: Russian (https://app.transifex.com/fcitx/teams/12005/ru/)\n" @@ -2627,7 +2627,7 @@ msgstr "Время" #: src/lib/fcitx/globalconfig.cpp:150 msgid "Time limit in milliseconds for triggering modifier key shortcuts" msgstr "" -"Ограничение по времени в миллисекундах для запуска сочетаний клавиш-" +"Ограничение по времени в миллисекундах для срабатывания комбинаций клавиш-" "модификаторов" #: data/fcitx5-diagnose.sh:750 @@ -2901,9 +2901,10 @@ msgid "" "When using modifier only hotkey, the action may only be triggered if the " "modifier key is released within the timeout. -1 means there is no limit." msgstr "" -"При использовании только горячей клавиши-модификатора действие может быть " -"запущено только в том случае, если клавиша-модификатор отпущена в течение " -"тайм-аута. -1 означает, что ограничений нет." +"При использовании сочетания клавиш, состоящего только из клавиш-" +"модификаторов, соответствующее действие будет выполнено только в том случае, " +"если клавиша-модификатор будет отпущена в течение установленного времени. -1 " +"означает отсутствие ограничения по времени." #: src/lib/fcitx/globalconfig.cpp:200 msgid "" -- Gitee From a10c27f67568fddde9db242186016c3fb0ec43db Mon Sep 17 00:00:00 2001 From: hantengc <42177714+hantengc@users.noreply.github.com> Date: Tue, 21 Jan 2025 22:58:09 +0800 Subject: [PATCH 65/69] do not display the exit button on the UKUI desktop environment (#1228) --- src/modules/notificationitem/dbusmenu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/notificationitem/dbusmenu.cpp b/src/modules/notificationitem/dbusmenu.cpp index 10e33c50..64101959 100644 --- a/src/modules/notificationitem/dbusmenu.cpp +++ b/src/modules/notificationitem/dbusmenu.cpp @@ -194,7 +194,8 @@ void DBusMenu::fillLayoutItem( appendSubItem(subLayoutItems, BII_Restart, depth, propertyNames); } if (parent_->instance()->canRestart() && - getDesktopType() != DesktopType::DEEPIN) { + getDesktopType() != DesktopType::DEEPIN && + getDesktopType() != DesktopType::UKUI) { appendSubItem(subLayoutItems, BII_Exit, depth, propertyNames); } } else if (id == BII_InputMethodGroup) { -- Gitee From 58a9bec965e9fe8f927c62bac506ff3c7c6ad865 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Tue, 21 Jan 2025 15:22:26 -0800 Subject: [PATCH 66/69] Add program name to key_trace log. --- src/lib/fcitx/instance.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/fcitx/instance.cpp b/src/lib/fcitx/instance.cpp index de27cd9b..d23a957d 100644 --- a/src/lib/fcitx/instance.cpp +++ b/src/lib/fcitx/instance.cpp @@ -931,7 +931,8 @@ Instance::Instance(int argc, char **argv) { << " rawKey: " << keyEvent.rawKey() << " origKey: " << keyEvent.origKey() << " Release:" << keyEvent.isRelease() - << " keycode: " << keyEvent.origKey().code(); + << " keycode: " << keyEvent.origKey().code() + << " program: " << ic->program(); if (keyEvent.isRelease()) { return; -- Gitee From 448b4fdf261bb34a39bae5c7f297fc53add00ce7 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Wed, 22 Jan 2025 15:27:15 -0800 Subject: [PATCH 67/69] bump version --- data/org.fcitx.Fcitx5.metainfo.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/org.fcitx.Fcitx5.metainfo.xml.in b/data/org.fcitx.Fcitx5.metainfo.xml.in index 17d7ec38..03a1a26a 100644 --- a/data/org.fcitx.Fcitx5.metainfo.xml.in +++ b/data/org.fcitx.Fcitx5.metainfo.xml.in @@ -31,6 +31,7 @@ fcitx5 + -- Gitee From 7d71627695b49c06a4270f4d8106e84afb75cddb Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Thu, 23 Jan 2025 04:40:37 -0800 Subject: [PATCH 68/69] Fix test instance dependency Fix #1234 --- test/CMakeLists.txt | 2 ++ test/testinstance.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 25bf4d23..97eed1f3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -106,6 +106,8 @@ foreach(TESTCASE ${FCITX_CORE_TEST}) endforeach() add_dependencies(testaddon dummyaddon) +add_dependencies(testinstance copy-addon testfrontend testim) +add_dependencies(testinputcontext copy-addon testfrontend testim) if (ENABLE_KEYBOARD) add_executable(testxkbrules testxkbrules.cpp ../src/im/keyboard/xkbrules.cpp ../src/im/keyboard/xmlparser.cpp) diff --git a/test/testinstance.cpp b/test/testinstance.cpp index ce8e2353..00a3268e 100644 --- a/test/testinstance.cpp +++ b/test/testinstance.cpp @@ -118,7 +118,8 @@ void testModifierOnlyHotkey(Instance &instance) { int main() { setupTestingEnvironment(FCITX5_BINARY_DIR, - {"testing/testim", "testing/testfrontend"}, {}); + {"testing/testim", "testing/testfrontend"}, + {"test"}); char arg0[] = "testinstance"; char arg1[] = "--disable=all"; -- Gitee From d2ad6a4704c2589f2120e844e8bf91b51ca305e3 Mon Sep 17 00:00:00 2001 From: hantengc Date: Thu, 17 Apr 2025 15:07:23 +0800 Subject: [PATCH 69/69] Fix compilation error --- test/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 97eed1f3..dfd7b258 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(addon) add_library(eventlooptests STATIC eventlooptests.cpp) -target_link_libraries(eventlooptests Fcitx5::Utils) +target_link_libraries(eventlooptests Fcitx5::Utils Pthread::Pthread) set(FCITX_UTILS_TEST testflags @@ -37,8 +37,8 @@ set(FCITX_UTILS_DBUS_TEST set(testdbus_LIBS Pthread::Pthread) set(testeventdispatcher_LIBS Pthread::Pthread) -set(testevent_LIBS Pthread::Pthread eventlooptests) -set(testcustomeventloop_LIBS Pthread::Pthread eventlooptests) +set(testevent_LIBS eventlooptests) +set(testcustomeventloop_LIBS eventlooptests) find_program(XVFB_BIN Xvfb) -- Gitee