diff --git a/.clang-format b/.clang-format index 5d94bf9910475a2d8b4bd1c4668474e8a6c7537d..74df40fbcb03e7a0ba8c09247ec4812a070a7730 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/CMakeLists.txt b/CMakeLists.txt index ac1e1dcb5a726bf7b2b54d9e472d7e54053231a7..d3ab20d42601b14775994b3ecd586b8ba55f0c30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.6.0) -project(fcitx VERSION 5.1.11) +cmake_minimum_required(VERSION 3.13) +project(fcitx VERSION 5.1.12) set(FCITX_VERSION ${PROJECT_VERSION}) find_package(ECM REQUIRED 1.0.0) @@ -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") @@ -31,12 +32,15 @@ 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) +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") if (ENABLE_EMOJI) find_package(ZLIB REQUIRED) @@ -46,35 +50,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. Backends checked: ${CANDIDATE_EVENT_LOOP_BACKENDS}") +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") @@ -192,7 +228,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 diff --git a/cmake/Fcitx5CompilerSettings.cmake b/cmake/Fcitx5CompilerSettings.cmake index 66136f0b7ee5a3f68e2a136ec936622af815f80e..54409704587bf711ab385499eaa5db283d3c8151 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() @@ -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") diff --git a/data/fcitx5-diagnose.sh b/data/fcitx5-diagnose.sh index 3ea44eb7b6189078f601e16a4853b1546fce1122..6549bbe6479f4ee38102d7553077c0f030e27084 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:')" diff --git a/data/org.fcitx.Fcitx5.metainfo.xml.in b/data/org.fcitx.Fcitx5.metainfo.xml.in index 17d7ec380267cf1ed29282057ea6f7f2109fd08a..03a1a26ad510f9372b48efeb5269c4a6619f082d 100644 --- a/data/org.fcitx.Fcitx5.metainfo.xml.in +++ b/data/org.fcitx.Fcitx5.metainfo.xml.in @@ -31,6 +31,7 @@ fcitx5 + diff --git a/po/ca.po b/po/ca.po index 532d4d2411df25e39937a3f928369126c07f0b4e..8c67f51660e0eeec6c83647cd667ae15e109d283 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: 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" @@ -48,11 +48,11 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +104,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Activa el mètode d'entrada" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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" -#: 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" -#: 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" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -187,67 +187,67 @@ 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 "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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" @@ -265,73 +265,73 @@ msgstr "Bateria" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +402,57 @@ 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 "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Porta-retalls" @@ -468,84 +460,60 @@ 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" -#: 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 "" -#: 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" -#: 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: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" @@ -566,32 +534,32 @@ 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:205 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" -#: 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 "" @@ -599,16 +567,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Desactiva el mètode d'entrada" @@ -616,41 +584,41 @@ 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/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Av Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Re Pàg predeterminat" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "" @@ -677,7 +645,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 "" @@ -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,36 +666,36 @@ 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" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -735,11 +703,11 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" 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 "" @@ -759,11 +727,11 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 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" @@ -772,27 +740,27 @@ msgstr "Fi" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +786,34 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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" @@ -854,27 +822,23 @@ 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 "" -#: 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 "" @@ -901,33 +865,33 @@ 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 "" -#: 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,20 +914,20 @@ 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 "" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -975,106 +939,101 @@ 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 "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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" -#: 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 "" -#: 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,12 +1182,12 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Drecera de teclat" @@ -1241,16 +1200,23 @@ 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:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1270,21 +1236,21 @@ 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 "" -#: 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 -#: data/fcitx5-wayland-launcher.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: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 "" @@ -1292,58 +1258,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1358,58 +1324,62 @@ 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" -#: 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 "" +#: 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 "" -#: 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:2 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}" -#: 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 "" @@ -1418,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 "" @@ -1735,199 +1705,199 @@ 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 "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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" -#: 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 "" @@ -1936,11 +1906,11 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1948,15 +1918,15 @@ 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" -#: 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, " @@ -1971,11 +1941,11 @@ 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ó" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "Bloq Núm" @@ -1984,48 +1954,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2037,17 +2007,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 "" @@ -2055,7 +2025,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" @@ -2064,17 +2034,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" @@ -2095,33 +2065,33 @@ 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" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2129,121 +2099,121 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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 "" @@ -2252,22 +2222,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" @@ -2276,7 +2246,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" @@ -2289,15 +2259,15 @@ 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 "" -#: 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" @@ -2309,59 +2279,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2371,101 +2341,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "" -#: 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" -#: 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 "" -#: 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" -#: 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" -#: 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: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" -#: 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 "" @@ -2474,31 +2444,31 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2517,42 +2487,46 @@ 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" +#: 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 "" @@ -2561,79 +2535,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "" @@ -2666,20 +2640,20 @@ 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" -#: 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: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Amunt" @@ -2688,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 "" @@ -2708,7 +2682,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2722,66 +2696,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2789,11 +2763,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Webcam" @@ -2805,7 +2779,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2816,21 +2796,21 @@ 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" -#: 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" @@ -2838,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" @@ -2891,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 "" @@ -2913,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" @@ -2954,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" @@ -2971,17 +2951,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 7a87e1ed9535e98b3b435c2b1e3e89069aeb2836..547978c4873fc5ee27ff5e6412327d4704f7843f 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: 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" @@ -48,11 +48,11 @@ 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)" -#: 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,57 +104,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Aktivér inputmetode" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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" -#: 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" -#: 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" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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." @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -187,67 +187,67 @@ 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" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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" @@ -265,73 +265,73 @@ msgstr "Batteri" msgid "Beginner's Guide" msgstr "Begyndervejledning" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +405,57 @@ 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" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 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" -#: 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" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Udklipsholder" @@ -473,84 +463,60 @@ 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" -#: 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." -#: 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" -#: 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: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" @@ -571,32 +537,32 @@ 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:205 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" -#: 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" @@ -604,16 +570,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Deaktivér inputmetode" @@ -621,41 +587,41 @@ msgstr "Deaktivér inputmetode" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Standard næste kandidat" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Standard-næste side" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Standard forrige kandidat" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Standard-forrige side" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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" @@ -682,7 +648,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 "" @@ -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,36 +669,36 @@ 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" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -740,11 +706,11 @@ 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" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Aktivér stavekontrol" @@ -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 "" @@ -764,11 +730,11 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 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" @@ -777,27 +743,27 @@ msgstr "End" msgid "Entries" msgstr "Poster" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Gennemløb inputmetode baglæns" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Gennemløb inputmetode forlæns" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Gennemløb inputmetode-gruppe baglæns" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Gennemløb inputmetode-gruppe forlæns" -#: src/lib/fcitx/globalconfig.cpp:41 +#: 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" -#: 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,34 +793,34 @@ 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}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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" @@ -863,27 +829,23 @@ 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 "" -#: 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:" @@ -913,33 +875,33 @@ 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" -#: 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,20 +924,20 @@ 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" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Fandt ${1} ${2}-modul: ${3}." @@ -987,106 +949,101 @@ 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}." -#: 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" -#: 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" -#: 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 {}" -#: 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,12 +1192,12 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Hottast" @@ -1255,16 +1212,23 @@ 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:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1290,21 +1254,21 @@ 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" -#: 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 -#: data/fcitx5-wayland-launcher.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: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" @@ -1312,58 +1276,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Indsæt" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1378,58 +1342,62 @@ 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" -#: 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" +#: 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" -#: 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:2 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}" -#: 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" @@ -1438,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" @@ -1755,199 +1723,199 @@ 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" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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" -#: 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" @@ -1956,11 +1924,11 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1968,15 +1936,15 @@ 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" -#: 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, " @@ -1991,11 +1959,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2004,7 +1972,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." @@ -2012,42 +1980,42 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2059,17 +2027,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 "" @@ -2077,7 +2045,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" @@ -2086,17 +2054,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" @@ -2119,36 +2087,36 @@ 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: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" -#: 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" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Varsel" @@ -2156,121 +2124,121 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2279,22 +2247,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" @@ -2303,7 +2271,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" @@ -2316,15 +2284,15 @@ 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" -#: 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" @@ -2336,59 +2304,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "Del inputtilstand" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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" -#: src/lib/fcitx/globalconfig.cpp:158 +#: 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:155 +#: 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" -#: src/ui/classic/classicui.h:132 +#: src/ui/classic/classicui.h:141 msgid "Show Layout Name In Icon" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "Vis kompakt information om inputmetode" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Vis preedit i program" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2398,101 +2366,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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" -#: 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" -#: 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" -#: 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" -#: 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" -#: 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: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" -#: 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}" @@ -2501,31 +2469,31 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:45 +#: 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" -#: 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 " @@ -2544,42 +2512,46 @@ 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" +#: 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 "" @@ -2591,79 +2563,79 @@ 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:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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" @@ -2696,20 +2668,20 @@ 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" -#: 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: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Op" @@ -2718,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" @@ -2738,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:" @@ -2752,66 +2724,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2819,11 +2791,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Webcam" @@ -2835,7 +2807,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2846,21 +2824,21 @@ 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" -#: 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" @@ -2868,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}\"." @@ -2905,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" @@ -2929,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." @@ -2951,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 " @@ -2961,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." @@ -2969,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" @@ -2997,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" @@ -3014,17 +2992,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 6a4c30c5d2d27745a8f64a45a145c679fab969fe..de21e28a41e310a629e003eaaee78305ff15464f 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: 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" @@ -50,11 +50,11 @@ 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)" -#: src/modules/unicode/unicode.cpp:457 +#: src/modules/unicode/unicode.cpp:494 msgid "(Type to search unicode by code or description)" msgstr "" @@ -106,57 +106,57 @@ 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" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Eingabemethode aktivieren" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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" -#: 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" -#: 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" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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." @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -189,67 +189,67 @@ 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" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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" @@ -267,73 +267,73 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Anleitung für Anfänger" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +407,57 @@ 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" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 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" -#: 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" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Clipboard" @@ -475,84 +465,60 @@ 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" -#: 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." -#: 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" -#: 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: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" @@ -573,32 +539,32 @@ 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:205 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" -#: 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" @@ -606,16 +572,16 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Eingabemethode deaktivieren" @@ -623,41 +589,41 @@ 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/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Nächster Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Vorgabe für nächste Seite" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Vorheriger Standardkandidat" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Vorgabe für vorherige Seite" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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" @@ -684,7 +650,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)" @@ -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,36 +671,36 @@ 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" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -742,11 +708,11 @@ 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" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Rechtschreibprüfung aktivieren" @@ -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 "" @@ -766,11 +732,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Ende" @@ -779,27 +745,27 @@ msgstr "Ende" msgid "Entries" msgstr "Einträge" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Eingabemethoden umgekehrt nummerieren" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +793,34 @@ 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}" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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" @@ -863,27 +829,23 @@ 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 "" -#: 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:" @@ -913,33 +875,33 @@ 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" -#: 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,20 +924,20 @@ 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" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -987,106 +949,101 @@ 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 "" -#: 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" -#: 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" -#: 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 {}" -#: 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,12 +1192,12 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Kurzbefehl" @@ -1253,16 +1210,23 @@ 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:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1282,21 +1246,21 @@ 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" -#: 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 -#: data/fcitx5-wayland-launcher.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: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" @@ -1304,58 +1268,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Einfügen" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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,58 +1334,62 @@ 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" -#: 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" +#: 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" -#: 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:2 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}" -#: 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" @@ -1430,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" @@ -1747,199 +1715,199 @@ 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" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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" -#: 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" @@ -1948,11 +1916,11 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Nein" @@ -1960,15 +1928,15 @@ 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" -#: 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, " @@ -1986,11 +1954,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -1999,48 +1967,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2052,17 +2020,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 +2038,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" @@ -2079,17 +2047,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" @@ -2110,33 +2078,33 @@ 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" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Vorhersage" @@ -2144,121 +2112,121 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "Programm" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2267,22 +2235,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" @@ -2291,7 +2259,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" @@ -2304,15 +2272,15 @@ 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 "" -#: 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" @@ -2324,59 +2292,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2386,101 +2354,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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" -#: 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" -#: 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" -#: 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" -#: 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" -#: 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: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" -#: 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" @@ -2489,31 +2457,31 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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,42 +2500,46 @@ 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" +#: 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 "" @@ -2576,79 +2548,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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" @@ -2681,20 +2653,20 @@ 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" -#: 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: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Hoch" @@ -2703,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 "" @@ -2723,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:" @@ -2737,66 +2709,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2804,11 +2776,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2820,7 +2792,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2831,21 +2809,21 @@ 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" -#: 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" @@ -2853,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" @@ -2906,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 "" @@ -2928,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" @@ -2969,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" @@ -2986,17 +2964,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 075c9a1d5e7cb90b5005ccbfec57894644f12314..39f4a805ae0d4bcc112d6b822d9a9e111b7ce859 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: 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" @@ -46,11 +46,11 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +102,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "" @@ -185,67 +185,67 @@ 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 "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "" @@ -263,73 +263,73 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +400,57 @@ 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 "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "" @@ -466,85 +458,61 @@ 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 "" -#: 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 "" -#: 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" -#: 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: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 "" @@ -565,32 +533,32 @@ 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:205 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 "" -#: 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 "" @@ -598,16 +566,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -615,41 +583,41 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "" @@ -676,7 +644,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 "" @@ -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,36 +665,36 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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 "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -734,11 +702,11 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" 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 "" @@ -758,11 +726,11 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -771,27 +739,27 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +785,34 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "" @@ -853,28 +821,23 @@ 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 "" -#: 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 "" @@ -901,33 +864,33 @@ 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 "" -#: 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,20 +913,20 @@ 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 "" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -975,106 +938,101 @@ 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 "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "" -#: 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 "" -#: 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,12 +1181,12 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1241,16 +1199,23 @@ 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:575 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 "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1270,21 +1235,21 @@ 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 "" -#: 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 -#: data/fcitx5-wayland-launcher.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: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 "" @@ -1292,58 +1257,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1358,58 +1323,62 @@ 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 "" -#: 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 "" +#: 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 "" -#: 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:2 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 "" -#: 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 "" @@ -1418,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 "" @@ -1735,199 +1704,199 @@ 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 "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "" -#: 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 "" @@ -1936,11 +1905,11 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1948,15 +1917,15 @@ 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 "" -#: 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, " @@ -1971,11 +1940,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "" @@ -1984,48 +1953,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2037,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 "" @@ -2055,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 "" @@ -2064,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 "" @@ -2095,33 +2064,33 @@ 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 "" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2129,121 +2098,121 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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 "" @@ -2252,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 "" @@ -2276,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 "" @@ -2289,15 +2258,15 @@ 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 "" -#: 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 "" @@ -2309,59 +2278,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2371,101 +2340,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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: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 "" -#: 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 "" @@ -2474,31 +2443,31 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2517,42 +2486,46 @@ 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 "" +#: 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 "" @@ -2561,79 +2534,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "" @@ -2666,20 +2639,20 @@ 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 "" -#: 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 "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2688,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 "" @@ -2708,7 +2681,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2722,66 +2695,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2789,11 +2762,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2805,7 +2778,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2816,21 +2795,21 @@ 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 "" -#: 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 "" @@ -2838,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 "" @@ -2891,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 "" @@ -2913,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 "" @@ -2954,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 "" @@ -2971,17 +2950,21 @@ 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 "" + +#, fuzzy +#~ msgid "Fcitx Configure UI:" +#~ msgstr "Configurar" diff --git a/po/fcitx5.pot b/po/fcitx5.pot index 9b3b71b78011087274e7d0ebf9f3fed74ea87eed..ae2ebab700bd9d5b1ec36a538c441bac19c24a9f 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: 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" @@ -43,11 +43,11 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +99,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "" @@ -182,67 +182,67 @@ 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 "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "" @@ -260,73 +260,73 @@ msgstr "" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +397,57 @@ 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 "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "" @@ -463,84 +455,60 @@ 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 "" -#: 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 "" -#: 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 "" -#: 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: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 "" @@ -561,32 +529,32 @@ 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:205 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 "" -#: 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 "" @@ -594,16 +562,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -611,41 +579,41 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "" @@ -672,7 +640,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 "" @@ -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,36 +661,36 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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 "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -730,11 +698,11 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" 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 "" @@ -754,11 +722,11 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -767,27 +735,27 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +781,34 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "" @@ -849,27 +817,23 @@ 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 "" -#: 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 "" @@ -896,33 +860,33 @@ 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 "" -#: 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,20 +909,20 @@ 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 "" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -970,106 +934,101 @@ 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 "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "" -#: 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 "" -#: 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,12 +1177,12 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1236,16 +1195,23 @@ 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:575 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 "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1265,21 +1231,21 @@ 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 "" -#: 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 -#: data/fcitx5-wayland-launcher.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: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,58 +1253,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1353,58 +1319,62 @@ 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 "" -#: 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 "" +#: 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 "" -#: 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:2 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 "" -#: 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 "" @@ -1413,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 "" @@ -1730,199 +1700,199 @@ 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 "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "" -#: 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 "" @@ -1931,11 +1901,11 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1943,15 +1913,15 @@ 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 "" -#: 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, " @@ -1966,11 +1936,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "" @@ -1979,48 +1949,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2032,17 +2002,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 "" @@ -2050,7 +2020,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 "" @@ -2059,17 +2029,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 "" @@ -2090,33 +2060,33 @@ 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 "" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2124,121 +2094,121 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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 "" @@ -2247,22 +2217,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 "" @@ -2271,7 +2241,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 "" @@ -2284,15 +2254,15 @@ 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 "" -#: 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 "" @@ -2304,59 +2274,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2366,101 +2336,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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: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 "" -#: 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 "" @@ -2469,31 +2439,31 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2512,42 +2482,46 @@ 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 "" +#: 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 "" @@ -2556,79 +2530,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "" @@ -2661,20 +2635,20 @@ 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 "" -#: 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 "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2683,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 "" @@ -2703,7 +2677,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2717,66 +2691,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2784,11 +2758,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2800,7 +2774,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2811,21 +2791,21 @@ 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 "" -#: 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 "" @@ -2833,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 "" @@ -2886,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 "" @@ -2908,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 "" @@ -2949,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 "" @@ -2966,17 +2946,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 c631b02e822a08bcf0e83410f233e85e01b19013..2a277f748cde9b3f63e3586a4b67b144cfe34ea6 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: 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" @@ -49,11 +49,11 @@ 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)" -#: 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,57 +105,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Activer la méthode de saisie" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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" -#: 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" -#: 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é" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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." @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -192,67 +192,67 @@ 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" -#: 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" -#: 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" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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" @@ -270,73 +270,73 @@ msgstr "Batterie" msgid "Beginner's Guide" msgstr "Guide du débutant" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +412,57 @@ 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" -#: 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" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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é" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Presse-papiers" @@ -481,84 +471,60 @@ 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é" -#: 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." -#: 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" -#: 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: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" @@ -579,32 +545,32 @@ 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:205 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" -#: 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" @@ -613,16 +579,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Désactiver la méthode de saisie" @@ -630,41 +596,41 @@ 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/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Candidat suivant par défaut" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Page suivante par défaut" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Candidat précédent par défaut" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Page précédente par défaut" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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" @@ -691,7 +657,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 "" @@ -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,36 +678,36 @@ 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" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -749,11 +715,11 @@ 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" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "Activer la vérification orthographique" @@ -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 "" @@ -773,11 +739,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Fin" @@ -786,28 +752,28 @@ msgstr "Fin" msgid "Entries" msgstr "Entrées" -#: src/lib/fcitx/globalconfig.cpp:59 +#: 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:52 +#: 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:76 +#: 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:69 +#: 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:41 +#: 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" -#: 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,34 +805,34 @@ 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}" -#: 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" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Favoris" @@ -875,27 +841,23 @@ 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 "" -#: 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 :" @@ -925,33 +887,33 @@ 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" -#: 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,20 +940,20 @@ 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" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Module ${1} ${2} trouvé  : ${3}." @@ -1003,106 +965,101 @@ 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}." -#: 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" -#: 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" -#: 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 {}" -#: 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,12 +1208,12 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Raccourci clavier" @@ -1271,16 +1228,23 @@ 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:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1307,21 +1271,21 @@ 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" -#: 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 -#: data/fcitx5-wayland-launcher.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: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" @@ -1329,39 +1293,39 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1370,20 +1334,20 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1398,58 +1362,62 @@ 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" -#: 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" +#: 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é" -#: 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:2 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}" -#: 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" @@ -1458,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" @@ -1775,199 +1743,199 @@ 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" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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" -#: 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" @@ -1976,11 +1944,11 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Non" @@ -1988,15 +1956,15 @@ 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" -#: 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, " @@ -2011,11 +1979,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2024,7 +1992,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." @@ -2033,42 +2001,42 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Ignorer l'option Xkb" @@ -2080,17 +2048,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 "" @@ -2098,7 +2066,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" @@ -2107,17 +2075,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" @@ -2143,33 +2111,33 @@ 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" -#: 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" -#: 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" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Présage" @@ -2177,121 +2145,121 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 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 :" -#: src/modules/quickphrase/quickphrase.conf.in.in:3 +#: src/modules/quickphrase/quickphrase.conf.in.in:2 msgid "Quick Phrase" msgstr "Expression rapide" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2300,22 +2268,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" @@ -2324,7 +2292,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" @@ -2337,15 +2305,15 @@ 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" -#: 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" @@ -2357,52 +2325,52 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 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: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" -#: src/lib/fcitx/globalconfig.cpp:158 +#: 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:155 +#: 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 " "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" -#: src/lib/fcitx/globalconfig.cpp:161 +#: 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:164 +#: 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" -#: 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." @@ -2411,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:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Afficher la pré-édition dans l'application" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2427,101 +2395,101 @@ 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:75 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" -#: 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" -#: 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" -#: 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" -#: 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" -#: 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: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" -#: 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}" @@ -2530,33 +2498,33 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:45 +#: 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 " "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 " @@ -2577,31 +2545,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 " @@ -2611,11 +2579,15 @@ 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" +#: 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 "" @@ -2628,79 +2600,79 @@ 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:143 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" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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" @@ -2733,20 +2705,20 @@ 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" -#: 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  : " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Haut" @@ -2755,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" @@ -2778,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 :" @@ -2792,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 " @@ -2854,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" @@ -2862,11 +2834,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2878,7 +2850,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2892,21 +2870,21 @@ 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" -#: 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" @@ -2914,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}\"." @@ -2953,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" @@ -2978,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}." @@ -3001,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 " @@ -3011,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." @@ -3019,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" @@ -3047,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" @@ -3064,17 +3042,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 8105f3853a19689f4243358df08c3fd2c9f78a75..adb95896bd0ac799ce33a55e0ed82dd5624c4592 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: 2025-01-18 20:25+0000\n" "PO-Revision-Date: 2017-11-23 04:14+0000\n" "Last-Translator: 63f334ffc0709ba0fc2361b80bf3c0f0_00ffd1e " ", 2021\n" @@ -49,11 +49,11 @@ msgstr "" msgid "${1} works properly." msgstr "" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +105,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -188,67 +188,67 @@ 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 "" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "סוללה" @@ -266,73 +266,73 @@ msgstr "סוללה" msgid "Beginner's Guide" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +403,57 @@ 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 "" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "לוח הגזירים" @@ -469,84 +461,60 @@ 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 "" -#: 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 "" -#: 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 "הגדרה" -#: 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: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 "" @@ -567,32 +535,32 @@ 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:205 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 "גזירה" -#: 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 "" @@ -600,16 +568,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "" @@ -617,41 +585,41 @@ msgstr "" msgid "Debug information from dbus:" msgstr "" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "" @@ -678,7 +646,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 "" @@ -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,36 +667,36 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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 "" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "" @@ -736,11 +704,11 @@ msgstr "" msgid "Enable" msgstr "" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" 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 "" @@ -760,11 +728,11 @@ msgstr "" msgid "Enable hint by default" msgstr "" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "" @@ -773,27 +741,27 @@ msgstr "" msgid "Entries" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +787,34 @@ 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 "" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "מועדפים" @@ -855,27 +823,23 @@ 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 "" -#: 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 "" @@ -902,33 +866,33 @@ 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 "" -#: 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,20 +915,20 @@ 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 "" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -976,106 +940,101 @@ 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 "" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "" -#: 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 "" -#: 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,12 +1183,12 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "" @@ -1242,16 +1201,23 @@ 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:575 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 "" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1271,21 +1237,21 @@ 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 "" -#: 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 -#: data/fcitx5-wayland-launcher.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: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 "" @@ -1293,58 +1259,58 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." msgstr "" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1359,58 +1325,62 @@ 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 "" -#: 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 "" +#: 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 "" -#: 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:2 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 "" -#: 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 "" @@ -1419,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 "" @@ -1736,199 +1706,199 @@ 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 "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "" -#: 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 "" @@ -1937,11 +1907,11 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1949,15 +1919,15 @@ 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 "" -#: 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, " @@ -1972,11 +1942,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -1985,48 +1955,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2038,17 +2008,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 "" @@ -2056,7 +2026,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 "" @@ -2065,17 +2035,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 "תמונות" @@ -2096,33 +2066,33 @@ 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 "כיבוי" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2130,121 +2100,121 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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 "" @@ -2253,22 +2223,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 "חיפוש" @@ -2277,7 +2247,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 "בחירה" @@ -2290,15 +2260,15 @@ 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 "" -#: 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 "שליחה" @@ -2310,59 +2280,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2372,101 +2342,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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: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 "השהיה" -#: 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 "" @@ -2475,31 +2445,31 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2518,42 +2488,46 @@ 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 "" +#: 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 "" @@ -2562,79 +2536,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "" @@ -2667,20 +2641,20 @@ 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 "" -#: 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 "" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2689,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 "" @@ -2709,7 +2683,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2723,66 +2697,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "" @@ -2790,11 +2764,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "" @@ -2806,7 +2780,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2817,21 +2797,21 @@ 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 "מעבד תמלילים" -#: 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 "" @@ -2839,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 "צהוב" @@ -2892,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 "" @@ -2914,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 "" @@ -2955,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" @@ -2972,17 +2952,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 876f0bfecaa36bc3acb39f0d6b19291b9cae1550..37798e69b4b6356b3b79877e37a7010eaef0a33a 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: 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" @@ -50,11 +50,11 @@ msgstr "${1} は見つかりません" msgid "${1} works properly." msgstr "${1} は正常に動作しています。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +106,57 @@ 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 ベースの仮想キーボードバックエンド" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "アクセントカラー" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "入力メソッドを有効にする" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "お気に入りに追加する" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "明るさ調整" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "すべてのアドオン用ライブラリが見つかりました。" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -189,67 +189,67 @@ 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 "右側のアプリケーション" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "バッテリー" @@ -267,73 +267,73 @@ msgstr "バッテリー" msgid "Beginner's Guide" msgstr "ビギナーズガイド" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +406,57 @@ 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 "中央右" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 設定を変更" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "キーモディファイアーを選択" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "クリックマージン" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "クリップボード" @@ -473,84 +464,60 @@ 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 "コミュニティ" -#: 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 "補完は有効です。" -#: 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 "設定" -#: 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: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" @@ -571,32 +538,32 @@ 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:205 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" -#: 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 トレイアイコン" @@ -604,16 +571,16 @@ 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 "ダークテーマ" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "入力メソッドをオフにする" @@ -621,41 +588,41 @@ msgstr "入力メソッドをオフにする" msgid "Debug information from dbus:" msgstr "dbus からのデバッグ情報:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "デフォルトの次候補" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "デフォルトの次ページ" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "デフォルトの前候補" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "デフォルトの前ページ" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 +657,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 "現在実行中のアプリケーションを検出する(再起動が必要)" @@ -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,36 +678,36 @@ 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 "下" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "絵文字" @@ -748,11 +715,11 @@ msgstr "絵文字" msgid "Enable" msgstr "有効" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 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 +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 で分数スケールを有効にする" @@ -772,11 +739,11 @@ msgstr "Wayland で分数スケールを有効にする" msgid "Enable hint by default" msgstr "デフォルトでヒントを有効にする" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 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" @@ -785,27 +752,27 @@ msgstr "End" msgid "Entries" msgstr "エントリー" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "前の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "次の入力メソッドに切り替える" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "前の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "次の入力メソッドグループに切り替える" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +800,34 @@ 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} が見つかりません。" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "お気に入り" @@ -869,27 +836,23 @@ 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 ランチャー(実験的)" -#: 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 状態:" @@ -925,35 +888,35 @@ 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 フロントエンド" -#: 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,22 +949,22 @@ 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" -#: 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 "" "キーイベントが処理されない場合、テキストをコミットする代わりにキーイベントを" "転送する" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "${1} ${2} モジュールが見つかりました: ${3}。" @@ -1013,106 +976,101 @@ 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}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "グループ" -#: 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 "グループ {}" -#: 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,12 +1219,12 @@ 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 "ホットリンク" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "ホットキー" @@ -1279,16 +1237,26 @@ 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:575 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 フロントエンド" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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 "" +"有効にすると、zwp_input_method_v2 でアクティブ化・非アクティブ化を行ったとき" +"に、zwp_virtual_keyboard_v1 の作成・破棄を行いません。これにより、Sway<=1.9、" +"RiverWM<=0.3.0 を含む特定のコンポジターのバグを回避できる可能性があります。" + +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1313,25 +1281,25 @@ 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:127 +#: src/ui/classic/theme.h:135 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 -#: data/fcitx5-wayland-launcher.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: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 "入力メソッドの設定" @@ -1339,39 +1307,39 @@ 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 "入力パネルのハイライト候補の枠線" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1379,20 +1347,20 @@ msgstr "" "入力メソッドは独自の設定の中に異なるセットアップを持つ場合があります。これは" "一般的にクリップボードやクイックフレーズなどのモジュールで使用されます。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "挿入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1409,64 +1377,68 @@ 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 入力メソッドパネル" -#: 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 "カタカナ" +#: 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" 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:2 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}" -#: 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 "キーボードの輝度を上げる" @@ -1475,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" @@ -1792,199 +1764,199 @@ 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 "ログオフ" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "マイクミュート" -#: 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 "ニュース" @@ -1993,11 +1965,11 @@ msgstr "ニュース" msgid "Next Candidate" msgstr "次の候補" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "次ページボタン" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "いいえ" @@ -2005,15 +1977,15 @@ 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 "なし" -#: 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, " @@ -2031,11 +2003,11 @@ 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 "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2044,7 +2016,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." @@ -2052,42 +2024,42 @@ 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 "オーバーレイの位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "XKB オプションより優先する" @@ -2099,17 +2071,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 "ページボタンの垂直方向の配置" @@ -2117,7 +2089,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" @@ -2126,17 +2098,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 "ピクチャー" @@ -2159,36 +2131,36 @@ 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: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 "電源オフ" -#: 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 "プリエディット有効" -#: 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 "テキストアイコンを優先する" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2196,121 +2168,121 @@ 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 "プリントスクリーン" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "プログラム" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "クイックフレーズ" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "リプライ" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2319,22 +2291,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 "検索" @@ -2343,7 +2315,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 "選択" @@ -2356,15 +2328,15 @@ 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 "キーボードで指定の入力メソッドを選択" -#: 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 "送信" @@ -2380,49 +2352,49 @@ 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 "影のマージン" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "入力状態を共有する" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "ショップ" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "フォーカスを変更する際に入力メソッドの情報を表示する" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "アイコンにレイアウト名を表示する" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "入力メソッドの情報をコンパクトに表示する" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." @@ -2430,11 +2402,11 @@ msgstr "" "アクティブなレイアウトが複数ある場合はアイコンにレイアウト名を表示します。オ" "プションでテキストアイコンを優先している場合はこのオプションを無視します。" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "アプリケーションにプリエディットを表示する" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "パスワード入力時にプリエディットテキストを表示する" @@ -2446,101 +2418,101 @@ msgstr "" "入力時にプリエディットを表示し、一致するシーケンスがない場合はデッドキーをコ" "ミットします。" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "間隔" -#: 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 "スペル" -#: 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 "スタンバイ" -#: 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 "ステータス通知" -#: 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 "サブタイトル" -#: 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: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 "サスペンド" -#: 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} にグループを切り替えました" @@ -2549,31 +2521,31 @@ 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 "タスクパネル" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2596,31 +2568,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 " @@ -2629,11 +2601,15 @@ msgstr "" "このような情報は開発者が診断するときに役に立つ場合がありますが、オンラインで" "公開する前に確認して、必要があれば削除してください。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 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 "" @@ -2645,79 +2621,79 @@ msgstr "" "あります。 ${link1} を参照してください。 アプリケーションのフリーズを含むXIM" "による一般的な問題については ${link2} を参照してください。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "トレイラベルのテキスト色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "トリガーキー" @@ -2750,20 +2726,20 @@ 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" -#: 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:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2772,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 "マウスホイールを使用して前または次のページに移動する" @@ -2792,7 +2768,7 @@ msgstr "マウスホイールを使用して前または次のページに移動 msgid "Use new compose behavior" msgstr "新規入力時の動作を使用する" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "ユーザーインターフェイス:" @@ -2806,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 " @@ -2867,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" @@ -2875,11 +2851,11 @@ 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 入力メソッドフロントエンド" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "ウェブカメラ" @@ -2894,7 +2870,13 @@ msgstr "" "ジャーがクリップボードの内容をパスワードとしてマークした場合は、クリップボー" "ドの更新が無視されます。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2908,21 +2890,21 @@ 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 "ワープロ" -#: 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" @@ -2930,42 +2912,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 "黄" @@ -2988,11 +2970,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} で問題が発生しています。" @@ -3016,7 +2998,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 " @@ -3026,7 +3008,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." @@ -3034,22 +3016,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 "縮小" @@ -3062,7 +3044,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" @@ -3079,17 +3061,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 75b37814be9972abdc46216f3f73e767667610c3..a3933807d63e8bf9b012f9d477536e04f49d4f1b 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-06-11 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" "Language-Team: Korean (https://app.transifex.com/fcitx/teams/12005/ko/)\n" @@ -51,11 +51,11 @@ msgstr "${1}을(를) 찾을 수 없습니다." msgid "${1} works properly." msgstr "${1}이(가) 제대로 작동합니다." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +107,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "입력기 활성화" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "즐겨찾기 추가" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "밝기 조절" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "모든 애드온에 대한 모든 라이브러리가 있습니다." @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -190,67 +190,67 @@ 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 "오른쪽 응용 프로그램" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "뒤로 앞으로" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "배터리" @@ -268,73 +268,73 @@ msgstr "배터리" msgid "Beginner's Guide" msgstr "초보자 가이드" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +407,57 @@ 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 "오른쪽 중앙" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Fcitx5 구성 변경" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "변환 키 선택" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "여백 클릭" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "클립보드" @@ -473,84 +465,60 @@ 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 "커뮤니티" -#: 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 "완성이 활성화되었습니다." -#: 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 "구성하기" -#: 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: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 "복사" @@ -571,32 +539,32 @@ 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:205 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 "자르기" -#: 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 트레이 아이콘" @@ -604,16 +572,16 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "입력기 비활성화" @@ -621,41 +589,41 @@ msgstr "입력기 비활성화" msgid "Debug information from dbus:" msgstr "dbus의 디버그 정보:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "기본 다음 후보" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "기본 다음 페이지" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "기본 이전 후보" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "기본 이전 페이지" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "설명" @@ -682,7 +650,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 "" @@ -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,36 +671,36 @@ 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 "아래쪽" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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 "꺼내기" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "에모지" @@ -740,11 +708,11 @@ msgstr "에모지" msgid "Enable" msgstr "활성화" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "KWin에서 블러 활성화" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "철자 검사 활성화" @@ -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 "" @@ -764,11 +732,11 @@ msgstr "" msgid "Enable hint by default" msgstr "기본적으로 힌트 사용" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "인챈트" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "종료" @@ -777,27 +745,27 @@ msgstr "종료" msgid "Entries" msgstr "항목" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "입력기 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "입력기 전환" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "입력기 그룹 역순으로 전환" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "입력기 그룹 전환" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +793,34 @@ 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}의 출력 내용에서 찾을 수 없음" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "즐겨찾기" @@ -861,27 +829,23 @@ 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 "" -#: 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 상태:" @@ -910,33 +874,33 @@ 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 프론트엔드" -#: 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,20 +926,20 @@ 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 "앞으로" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "${1} ${2}개의 모듈을 찾았습니다: ${3}" @@ -987,106 +951,101 @@ 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}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "그룹" -#: 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 "그룹 {}" -#: 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,12 +1194,12 @@ 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 "핫 링크" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "단축키" @@ -1253,16 +1212,23 @@ 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:575 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 전처리기" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1283,25 +1249,25 @@ 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:127 +#: src/ui/classic/theme.h:135 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 -#: data/fcitx5-wayland-launcher.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: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 "입력기 구성" @@ -1309,39 +1275,39 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1349,20 +1315,20 @@ msgstr "" "입력기가 별도의 구성을 가질 수 있습니다. 클립보드나 상용구와 같은 모듈에서 일" "반적으로 사용됩니다." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "삽입" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1377,58 +1343,62 @@ 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 입력기 패널" -#: 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 "가타카나" +#: 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 "키" -#: 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:2 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}" -#: 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 "키보드 밝기 높이기" @@ -1437,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 "전구" @@ -1754,199 +1724,199 @@ 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 "로그오프" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "마이크 끄기" -#: 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 "뉴스" @@ -1955,11 +1925,11 @@ msgstr "뉴스" msgid "Next Candidate" msgstr "다음 후보" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "다음 페이지 버튼" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "아니오" @@ -1967,15 +1937,15 @@ 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 "없음" -#: 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,11 +1960,11 @@ 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 "알림" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2003,7 +1973,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." @@ -2011,42 +1981,42 @@ 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 "오버레이 위치" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Xkb 옵션 재정의" @@ -2058,17 +2028,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 "" @@ -2076,7 +2046,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 "붙이기" @@ -2085,17 +2055,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 "사진" @@ -2119,33 +2089,33 @@ 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 "전원 끄기" -#: 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 "사전편집 활성화" -#: 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 "텍스트 아이콘 선호" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "사전 설정" @@ -2153,121 +2123,121 @@ 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 "화면 출력" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "프로그램" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "상용구" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "답장" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2276,22 +2246,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 "검색" @@ -2300,7 +2270,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 "선택" @@ -2313,15 +2283,15 @@ 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 "키보드를 이용하여 특정 입력기 선택" -#: 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 "보내기" @@ -2333,49 +2303,49 @@ 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 "그림자 여백" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "입력 상태 공유" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "숍" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "포커스를 변경할 때 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "아이콘에 자판 이름 표시" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "간결한 입력기 정보 표시" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." @@ -2383,11 +2353,11 @@ msgstr "" "활성 자판이 두 개 이상 있는 경우, 아이콘에 자판 이름을 표시합니다. 텍스트 선" "호 아이콘이 참으로 설정된 경우, 이 옵션은 무시됩니다." -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "응용프로그램에서 사전편집 표시" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2397,101 +2367,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "간격" -#: 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 "철자" -#: 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 "대기" -#: 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 "상태 표시기" -#: 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 "부제" -#: 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: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 "중단" -#: 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}(으)로 그룹 전환됨" @@ -2500,31 +2470,31 @@ 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 "작업 패널" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2543,31 +2513,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 " @@ -2576,11 +2546,15 @@ msgstr "" "이러한 정보는 개발자에게 도움이 될 수 있지만, 온라인에 올리기 전에 꼭 확인하" "고 민감한 정보가 있다면, 제거하세요." -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 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 "" @@ -2592,79 +2566,79 @@ msgstr "" "확인합니다. 응용 프로그램 멈춤을 포함하여 XIM을 사용하는 다른 일반적인 문제" "는 ${link2}를 참조합니다." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "트레이 레이블 텍스트 색상" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "트리거 키" @@ -2697,20 +2671,20 @@ 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 "되돌리기" -#: 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 "유니코드:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "위쪽" @@ -2719,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 "마우스 휠을 사용하여 이전 또는 다음 페이지로 이동" @@ -2739,7 +2713,7 @@ msgstr "마우스 휠을 사용하여 이전 또는 다음 페이지로 이동" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "사용자 인터페이스:" @@ -2753,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 " @@ -2814,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" @@ -2822,11 +2796,11 @@ 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 입력기 프론트엔드" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "웹캠" @@ -2838,7 +2812,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2852,21 +2832,21 @@ 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 "워드프로세서" -#: 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" @@ -2874,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 "노랑" @@ -2932,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를 사용하는데 문제가 발생할 수 있습니다." @@ -2954,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 " @@ -2964,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." @@ -2972,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 "작게 보기" @@ -3000,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" @@ -3017,17 +2997,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 f508af00f8eabaceee13f60aa32b7fd065225de1..1e8f24908fd443808ede0e22b9fbfc498b0220f6 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: 2024-07-26 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 , 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" @@ -51,11 +51,11 @@ msgstr "${1} не найден." msgid "${1} works properly." msgstr "${1} работает правильно." -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +107,57 @@ 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" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "Акцентные цвета" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Активировать метод ввода" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "Добавить в избранное" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "Отрегулировать яркость" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "Все библиотеки для всех дополнений найдены." @@ -175,7 +175,7 @@ msgstr "" "Разрешить переопределение системных настроек XKB (поддерживается только KDE " "5)" -#: src/lib/fcitx/globalconfig.cpp:192 +#: src/lib/fcitx/globalconfig.cpp:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -192,67 +192,67 @@ 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 "Приложение справа" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "Переслать Обратно" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "Аккумулятор" @@ -270,73 +270,73 @@ msgstr "Аккумулятор" msgid "Beginner's Guide" msgstr "Руководство для начинающих" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,36 +410,36 @@ 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" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "Изменить конфигурацию Fcitx 5" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "Флажок" @@ -457,20 +447,20 @@ 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 "Классический пользовательский интерфейс" -#: 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 "Нажмите на Поле" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Буфер обмена" @@ -478,70 +468,46 @@ 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 "Сообщество" -#: 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 "Завершение включено." -#: 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:560 +#: 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 "Копировать" @@ -576,32 +542,32 @@ 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:205 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 "Отрезать" -#: 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" @@ -609,16 +575,16 @@ 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 "Тёмная тема" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Деактивация метода ввода" @@ -626,41 +592,41 @@ msgstr "Деактивация метода ввода" msgid "Debug information from dbus:" msgstr "Отладочная информация от dbus:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "Следующее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Следующая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Предыдущее слово-кандидат по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Предыдущая страница по умолчанию" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "Описание" @@ -695,7 +661,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 "Определить текущее запущенное приложение (требуется перезапуск)" @@ -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,22 +696,22 @@ 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 "Извлечь" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" 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" @@ -777,11 +743,11 @@ msgstr "Включить дробную шкалу в Wayland" msgid "Enable hint by default" msgstr "Включить подсказку по умолчанию" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Окончание" @@ -790,27 +756,27 @@ msgstr "Окончание" msgid "Entries" msgstr "Записи" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "Перечислить методы ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "Перечислить методы ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "Перечислить группы методов ввода в обратном порядке" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "Перечислить группы методов ввода в прямом порядке" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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 "Избранное" @@ -876,27 +842,23 @@ 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 (Экспериментально)" -#: 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:" @@ -933,35 +895,35 @@ 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" -#: 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,22 +955,22 @@ 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 "Пересылать" -#: 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 "" "Пересылать ключевое событие вместо фиксации текста, если оно не " "обрабатывается" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "Найден ${1} ${2} модуль: ${3}." @@ -1020,106 +982,101 @@ 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}." -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "Группа" -#: 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 "Группа {}" -#: 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,12 +1225,12 @@ 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 "Горячие ссылки" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Горячая клавиша" @@ -1288,16 +1245,27 @@ msgstr "" "Горячая клавиша для переключения на определённый метод ввода только для " "текущего контекста ввода" -#: src/lib/fcitx-utils/key.cpp:565 +#: src/lib/fcitx-utils/key.cpp:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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 "" +"Если этот параметр включен, zwp_virtual_keyboard_v1 не будет создаваться или " +"уничтожаться при активации и деактивации с помощью zwp_input_method_v2. Это " +"может помочь обойти некоторые ошибки в определенных Compositor, включая " +"Sway<=1.9, RiverWM<=0.3.0." + +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1313,8 +1281,8 @@ msgid "" msgstr "" "Если вы используете ${1}, вам, возможно, понадобится деинсталлировать ${2} " "или удалить ${3}, чтобы использовать любой метод ввода, отличный от ${2}. " -"Для получения подробной информации,а также поиска других решений, см. " -"${link}." +"Для получения подробной информации,а также поиска других решений, см. $" +"{link}." #: data/fcitx5-diagnose.sh:740 msgid "" @@ -1327,21 +1295,21 @@ msgstr "" "интеграции с IBus, чтобы использовать любой метод ввода, отличный от ${2}. " "Для получения подробной информации см. ${link}." -#: src/ui/classic/theme.h:127 +#: src/ui/classic/theme.h:135 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 -#: data/fcitx5-wayland-launcher.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: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 "Настройка метода ввода" @@ -1349,39 +1317,39 @@ 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 "Выделение границы слова-кандидата в поле ввода" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1390,20 +1358,20 @@ msgstr "" "конфигурации. Это обычно используется такими модулями, как буфер обмена или " "быстрая фраза." -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "Вставка" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1425,58 +1393,64 @@ 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" -#: 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 "Катакана" +#: 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" 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:2 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}" -#: 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 "Увеличить яркость клавиатуры" @@ -1485,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" @@ -1802,199 +1776,199 @@ 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 "Выйти" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "Отключение микрофона" -#: 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 "Новости" @@ -2003,11 +1977,11 @@ msgstr "Новости" msgid "Next Candidate" msgstr "Следующее слово-кандидат" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "Кнопка следующей страницы" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "Нет" @@ -2019,11 +1993,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, " @@ -2041,11 +2015,11 @@ 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 "Уведомление" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2054,7 +2028,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." @@ -2062,42 +2036,42 @@ 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 "Позиция наложения" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "Переопределить параметр Xkb" @@ -2109,17 +2083,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 "Выравнивание кнопки страницы по вертикали" @@ -2127,7 +2101,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 "Вставить" @@ -2136,17 +2110,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 "Картинки" @@ -2172,33 +2146,33 @@ 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 "Выключение" -#: 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 "Предварительное редактирование включено" -#: 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 "Иконка предпочтительного текста" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2206,121 +2180,121 @@ 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 "Снимок экрана" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "Программа" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "Быстрая фраза" -#: src/modules/quickphrase/quickphrase.cpp:488 +#: src/modules/quickphrase/quickphrase.cpp:509 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 "Ответить" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2329,22 +2303,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 "Поиск" @@ -2353,7 +2327,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 "Выбрать" @@ -2366,15 +2340,15 @@ 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 "Выберите конкретный метод ввода с клавиатуры" -#: 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 "Отправить" @@ -2390,49 +2364,49 @@ 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 "Затенённое поле" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "Поделиться состоянием ввода" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "Магазин" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "Показывать информацию о способе ввода при изменении фокуса" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "Показать имя раскладки в значке" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "Показать информацию о компактном методе ввода" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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,11 +2415,11 @@ msgstr "" "для значка предпочтительного текста установлено значение true, этот параметр " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "Показать предварительное редактирование в приложении" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "Показывать предварительно редактируемый текст при вводе пароля" @@ -2457,67 +2431,67 @@ msgstr "" "Показывать предварительное редактирование при составлении и фиксировать " "мертвую клавишу, если нет подходящей последовательности." -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "Расстояние" -#: 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 "Подсказки" -#: 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 "Режим ожидания" -#: 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 "Уведомление о статусе" -#: 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 "Подзаголовок" @@ -2526,32 +2500,32 @@ msgstr "Подзаголовок" msgid "Super" msgstr "Super" -#: src/lib/fcitx-utils/key.cpp:563 +#: 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 "Приостановить" -#: 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}" @@ -2560,31 +2534,31 @@ 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 "Панель задач" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2596,8 +2570,8 @@ msgstr "" "Переменная окружения, проверенная этим сценарием, показывает окружение " "только в текущей оболочке. Все еще есть вероятность, что вы не установили " "среду для всего сеанса графического рабочего стола. Вы можете проверить " -"фактическую переменную среды определенного процесса, используя `xargs -0 -" -"L1 /proc/$PID/environ` для определенного процесса, который вы считаете " +"фактическую переменную среды определенного процесса, используя `xargs -0 " +"-L1 /proc/$PID/environ` для определенного процесса, который вы считаете " "неработающим." #: src/modules/imselector/imselector.h:45 @@ -2610,32 +2584,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 " @@ -2645,11 +2619,17 @@ msgstr "" "целях, пожалуйста, дважды проверьте и удалите при необходимости, прежде чем " "публиковать ее в Интернете публично." -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 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 "" @@ -2662,74 +2642,74 @@ msgstr "" "Для других более общих проблем, связанных с использованием XIM, включая " "замораживание приложений, см. ${link2}." -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "Цвет текста лейбла лотка" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "Активация метода ввода" @@ -2767,20 +2747,20 @@ 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 "Отменить" -#: 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 "Юникод: " -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "Вверх" @@ -2789,21 +2769,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 "Используйте колёсико мыши, для перелистывания страниц" @@ -2811,7 +2791,7 @@ msgstr "Используйте колёсико мыши, для перелис msgid "Use new compose behavior" msgstr "Использовать новое поведение при написании" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "Пользовательский интерфейс:" @@ -2827,59 +2807,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 " @@ -2889,7 +2869,7 @@ msgstr "" "информацию, включая имя дистрибутива, версию ядра, имя запущенных в данный " "момент программ и т. д." -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2897,11 +2877,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "Веб-камера" @@ -2916,7 +2896,17 @@ msgstr "" "пометку содержимого буфера обмена как пароля, это обновление буфера обмена " "будет игнорироваться." -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" "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 " @@ -2930,21 +2920,21 @@ 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 "Текстовый редактор" -#: 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" @@ -2952,37 +2942,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}\"." @@ -2990,7 +2980,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 "Жёлтое" @@ -3015,11 +3005,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} программах." @@ -3043,7 +3033,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 " @@ -3053,7 +3043,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." @@ -3062,22 +3052,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 "Уменьшить" @@ -3090,7 +3080,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" @@ -3107,17 +3097,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 6b9b63c52725284d953c0f4fd12e9a36849562ff..e28247cdcc800c0089b920e98d6bd09f3b29a2ca 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: 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" @@ -47,11 +47,11 @@ 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)" -#: 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,57 +103,57 @@ 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 "" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "Kích hoạt kiểu gõ" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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" -#: 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" -#: 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" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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." @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -186,67 +186,67 @@ 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" -#: 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" -#: 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" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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" @@ -264,73 +264,73 @@ 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:232 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,57 +403,57 @@ 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" -#: 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" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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" -#: 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" -#: 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ề" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "Bảng nhớ tạm" @@ -470,84 +461,60 @@ 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" -#: 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." -#: 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" -#: 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: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" @@ -568,32 +535,32 @@ 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:205 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" -#: 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" @@ -601,16 +568,16 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "Vô hiệu hóa bộ gõ" @@ -618,41 +585,41 @@ 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/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: 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:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "Trang mặc định tiếp theo" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "Ứng viên mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "Trang mặc định trước đó" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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ả" @@ -679,7 +646,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)" @@ -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,36 +667,36 @@ 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" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "Emoji" @@ -737,11 +704,11 @@ 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" -#: 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ả" @@ -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 "" @@ -761,11 +728,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "Kết thúc" @@ -774,27 +741,27 @@ msgstr "Kết thúc" msgid "Entries" msgstr "Các mục" -#: src/lib/fcitx/globalconfig.cpp:59 +#: 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:52 +#: 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:76 +#: 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:69 +#: 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:41 +#: 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" -#: 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,34 +787,34 @@ 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}" -#: 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" -#: src/lib/fcitx-utils/key.cpp:107 +#: src/lib/fcitx-utils/key.cpp:115 msgctxt "Key name" msgid "Favorites" msgstr "Yêu thích" @@ -856,27 +823,23 @@ 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 "" -#: 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:" @@ -906,33 +869,33 @@ 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" -#: 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,20 +925,20 @@ 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" -#: 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 "" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "" @@ -987,106 +950,101 @@ 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 "" -#: 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" -#: 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" -#: 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 {}" -#: 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,12 +1193,12 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "Phím tắt" @@ -1254,16 +1212,23 @@ 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:575 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" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1283,21 +1248,21 @@ 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" -#: 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 -#: data/fcitx5-wayland-launcher.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: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õ" @@ -1305,39 +1270,39 @@ 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 "" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1346,20 +1311,20 @@ 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" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1374,58 +1339,62 @@ 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" -#: 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 "" +#: 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 "" -#: 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:2 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}" -#: 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 "" @@ -1434,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 "" @@ -1751,199 +1720,199 @@ 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 "" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "" -#: 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,11 +1921,11 @@ msgstr "" msgid "Next Candidate" msgstr "" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "" @@ -1964,15 +1933,15 @@ 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 "" -#: 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, " @@ -1987,11 +1956,11 @@ 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" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "NumLock" @@ -2000,48 +1969,48 @@ 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." 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 "" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "" @@ -2053,17 +2022,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 +2040,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 +2049,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,33 +2080,33 @@ 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 "" -#: 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 "" -#: 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 "" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "" @@ -2145,121 +2114,121 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:488 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 "" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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 "" @@ -2268,22 +2237,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 "" @@ -2292,7 +2261,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 "" @@ -2305,15 +2274,15 @@ 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 "" -#: 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,59 +2294,59 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "" @@ -2387,101 +2356,101 @@ msgid "" "sequence." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: 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: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 "" -#: 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,31 +2459,31 @@ 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 "" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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,42 +2502,46 @@ 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 "" +#: 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 "" @@ -2577,79 +2550,79 @@ msgid "" "freezing, see ${link2}." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "" @@ -2682,20 +2655,20 @@ 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" -#: 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:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "" @@ -2704,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 "" @@ -2724,7 +2697,7 @@ msgstr "" msgid "Use new compose behavior" msgstr "" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "" @@ -2738,66 +2711,66 @@ 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 " "programs, etc." msgstr "" -#: src/modules/wayland/wayland.conf.in.in:3 +#: src/modules/wayland/wayland.conf.in.in:2 msgid "Wayland" msgstr "Wayland" @@ -2805,11 +2778,11 @@ 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 "" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "WebCam" @@ -2821,7 +2794,13 @@ msgid "" "will be ignored." msgstr "" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2832,21 +2811,21 @@ 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 "" -#: 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 "" @@ -2854,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 "" @@ -2907,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 "" @@ -2929,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 "" @@ -2970,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 "" @@ -2987,17 +2966,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 672a6acf9c136203724c7685f4b77ef30f1e8e4f..0f3287a0a101aef4e8bb2969e6d7ab52d4786e6e 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-06-13 20:24+0000\n" +"POT-Creation-Date: 2025-01-19 20:24+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" @@ -51,11 +51,11 @@ msgstr "${1} 未找到." msgid "${1} works properly." msgstr "${1} 工作正常。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +107,57 @@ 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 的虚拟键盘后端" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "重点色" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "激活输入法" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "添加收藏" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "调整亮度" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "所有插件所需的库都被找到。" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -190,67 +190,67 @@ 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 "应用程序右" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "向后" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "电池" @@ -268,73 +268,73 @@ msgstr "电池" msgid "Beginner's Guide" msgstr "入门指南" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,57 +405,57 @@ 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 "右侧居中" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "修改 Fcitx 5 配置" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 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 "选词修饰键" -#: src/ui/classic/classicui.conf.in.in:3 +#: src/ui/classic/classicui.conf.in.in:2 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 "点击区域边距" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "剪贴板" @@ -471,84 +463,60 @@ 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 "社区" -#: 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 "已启用补全。" -#: 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 "配置" -#: 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: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 "复制" @@ -569,32 +537,32 @@ 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:205 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 "剪切" -#: 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 托盘图标" @@ -602,16 +570,16 @@ 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 "深色主题" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "取消激活输入法" @@ -619,41 +587,41 @@ msgstr "取消激活输入法" msgid "Debug information from dbus:" msgstr "来自 dbus 的调试信息:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "默认跳转下一个候选词" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "默认下一页" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "默认跳转前一个候选词" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "默认上一页" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "描述" @@ -685,7 +653,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 "检测当前运行的程序 (需要重启)" @@ -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,36 +674,36 @@ 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 "下" -#: src/modules/quickphrase/quickphrase.h:43 +#: src/modules/quickphrase/quickphrase.h:49 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 "弹出" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" msgstr "颜文字" @@ -743,11 +711,11 @@ msgstr "颜文字" msgid "Enable" msgstr "启用" -#: src/ui/classic/theme.h:143 +#: src/ui/classic/theme.h:151 msgid "Enable Blur on KWin" msgstr "KWin 下启用模糊" -#: src/modules/quickphrase/quickphrase.h:39 +#: src/modules/quickphrase/quickphrase.h:45 msgid "Enable Spell check" msgstr "启用拼写检查" @@ -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 下启用分数缩放" @@ -767,11 +735,11 @@ msgstr "在 Wayland 下启用分数缩放" msgid "Enable hint by default" msgstr "默认启用提示" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 msgid "Enchant" msgstr "Enchant" -#: src/lib/fcitx-utils/key.cpp:46 +#: src/lib/fcitx-utils/key.cpp:54 msgctxt "Key name" msgid "End" msgstr "行尾" @@ -780,27 +748,27 @@ msgstr "行尾" msgid "Entries" msgstr "项目" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "向后切换输入法" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "向前切换输入法" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "向后切换输入法分组" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "向前切换输入分组" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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,34 +796,34 @@ 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}。" -#: src/modules/quickphrase/quickphrase.h:41 +#: src/modules/quickphrase/quickphrase.h:47 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 "收藏" @@ -864,27 +832,23 @@ 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 启动器 (实验性)" -#: 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 状态:" @@ -918,33 +882,33 @@ 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 前端" -#: 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,20 +936,20 @@ 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 "向前" -#: 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 "按键事件未处理时转发按键而不是提交文本" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "找到了 ${1} ${2} 模块:${3}。" @@ -997,106 +961,101 @@ 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}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "分组" -#: 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 "分组 {}" -#: 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,12 +1204,12 @@ 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 "热门链接" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "快捷键" @@ -1263,16 +1222,26 @@ 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:575 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 前端" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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 "" +"启用时,当使用 zwp_input_method_v2 协议时,激活和停用时不创建和销毁 " +"zwp_virtual_keyboard_v1 对象。这可以绕过某些混成器的问题,包括 Sway<=1.9," +"RiverWM<=0.3.0。" + +#: src/lib/fcitx/globalconfig.cpp:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1293,25 +1262,25 @@ 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:127 +#: src/ui/classic/theme.h:135 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 -#: data/fcitx5-wayland-launcher.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: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 "输入法配置" @@ -1319,39 +1288,39 @@ 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 "输入框高亮候选词边框" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1359,20 +1328,20 @@ msgstr "" "输入法也许在自身配置中有不同的设置。 这个选项主要用于模块例如剪贴板和快速输" "入。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1392,58 +1361,62 @@ 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 输入法面板" -#: 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 "片假名" +#: 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" 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:2 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}" -#: 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 "增加键盘背光亮度" @@ -1452,315 +1425,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 "灯泡" @@ -1769,199 +1742,199 @@ 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 "注销" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "麦克风静音" -#: 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 "新闻" @@ -1970,11 +1943,11 @@ msgstr "新闻" msgid "Next Candidate" msgstr "下一个候选词" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "下一页按钮" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "否" @@ -1982,15 +1955,15 @@ 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 "无" -#: 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, " @@ -2007,11 +1980,11 @@ 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 "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "数字锁定" @@ -2020,49 +1993,49 @@ 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." 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 "覆盖图片位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "覆盖 Xkb 选项" @@ -2074,17 +2047,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 "页面按钮垂直对齐" @@ -2092,7 +2065,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 "粘贴" @@ -2101,17 +2074,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,33 +2107,33 @@ 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 "关机" -#: 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 "预编辑已启用" -#: 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 "优先使用文字图标" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2168,121 +2141,121 @@ 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 "截屏" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "程序" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "快速输入" -#: src/modules/quickphrase/quickphrase.cpp:470 +#: src/modules/quickphrase/quickphrase.cpp:509 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 "回复" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2291,22 +2264,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 "搜索" @@ -2315,7 +2288,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 "选择" @@ -2328,15 +2301,15 @@ 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 "通过键盘选择特定的输入法" -#: 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 "发送" @@ -2350,49 +2323,49 @@ 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 "阴影边距" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "共享输入状态" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "购物" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "在焦点更改时显示输入法信息" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "在图标中显示布局名称" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "显示紧凑的输入法信息" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." @@ -2400,11 +2373,11 @@ msgstr "" "如果有超过一个活动布局,则在图标中显示布局名称。如果优先使用文字图标已启用," "这个选项将会被忽略" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "在程序中显示预编辑文本" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "输入密码时显示预编辑文本" @@ -2414,101 +2387,101 @@ msgid "" "sequence." msgstr "使用组合键时显示预编辑,并且在没有匹配序列时提交死键对应符号" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "间隔" -#: 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 "拼写" -#: 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 "待机" -#: 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 "状态提示器" -#: 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 "副标题" -#: 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: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 "睡眠" -#: 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}" @@ -2517,31 +2490,31 @@ 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 "任务栏" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2563,31 +2536,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 " @@ -2596,11 +2569,15 @@ msgstr "" "尽管这些信息对于开发者诊断问题有帮助,请在公开发送到在线网站前检查并且根据需" "要移除的对应信息。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 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 "" @@ -2611,79 +2588,79 @@ msgstr "" "您可以在 ${link1} 找到一些会在使用 xim 时出现问题的应用程序。包括应用程序卡死" "在内的更多使用 xim 可能出现的普遍问题请参见 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "托盘标签文本颜色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 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 "触发键" @@ -2716,20 +2693,20 @@ 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 "撤销" -#: 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:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2738,19 +2715,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 "使用鼠标滚轮翻页" @@ -2758,7 +2735,7 @@ msgstr "使用鼠标滚轮翻页" msgid "Use new compose behavior" msgstr "使用新的组合键行为" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "用户界面:" @@ -2772,59 +2749,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 " @@ -2833,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" @@ -2841,11 +2818,11 @@ 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 输入法前端" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "摄像头" @@ -2857,7 +2834,15 @@ msgid "" "will be ignored." msgstr "如果密码管理工具支持,那么剪贴板会忽略从密码管理工具复制的密码。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" "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 " @@ -2870,21 +2855,21 @@ 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 "文字处理器" -#: 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" @@ -2892,42 +2877,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 "黄" @@ -2949,11 +2934,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 时遇到问题." @@ -2975,7 +2960,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 " @@ -2984,7 +2969,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." @@ -2992,22 +2977,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 "缩小" @@ -3020,7 +3005,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" @@ -3037,17 +3022,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 5549c28f7b99a3c66ecd1347f03f7ba3acce56b8..8fb837c5fe5ad90f873321c5b6ea4919269d9b3e 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: 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/" @@ -57,11 +57,11 @@ msgstr "找不到 ${1}。" msgid "${1} works properly." msgstr "${1} 運作正常。" -#: src/lib/fcitx/instance.cpp:419 +#: src/lib/fcitx/instance.cpp:422 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,57 +113,57 @@ 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 的虛擬鍵盤後端" -#: src/ui/classic/theme.h:202 +#: src/ui/classic/theme.h:210 msgid "Accent Colors" msgstr "強調色" -#: src/lib/fcitx/globalconfig.cpp:83 +#: src/lib/fcitx/globalconfig.cpp:93 msgid "Activate Input Method" msgstr "啟用輸入法" -#: src/lib/fcitx/globalconfig.cpp:139 +#: src/lib/fcitx/globalconfig.cpp:162 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 "加入收藏" -#: src/modules/unicode/unicode.conf.in.in:4 +#: src/modules/unicode/unicode.conf.in.in:3 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 "調整亮度" -#: src/lib/fcitx/globalconfig.cpp:27 +#: src/lib/fcitx/globalconfig.cpp:36 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 "找到了所有附加元件的函式庫。" @@ -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:215 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:571 msgctxt "Key name" msgid "Alt" msgstr "Alt" @@ -196,67 +196,67 @@ 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 "應用程式右" -#: src/im/keyboard/keyboard.h:99 +#: src/im/keyboard/keyboard.h:100 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 "往後" -#: src/modules/spell/spell.h:38 +#: src/modules/spell/spell.h:39 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 "電池" @@ -274,73 +274,73 @@ msgstr "電池" msgid "Beginner's Guide" msgstr "新手指南" -#: src/lib/fcitx/globalconfig.cpp:209 +#: src/lib/fcitx/globalconfig.cpp:232 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,36 +411,36 @@ 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 "右側居中" -#: data/fcitx5-configtool.desktop.in.in:5 +#: data/fcitx5-configtool.desktop.in.in:4 msgid "Change Fcitx 5 Configuration" msgstr "變更 Fcitx 5 設定" -#: src/ui/classic/theme.h:181 +#: src/ui/classic/theme.h:189 msgid "Check box" msgstr "複選框" @@ -456,20 +448,20 @@ 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 "經典使用者介面" -#: 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 "按區域邊距" -#: src/modules/clipboard/clipboard.conf.in.in:3 +#: src/modules/clipboard/clipboard.conf.in.in:2 msgid "Clipboard" msgstr "剪貼簿" @@ -477,70 +469,46 @@ 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 "社群" -#: 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 "已啟用補全。" -#: 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:560 +#: 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 "複製" @@ -575,32 +543,32 @@ 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:205 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 "剪下" -#: 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 工具列圖示" @@ -608,16 +576,16 @@ 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 "深色模式" -#: src/lib/fcitx/globalconfig.cpp:92 +#: src/lib/fcitx/globalconfig.cpp:102 msgid "Deactivate Input Method" msgstr "停用輸入法" @@ -625,41 +593,41 @@ msgstr "停用輸入法" msgid "Debug information from dbus:" msgstr "來自 dbus 的除錯訊息:" -#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:366 -#: src/ui/classic/themes/default/theme.conf.in:3 +#: src/lib/fcitx/inputmethodmanager.cpp:153 src/lib/fcitx/instance.cpp:369 +#: 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:128 +#: src/lib/fcitx/globalconfig.cpp:138 msgid "Default Next Candidate" msgstr "預設下一個候選字" -#: src/lib/fcitx/globalconfig.cpp:112 +#: src/lib/fcitx/globalconfig.cpp:122 msgid "Default Next page" msgstr "預設下一頁" -#: src/lib/fcitx/globalconfig.cpp:122 +#: src/lib/fcitx/globalconfig.cpp:132 msgid "Default Previous Candidate" msgstr "預設上一個候選字" -#: src/lib/fcitx/globalconfig.cpp:100 +#: src/lib/fcitx/globalconfig.cpp:110 msgid "Default Previous page" msgstr "預設上一頁" -#: src/lib/fcitx/globalconfig.cpp:166 +#: src/lib/fcitx/globalconfig.cpp:189 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 "" "設定 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 "檢測當前運行的程式 (需要重新啟動)" @@ -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,22 +696,22 @@ 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 "退出" -#: src/modules/emoji/emoji.conf.in.in:3 +#: src/modules/emoji/emoji.conf.in.in:2 msgid "Emoji" 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 下啟用分數縮放" @@ -775,11 +743,11 @@ msgstr "在 Wayland 下啟用分數縮放" msgid "Enable hint by default" msgstr "預設啟用提示" -#: src/modules/spell/spell.h:23 +#: src/modules/spell/spell.h:24 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 鍵" @@ -788,27 +756,27 @@ msgstr "End 鍵" msgid "Entries" msgstr "項目" -#: src/lib/fcitx/globalconfig.cpp:59 +#: src/lib/fcitx/globalconfig.cpp:69 msgid "Enumerate Input Method Backward" msgstr "枚舉輸入法向後" -#: src/lib/fcitx/globalconfig.cpp:52 +#: src/lib/fcitx/globalconfig.cpp:62 msgid "Enumerate Input Method Forward" msgstr "枚舉輸入法向前" -#: src/lib/fcitx/globalconfig.cpp:76 +#: src/lib/fcitx/globalconfig.cpp:86 msgid "Enumerate Input Method Group Backward" msgstr "枚舉輸入法群組向後" -#: src/lib/fcitx/globalconfig.cpp:69 +#: src/lib/fcitx/globalconfig.cpp:79 msgid "Enumerate Input Method Group Forward" msgstr "枚舉輸入法群組向前" -#: src/lib/fcitx/globalconfig.cpp:41 +#: src/lib/fcitx/globalconfig.cpp:51 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 "收藏" @@ -872,27 +840,23 @@ 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 啟動器(實驗性)" -#: 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 狀態:" @@ -926,33 +890,33 @@ 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 前端" -#: 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,20 +944,20 @@ 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 "轉遞按鍵事件" -#: 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 "在按鍵事件未處理時轉遞按鍵事件而非提交文本" -#: data/fcitx5-diagnose.sh:1276 +#: data/fcitx5-diagnose.sh:1176 msgid "Found ${1} ${2} module: ${3}." msgstr "找到了 ${1} 的 ${2} 模組:${3}。" @@ -1005,106 +969,101 @@ 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}。" -#: src/modules/notifications/notifications.conf.in.in:4 +#: src/modules/notifications/notifications.conf.in.in:3 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 "群組" -#: 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 "群組 {}" -#: 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,12 +1212,12 @@ 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 "熱門連結" -#: src/lib/fcitx/globalconfig.cpp:207 +#: src/lib/fcitx/globalconfig.cpp:230 msgid "Hotkey" msgstr "快捷鍵" @@ -1271,16 +1230,23 @@ 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:575 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 前端" -#: src/lib/fcitx/globalconfig.cpp:203 +#: 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:226 msgid "" "If value is 0, the user data may only be saved when fcitx quits (e.g. " "logout)." @@ -1301,25 +1267,25 @@ 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:127 +#: src/ui/classic/theme.h:135 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 -#: data/fcitx5-wayland-launcher.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: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 "輸入法設定" @@ -1327,39 +1293,39 @@ 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 "輸入框高亮候選詞邊框" -#: 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:104 src/lib/fcitx/globalconfig.cpp:116 +#: 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." @@ -1367,20 +1333,20 @@ msgstr "" "輸入法在它們自己的設定中可能有不同的設定。這通常由剪貼板或快速短語等模塊使" "用。" -#: src/lib/fcitx-utils/key.cpp:229 +#: src/lib/fcitx-utils/key.cpp:237 msgctxt "Key name" msgid "Insert" msgstr "插入" -#: src/lib/fcitx/globalconfig.cpp:199 +#: src/lib/fcitx/globalconfig.cpp:222 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}." @@ -1396,63 +1362,67 @@ 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 輸入法面板" -#: 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 "片假名" +#: 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 "按鍵" -#: 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:2 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}" -#: 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 "鍵盤亮度增加" @@ -1461,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 "燈泡" @@ -1778,199 +1748,199 @@ 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 "登出" -#: src/im/keyboard/keyboard.h:102 +#: src/im/keyboard/keyboard.h:103 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 "靜音麥克風" -#: 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 "新聞" @@ -1979,11 +1949,11 @@ msgstr "新聞" msgid "Next Candidate" msgstr "下一個候選字" -#: src/ui/classic/theme.h:164 +#: src/ui/classic/theme.h:172 msgid "Next Page Button" msgstr "下一頁按鈕" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "No" msgstr "否" @@ -1995,11 +1965,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, " @@ -2016,11 +1986,11 @@ 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 "通知" -#: src/lib/fcitx-utils/key.cpp:54 +#: src/lib/fcitx-utils/key.cpp:62 msgctxt "Key name" msgid "NumLock" msgstr "數字鎖定 (NumLock)" @@ -2029,48 +1999,48 @@ 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." 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 "覆蓋圖片位置" -#: src/lib/fcitx/globalconfig.cpp:173 +#: src/lib/fcitx/globalconfig.cpp:196 msgid "Override Xkb Option" msgstr "覆蓋 Xkb 選項" @@ -2082,17 +2052,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 "頁面按鈕垂直對齊" @@ -2100,7 +2070,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 "貼上" @@ -2109,17 +2079,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 "圖片" @@ -2142,33 +2112,33 @@ 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 "關機" -#: 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 "預編輯已啟用" -#: 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 "首選文字圖示" -#: src/modules/spell/spell.h:22 +#: src/modules/spell/spell.h:23 msgid "Presage" msgstr "Presage" @@ -2176,29 +2146,29 @@ 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)" -#: src/lib/fcitx/globalconfig.cpp:28 +#: src/lib/fcitx/globalconfig.cpp:37 msgid "Program" msgstr "程式" -#: data/fcitx5-diagnose.sh:1249 +#: data/fcitx5-diagnose.sh:1149 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 "快速片語" @@ -2206,91 +2176,91 @@ 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 "回覆" -#: src/lib/fcitx/globalconfig.cpp:143 +#: src/lib/fcitx/globalconfig.cpp:166 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" @@ -2299,22 +2269,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 "搜尋" @@ -2323,7 +2293,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 "選取" @@ -2336,15 +2306,15 @@ 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 "通過鍵盤選擇特定的輸入法" -#: 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 "傳送" @@ -2358,49 +2328,49 @@ 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 "陰影邊緣" -#: src/lib/fcitx/globalconfig.cpp:147 +#: src/lib/fcitx/globalconfig.cpp:170 msgid "Share Input State" msgstr "共享輸入法狀態" -#: src/lib/fcitx-utils/key.cpp:562 +#: 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 "商店" -#: src/lib/fcitx/globalconfig.cpp:158 +#: src/lib/fcitx/globalconfig.cpp:181 msgid "Show Input Method Information when changing focus" msgstr "當切換輸入焦點時顯示輸入法資訊" -#: src/lib/fcitx/globalconfig.cpp:155 +#: src/lib/fcitx/globalconfig.cpp:178 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 "在圖示顯示佈局名稱" -#: src/lib/fcitx/globalconfig.cpp:161 +#: src/lib/fcitx/globalconfig.cpp:184 msgid "Show compact input method information" msgstr "顯示緊湊的輸入法訊息" -#: src/lib/fcitx/globalconfig.cpp:164 +#: src/lib/fcitx/globalconfig.cpp:187 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." @@ -2408,11 +2378,11 @@ msgstr "" "如果有多個活動佈局,則在圖示中顯示佈局名稱。如果首選文字圖示設定為 true,則此" "選項將被忽略。" -#: src/lib/fcitx/globalconfig.cpp:151 +#: src/lib/fcitx/globalconfig.cpp:174 msgid "Show preedit in application" msgstr "在應用程式中顯示預編輯" -#: src/lib/fcitx/globalconfig.cpp:195 +#: src/lib/fcitx/globalconfig.cpp:218 msgid "Show preedit text when typing password" msgstr "輸入密碼時顯示預編輯文本" @@ -2422,67 +2392,67 @@ msgid "" "sequence." msgstr "使用組合鍵時顯示預編輯,並且在沒有匹配序列時提交死鍵對應符號" -#: src/lib/fcitx/globalconfig.cpp:65 +#: src/lib/fcitx/globalconfig.cpp:75 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 "間隔" -#: 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 "拼寫" -#: 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 "待機" -#: 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 "狀態指示器" -#: 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 "副標題" @@ -2491,32 +2461,32 @@ msgstr "副標題" msgid "Super" msgstr "超級" -#: src/lib/fcitx-utils/key.cpp:563 +#: 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 "暫停" -#: 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}" @@ -2525,31 +2495,31 @@ 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 "工作列" -#: src/lib/fcitx/globalconfig.cpp:45 +#: src/lib/fcitx/globalconfig.cpp:55 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 " @@ -2571,31 +2541,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 " @@ -2604,11 +2574,15 @@ msgstr "" "儘管這些訊息對開發人員的診斷有幫助,但在公開發佈到網上之前,請仔細檢查並根據" "需要刪除信息。" -#: src/lib/fcitx-utils/key.cpp:212 +#: src/lib/fcitx-utils/key.cpp:220 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 "" @@ -2619,74 +2593,74 @@ msgstr "" "若要查看您在使用 xim 時,一些應用程式的特定問題,請檢查 ${link1}。使用 XIM 的" "其他一般性的問題包括應用程式凍結,請參閱 ${link2}。" -#: src/lib/fcitx/globalconfig.cpp:133 +#: src/lib/fcitx/globalconfig.cpp:143 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 "托盤標簽文字顏色" -#: src/lib/fcitx/globalconfig.cpp:35 +#: src/lib/fcitx/globalconfig.cpp:44 msgid "Trigger Input Method" msgstr "切換啟用或非啟用輸入法" @@ -2724,20 +2698,20 @@ 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 "復原" -#: 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:" -#: src/lib/fcitx-utils/key.cpp:48 +#: src/lib/fcitx-utils/key.cpp:56 msgctxt "Key name" msgid "Up" msgstr "上" @@ -2746,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 "使用滑鼠滾輪到上一頁或下一頁" @@ -2766,7 +2740,7 @@ msgstr "使用滑鼠滾輪到上一頁或下一頁" msgid "Use new compose behavior" msgstr "使用新的撰寫行為" -#: data/fcitx5-diagnose.sh:1677 +#: data/fcitx5-diagnose.sh:1577 msgid "User Interface:" msgstr "使用者介面:" @@ -2780,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 " @@ -2841,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" @@ -2849,11 +2823,11 @@ 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 輸入法前端" -#: src/lib/fcitx-utils/key.cpp:200 +#: src/lib/fcitx-utils/key.cpp:208 msgctxt "Key name" msgid "WebCam" msgstr "網路攝影機" @@ -2865,7 +2839,13 @@ msgid "" "will be ignored." msgstr "密碼管理員支援時,讓剪貼簿忽略從密碼管理員複製的密碼。" -#: src/lib/fcitx/globalconfig.cpp:177 +#: src/lib/fcitx/globalconfig.cpp:156 +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 "" + +#: 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 " @@ -2878,21 +2858,21 @@ 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 "文書處理器" -#: 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" @@ -2900,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 "黃色" @@ -2956,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 時遇到問題。" @@ -2982,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 " @@ -2991,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." @@ -2999,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 "縮小" @@ -3027,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" @@ -3044,17 +3024,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/src/CMakeLists.txt b/src/CMakeLists.txt index f24f0f1d5b2974da0d9fb46b121ddd746e75704d..faba3aa2a6e21ca7dd87160b0109de1785b4ff1a 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 getStaticAddon + 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 723be2ec3fa77d9b6a7fdd755dfadc286836c0b4..e148b3208fa33303f52b7037edb5ec98631d30b2 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 0a5e626d4f325fdc840a7ed38ad8eadbbf258346..41d122ac6bf1ba10b649fa9946c1e198b380cbdf 100644 --- a/src/frontend/dbusfrontend/dbusfrontend.conf.in.in +++ b/src/frontend/dbusfrontend/dbusfrontend.conf.in.in @@ -1,10 +1,10 @@ [Addon] Name=DBus Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libdbusfrontend 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 20c04fff90b460d0fa83eecaf9324da1919ceb8e..73f9dd8036860fe63cf8ac49d471b6de678c390a 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/CMakeLists.txt b/src/frontend/fcitx4frontend/CMakeLists.txt index eeb55ce58cf40fa0c169760108494eef9c1a9b85..788088e3a558243a026f52d71a3b100db5022c6f 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 07919a3c533be7051ef4a2afdab432ab8c4ee212..39e6a10f15eb23dd1bff2bb1e348cb91095761c3 100644 --- a/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in +++ b/src/frontend/fcitx4frontend/fcitx4frontend.conf.in.in @@ -1,12 +1,13 @@ [Addon] Name=Fcitx4 Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libfcitx4frontend 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 e1b48947ceb9edca46c27a280859e456a5f0081e..62b40ca660c5db25524cb7d76de5695b326effc9 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/CMakeLists.txt b/src/frontend/ibusfrontend/CMakeLists.txt index 4b113bc64419c17a4c523894b9934069cbdab572..43308f17389f0409c9aa869fa0bcc922bc941ecb 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 aed719b094ebd7038abe3279aba29c854c81474f..c834dbf60259dee75f75aefd901e540c9c6a1b78 100644 --- a/src/frontend/ibusfrontend/ibusfrontend.conf.in.in +++ b/src/frontend/ibusfrontend/ibusfrontend.conf.in.in @@ -1,10 +1,11 @@ [Addon] Name=IBus Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libibusfrontend 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 f3df669e3e60244ef06e7d04d94ace00a1338b87..39f1a3095576b2ec1dc12094a69239c7e66766f7 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/CMakeLists.txt b/src/frontend/waylandim/CMakeLists.txt index f462c7da5a7f82bfd0a6b5108734c408efcc2adc..fc4d2b4cde543a7a67a8fc43540f8404c20d8658 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/appmonitor.cpp b/src/frontend/waylandim/appmonitor.cpp index a5969394bb62bff6b94311f9342f9f349b0c4adf..bca0ba0923e3ebe314889a60394b93bd4708379d 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 3b56423ae917378a236af755498cf39390acaf3e..a5c0be3ccfaa703a7d67b1df2cd8bf43bb235dcb 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 38bb7fa7b46ce43f162d15b660c81c74e96bf273..8c1f2064998b722798a9d177c6755c114f478608 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 eccdd40d7be0260e5aca249f6399a3639a89e24f..32b107d715b769e0c7e9aa2ee7b69b27534776b2 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 3e89e3c328c9470d7be26efeae5323b60db4ad25..a2366e6387269f11c08f8873a1e2d4a1aea54f3f 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 f72931e7d0de14ac1655ba8520c4eb7303787ee5..7d187717e2cbe029f7363099bbad8facd46e299f 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.conf.in.in b/src/frontend/waylandim/waylandim.conf.in.in index e70467d1da7749084e751956043241257d97d717..6c72dea8b2aed96312231d65719bcf335e2887b3 100644 --- a/src/frontend/waylandim/waylandim.conf.in.in +++ b/src/frontend/waylandim/waylandim.conf.in.in @@ -1,11 +1,12 @@ [Addon] Name=Wayland Input method frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libwaylandim Category=Frontend 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 bc4e6085a3d2bf4b1558227eb0a1d3b07793d0f8..f8a0951759e8e27fbe21bc45b0a2b7bb99b18dff 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") @@ -23,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, @@ -61,12 +71,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; } @@ -111,4 +122,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::WaylandIMModuleFactory); +FCITX_ADDON_FACTORY_V2(waylandim, fcitx::WaylandIMModuleFactory); diff --git a/src/frontend/waylandim/waylandim.h b/src/frontend/waylandim/waylandim.h index d512a927a6c1ffe3667064d3031b468c476bbeab..de2884dcea28e438beedfe126e4a7f73bd94add0 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" @@ -29,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; @@ -60,6 +78,10 @@ public: AggregatedAppMonitor *appMonitor(const std::string &display); + bool persistentVirtualKeyboard() const { + return persistentVirtualKeyboard_; + } + private: Instance *instance_; WaylandIMConfig config_; @@ -72,6 +94,7 @@ private: std::unique_ptr> createdCallback_; std::unique_ptr> closedCallback_; + bool persistentVirtualKeyboard_ = false; }; } // namespace fcitx diff --git a/src/frontend/waylandim/waylandim_public.h b/src/frontend/waylandim/waylandim_public.h index 8a7b5a827b5ce6dfffc3e9126c4d3f2bc37c6d59..5e182dbfc37a8a9baabe38fdcace8b303d24f8a1 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 c277a1faf6f9834b687a28490577b4f2e5f78ad8..6955f18bd7edd3d78ef84afbeac1adf36dac60b1 100644 --- a/src/frontend/waylandim/waylandimserver.cpp +++ b/src/frontend/waylandim/waylandimserver.cpp @@ -6,15 +6,39 @@ */ #include "waylandimserver.h" #include +#include +#include #include +#include +#include +#include #include +#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/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 40f581ef4053115db0d1825e6c3d5571fdd29209..408baba804d0beb95ee60bf46cd2d2ca46fbe45a 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 726da79783652dab28e84fadbc042b7fa8936527..5c8a2a258350f6d2dbd25d1a2d9491bd2d3bf10f 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 4a1183e585d2e7f6b0e2f9a28753177650abcec7..f929787137cd692a01eaaea408f9ba904efa1826 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 a057fd1d6403be80128e2460b730d8a65f80f317..ea0be8cc81fe80201080f19da43554e32d793146 100644 --- a/src/frontend/waylandim/waylandimserverv2.cpp +++ b/src/frontend/waylandim/waylandimserverv2.cpp @@ -6,15 +6,36 @@ */ #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 "wayland_public.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 { @@ -100,9 +121,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 +142,14 @@ 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())) { + 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) { @@ -164,13 +187,23 @@ WaylandIMInputContextV2::WaylandIMInputContextV2( Key(FcitxKey_None, KeyStates(), vkkey + 8), WL_KEYBOARD_KEY_STATE_RELEASED); } - vk_->modifiers(0, 0, 0, 0); } focusOutWrapper(); } + if (!server_->parent()->persistentVirtualKeyboard()) { + vk_.reset(); + vkReady_ = false; + } } if (pendingActivate_) { pendingActivate_ = false; + 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 @@ -420,9 +453,11 @@ 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) { - vk_->keymap(format, scopeFD.fd(), size); - vkReady_ = true; + if (keymapChanged || !vkReady_) { + if (vk_) { + vk_->keymap(format, scopeFD.fd(), size); + vkReady_ = true; + } } server_->parent_->wayland()->call(); @@ -501,8 +536,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 9fdf260193ca8b2e2e2b8ead5fd886abaab8f56c..43e5fe0c434bd8106c7c2c26a8f6ed5bbb6a8ca0 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" @@ -41,6 +55,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 +87,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"; } diff --git a/src/frontend/waylandim/wlrappmonitor.cpp b/src/frontend/waylandim/wlrappmonitor.cpp index dc987a294ffd732c5c1fc87fe6fb80547acbed0a..0a28ece53197e26eeb887923695ab6851bbc7823 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 a0a0242a2b797db9eadfa22a3a4b70c8ac9124ab..d25fbb495657c5861861f2f765e6a3dbc90777b3 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: diff --git a/src/frontend/xim/CMakeLists.txt b/src/frontend/xim/CMakeLists.txt index 7d0633579fa4346bd530a340428811b9d01f3234..b637d9f5b2281cf2d6ed6ad10055d13af75e4eb0 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 dd1fbcffa429f245e049a0e5856ec6325be6a352..46fd266f83375854f0afdbc60b1e68eda75b9f91 100644 --- a/src/frontend/xim/xim.conf.in.in +++ b/src/frontend/xim/xim.conf.in.in @@ -1,13 +1,14 @@ [Addon] Name=X Input Method Frontend -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libxim Category=Frontend 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 c9b81a0b1a8adff133ac40f9e8f3eeb70e9b219e..99f8020685b4066a77edfc26463605fe796e1f93 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( @@ -705,4 +715,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 ae7691ad05136749350526c91a556f8bbb369b9e..f898c6b32bd27796547e98e4f9f9b88c722c420a 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 434cdf3f5f11247b55738285ef37cfa6f7f4d466..c9954dd4ea4fc71f66532b29c9bec97a51f4b457 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 9b10efa4a81f9763ee682bcc3f2401d3f914fece..d09bac5744fab5363e47edac762bc193523351cd 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/im/keyboard/keyboard.h b/src/im/keyboard/keyboard.h index ff5573da934fab860db1ee97a381db16a2a48802..8b534150d3dc41aa8aed8ceb01d0b62616a78747 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"};); diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt index 85c9865bca1c40c1e9bdef59228b53724530b221..b2f37acd3d9c68340ee2b1ef3675b12dd68d3c4a 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} @@ -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 ac2509b30a5094224b3efd109bf704e83ab7dcea..11a5adc760da74c74b45db07a4e4296e83f522bc 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.cpp b/src/lib/fcitx-config/dbushelper.cpp index 4b6e58bcfc843d9f296664ce2bbb90b766943d66..3c2491df3ac7d27bd5cd4260907e1ca8947d79f5 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 d75e2e7ccbb5521443aacf14d9778b0760f52a96..dd16c7cc21f67efba5cd4fc0aca212fc50857ba2 100644 --- a/src/lib/fcitx-config/dbushelper.h +++ b/src/lib/fcitx-config/dbushelper.h @@ -7,11 +7,12 @@ #ifndef _FCITX_CONFIG_DBUSHELPER_H_ #define _FCITX_CONFIG_DBUSHELPER_H_ +#include #include #include +#include #include #include -#include "fcitxconfig_export.h" namespace fcitx { diff --git a/src/lib/fcitx-config/iniparser.cpp b/src/lib/fcitx-config/iniparser.cpp index 849eb4c613f7a691c866644ef301c03903f77709..25be6b4be9943c64de45b4f50a3138123ae22487 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/iniparser.h b/src/lib/fcitx-config/iniparser.h index 6c67d5d552198dafff855de9d0d5ca8305323747..06865a2e06c71df0ab5c12ad8ca62f0eedad94b4 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.cpp b/src/lib/fcitx-config/marshallfunction.cpp index 020e419ad99938133f10568cca1e0d819352f43b..85ea630d5970553a558e23fb103a91b54f620832 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 f371a80156f3f3de1691cd6732889b2a8040c896..ef91f0bb037fd814cd1a142686fd1366154a3534 100644 --- a/src/lib/fcitx-config/marshallfunction.h +++ b/src/lib/fcitx-config/marshallfunction.h @@ -7,11 +7,15 @@ #ifndef _FCITX_CONFIG_INTOPTION_H_ #define _FCITX_CONFIG_INTOPTION_H_ +#include +#include #include +#include +#include #include #include +#include #include -#include "rawconfig.h" namespace fcitx { diff --git a/src/lib/fcitx-config/option.cpp b/src/lib/fcitx-config/option.cpp index 5b259a9d82f4eb982290e67b7c95cf5032d997dd..be1db53a828898e8a1bd70594653e21dca063915 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 57de815371cd631d9d35fa9f42d311c282410507..95e614b4a5bf2b0b7237a793711e4606eec84aa9 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 #include // IWYU pragma: export #include #include +#include +#include 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 666e794f6bd45548a762ec090f45c9ac301a277d..577de6fab21ae88bfe4da47543d559710e6085f1 100644 --- a/src/lib/fcitx-config/option_details.h +++ b/src/lib/fcitx-config/option_details.h @@ -7,9 +7,11 @@ #ifndef _FCITX_CONFIG_OPTION_DETAILS_H_ #define _FCITX_CONFIG_OPTION_DETAILS_H_ +#include #include +#include +#include #include -#include "fcitxconfig_export.h" namespace fcitx { @@ -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 5c87fb42bffd8a83230614c5ae0245e9a4004178..d0f9d721dc9e202ade32a5a4c56bf3051063f4eb 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; } diff --git a/src/lib/fcitx-config/rawconfig.h b/src/lib/fcitx-config/rawconfig.h index b5dfc3636edffb5e6a8ccd0ef7e4639358625070..96106826f120ebe7701a5603e9e5afc7ad7992c1 100644 --- a/src/lib/fcitx-config/rawconfig.h +++ b/src/lib/fcitx-config/rawconfig.h @@ -7,19 +7,21 @@ #ifndef _FCITX_CONFIG_RAWCONFIG_H_ #define _FCITX_CONFIG_RAWCONFIG_H_ +#include #include #include #include +#include #include +#include #include #include -#include "fcitxconfig_export.h" namespace fcitx { class RawConfig; -typedef std::shared_ptr RawConfigPtr; +using RawConfigPtr = std::shared_ptr; class RawConfigPrivate; class FCITXCONFIG_EXPORT RawConfig { @@ -106,8 +108,8 @@ private: std::unique_ptr d_ptr; }; -FCITXUTILS_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/CMakeLists.txt b/src/lib/fcitx-utils/CMakeLists.txt index dd67e07dba7bbef256b7fc0c1b359692f72fb60d..9eb64046cf0d4c79ec9e004a82db5dcbabc980fd 100644 --- a/src/lib/fcitx-utils/CMakeLists.txt +++ b/src/lib/fcitx-utils/CMakeLists.txt @@ -1,51 +1,48 @@ 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 cutf8.cpp color.cpp i18nstring.cpp - event_common.cpp eventdispatcher.cpp library.cpp fs.cpp @@ -60,6 +57,8 @@ set(FCITX_UTILS_SOURCES misc.cpp semver.cpp keydata.cpp + event.cpp + eventloopinterface.cpp ) set(FCITX_UTILS_HEADERS @@ -70,6 +69,7 @@ set(FCITX_UTILS_HEADERS color.h i18nstring.h event.h + eventloopinterface.h eventdispatcher.h library.h cutf8.h @@ -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} @@ -127,21 +127,13 @@ 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) 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/Fcitx5Macros.cmake b/src/lib/fcitx-utils/Fcitx5Macros.cmake index eefc0b2b7bc7b8d99cea4b76f55d0ff3ebcdde4b..9c94dee1087b4e07b2f47380524d63ac96d249b5 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-utils/color.cpp b/src/lib/fcitx-utils/color.cpp index c933f47240afdbef6cf85728ed763a5490c6670f..5153349bcb4189dd43c9a3f1e6bddf62d8aae036 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 b18d31f4b63d1e9165e8fa3876378517f8ed5b39..ea0bd2d44a24aec02863d9664cbda282cb70ded1 100644 --- a/src/lib/fcitx-utils/color.h +++ b/src/lib/fcitx-utils/color.h @@ -8,10 +8,11 @@ #ifndef _FCITX_UTILS_COLOR_H_ #define _FCITX_UTILS_COLOR_H_ +#include #include #include +#include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/connectableobject.cpp b/src/lib/fcitx-utils/connectableobject.cpp index 4087c7155f7cddf9965c4d26c93413deec3f2e1a..322e3779297b4050c3b61a6796af18641ef26a86 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 fac932e14ce6f91be833409ba6c6c826fba0fcb4..4d477584bfa575dbdc8e3a78c1993a39086d7982 100644 --- a/src/lib/fcitx-utils/connectableobject.h +++ b/src/lib/fcitx-utils/connectableobject.h @@ -7,12 +7,14 @@ #ifndef _FCITX_UTILS_CONNECTABLEOBJECT_H_ #define _FCITX_UTILS_CONNECTABLEOBJECT_H_ +#include #include #include #include +#include +#include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/cutf8.cpp b/src/lib/fcitx-utils/cutf8.cpp index 9d54a8c74076cd2d3b7720d35d556a3ef14cf2c4..5d30c0b0f7ba6b28590121088e3188737258f460 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/cutf8.h b/src/lib/fcitx-utils/cutf8.h index 904066072f5ef1b5ca672cf3d60d69fc33bee2c9..8b608e7fa0d265ef9fb2b23e5de06a32df9de4f5 100644 --- a/src/lib/fcitx-utils/cutf8.h +++ b/src/lib/fcitx-utils/cutf8.h @@ -15,59 +15,52 @@ #include #include -#include "fcitxutils_export.h" +#include //// Max length of a utf8 character #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/bus.h b/src/lib/fcitx-utils/dbus/bus.h index b6885fdfa347b85d9a055146d8cb09def9ef9c7e..3c0ffc2846d4762a824b8dff2d1f93156ba67afb 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 /// \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 cb10c8bfddf0bc4491964b0beb82d1449d503f99..0141088777c92aa8ccd32b0a440ad587398e7494 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 8fad9a2605d90f6f0e8d9d9ca9793b2ead494e54..bafdd34e3288d59775f94634574a50d0a310dfce 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 9443c6b345be76429fd9dfa41afd0c7d3d6c0377..98e939c51c6fc342c9526dd3edfa0e0a73447a80 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 9e04a11abd3cc4f97ebf026e686eccd4747cebd6..75ebe8a27ad3e862bf13bcc37bcea082478551bb 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 ea3934fb86f9116403505dbdbb40b9acc05baf6b..0f4df5ccd5b8e5834f5cd50992ce6a8dd79cd4f6 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 8e88705dce0ed6520e1d02c5dd41b09f8df5af6d..d06703daa5fc7bdf23c7a2168f3a741fe701045e 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 261579a77eb4731aa0f44349b51cd69a58200586..56f0d018e923f38ee4d9731c9e091f1e96c58363 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 cbf6427763a7712cc9396d37d4f162a2c0e07d97..8d24c5e968cdbded424fa856b2d540f9a7868114 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.cpp b/src/lib/fcitx-utils/dbus/matchrule.cpp index 769660522330e3d3a99a340ec8135fec9688b325..f09906c5a3adb886c29477fc602040e4d24b651a 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 2bb03fc30807edbe15520db3e53a7fef444905a7..ed0f9f13825faff860f3cba3372dc5d0a2bd0815 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 @@ -18,8 +21,7 @@ /// \file /// \brief API for DBus matching rule. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class MatchRulePrivate; class Message; @@ -71,8 +73,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 5b7bbc4eef4eff4b56e6cdade5c3d4117106898c..f027a0a71e242198772f6289f3f5bdbc5b20e3fc 100644 --- a/src/lib/fcitx-utils/dbus/message.h +++ b/src/lib/fcitx-utils/dbus/message.h @@ -8,14 +8,17 @@ #define _FCITX_UTILS_DBUS_MESSAGE_H_ #include +#include #include #include #include #include #include #include +#include #include #include // IWYU pragma: export +#include #include #include #include @@ -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 577a9032d2db10491cd18738607d5b02a0b6ba58..54bd04f3440c308610baec5de51c2063dcdab75f 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.cpp b/src/lib/fcitx-utils/dbus/objectvtable.cpp index 63b82ddc8796e23eb420452940072776fa2747b8..e8c8f7fdb42e699ea4913ea2b7e654fdccfc8bff 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 c8cfe183b42c61b42f7122ee7f716208e29c26f7..f9de58e716a34d6ea166d9c22fd6ba1d5a3795e1 100644 --- a/src/lib/fcitx-utils/dbus/objectvtable.h +++ b/src/lib/fcitx-utils/dbus/objectvtable.h @@ -7,13 +7,16 @@ #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 @@ -23,18 +26,17 @@ /// \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 ccc2ba4a25a1aaa739130e016a81217ad3344602..e8009705af7c810865dbe5d9afbf0d427e7292f5 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 768d044e4e82985185182a64172f89c3935d40c1..7654eb65ddc8c93a511aa5cee5b8ce05a6a68439 100644 --- a/src/lib/fcitx-utils/dbus/sdbus/bus.cpp +++ b/src/lib/fcitx-utils/dbus/sdbus/bus.cpp @@ -5,11 +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 { @@ -17,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; }; @@ -117,9 +131,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."); } } @@ -136,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; @@ -148,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 87537bf4d3f2fc2c6ed17ace7328ea0b0ea3b91e..c24c52b1c4167edd30d198bc432d5915a9af625e 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 c53d20f34499bd0302f17c4deea5c2a447aa4bc4..998d3292fc4c728b1a70e8c35ac1cd5bd0dacc38 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 c8058e37c5b3ae32e1e8348ad9fb773acf3f0111..0a468334039ad5489eacff138dda9e80dcb5f948 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 c9b6f51fdf6dddc4da6b8b643e6e7775eac58ae9..e91980c87e13a4657b2bf85b165c39c0458e41be 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 0c1989c6879ad0ad7af038cd58f9cd4a79dc93f8..de0448d6e8208561bc60d7de898f324ac49e2094 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 91bad63e77c0e1f72f6841442844c612ac947c75..103cc2f3d32bc9e645f3ae124778eb9a0dbac73a 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 875d87bcf9c1dc3ec2bf4d77817a1f3c26a0398a..8fb2498ee4c7570551028502c81c9dd2d1879631 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 4298fc6df897106abfd56e9397c536ae89030f14..9d0fd282b9315c38f3287713e6262e4fd533ebf0 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 4cfeb7e2e1d5e2fdbeb8aa18a60a3e1f423b4fee..a9c2bf6c7dd83cbfcea662d72b6338fd50dcf9ac 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 965ead2b6396980913cb1a899534a0130bc4c6d7..459566113555d605f475de66914fd41f240f0cd3 100644 --- a/src/lib/fcitx-utils/dbus/servicewatcher.h +++ b/src/lib/fcitx-utils/dbus/servicewatcher.h @@ -7,9 +7,11 @@ #ifndef _FCITX_UTILS_DBUS_SERVICEWATCHER_H_ #define _FCITX_UTILS_DBUS_SERVICEWATCHER_H_ +#include #include #include #include +#include #include #include @@ -18,14 +20,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 +47,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 8287c123c26cfe6a419c9007003a63d18dc5f908..ef46c576155aefe62bd5c272b7ff708186dce799 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 73ade95548bda925270dc4a08600a48ba4c9d163..c540730b0a88076ad85f7ef6bbf9fc208dd0c34b 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 "fcitx-utils/misc_p.h" +#include +#include +#include +#include "../macros.h" +#include "../misc_p.h" +#include "message.h" namespace fcitx::dbus { diff --git a/src/lib/fcitx-utils/dbus/variant.h b/src/lib/fcitx-utils/dbus/variant.h index c61452cf640fa84452c55d0a04526c52055a7d0b..065b235e047803819a21c7d667f81ce3a65f1908 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 /// \addtogroup FcitxUtils /// \{ /// \file /// \brief API for dbus variant type. -namespace fcitx { -namespace dbus { +namespace fcitx::dbus { class VariantTypeRegistryPrivate; @@ -48,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() { @@ -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 167865a16f0f6a781a2bcf46fbab3a2cd86dbeae..32dcf3068ed4e2ced0d68859cea95762d930231a 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 5169cdbd7e993a029383a140d79f82a23e252850..e9b562c842012f07ced85df23760f1bede2556a9 100644 --- a/src/lib/fcitx-utils/element.h +++ b/src/lib/fcitx-utils/element.h @@ -7,8 +7,11 @@ #ifndef _FCITX_UTILS_ELEMENT_H_ #define _FCITX_UTILS_ELEMENT_H_ +#include +#include #include -#include "fcitxutils_export.h" +#include +#include /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/endian_p.h b/src/lib/fcitx-utils/endian_p.h index d524dfa230e2dfcd8f5a85417268bf3425198f68..332043b83cb420f8e632a9502d50c8a7891f3c2f 100644 --- a/src/lib/fcitx-utils/endian_p.h +++ b/src/lib/fcitx-utils/endian_p.h @@ -8,11 +8,11 @@ #define _FCITX_UTILS_ENDIAN_P_H_ #include -#if defined(__linux__) || defined(__GLIBC__) -#include +#if defined(__linux__) || defined(__GLIBC__) || defined(__EMSCRIPTEN__) +#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.cpp b/src/lib/fcitx-utils/event.cpp new file mode 100644 index 0000000000000000000000000000000000000000..bdbd5f4487ec1b429b7cde0f295f294707810e64 --- /dev/null +++ b/src/lib/fcitx-utils/event.cpp @@ -0,0 +1,103 @@ + +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ + +#include "event.h" +#include +#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)) { + if (!impl_) { + throw std::runtime_error("No available event loop implementation."); + } + } + + std::unique_ptr impl_; + + static EventLoopFactory factory_; +}; + +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))) {} + +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 066df708bc5b596d389cbe884b524def7cec6a6f..66a2755d06a18abb0220d2fe7c5d3ab1c751e407 100644 --- a/src/lib/fcitx-utils/event.h +++ b/src/lib/fcitx-utils/event.h @@ -10,74 +10,39 @@ #include #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); +using EventLoopFactory = std::function()>; 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. + * + * 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(); FCITX_NODISCARD std::unique_ptr @@ -92,6 +57,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 f84c7e3603c128d799a22ccfcd794afbb225a32a..93821191561da3b17967229641102331d358d83e 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; +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; } - void setEnabled(bool enabled) override { - auto newState = enabled ? LibUVSourceEnableState::Enabled - : LibUVSourceEnableState::Disabled; - setState(newState); + auto curr = now(clock_); + uint64_t timeout = time_ > curr ? (time_ - curr) : 0; + // 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; + return false; } - - 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; - } - - 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(); - } - - 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 { @@ -340,12 +143,12 @@ bool EventLoop::exec() { event->callback_(event); } catch (const std::exception &e) { // some abnormal things threw - abort(); + std::abort(); } } } 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) { @@ -450,18 +249,21 @@ 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(); } } -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 0000000000000000000000000000000000000000..d379b75a9f4474d4099e7e77b0adeeb405ec517d --- /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_none.cpp b/src/lib/fcitx-utils/event_none.cpp new file mode 100644 index 0000000000000000000000000000000000000000..16ed3b4aa99a940b6e3ec450d71308250b09c891 --- /dev/null +++ b/src/lib/fcitx-utils/event_none.cpp @@ -0,0 +1,18 @@ + +/* + * SPDX-FileCopyrightText: 2015-2015 CSSlayer + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + */ +#include +#include "event_p.h" +#include "eventloopinterface.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/src/lib/fcitx-utils/event_p.h b/src/lib/fcitx-utils/event_p.h new file mode 100644 index 0000000000000000000000000000000000000000..836a8a087ffde03f8f287fea7d5f87124abe0193 --- /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 0994f5e64f84ba0915e7d29beafe66815151441e..d96089986bf34d957fa78e62d488f88d900b9639 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 "eventloopinterface.h" +#include "log.h" +#include "macros.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()) {} - -EventLoop::~EventLoop() = default; +EventLoopSDEvent::~EventLoopSDEvent() { sd_event_unref(event_); }; -const char *EventLoop::impl() { return "sd-event"; } +const char *EventLoopSDEvent::implementation() const { return "sd-event"; } -void *EventLoop::nativeHandle() { - FCITX_D(); - return d->event_; -} +void *EventLoopSDEvent::nativeHandle() { return 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) { @@ -286,18 +300,17 @@ 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; } 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); @@ -318,17 +331,17 @@ 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; } -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/eventdispatcher.cpp b/src/lib/fcitx-utils/eventdispatcher.cpp index de9f7b4d9fd9b92238f126d7594ee6dd48d9ed21..cd88dc58baca7d406855fe22282905019fbd5ce8 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 6e4619b370fc5f5bc987213cdb590b768841f269..ebec160239eb9be287efa79477038063647ed097 100644 --- a/src/lib/fcitx-utils/eventdispatcher.h +++ b/src/lib/fcitx-utils/eventdispatcher.h @@ -10,9 +10,10 @@ #include #include +#include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { 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 ee5d72056371b824bf6f7863ce40e4d81b1a71be..02f367b35a10b24576c091e0f5110700690189c5 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 0000000000000000000000000000000000000000..f31c28f047d1cd1ce34f4fa1a286bf80924778e1 --- /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 + +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_ diff --git a/src/lib/fcitx-utils/flags.h b/src/lib/fcitx-utils/flags.h index 2bd2dad822ba989d35e797291f67e5e3f2fec95e..f84cc168e497cc34953d3cd4b5a50ed0d8e3f8b6 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/fs.cpp b/src/lib/fcitx-utils/fs.cpp index 507de8e1d71d14478fd9415c399f85f5f481f9bc..9f3b4309382b338cb6752edf87b2aed8cd0f1289 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 +#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 ad1e15c01464673ddbbd759ed1de880c6e54924d..1133154586977ff0944de14615f9962169620a3c 100644 --- a/src/lib/fcitx-utils/fs.h +++ b/src/lib/fcitx-utils/fs.h @@ -7,11 +7,14 @@ #ifndef _FCITX_UTILS_FS_H_ #define _FCITX_UTILS_FS_H_ -#include +#include +#include +#include #include #include +#include +#include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ @@ -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); diff --git a/src/lib/fcitx-utils/handlertable.h b/src/lib/fcitx-utils/handlertable.h index 6e71956d3be6c9fa04c4840de14848546e481a97..d74d0bdf541b3a84ee360a92987b92548f4fc4ca 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 ba657f7a9dcc4ec14ed273b5f4eeabfb44df8cfa..843daca08a970482d4aae6d9c5778b13831ae7ab 100644 --- a/src/lib/fcitx-utils/handlertable_details.h +++ b/src/lib/fcitx-utils/handlertable_details.h @@ -7,11 +7,15 @@ #ifndef _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ #define _FCITX_UTILS_HANDLERTABLE_DETAILS_H_ -#include +// IWYU pragma: private, include + +#include +#include #include #include +#include #include -#include "fcitxutils_export.h" +#include namespace fcitx { diff --git a/src/lib/fcitx-utils/i18n.cpp b/src/lib/fcitx-utils/i18n.cpp index dbee8f23ea75cb215359d8a8ff9bf2f28aace6b1..9c0799f0671b56b1e46af1ab7aed853f14eb1202 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/i18n.h b/src/lib/fcitx-utils/i18n.h index db4bf3f8fa5f2a84286f97cd2e154640dd907480..1f07f55c311baeacf6a34b96266121f9f6c8447f 100644 --- a/src/lib/fcitx-utils/i18n.h +++ b/src/lib/fcitx-utils/i18n.h @@ -8,32 +8,26 @@ #define _FCITX_UTILS_I18N_H_ #include -#include "fcitxutils_export.h" +#include 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/i18nstring.cpp b/src/lib/fcitx-utils/i18nstring.cpp index 2c6f7436ab44df860705b251aed009aca523f7b0..da9dfdd60ddfcae4b211d2fa3a30278977ef6e07 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 4ba7b996e622fb1ed2550e7df9e523c3e725f0f2..a69c179aeff667823aae1638d493db8736be10e2 100644 --- a/src/lib/fcitx-utils/i18nstring.h +++ b/src/lib/fcitx-utils/i18nstring.h @@ -7,10 +7,9 @@ #ifndef _FCITX_UTILS_I18NSTRING_H_ #define _FCITX_UTILS_I18NSTRING_H_ -#include #include #include -#include "fcitxutils_export.h" +#include namespace fcitx { class FCITXUTILS_EXPORT I18NString { diff --git a/src/lib/fcitx-utils/inputbuffer.cpp b/src/lib/fcitx-utils/inputbuffer.cpp index 0dc03b3b1f4852471f6bc0aeb35c5a6c8e3f9087..67f7345e8426deedc4e7600aa653548d26930228 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 6ec8b10fa1c58753ddd7970515259723f0c6c12a..0702a45745cc6094a9b3b11e08fabd491715888b 100644 --- a/src/lib/fcitx-utils/inputbuffer.h +++ b/src/lib/fcitx-utils/inputbuffer.h @@ -12,9 +12,10 @@ #include #include #include +#include +#include #include #include -#include "fcitxutils_export.h" /// \addtogroup FcitxUtils /// \{ diff --git a/src/lib/fcitx-utils/intrusivelist.h b/src/lib/fcitx-utils/intrusivelist.h index c0e08ad53ce710bb582b63197a3f6d09b8a7d394..5c01bff8216bacac9380c7ecb7f161e03d8a5e31 100644 --- a/src/lib/fcitx-utils/intrusivelist.h +++ b/src/lib/fcitx-utils/intrusivelist.h @@ -7,11 +7,13 @@ #ifndef _FCITX_UTILS_INSTRUSIVELIST_H_ #define _FCITX_UTILS_INSTRUSIVELIST_H_ -#include #include +#include #include #include -#include "misc.h" +#include +#include +#include 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 f9f9462536a60a041d9cfa7edf066bbb74537c13..577010553d27320615435daddb4d61c75f905158 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 9afcf917150afb3e1056aa380d7ed32e2e9e4a3f..09d991ace3802ebea7b42f2f9dc01f1d6a28f60e 100644 --- a/src/lib/fcitx-utils/key.h +++ b/src/lib/fcitx-utils/key.h @@ -18,9 +18,10 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" +#include namespace fcitx { class Key; diff --git a/src/lib/fcitx-utils/keydata.h b/src/lib/fcitx-utils/keydata.h index 211d3d21050cdfcd175e6ac0c8304be04a23bb23..e9c862516b0d6e163be4774ee48aba30e0f942af 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/keysymgen.h b/src/lib/fcitx-utils/keysymgen.h index c70b0b9971cc93bf3cbd280da26a12ef11ce3a90..eabfad22ebee2e90419d85dbc5f15c27995ab973 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) diff --git a/src/lib/fcitx-utils/library.cpp b/src/lib/fcitx-utils/library.cpp index 8737f9a769c44610173dd05e840ce856234f1cb5..4dbe80c3e86b717f3d045883183f5bb7c0c3d880 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 11132775d6374841e92668b45bf580fbc1f4ddf3..e11d84ebd23bdc4a7db4132e0742aca6c567605b 100644 --- a/src/lib/fcitx-utils/library.h +++ b/src/lib/fcitx-utils/library.h @@ -12,12 +12,13 @@ /// \file /// \brief Class to handler dynamic library. +#include #include #include #include +#include #include #include -#include "fcitxutils_export.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/log.cpp b/src/lib/fcitx-utils/log.cpp index 705bc270318eacf7572b431eeb9da2c4fbb024f1..8f47910c474c3a19c95962e77b3458625a7f3494 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 ebdb815898dc6d4de04db4b39dd335bd85f6027f..9f36e3ee15fce7ad78583743487f50803c8cf58e 100644 --- a/src/lib/fcitx-utils/log.h +++ b/src/lib/fcitx-utils/log.h @@ -16,18 +16,22 @@ #include #include #include +#include #include #include #include #include #include #include +#include +#include +#include #include #include +#include #include #include #include -#include "fcitxutils_export.h" namespace fcitx { @@ -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 f2863a686d0bf4d5c10756a41062ef389dacca65..c9125ec46ce897b23dfff6fdad39028e220866ae 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 e31993cb34708490b4d42b29bbc93e777552f216..ef5eb415a9f3d6a1d2daf072b1526fcbacadf6c7 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 @@ -21,13 +24,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 +79,7 @@ void startProcess(const std::vector &args, int status; waitpid(child_pid, &status, 0); } +#endif } std::string getProcessName(pid_t pid) { @@ -111,6 +124,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 +136,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 +154,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 +164,7 @@ bool isInFlatpak() { return fs::isreg("/.flatpak-info"); }(); return flatpak; +#endif } } // namespace fcitx diff --git a/src/lib/fcitx-utils/misc.h b/src/lib/fcitx-utils/misc.h index 2c506fb678873e9a88449bca567cef5e504448b2..6a48096a91707bdcc22453becd4759579bd9c870 100644 --- a/src/lib/fcitx-utils/misc.h +++ b/src/lib/fcitx-utils/misc.h @@ -8,14 +8,16 @@ #define _FCITX_UTILS_MISC_H_ #include +#include #include #include +#include #include #include -#include +#include #include +#include #include -#include "fcitxutils_export.h" namespace fcitx { @@ -169,6 +171,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_ diff --git a/src/lib/fcitx-utils/misc_p.h b/src/lib/fcitx-utils/misc_p.h index a2f2f76da7ad97a33ec0060f8dbf35f2b5a715bf..f8235e4f4628369090cacdfc7c769f32fb49a362 100644 --- a/src/lib/fcitx-utils/misc_p.h +++ b/src/lib/fcitx-utils/misc_p.h @@ -10,14 +10,17 @@ #include #include #include +#include #include #include +#include +#include #include #include -#include #include -#include -#include "endian_p.h" +#include +#include +#include "config.h" namespace fcitx { diff --git a/src/lib/fcitx-utils/mtime_p.h b/src/lib/fcitx-utils/mtime_p.h index 032dd79f655e7e7d41c7d90a22de2bf394637bb7..e0de5b7f5b9f48c7f67efff806e8d029383c219e 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/rect.h b/src/lib/fcitx-utils/rect.h index a99cb8c21c2cc58fdeb9108e1c3de676ccf0c0e2..8a2e0e4032b11ac4585e1d9e96ea87bca9279348 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.cpp b/src/lib/fcitx-utils/semver.cpp index 91bc03de585763b29c8fa8c4fef7b2da3f226683..867f1372f55dccdb638cd474a8de8cbbf4a97548 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" @@ -23,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) { @@ -35,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; diff --git a/src/lib/fcitx-utils/semver.h b/src/lib/fcitx-utils/semver.h index 7d1103fda680c6d39710b0f5c4082cce5ed678de..59993459b220801e82df5f606b4299b11c75814c 100644 --- a/src/lib/fcitx-utils/semver.h +++ b/src/lib/fcitx-utils/semver.h @@ -10,11 +10,12 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" -#include "log.h" -#include "macros.h" +#include +#include +#include namespace fcitx { @@ -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 ec43b090c9fb0c84726e86081cb74e71299d8054..07e5c04a26543e4aa0dd290aaa28d31ab1951ddc 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 687618ed2d91b8b7646b667e60bb9f22d5f38f8b..17c5d164ef49eacc660d400ede860e06f3d22658 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/standardpath.h b/src/lib/fcitx-utils/standardpath.h index 810459c1954eb186e32938fbac1c5d2c64059da3..796242eda0354af0afcc7749e86533cbe7e61729 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 c2f7dfe3e37373acf35a5326d0e42b921dc48af7..bf1134726518bf42477f470660f26e5dbdad9d07 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 #include "charutils.h" #include "macros.h" @@ -407,4 +414,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 fc8888f34ebd734798cfbfa81ece2e9dd3cc5328..b1e8a6263ad86ea4335ac03f3e472e4029653107 100644 --- a/src/lib/fcitx-utils/stringutils.h +++ b/src/lib/fcitx-utils/stringutils.h @@ -17,10 +17,11 @@ #include #include #include +#include #include #include -#include "fcitxutils_export.h" -#include "stringutils_details.h" +#include +#include // IWYU pragma: export namespace fcitx::stringutils { @@ -58,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 @@ -182,6 +182,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/src/lib/fcitx-utils/stringutils_details.h b/src/lib/fcitx-utils/stringutils_details.h index a5c90a1f069dedea93e27962c622b2797bd56697..addb36b454af43e0e5f0d9560b271a9b93211241 100644 --- a/src/lib/fcitx-utils/stringutils_details.h +++ b/src/lib/fcitx-utils/stringutils_details.h @@ -7,15 +7,17 @@ #ifndef _FCITX_UTILS_STRINGUTILS_DETAIL_H_ #define _FCITX_UTILS_STRINGUTILS_DETAIL_H_ -#include +// IWYU pragma: private, include + #include #include #include -#include +#include #include #include -#include -#include "fcitxutils_export.h" +#include +#include +#include namespace fcitx::stringutils::details { diff --git a/src/lib/fcitx-utils/testing.cpp b/src/lib/fcitx-utils/testing.cpp index 5b7ed79c5e5010f970ff916767013b789af7e4aa..cc4b3199ffb5c0241703d4d6bc84c005bc162ee0 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/testing.h b/src/lib/fcitx-utils/testing.h index ef606ac437a4042deb233d407a16b05a928962e6..de921d6b18d6d5ac9ef0d588bf80f91f9b4f5bd4 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/trackableobject.h b/src/lib/fcitx-utils/trackableobject.h index 15638f8185c03ac0380be678672e6e160a56f199..ef13646a145c51a0fdc43f5954a6387fce165e6a 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 16e9613412f7f0742fee038dfa8802daa51212a0..fcc93e3520fb282e5cb37d1f3b2aa4a96bf92ee8 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 13861fd2b75fef1ead1adeb6d44d6b53b534fee3..18678a2b72f3252cc6b9cbf4e00ab0103909525f 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/unixfd.h b/src/lib/fcitx-utils/unixfd.h index 97d4d75198a31da91703712d2b65d0ba0b37e649..01980e3ffbbbb329d60bec566529c09991b9e46b 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.cpp b/src/lib/fcitx-utils/utf8.cpp index 36e8d926e5d4ff4a2af9416298938117a77807f8..1d30fe678b4fdd0b0a55b384c11a46c5c6e82da0 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 e9dfb82b31d8279f19ab2e747cadf771287e7b0b..7eb1c1cc255c3f716bfd3add2652b096f62fab0e 100644 --- a/src/lib/fcitx-utils/utf8.h +++ b/src/lib/fcitx-utils/utf8.h @@ -12,13 +12,18 @@ /// \file /// \brief C++ Utility functions for handling utf8 strings. +#include +#include +#include #include #include #include #include +#include #include +#include +#include #include -#include "fcitxutils_export.h" namespace fcitx::utf8 { diff --git a/src/lib/fcitx-utils/uuid_p.h b/src/lib/fcitx-utils/uuid_p.h index 165b9a4c70a360de1d0055d45853a4133d9acae6..3b3fe6a696d29ee8a581a69d941e8dcda997169f 100644 --- a/src/lib/fcitx-utils/uuid_p.h +++ b/src/lib/fcitx-utils/uuid_p.h @@ -13,9 +13,10 @@ #include #include #include -#include "charutils.h" -#include "event.h" -#include "unixfd.h" +#include +#include +#include +#include #ifdef TEST_DISABLE_LIBUUID #undef ENABLE_LIBUUID 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 4d17c63e4bfc33e77c378f743a072508862750fc..b1507d499b99f4fddcfddf4fd7a4661a4e561619 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 9ca840d22cbe6413bc8c5652e5d1dd58579e6f9e..0518c4a0560a1b51391a250b27435f155fc33259 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 ad69bc4e22fc807e5727b765daf33dca9eefaf0b..0e90b992f05ec75900d68f9bb068c3e99ad94e26 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 a3b6e5c5cb9a586cfb07fb025b30e952df10eef0..57cae193a7f71f48aa927073fd8d9e131076b7fa 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 f9089f3d0a47fc62977b96f74c1e678add1b48f0..a06173e8de234357405ec63cebac1df0f7d8372c 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 75dae7fec61d5c0d675b0a627c82287577f84cbf..74087b763eb1998b9f85b5e5d578005bb2d0c95c 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 02fbebf4fece4b8bfe58b9d5e39b9938babcab37..8f89c7a7c0a9e06b1bc778c2351cf14abc4c53d6 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 fd94205044f50ccdd9fe1a7873ef8d62a6505c68..6c1e72a9bca9015572160aad1b281e91f27998c0 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 d6f50192f34689e27b5de5b888cdfa23e6b4bb5a..c531479607d400fd9b466c99e3167b2e2048d955 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 104e4e04debde7a2c81098e0c0686c4e27a905b3..820d59353d87fc400c7b8a92cae85bcca6de183d 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 27c6f9560e7b2b0ca1f06aff5d76164ad0edf0f1..a4539295e676e3fc8e54b153d74e8c9aac8c4cf4 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 a7af34145163decbb353b54e32664c7e80eac9e6..f2bfa6d577b93548dadacad1e4361abfa70ba06c 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 2b0cb08e6e946e57a3fb97ceae9aea8de92e0bd7..acdba6d5b96687cf593b42a8a284b1e520693121 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 21fc8d0f0a4fbf943311c885edd363b737160502..469c38672b931e564639e04c3a08e37e20c66034 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 39303aef7b4d1b1966c09f40d626dd1db805318c..9b54aebd4f42b5693e6f33906fd9f957d9b306c5 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 74a5411bc17e6f951cce20836e9081c08d75aa15..68ff1ebd8feedf42180dc7470c22e7d03dc066db 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 be831a0944d449806209790ccbad74078b942b2c..2bf11951e2c0bdd93f9883cbb4fc6ee4d5e21789 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 3681e1fd0d13493a03655e02c4fa7fb0afa089ac..947195d36b641fce3d2829af1791ef80fd1cc9d4 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 59bd11e768a29e8c428ce0d2d2fed4ec855263a4..425cf23675784f200f03c25dcfd4e3cdc7ef37f5 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 69cbf0aea9ccc7ae9be130a6f3055e9a7621e6e8..5e5b7f435944217686ba66ffc0c1fa01ad6f87c6 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 dd3e2cc93c50e097f5b8f2436a1af501c5115d2a..fdd37c06791601691c9598d58514eab0dc2a9e8e 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 22bbc478dae8a22e339cbebe91d50f051b1b4594..407f71b7b071e046b880fbe6399335b66a8cb333 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 b428837c471163098dc1703fc68a5c026653db2d..ead6374837c59911ff2fd608f9bda39dd95215fa 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 875a49ef08f1f8ee0083071edf4d04790ff9409f..78c906218b763cc3d348475b7da32943e4aecfe4 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 bd7eafa8f1e642e0d51a479252f86479a81d17e4..eb0603f30b380212a60fb38a7949405a9e3e937f 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 b94ae507e2fff388f01d28048d5fcbb268789fdf..17dadee2db0c3ef2ecad70f9716cd1bba3febb81 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 3c19cc6abbece596bef66b308be1f15961d9b404..9999fe8de59cd71feb0ab55f05e14b47c798fc69 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 c2a5501205a07f83050897c46d6445dfae4e6d4d..6090b81fd9c5f2e1ad9a07d68e55584c43baf16a 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 642865189fac45ee1341283150f05fdda514e0db..43f398b3af7bfcd42ffc497de0b112fcacd8838e 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 06cba7d50b514a5096477830be159d2c55668730..a344cf327e233bd4cb13dcf90d62ef2270d295b3 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 c672f614615d3b839717a04525e2d1f4ba5095cd..a7f8c81052766be71ea295c0be609ce0cbedc224 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 5111febe71bc0b23e93e9fe8a95e25de053b7f85..f38137215a0f5ec9f3648aa08b84d7632f8d7b6a 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 6fc8b7a3448f2615f0e3d1241e4cea5f8e832b68..3973456a9c22ae2db74efdb18477305fa18493a3 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 756d1e340c2fcf91faed403e95ec6485a8265dca..a720e8643cf203112767c04b9ee71ece0591e509 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 2eb4fefe0b3511cd71ba9aa36640b59b0b7a766e..3862df51fd39f66b83a46409177062e62d961b8f 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 837671c76774966c026c0945e0f88b2775344e38..f453ee451551c9114b035bb520cbc66c62d164c8 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 41e47bad4b990d51939138af16e2a7e16b151851..705675cf91280c683e5e29a4f858fc9b713f39d6 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 0ae93b2047d384d6893ea53d66c0cc75acbf7278..801b93f84f2742476de3ce616bd7a5211c013e99 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 bf6d70397bd3aab532a02a27433dc3df74c6c41e..af73c2a9f695aa7dc1ed5e80196fd6172c081d7f 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/CMakeLists.txt b/src/lib/fcitx/CMakeLists.txt index df15dd57bee0c53557e71159346d158c780784f2..927d16768bc242def0d22d8bf2644ec8ae1faeb8 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} @@ -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 b840c89c4d659af60f8a79bad14e3eb7c272277a..bf9b05f2dbd6ca1c7d47f3b9582e85021344a751 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 b1c287df8562bd575623628b185a3396e00369b8..1dd63c7c46fb1023232ff1c9fd0e4a426cac030c 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 55704851e6880972fe7b84251ff1288fdfe78b7a..3d4a8ce3456381b7361c4373da53aae0e97f447b 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 30d311fcb1c1a8bcc799c565abe0613a1a46b6af..80a1fa88bd1d3b948523d8604e7bdcb3258e7407 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 /// \{ @@ -192,13 +192,45 @@ 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; \ } \ } +#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_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(StaticRegistryGetter, AddonName) \ + extern "C" { \ + ::fcitx::AddonFactory *fcitx_addon_factory_instance_##AddonName(); \ + } \ + class StaticAddonRegistrar_##AddonName { \ + public: \ + StaticAddonRegistrar_##AddonName() { \ + (StaticRegistryGetter)().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/addoninstance_p.h b/src/lib/fcitx/addoninstance_p.h index ec7873e8b19bd77ba88806629a1c3cae087626a3..2aad8188eab3a83fb4587e63a1e698bebcea532a 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.cpp b/src/lib/fcitx/addonloader.cpp index efa9515ca93e22c752277623e601f4fcdee7cd6e..a069b6a1c4c4a5a3c11e0f7f4831d77978c7f4a6 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" @@ -20,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(std::move(lib))); + registry_.emplace(info.uniqueName(), + std::make_unique( + 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.h b/src/lib/fcitx/addonloader.h index aa7fba88dd39ed679ca6899202f1d53d74429650..452266b56dadb43e1a2070b4b2c45a5daf34c832 100644 --- a/src/lib/fcitx/addonloader.h +++ b/src/lib/fcitx/addonloader.h @@ -4,21 +4,21 @@ * 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 #include #include -#include "fcitxcore_export.h" +#include 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 f07a6aa7bb0bf3dbe2c30b4d3fa1a76f4e7bfee2..e15894f3d7795be3c51126d8860516388f1c23e8 100644 --- a/src/lib/fcitx/addonloader_p.h +++ b/src/lib/fcitx/addonloader_p.h @@ -7,22 +7,44 @@ #ifndef _FCITX_ADDONLOADER_P_H_ #define _FCITX_ADDONLOADER_P_H_ +#include #include -#include "fcitx-utils/library.h" -#include "fcitx-utils/standardpath.h" -#include "addonfactory.h" -#include "addoninfo.h" -#include "addoninstance.h" -#include "addonloader.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include 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, std::vector libraries) + : libraries_(std::move(libraries)) { + std::string v2Name = stringutils::concat(FCITX_ADDON_FACTORY_ENTRY, "_", + info.uniqueName()); + 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); + } if (!funcPtr) { - throw std::runtime_error(library_.error()); + throw std::runtime_error(library.error()); } auto func = Library::toFunction(funcPtr); factory_ = func(); @@ -34,7 +56,7 @@ public: AddonFactory *factory() { return factory_; } private: - Library library_; + std::vector libraries_; AddonFactory *factory_; }; diff --git a/src/lib/fcitx/addonmanager.h b/src/lib/fcitx/addonmanager.h index 09bced6d9c35f57d3a5e943ba0257af964be84e4..1b99013de017f63c38943b463f7535b6cb04241c 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 a5b9dff74b0a711651cc6982cad773b9b6a0bfc0..659e01a2ef99cf2a6e8f677e2f3ff5b2d36de432 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.cpp b/src/lib/fcitx/candidatelist.cpp index 4d1950ed4742947b252359662a85e319e9cc8299..dc8dcc32b4b253be27eb7bca6a71a2687ef72a63 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; } diff --git a/src/lib/fcitx/candidatelist.h b/src/lib/fcitx/candidatelist.h index 8013e4fd9394c2488dcaf80eb668e725633b12b1..e188e17a3351a1b2e4a46e2a7c9ac6a9fce9344c 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 0ada9bb0751206369e8d61f7e3d8bbc116c6d509..3ef36628a95ee8d19d7efe21779263e4fadddfa0 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 b46692e3cd3ba1479906e4cbff7f1a9470fd1847..cc620342a026b92dd8795bf2b78ec9ab6cb0c0b7 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 949d3bfe9c6c10aeed03d18423b3a649121481a0..f7e59a3adc68cba95839151d4cc9b7b0efca1a95 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.cpp b/src/lib/fcitx/globalconfig.cpp index 763e7282766099ebeeae41a9a99fc8e43aa6b0cc..23ebc57a54bb7a09ee063eaed874d7ad5a3b9e7b 100644 --- a/src/lib/fcitx/globalconfig.cpp +++ b/src/lib/fcitx/globalconfig.cpp @@ -6,11 +6,20 @@ */ #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" @@ -133,7 +142,20 @@ FCITX_CONFIGURATION( "TogglePreedit", _("Toggle embedded preedit"), {Key("Control+Alt+P")}, - KeyListConstrain()};); + KeyListConstrain()}; + Option, ToolTipAnnotation> + modifierOnlyKeyTimeout{ + this, + "ModifierOnlyKeyTimeout", + _("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 the modifier key is released within " + "the timeout. -1 means there is no limit.")}};); FCITX_CONFIGURATION( BehaviorConfig, Option activeByDefault{this, "ActiveByDefault", @@ -401,8 +423,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 b1daee3eb4da3c134035d49de08217083cb63d26..1ddfa842da1ee70731c19dff820f7e29c6fedde4 100644 --- a/src/lib/fcitx/globalconfig.h +++ b/src/lib/fcitx/globalconfig.h @@ -7,13 +7,16 @@ #ifndef _FCITX_GLOBALCONFIG_H_ #define _FCITX_GLOBALCONFIG_H_ +#include #include +#include #include +#include #include #include #include +#include #include -#include "fcitxcore_export.h" namespace fcitx { @@ -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/icontheme.h b/src/lib/fcitx/icontheme.h index e01af578916945f55874aaf7710bed114dc6a1d0..bbb123c5ef4dbe77a57a7f7aad711e6e569d2155 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 215f93312074dcecf9514c228a637b04d510e646..9fd6817211b30c489d96b146fc0afaeaacd8a80d 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 0b7bc693a3452f8893f893df188911ad1f8c390f..466878cf259f0732c244a171a472e53f55d21e37 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 3c3561f5d523309572b681e23949808e692cbda7..c4346424a3146968e6c9612459d094ca669da447 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 e5c0d99c3943bfd7891afc9a7872a2a6afe5432b..1a94f7ca28997e65d58a595f35a1d2f0e709f18d 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 5b0349d351f1170ccf7873452c01a427489c1a46..75f7fcb5511e90a6244bdeb8639ed7923048d5e7 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 8b8f0e9fbe0442ce12e615b625e591be6f833a76..b792b2e8f11afa8ba4d58fa39e6fc9f5bb0215bc 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 a01431a205ee6f24847c98877717e0af4b8ee2ec..3c1f230982596f2f587c882db04b2a0d7d724868 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 075c6f26e86085f00cb39e682e0b0d8488332542..fa85aaa41c590320cc910bff2e16f7882e61cf61 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 41757fbdd711d6673ddf92a24ef75608342283b4..5d06fd680e93c4b8d13e812d3166173d60b99aca 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 63faabb8c350f087f1f5d797b085291e5e43078a..9b88a1c3fbff860ecf94154ebf453b648f135872 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 a78ba2690f22e9d013145af4317f4973e93156d8..ac2681c19d03d1e6788fcdc3a45a9aa04dcf92cc 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.cpp b/src/lib/fcitx/instance.cpp index d2e9aa23f71d1b7c8353e8bc631951f61015e3f9..d23a957d08a56bee725372e06e43cdb16bc6d527 100644 --- a/src/lib/fcitx/instance.cpp +++ b/src/lib/fcitx/instance.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -23,7 +24,9 @@ #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/key.h" #include "fcitx-utils/log.h" #include "fcitx-utils/macros.h" #include "fcitx-utils/misc.h" @@ -580,6 +583,7 @@ void InputState::reset() { pendingGroupIndex_ = 0; keyReleased_ = -1; lastKeyPressed_ = Key(); + lastKeyPressedTime_ = 0; totallyReleased_ = true; } @@ -787,7 +791,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 +829,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(); @@ -920,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; @@ -1042,11 +1054,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 +1101,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.h b/src/lib/fcitx/instance.h index 5e1102e47049060902aea49c6cbbb1bb2f6febbf..ace03efc2c03a990ccd95d900ac68fba017fdbf1 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 4676d89a4345a6fbd14e69130248801555bd894a..e386a5ef69e848fc3d54bce9fb660a7811bb1608 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 @@ -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; diff --git a/src/lib/fcitx/menu.h b/src/lib/fcitx/menu.h index 9870a5dad1d98f759f147d93faf8c9eed61e966c..65e132ccaa6189032215e9a6a14d2bf236953128 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 6eabb05458708c4db2606ccb30bd1171081a8769..1a3354550ab26605e32581a8b2b4f444de6a8c7d 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 a3826008a11d98bbbb64a1659e82ccd6e2a5a849..fd2de37b23d3b427620bb169e97dba9c7a6d8396 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 ee26b2f4e7129606ae34a94db4987e1c78bf064a..e98a3b4fa409612ac94335142900fa0e1b4ae622 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 /// \{ @@ -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/src/lib/fcitx/text.h b/src/lib/fcitx/text.h index 12d23537c146a2ce70b6ff7bb57296f36f7e8b94..bb52083980740a56e6c2d318f06dfe3c93078173 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.cpp b/src/lib/fcitx/userinterfacemanager.cpp index fa9e2698e4479ba387b046636259376b50be0780..19178b09a71e0d735405ab873fd1fbde68749fcf 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) { diff --git a/src/lib/fcitx/userinterfacemanager.h b/src/lib/fcitx/userinterfacemanager.h index 322691f594ad642b07ce6241515cfe796b4471fa..70a2a32ffead8195b3026dce4175d9945954746c 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/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt index d00d281a87ac8eafb69b759b297006aaa6590df4..997c4e3e004fb4e9ce95f20d76a616b3bacc476d 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 250865313d2cf086fc6adc140961d92ac9d62942..286ed32ffceb9098e282d73d49f73914bec5a3cc 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@ @@ -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 9ba497998b7b077b76be3f1cc31680f348a7ee83..27443de61ff4ec2e2cbe7f75d06513e2be5819f5 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/clipboard/waylandclipboard.h b/src/modules/clipboard/waylandclipboard.h index 217878eeaec90f481e464801c0a6988977a3d114..1013628bdd3a69ead624eac449492a6e53989c0d 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/dbus/CMakeLists.txt b/src/modules/dbus/CMakeLists.txt index b311b1efaf00f6120326177b536c27624b4cd033..349309aee00d5785281bd9993609e1826f31bbfc 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 1b0c65fbebbb2d56c182898835e2678f0e8c1033..9d365ab7f95a858d224c3f535838a81bd4e03422 100644 --- a/src/modules/dbus/dbus.conf.in.in +++ b/src/modules/dbus/dbus.conf.in.in @@ -1,12 +1,13 @@ [Addon] Name=DBus -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libdbus 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 23e69bfdfdcf489f9f6e3033eadf4906754b92a5..bb46e9936327926abae810eb2f663d8ac6578d42 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/CMakeLists.txt b/src/modules/emoji/CMakeLists.txt index 2cfd65a0cc664b1a2c9f5f04fc61d53b4672fc0e..cd7c3d903317932622be5e58206e678677006157 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 ba9078a3406fc15abfe19e6ff5a77dc401804777..9be23ef84c69c04a41b66ec4ad2f9522857bc41e 100644 --- a/src/modules/emoji/emoji.conf.in.in +++ b/src/modules/emoji/emoji.conf.in.in @@ -1,7 +1,10 @@ [Addon] Name=Emoji -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ 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 4c6aa6b918208e466c7a8173714f0b7bd1cbe9a3..9dbf57afcd5b4ff87d01f20ee2ba96998971df7c 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/CMakeLists.txt b/src/modules/imselector/CMakeLists.txt index 5b39985446a19b2e38dd975c5acdc3eb83e858a4..f8d5e8d3ed7da0ba23abe58161440e556faf8a3b 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 a935dd85b30de68bd1c75d47312cefa7f6da1733..8d4365ee53902281fe3636264d9061f6dc0cc17c 100644 --- a/src/modules/imselector/imselector.conf.in.in +++ b/src/modules/imselector/imselector.conf.in.in @@ -4,6 +4,9 @@ Comment=Select specific input method via keyboard Category=Module Version=@PROJECT_VERSION@ Library=libimselector -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ 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 092a32d41bf217dc53a963c8f68d302231572079..858d145af772a98bac36c796326ad6024cfb8363 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/CMakeLists.txt b/src/modules/notificationitem/CMakeLists.txt index e6ee3aeb34e28edfa9a51b0ca0ef209bd17532b5..d164b290cfec03e50d5818b1ac6e449b784e53b0 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/dbusmenu.cpp b/src/modules/notificationitem/dbusmenu.cpp index 10e33c50bc73fdd92302435f4d99af1c49a131db..641019592d49623e5277cf831abfd8d968c9280c 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) { diff --git a/src/modules/notificationitem/notificationitem.conf.in.in b/src/modules/notificationitem/notificationitem.conf.in.in index 9e14810dd7116b6d6503c4fbe0098c85435facf5..5899a4f41ff39b46d299192b2f32f548dff761a3 100644 --- a/src/modules/notificationitem/notificationitem.conf.in.in +++ b/src/modules/notificationitem/notificationitem.conf.in.in @@ -1,12 +1,12 @@ [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@ 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 b94f7789e87dc2fa77004ff8e1a80f0a25aa453e..57c835c6a78138eb9bb931b4f590531e7ea7710e 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" @@ -27,6 +28,7 @@ FCITX_DEFINE_LOG_CATEGORY(notificationitem, "notificationitem"); #define SNI_DEBUG() FCITX_LOGC(::notificationitem, Debug) +#define SNI_ERROR() FCITX_LOGC(::notificationitem, Error) namespace fcitx { @@ -53,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); } @@ -363,7 +369,8 @@ void NotificationItem::maybeScheduleRegister() { } void NotificationItem::enable() { - if (enabled_) { + enabled_ += 1; + if (enabled_ > 1) { return; } @@ -373,13 +380,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() { @@ -414,4 +428,4 @@ class NotificationItemFactory : public AddonFactory { } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::NotificationItemFactory) +FCITX_ADDON_FACTORY_V2(notificationitem, fcitx::NotificationItemFactory) diff --git a/src/modules/notificationitem/notificationitem.h b/src/modules/notificationitem/notificationitem.h index def6b0dffbfba311756015d1b9b6b6c80d536af7..b9630db344b4b3442d00c781e2644d9ee30cd7ea 100644 --- a/src/modules/notificationitem/notificationitem.h +++ b/src/modules/notificationitem/notificationitem.h @@ -8,9 +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" @@ -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 ab06e6a5351a6d1be658851b8e76bb13b6681a60..04039149eba51c54d81cd0f14b9323899338ff02 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/modules/notifications/CMakeLists.txt b/src/modules/notifications/CMakeLists.txt index 6da46600c3837fcc8ff96bd0a81885302ae0ab3c..2b1a7b0c7811eb53be4fdb88a0b6bfd59b86ab6f 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 3c962a3ba7a9ba1c65f608083659c675b45689d4..539f03f3d3cff1a6bb654c815acd39d4d98ffb65 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@ @@ -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 7e0728468c776cbf4b7b5f05ece7764bf9a31301..4dc6a831a74d3a8a214bc25368fce3dfc037ef2b 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(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 6ee3c869093aa52bd54f2585646c309a9528dba3..2ec3b4779db421c18fa2bb2e74e87e8879a96fa0 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_ diff --git a/src/modules/quickphrase/CMakeLists.txt b/src/modules/quickphrase/CMakeLists.txt index 2b0458f6dd153091e60c0b329e5fff4ba722ee52..b5bc37ac294d9f5abba5447d1c9ca768d4da4759 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 672ef21a316d6f127eede4f28591e6f1b7777e45..7f63d8d7300a19e6429dad0d4a7a0d32047ea35f 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/quickphrase/quickphrase.cpp b/src/modules/quickphrase/quickphrase.cpp index d1d1979c47b3ae6b573299cfdcf37fa382fa65f1..0034021441558b664506d98a7e5a25864ef60b93 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()); @@ -546,4 +581,4 @@ class QuickPhraseModuleFactory : public AddonFactory { }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::QuickPhraseModuleFactory) +FCITX_ADDON_FACTORY_V2(quickphrase, fcitx::QuickPhraseModuleFactory) diff --git a/src/modules/quickphrase/quickphrase.h b/src/modules/quickphrase/quickphrase.h index d47f7d8fb7f580da99802123f0e30c48a775b8ab..262fd6ee47ed2f205e425c176468b54d22caab3f 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 8da49a3af56f65bdf4bde87a2c03e70ceb4685dd..1ebc6283d3992f4a0a5a55cb9b2c18551a9841a9 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/src/modules/quickphrase/quickphraseprovider.cpp b/src/modules/quickphrase/quickphraseprovider.cpp index 6755db41bca51246aefc633c2359e0ff45ba4a18..25fecb4760af474263041eae45f73c99f421a624 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" @@ -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) { diff --git a/src/modules/spell/CMakeLists.txt b/src/modules/spell/CMakeLists.txt index 094e1a58ccbc491fe682543724477cabf672e93f..acdbb2b11107ae075e10b222ceac96199d2ba753 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) @@ -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() diff --git a/src/modules/spell/spell.conf.in.in b/src/modules/spell/spell.conf.in.in index 0d8969ee2b237492b3a0e4d8d59cbc2c528a917a..8beb25464b5ea6d7d5547e9d3e34b0576566db11 100644 --- a/src/modules/spell/spell.conf.in.in +++ b/src/modules/spell/spell.conf.in.in @@ -1,8 +1,11 @@ [Addon] Name=Spell -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libspell 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 cc3d951f3c71c902834a0c05539f1f6df660e793..6044c93597b6afdfcf531989d3c258857100200d 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) +FCITX_ADDON_FACTORY_V2(spell, fcitx::SpellModuleFactory) diff --git a/src/modules/spell/spell.h b/src/modules/spell/spell.h index 607789623f47dd066867b83239a45167d4eb0a49..3cfa2db59a373ae2a0215eeadb7ad7af48a61c86 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_ diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt index 9534f0788988213306181e09a86ada1c4675ba80..73f7e064c86cb625c33728369068de20a532373f 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 28cbe3f77be08e6c7a16180a398a4ce85c1369f2..ec89658a4e4d18b042bbd0abbaa5ded6d30943c8 100644 --- a/src/modules/unicode/unicode.conf.in.in +++ b/src/modules/unicode/unicode.conf.in.in @@ -1,12 +1,15 @@ [Addon] Name=Unicode Comment=Add Unicode Typing Support -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libunicode Category=Module 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 9f6c1eb6b07d7dbc0cad5ea6b74e17e95aeebccc..4cabf1c3b15ec71ea907a2e40caf06494e920bcd 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 +#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)) { @@ -471,4 +508,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/CMakeLists.txt b/src/modules/wayland/CMakeLists.txt index 09edc0d93342063804d300b98a24eb13fee1e7a0..98716280782d060351e56ca8791ebcdc7d10c212 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 88fa87e3822f2e6be925d67d0a22f81b59aac266..027a6cf3d9048b3771d66939df83b334f2c24cf0 100644 --- a/src/modules/wayland/wayland.conf.in.in +++ b/src/modules/wayland/wayland.conf.in.in @@ -1,7 +1,10 @@ [Addon] Name=Wayland -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ 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 d619e46fc06aadabe1380f17664003408652e30d..8595defb17379f6c9f522694d2f1881cd50c7554 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/CMakeLists.txt b/src/modules/xcb/CMakeLists.txt index 3b9988d16c0e916b9a7d2d8a363808a9ea3213b5..e00e25f1e20103bd8d5d8d790e13a936c8149ce3 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 feda5536a4604b3fd660918e2d6ccc26518168d9..37df9dedf37b105a4bca57f5b503a3bd308111f9 100644 --- a/src/modules/xcb/xcb.conf.in.in +++ b/src/modules/xcb/xcb.conf.in.in @@ -1,7 +1,10 @@ [Addon] Name=XCB -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ Library=libxcb Category=Module Version=@PROJECT_VERSION@ Configurable=True + +[Addon/Dependencies] +0=core:@PROJECT_VERSION@ diff --git a/src/modules/xcb/xcbconnection.cpp b/src/modules/xcb/xcbconnection.cpp index 4cc6f36b23624f3b79b0ae3b9a062baee5110fe5..92f29619be78deb9bf6d02e82f23cb60b8335db0 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 } } } diff --git a/src/modules/xcb/xcbconnection.h b/src/modules/xcb/xcbconnection.h index 888d21b7f19d2f3f590bbf744c389860509f7472..1db2926b2b90bf110eeb1f9ed066c0d35abd5174 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 5449270c309609fa34478bc36e10b52226d30c1a..d83e95f70811518432c5f395517c686c0c36b98e 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/modules/xcb/xcbmodule.cpp b/src/modules/xcb/xcbmodule.cpp index b30c7a75a0ff9d7005be629899a3a52f14fbef3f..5c9c8a05a23936d5208c5eb509e2f7f918ca4dd1 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/CMakeLists.txt b/src/server/CMakeLists.txt index 0ae3628be272fd3634d51ff3a14c83c447851e99..25feb05276970ef6bb1b5fbd76a8c70234626937 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/server/main.cpp b/src/server/main.cpp index 3e95c8c255509a73d10e792ba8d9f248e86973a2..abc17ebcb5fce183e4bd1359ec49a965b85eaa85 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; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(getStaticAddon) #ifdef ENABLE_KEYBOARD -static KeyboardEngineFactory keyboardFactory; -#endif - -StaticAddonRegistry staticAddon = { -#ifdef ENABLE_KEYBOARD - std::make_pair("keyboard", &keyboardFactory) +FCITX_IMPORT_ADDON_FACTORY(getStaticAddon, keyboard); #endif -}; int main(int argc, char *argv[]) { umask(077); @@ -79,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/src/ui/classic/CMakeLists.txt b/src/ui/classic/CMakeLists.txt index ceda3207318a1805943f6fb1326a689be128f5c2..fb1d87f0cb27906516939711fe310d1bf359c9e7 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/buffer.cpp b/src/ui/classic/buffer.cpp index 015d8570248c66c0102280e6a7f0878a98d50f93..025245d91b9a499249580fd9b3b566dfa0b60604 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 749ea1291c138405c3227a61201818ded68e726f..28ee1a316bd4ff42711e7cdbf8ed768c47781a6b 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.conf.in.in b/src/ui/classic/classicui.conf.in.in index 1c96fa1edbaa09c477128a960f653a2b9a0a6e17..0c79a09bf50a132038df9cbbb97d63ddee6ba6e3 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/classic/classicui.cpp b/src/ui/classic/classicui.cpp index 9655ac5cb7124346bcdf11862c1b37802b797951..0dfa8e2e5fea23c840edddfef79fa7028a03eb01 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); } } @@ -508,4 +532,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/classic/classicui.h b/src/ui/classic/classicui.h index 1aa4cccfb6651fa85bdd008f69f7b8b8ac16c822..b79510b8ea546f7dda585de2de4f853d75db4e4b 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/colorhelper.cpp b/src/ui/classic/colorhelper.cpp index f551d0592403ba921003dfc2d83bf6f865747b4f..1b300923d5ecaad1c7a763446adf2c3d07a47884 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 7217c11d5241db263e9b8fbd3c394c9639a43606..0e1b6a46f7240e313c3c6427780cd6b94cb3bf63 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/src/ui/classic/common.h b/src/ui/classic/common.h index 395a9183d021100a509dd3a6bfb296ae75b22064..61c93f1ed25bfe4e6efec9a3df9e9204eeb1e995 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 e0ae4f5c88ef216b80a32021eb57cba02e66e2ef..2e19b10df21f37bd23d66bc00b4a31a5d52f66cd 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); @@ -271,10 +292,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}; } @@ -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 d1c102e88c82c2b783e13fd26027247ca77fd098..0ded731d547fe3d894d7a57ae5b0ffd1efe720f5 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 098c7cd1595cd1c1451870eaa92be61845ff386d..58909054078d53eb829af25f2dab3ba9e4653757 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 64e4e0beef622d1e73ebee7160ecab70bff2099c..5b5b365c76155d8e36799a942ca722a81f804b7c 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 4999662c3a890b9acca3a9728190ae4002205a24..623840f367cdcbdb53c0c9b27e6f5f2bb1b820ec 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 69e1a39185cc18ded43f98ace82ba909b0c8994f..adf2be356939d3f11319300e6f787978a3711929 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.cpp b/src/ui/classic/theme.cpp index cb44bcac73f721a0abe7f5a34c2f0481fcff0fea..c4bd03e6aebdaf4a3537d71eb6db476feb1bb7ec 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 fa9e3b4f93eeed8efb548154deb230708a2f1c97..6e2b23965b64d5c4de077aa7f68561ad5d259b90 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 #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" 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 f08a64d98b4434960b3d63e9b83c43d84df3fef2..682e14e2f430feef78a07c6523bdfd518a0db908 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 77c086c8e9742301a825a89fe14910690df7f012..0a6fd6a5f45b063b930752567b2c8e97150b9d04 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 diff --git a/src/ui/classic/waylandcursortheme.cpp b/src/ui/classic/waylandcursortheme.cpp index a1299b4db30220d520b70a998205efa4d296d60d..4788b871e6385d44e90a1d6a6433294175bd1112 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 7937d7f0efce089da048924325054fabb4cbca6a..0e03429a9233a32afe288a83dcba965a417690a0 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 c05b4328f3aca81e270739a4e0f23b5c011f014b..bf0c63a3387355ab9ab2bb32e33028f70a10bb63 100644 --- a/src/ui/classic/waylandinputwindow.cpp +++ b/src/ui/classic/waylandinputwindow.cpp @@ -5,18 +5,26 @@ * */ #include "waylandinputwindow.h" -#include -#include "fcitx/misc_p.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" #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 @@ -109,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(); } @@ -151,6 +158,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/waylandinputwindow.h b/src/ui/classic/waylandinputwindow.h index 2d23a02773ee3e2a747f16804c1275866775fb39..ddad6b528a4dac586151316bb7a425e4afb10dbe 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 94fd880c61e6877fe4f641bdf647db326f4701a0..68fc4e2a4c7b93599e335de991f50b37a5786a4b 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 c692584988ae53d415e1ceaf33d8bd6e4d7f5210..134f993432c41871ef6104bb6a2e8b5bd1a7e2f1 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 6c8d415f4adf1b03c592aba4e1712e932ae9e317..194f2e25ba8f6acf28707fa2469e5d211d037f3f 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 1c7f6c68615ada047dbcdbe8f33cc419068610b7..933707ab27c1acb58bd8222fc9c442f16a8d067c 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 ea15c2264a0f0afd27537d89f0fd5e06dc2f79af..ac1e81735c347b9ecc8cd473674e54cca4d3d244 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 e979f0bd3361bd3aa611bb58f450ba96bf9902e6..48758b9cd9cf8a53e0f19ed455fb696da4a9b341 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 378b4f5bd819ead426f533f8322215242747b05b..fe8ea752a7f4108ee501d56a89fbecf54268e25b 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 3f7a7160e69b4823408446fef904041ce8cf1136..cba0500a0baa6e4943bd611fadaab2f1f74b3abc 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 6cb9f1d4e69f6a74be3450004876338ee1ce44d5..2dc494ab668d20cf3438aec20fd82aa6bf0f8c6b 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 ef951a5c0b1498397b59fecc002257920e093174..842f11bc236663c9142a7c566e00dc666b3b0d7e 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 93c3b55c80fff46c16aa86b34aa2cdb65502d014..6923916b57ac4a8f8c74ff3f95f0b429cfe2a3c6 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 { @@ -18,10 +33,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) { @@ -165,6 +180,7 @@ void XCBInputWindow::update(InputContext *inputContext) { if (!visible()) { if (oldVisible) { xcb_unmap_window(ui_->connection(), wid_); + hoverIndex_ = -1; } return; } diff --git a/src/ui/classic/xcbinputwindow.h b/src/ui/classic/xcbinputwindow.h index 37fb9852e5b3a8b93bfec909dcee5347f18e2d9c..4f89d3f85c73e7b6cd4c419713d29ee81b0e8604 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 7d45dfcd3754f697d622a80710ffa9fa548c1e2e..83cea2ad938748d453cfd5f355b8cada77b0f9f1 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 f71b8ec6d7cb0a52c001405854ece6ee78a1fde9..297fd17de9c541e2a6dc763617bbb7af3c36daea 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 3ad3d50171b0a8323c70d83c7da70d2f0c40df65..ea74ac6e8548001c9f0d677030c704e94511df77 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 d394a4eaf4d8351c070d6c9f06fd1d094755a343..db4e45fc8bd416ba5082d4c52ec93aeab4ccaeb6 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.cpp b/src/ui/classic/xcbui.cpp index 5a29edb8bfc3201d40d03630003156908aa3c247..cdb2dd4489bf20b7ebcf8efb25db16bbc5dbdf91 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 d381ab9e46d1944b5d74950a1403b5075c7c3417..b78c414d5db573ec3fa2fd20dbf544c338e1b0fe 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_; } @@ -73,7 +84,6 @@ private: void refreshManager(); void readXSettings(); void initScreen(); - void updateTray(); void scheduleUpdateScreen(); static void destroyCairoDevice(cairo_device_t *device); @@ -90,7 +100,6 @@ private: bool needFreeColorMap_ = false; std::unique_ptr inputWindow_; std::unique_ptr trayWindow_; - bool enableTray_ = false; std::string iconThemeName_; @@ -118,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 0bf8dda021f560398b99911987e2a706942e9267..1f5a386bf701d5ceed76d24fc914de026c40d81a 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 1fc89f630459afd305c1ba4fb7e98d6382fddd93..2ff145ccd1225fd76528c4947e36c58493ba81f3 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_ diff --git a/src/ui/kimpanel/CMakeLists.txt b/src/ui/kimpanel/CMakeLists.txt index 12c9c926259063883ca4cb4f50868c957339e9cc..91ed5e0d1aa463755a7b6c11d46262086c150f58 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 105ffbf73714a06057ab9e4879e92d01947288a3..0956b07e07801b239bd74b20d84953c419280155 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/kimpanel/kimpanel.cpp b/src/ui/kimpanel/kimpanel.cpp index 76b20afb1c90a653923ce86ab0c0339709d6bfb3..bac72b003978feb0e2b7adf1824c6035f43cc120 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/CMakeLists.txt b/src/ui/virtualkeyboard/CMakeLists.txt index ab59334b8b1bab4172b4e3043098c635fe2c52a2..180d762ddc1b23f57e14f8ccec5530320c5d9beb 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 7d3d22df96a517caffcea7045c25f1781eb9ac62..4e7fe063354df2c28ae3de3a1a2d67bfc90d0948 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/src/ui/virtualkeyboard/virtualkeyboard.cpp b/src/ui/virtualkeyboard/virtualkeyboard.cpp index 787ba4389224420a61b3b9b07e95c9f3bc6e5c89..6f3c0583089089d854bd72b46fff79baf6bcfe1d 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" @@ -32,7 +34,7 @@ public: void showVirtualKeyboard() { parent_->showVirtualKeyboardForcibly(); } - void hideVirtualKeyboard() { parent_->hideVirtualKeyboard(); } + void hideVirtualKeyboard() { parent_->hideVirtualKeyboardForcibly(); } void toggleVirtualKeyboard() { parent_->toggleVirtualKeyboard(); } @@ -323,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(); } @@ -535,4 +549,4 @@ public: }; } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::VirtualKeyboardFactory); +FCITX_ADDON_FACTORY_V2(virtualkeyboard, fcitx::VirtualKeyboardFactory); diff --git a/src/ui/virtualkeyboard/virtualkeyboard.h b/src/ui/virtualkeyboard/virtualkeyboard.h index 92bff2f07ec151343466fa3b4b985ffb524f95bd..a94e096ac629693eaf03293d551a92b228d0a39c 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); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bed8e37cfafcbdc6b217e99ba7473f493ad2c4b4..dfd7b25894adafeeb46d160d1bac4a784c628e18 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 Pthread::Pthread) + 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 eventlooptests) +set(testcustomeventloop_LIBS eventlooptests) find_program(XVFB_BIN Xvfb) @@ -79,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 @@ -100,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/addon/CMakeLists.txt b/test/addon/CMakeLists.txt index ed4ce32fa1dcda3176cb3d3eb1a735c9798eecb2..a47d99d7a6465afe49e01a10508042c4c2142850 100644 --- a/test/addon/CMakeLists.txt +++ b/test/addon/CMakeLists.txt @@ -1,6 +1,9 @@ -add_library(dummyaddon MODULE dummyaddon.cpp) +add_fcitx5_addon(dummyaddon dummyaddon.cpp) target_link_libraries(dummyaddon Fcitx5::Core) +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) if (ENABLE_KEYBOARD) diff --git a/test/addon/dummyaddon.cpp b/test/addon/dummyaddon.cpp index a6f752118008346330c4f2ace76f851b9f7b42d4..41d807fc786265c1056a96afb39f55c8a118a89f 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/dummyaddondeps.cpp b/test/addon/dummyaddondeps.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7e665162b8cd6e7a94f94ed458d8293a8e637511 --- /dev/null +++ b/test/addon/dummyaddondeps.cpp @@ -0,0 +1,8 @@ +#include "fcitx-utils/log.h" + +FCITX_DEFINE_LOG_CATEGORY(dummyaddondeps, "dummyaddondeps"); + +static int init = []() { + fcitx::Log::setLogRule("default=3"); + return 0; +}(); diff --git a/test/addon/fcitx5/addon/testfrontend.conf b/test/addon/fcitx5/addon/testfrontend.conf index 927f0aadde047d13a06bf12f9b11dfde26670ab1..55ac86e33b505f9bcdef305cc5c8b44ed376fd45 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 f4cf40a1af5ce45ef9e7d39933071843bc6f91cc..737e4fdf7fdaf860139ef5cde65b4ad2f222e81b 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/addon2/fcitx5/addon/dummyaddon2.conf b/test/addon2/fcitx5/addon/dummyaddon2.conf index 643d23e830695d6314314b7cdb12c96d0bf04c76..8c9a42afbf45791165287d03ece1a54813762191 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/eventlooptests.cpp b/test/eventlooptests.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6f3b0df8a82ba09192988eb57fb45c24d1d56d74 --- /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 0000000000000000000000000000000000000000..0b17d8b85c3cbcea02d4f5fc297c4da07b51153e --- /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/testaddon.cpp b/test/testaddon.cpp index daa141b999759895bf2f089c6b9920911dc58f54..5c847949dba2ab81faac59fe371bafc781ab12d0 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; } diff --git a/test/testcompose.cpp b/test/testcompose.cpp index 2e47c1165ad28868b88942a34dbe96c28f2a3e14..7645920cac6e916208c57e3b464704e48442477d 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; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(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); @@ -88,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/testconfig.cpp b/test/testconfig.cpp index 68dc4fb69d63108f5aba4fb39b033ebfa7ecddcf..0730d8ae910ace2bf706e9ac2fa7f9d5bf88b84c 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/testcustomeventloop.cpp b/test/testcustomeventloop.cpp new file mode 100644 index 0000000000000000000000000000000000000000..1a2c9b1f4c1d247f73ac8c1d838526f4ca6df69a --- /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/testemoji.cpp b/test/testemoji.cpp index 7a51aa2aff780db65ee19428e085bdd3ff314036..8df7f6f974208eee5203025ae869e2f5d98c6fb6 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/testevent.cpp b/test/testevent.cpp index 6750bdff91eaadeb248c1bf954357c41d7fd3dcb..35384a819349a870d5933b6d8d5250405895bfd4 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 diff --git a/test/testfs.cpp b/test/testfs.cpp index 7fedfdc989fa9335b4f4f8890e30a05e5bb13bc7..470bf34d90ef30f87242f65e63ed42bebaaed24d 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/testinstance.cpp b/test/testinstance.cpp index 65743cba690cc00e828ca71d7591db6906f48c32..00a3268efb6e272aea406cc62418bc3bd3f54d75 100644 --- a/test/testinstance.cpp +++ b/test/testinstance.cpp @@ -4,51 +4,126 @@ * 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"}, + {"test"}); 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 +134,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; } diff --git a/test/testisocodes.cpp b/test/testisocodes.cpp index 60a6fda73636b8b3eab5d68e0c03bd41cd82e89b..6306c4f45314e24e7427bf75f555796a48c507a7 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/testlibrary.cpp b/test/testlibrary.cpp index 05dce4b6c305a9b683e98004ae5c0c81eae94cb9..03fac6d0196a751f5cc34894176ee3025ab2988f 100644 --- a/test/testlibrary.cpp +++ b/test/testlibrary.cpp @@ -6,19 +6,17 @@ */ #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" 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); } diff --git a/test/testlist.cpp b/test/testlist.cpp index cc458286be73d3adf5c1095376fde6b145b327db..36e4a20cf4da15055006a9412de21f5bf05d42bc 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 be12e46dc319452b07200500d7a92d69c2dad320..49591e126cdeb267a7d8c5d4e1c7d86511b09adf 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/testquickphrase.cpp b/test/testquickphrase.cpp index f47737275512c37efa4527527f86947a3e48c1a3..c0c285516f0685456f150018e9498472f7c949d3 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/test/testspell.cpp b/test/testspell.cpp index 2cc8f18a34ecf48b3bc7d7a2fcd544acffd86a56..a67deab1bb7140ea91d67423f819a3ee0bfd3941 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; +FCITX_DEFINE_STATIC_ADDON_REGISTRY(staticAddon); +FCITX_IMPORT_ADDON_FACTORY(staticAddon, keyboard); + void scheduleEvent(EventDispatcher *dispatcher, Instance *instance) { dispatcher->schedule([instance]() { auto *spell = instance->addonManager().addon("spell", true); @@ -64,18 +73,12 @@ 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"; 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); diff --git a/test/teststringutils.cpp b/test/teststringutils.cpp index 831545bdfa6921c47513b0e37c1051f759066eef..6503e0a6a8eb8a50276b6915ad2a7d48335bb6e9 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; } diff --git a/test/testtext.cpp b/test/testtext.cpp index c096e2200128e8f2c8e0d7ec8120f6225b17088a..db06d7ed872342737c02e84ef8f74416bcec95fa 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/test/testunicode.cpp b/test/testunicode.cpp index 122d84fde919db630dc0c446cf41a06d23f0d890..d2346122812fec0e1606b518f3f372f85d5a53ce 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); diff --git a/test/testxim.cpp b/test/testxim.cpp index 64e0210b00a3e838ca7f5c8142435fcf16605deb..39ac32bc1e004977759448a81d2a8782447f8f83 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, diff --git a/testing/testfrontend/CMakeLists.txt b/testing/testfrontend/CMakeLists.txt index bbe1bded6a92d5db8b1d8d813574f6506e1001b3..fe61cb50e93acddbed330c08532d9e452f0115a0 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/testfrontend/testfrontend.conf b/testing/testfrontend/testfrontend.conf index c3120973b4a7d9d6517701e085a0ce14c5a62b53..55ac86e33b505f9bcdef305cc5c8b44ed376fd45 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 ae1ab7509a1bce33e2b75b06e71189cd241f69e4..56320c7876dd43d84fcf506d0b9b34aec15ad386 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 { @@ -106,4 +106,4 @@ public: } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::TestFrontendFactory); +FCITX_ADDON_FACTORY_V2(testfrontend, fcitx::TestFrontendFactory); diff --git a/testing/testfrontend/testfrontend_public.h b/testing/testfrontend/testfrontend_public.h index eaa88d0b4772f66ad8729654731e1b4c8d63167c..678edb9c069f23ac689c79325f3dce1de7cc3d85 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 diff --git a/testing/testim/CMakeLists.txt b/testing/testim/CMakeLists.txt index 6970603e4fac0d42fddd6dea743f06c98bbd181e..c6327e7f2240319b46f1929fb2571531e3a7e012 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/testim/testim.conf b/testing/testim/testim.conf index 0a7046dd6f0742ec6a461df25015b7b34f23cc82..3aff9cccd5044192a9741d4b375a7efc6c438604 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 5a65634ea53a49a82541f4075c7f396ff47686a4..6cddbc13955d159c45fa5883ab87194f6e6a053b 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 { @@ -32,4 +32,4 @@ public: } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::TestIMFactory); +FCITX_ADDON_FACTORY_V2(testim, fcitx::TestIMFactory); diff --git a/testing/testui/CMakeLists.txt b/testing/testui/CMakeLists.txt index 3f8d2bc6d82f8bff093d7a8c0a034820ab4f7f65..dfb4c5d6bcb4340b40c10a80bc5be6e98e152a70 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) diff --git a/testing/testui/testui.conf b/testing/testui/testui.conf index e6d684c9f5117ef6c3ddf22896855935689394c3..67ec59379a5f2abfac0f1ed786394bd122e14476 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 1c2e1c013eeb1fd657e88204015ac6402f962f88..7d22baec444e6f75f15b3001c36a4c941c047e0c 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);