Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-skk for openSUSE:Factory checked in at 2022-11-28 11:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-skk (Old) and /work/SRC/openSUSE:Factory/.fcitx5-skk.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-skk" Mon Nov 28 11:05:51 2022 rev:3 rq:1038433 version:5.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-skk/fcitx5-skk.changes 2022-03-13 20:25:37.571687744 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-skk.new.1597/fcitx5-skk.changes 2022-11-28 11:05:56.915427256 +0100 @@ -1,0 +2,12 @@ +Sun Nov 20 10:24:17 UTC 2022 - Fusion Future <[email protected]> + +- Update to 5.0.14 + * Update translation + +------------------------------------------------------------------- +Tue Jul 5 11:29:21 UTC 2022 - Fusion Future <[email protected]> + +- Update to 5.0.13 + * Update translation + +------------------------------------------------------------------- Old: ---- fcitx5-skk-5.0.11.tar.xz New: ---- fcitx5-skk-5.0.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-skk.spec ++++++ --- /var/tmp/diff_new_pack.k1yYVC/_old 2022-11-28 11:05:57.423429744 +0100 +++ /var/tmp/diff_new_pack.k1yYVC/_new 2022-11-28 11:05:57.427429763 +0100 @@ -17,7 +17,7 @@ Name: fcitx5-skk -Version: 5.0.11 +Version: 5.0.14 Release: 0 Summary: Libskk input method engine for Fcitx5 License: GPL-3.0-or-later ++++++ fcitx5-skk-5.0.11.tar.xz -> fcitx5-skk-5.0.14.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/.clang-format new/fcitx5-skk-5.0.14/.clang-format --- old/fcitx5-skk-5.0.11/.clang-format 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx5-skk-5.0.14/.clang-format 2022-06-01 20:51:13.078862700 +0200 @@ -0,0 +1,74 @@ +--- +Language: Cpp +# BasedOnStyle: LLVM +AccessModifierOffset: -4 +ConstructorInitializerIndentWidth: 4 +AlignEscapedNewlinesLeft: false +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AlwaysBreakTemplateDeclarations: true +AlwaysBreakBeforeMultilineStrings: false +BreakBeforeBinaryOperators: false +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BinPackParameters: true +ColumnLimit: 80 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +DerivePointerAlignment: false +ExperimentalAutoDetectBinPacking: false +IndentCaseLabels: false +IndentWrappedFunctionNames: false +IndentFunctionDeclarationAfterType: false +MaxEmptyLinesToKeep: 1 +KeepEmptyLinesAtTheStartOfBlocks: true +NamespaceIndentation: None +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakString: 1000 +PenaltyBreakFirstLessLess: 120 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Right +SpacesBeforeTrailingComments: 1 +Cpp11BracedListStyle: true +Standard: Cpp11 +IndentWidth: 4 +TabWidth: 4 +UseTab: Never +BreakBeforeBraces: Attach +SpacesInParentheses: false +SpacesInAngles: false +SpaceInEmptyParentheses: false +SpacesInCStyleCastParentheses: false +SpacesInContainerLiterals: true +SpaceBeforeAssignmentOperators: true +ContinuationIndentWidth: 4 +CommentPragmas: '^ IWYU pragma:' +ForEachMacros: [ Q_FOREACH, BOOST_FOREACH ] +SpaceBeforeParens: ControlStatements +DisableFormat: false +SortIncludes: true +IncludeCategories: + # C system headers. + - Regex: '^[<"](aio|arpa/inet|assert|complex|cpio|ctype|curses|dirent|dlfcn|errno|fcntl|fenv|float|fmtmsg|fnmatch|ftw|glob|grp|iconv|inttypes|iso646|langinfo|libgen|limits|locale|math|monetary|mqueue|ndbm|netdb|net/if|netinet/in|netinet/tcp|nl_types|poll|pthread|pwd|regex|sched|search|semaphore|setjmp|signal|spawn|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|strings|stropts|sys/ipc|syslog|sys/mman|sys/msg|sys/resource|sys/select|sys/sem|sys/shm|sys/socket|sys/stat|sys/statvfs|sys/time|sys/times|sys/types|sys/uio|sys/un|sys/utsname|sys/wait|tar|term|termios|tgmath|threads|time|trace|uchar|ulimit|uncntrl|unistd|utime|utmpx|wchar|wctype|wordexp)\.h[">]$' + Priority: 20 + # C++ system headers (as of C++17). + - Regex: '^[<"](algorithm|any|array|atomic|bitset|cassert|ccomplex|cctype|cerrno|cfenv|cfloat|charconv|chrono|cinttypes|ciso646|climits|clocale|cmath|codecvt|complex|condition_variable|csetjmp|csignal|cstdalign|cstdarg|cstdbool|cstddef|cstdint|cstdio|cstdlib|cstring|ctgmath|ctime|cuchar|cwchar|cwctype|deque|exception|execution|filesystem|forward_list|fstream|functional|future|initializer_list|iomanip|ios|iosfwd|iostream|istream|iterator|limits|list|locale|map|memory|memory_resource|mutex|new|numeric|optional|ostream|queue|random|ratio|regex|scoped_allocator|set|shared_mutex|sstream|stack|stdexcept|streambuf|string|string_view|strstream|system_error|thread|tuple|type_traits|typeindex|typeinfo|unordered_map|unordered_set|utility|valarray|variant|vector)[">]$' + Priority: 30 + # Other libraries' h files (with angles). + - Regex: '^<' + Priority: 40 + # Your project's h files. + - Regex: '^[<"]fcitx' + Priority: 45 + # Other libraries' h files (with quotes). + - Regex: '^"' + Priority: 50 +... + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/CMakeLists.txt new/fcitx5-skk-5.0.14/CMakeLists.txt --- old/fcitx5-skk-5.0.11/CMakeLists.txt 2022-03-09 19:26:05.247207000 +0100 +++ new/fcitx5-skk-5.0.14/CMakeLists.txt 2022-11-20 08:08:14.075401800 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.4.0) -project(fcitx5-skk VERSION 5.0.11) +project(fcitx5-skk VERSION 5.0.14) find_package(ECM 1.0.0 REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in new/fcitx5-skk-5.0.14/org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in --- old/fcitx5-skk-5.0.11/org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in 2022-03-09 19:26:05.320542000 +0100 +++ new/fcitx5-skk-5.0.14/org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in 2022-11-20 08:08:14.142069000 +0100 @@ -10,6 +10,9 @@ <url type="bugtracker">https://github.com/fcitx/fcitx5-skk/issues</url> <project_group>Fcitx</project_group> <releases> + <release version="5.0.14" date="2022-11-19"/> + <release version="5.0.13" date="2022-07-03"/> + <release version="5.0.12" date="2022-05-22"/> <release version="5.0.11" date="2022-03-09"/> <release version="5.0.10" date="2022-02-01"/> <release version="5.0.9" date="2021-11-05"/> @@ -23,4 +26,5 @@ <release version="5.0.1" date="2020-12-03"/> <release version="5.0.0" date="2020-10-30"/> </releases> + <content_rating type="oars-1.1"/> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/ca.po new/fcitx5-skk-5.0.14/po/ca.po --- old/fcitx5-skk-5.0.11/po/ca.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/ca.po 2022-06-30 06:09:36.921831600 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: csslayer <[email protected]>, 2020\n" "Language-Team: Catalan (https://www.transifex.com/fcitx/teams/12005/ca/)\n" @@ -204,10 +204,15 @@ msgid "Rule" msgstr "" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "Mostra l'anotació" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Mètode d'entrada skk per al fcitx" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "Sistema" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/da.po new/fcitx5-skk-5.0.14/po/da.po --- old/fcitx5-skk-5.0.11/po/da.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/da.po 2022-06-30 06:09:36.921831600 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://www.transifex.com/fcitx/teams/12005/da/)\n" @@ -203,10 +203,15 @@ msgid "Rule" msgstr "Regel" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "SKK japansk-inputmetode" @@ -223,14 +228,6 @@ msgid "Show Annotation" msgstr "Vis annotering" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Skk-inputmetode til Fcitx" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "System" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/de.po new/fcitx5-skk-5.0.14/po/de.po --- old/fcitx5-skk-5.0.11/po/de.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/de.po 2022-06-30 06:09:36.921831600 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: Ettore Atalan <[email protected]>, 2022\n" "Language-Team: German (https://www.transifex.com/fcitx/teams/12005/de/)\n" @@ -204,10 +204,15 @@ msgid "Rule" msgstr "Regel" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "Anmerkungen zeigen" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Skk Eingabemethode für Fcitx" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "System" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/fcitx5-skk.pot new/fcitx5-skk-5.0.14/po/fcitx5-skk.pot --- old/fcitx5-skk-5.0.11/po/fcitx5-skk.pot 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/fcitx5-skk.pot 2022-06-30 06:09:36.921831600 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -199,10 +199,15 @@ msgid "Rule" msgstr "" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -219,14 +224,6 @@ msgid "Show Annotation" msgstr "" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/he.po new/fcitx5-skk-5.0.14/po/he.po --- old/fcitx5-skk-5.0.11/po/he.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/he.po 2022-06-30 06:09:36.921831600 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: Omer I.S. <[email protected]>, 2021\n" "Language-Team: Hebrew (https://www.transifex.com/fcitx/teams/12005/he/)\n" @@ -204,10 +204,15 @@ msgid "Rule" msgstr "" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/ja.po new/fcitx5-skk-5.0.14/po/ja.po --- old/fcitx5-skk-5.0.11/po/ja.po 2022-03-09 06:09:16.775278300 +0100 +++ new/fcitx5-skk-5.0.14/po/ja.po 2022-06-30 06:09:36.921831600 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-08 20:24+0000\n" +"POT-Creation-Date: 2022-06-18 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: UTUMI Hirosi <[email protected]>, 2022\n" "Language-Team: Japanese (https://www.transifex.com/fcitx/teams/12005/ja/)\n" @@ -207,10 +207,15 @@ msgid "Rule" msgstr "å ¥åæ¹å¼" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "Fcitx ç¨ã® SKK å ¥åã¡ã½ãã" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "SKK æ¥æ¬èªå ¥åã¡ã½ãã" @@ -227,14 +232,6 @@ msgid "Show Annotation" msgstr "注éã表示" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Fcitx ç¨ã® SKK å ¥åã¡ã½ãã" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "ã·ã¹ãã " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/ko.po new/fcitx5-skk-5.0.14/po/ko.po --- old/fcitx5-skk-5.0.11/po/ko.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/ko.po 2022-11-13 02:07:20.499043200 +0100 @@ -4,15 +4,15 @@ # # Translators: # csslayer <[email protected]>, 2020 -# Junghee Lee <[email protected]>, 2021 +# JungHee Lee <[email protected]>, 2022 # msgid "" msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-10-29 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" -"Last-Translator: Junghee Lee <[email protected]>, 2021\n" +"Last-Translator: JungHee Lee <[email protected]>, 2022\n" "Language-Team: Korean (https://www.transifex.com/fcitx/teams/12005/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ #: rc.cpp:6 #, kde-format msgid "&Add" -msgstr "" +msgstr "ì¶ê°(&A)" #. i18n: file: gui/adddictdialog.ui:73 #. i18n: ectx: property (text), widget (QLabel, hostLabel) @@ -53,7 +53,7 @@ #: rc.cpp:18 #, kde-format msgid "&Revert" -msgstr "" +msgstr "ëë리기(&R)" #. i18n: file: gui/adddictdialog.ui:25 #. i18n: ectx: property (text), widget (QLabel, typeLabel) @@ -129,7 +129,7 @@ #: src/skk.cpp:66 src/skk.h:42 msgid "Half width Katakana" -msgstr "ë°ê° ê°íê°ë" +msgstr "ë°ê° ê°íì¹´ë" #: src/skk.cpp:64 src/skk.h:41 msgid "Hiragana" @@ -160,22 +160,22 @@ #: rc.cpp:15 #, kde-format msgid "Move &Down" -msgstr "" +msgstr "ìëë¡ ì´ë(&D)" #. i18n: file: gui/dictwidget.ui:64 #. i18n: ectx: property (text), widget (QToolButton, moveUpDictButton) #: rc.cpp:12 #, kde-format msgid "Move &Up" -msgstr "" +msgstr "ìë¡ ì´ë(&U)" #: src/skk.h:35 msgid "Not set" -msgstr "ì§ì ëì§ ìì" +msgstr "ì¤ì ëì§ ìì" #: src/skk.h:116 msgid "Number candidate of Triggers To Show Candidate Window" -msgstr "íë³´ ì°½ì ë³´ì´ê¸° ìí íë³´ì ì" +msgstr "íë³´ ë¨ì´ ì°½ì íì를 í¸ë¦¬ê±°í í¤ ì ë ¥ ì" #: src/skk.h:77 msgid "Page size" @@ -194,23 +194,28 @@ #: rc.cpp:9 #, kde-format msgid "R&emove" -msgstr "" +msgstr "ì ê±°(&E)" #: src/skk.h:84 msgid "Return-key does not insert new line on commit" -msgstr "ì ë ¥ ìë£ ì ìí°í¤ê° ì ì¤ì ì¶ê°íì§ ìì" +msgstr "Return í¤ë ì ë ¥ìë£ ì ì ì¤ì ì½ì íì§ ììµëë¤" #: src/skk.h:70 msgid "Rule" msgstr "ê·ì¹" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "Fcitxì© SKK ì ë ¥ê¸°" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" -msgstr "" +msgstr "SKK ì¼ë³¸ì´ ì ë ¥ê¸°" #: gui/adddictdialog.cpp:104 gui/adddictdialog.cpp:119 msgid "Select Dictionary File" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "주ì ë³´ì´ê¸°" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Fcitx를 ìí Skk ì ë ¥ê¸°" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "ìì¤í " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/ru.po new/fcitx5-skk-5.0.14/po/ru.po --- old/fcitx5-skk-5.0.11/po/ru.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/ru.po 2022-11-13 02:07:20.502376600 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-10-23 20:24+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: Dmitry <[email protected]>, 2022\n" "Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n" @@ -18,16 +18,16 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" -"%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || " +"(n%100>=11 && n%100<=14)? 2 : 3);\n" #. i18n: file: gui/dictwidget.ui:31 #. i18n: ectx: property (text), widget (QToolButton, addDictButton) #: rc.cpp:6 #, kde-format msgid "&Add" -msgstr "" +msgstr "&ÐобавиÑÑ" #. i18n: file: gui/adddictdialog.ui:73 #. i18n: ectx: property (text), widget (QLabel, hostLabel) @@ -55,7 +55,7 @@ #: rc.cpp:18 #, kde-format msgid "&Revert" -msgstr "" +msgstr "&ÐеÑнÑÑÑÑÑ" #. i18n: file: gui/adddictdialog.ui:25 #. i18n: ectx: property (text), widget (QLabel, typeLabel) @@ -74,7 +74,7 @@ #: src/skk.h:80 msgid "Candidate Layout" -msgstr "ÐÐ°ÐºÐµÑ ÐºÐ°Ð½Ð´Ð¸Ð´Ð°Ñа" +msgstr "РаÑположение Ñлов-кандидаÑов" #: src/skk.h:99 msgid "Candidates Page Down" @@ -162,14 +162,14 @@ #: rc.cpp:15 #, kde-format msgid "Move &Down" -msgstr "" +msgstr "ÐвигаÑÑ &Ðниз" #. i18n: file: gui/dictwidget.ui:64 #. i18n: ectx: property (text), widget (QToolButton, moveUpDictButton) #: rc.cpp:12 #, kde-format msgid "Move &Up" -msgstr "" +msgstr "ÐвигаÑÑ &ÐвеÑÑ " #: src/skk.h:35 msgid "Not set" @@ -196,7 +196,7 @@ #: rc.cpp:9 #, kde-format msgid "R&emove" -msgstr "" +msgstr "&УдалиÑÑ" #: src/skk.h:84 msgid "Return-key does not insert new line on commit" @@ -206,10 +206,15 @@ msgid "Rule" msgstr "ÐÑавило" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "ÐеÑод ввода SKK Ð´Ð»Ñ Fcitx" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "ЯпонÑкий меÑод ввода SKK" @@ -226,14 +231,6 @@ msgid "Show Annotation" msgstr "ÐоказÑваÑÑ Ð°Ð½Ð½Ð¾ÑаÑиÑ" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "ÐеÑод ввода Skk Ð´Ð»Ñ Fcitx" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "СиÑÑема" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/tr.po new/fcitx5-skk-5.0.14/po/tr.po --- old/fcitx5-skk-5.0.11/po/tr.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/tr.po 2022-06-30 06:09:36.925165000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: abc Def <[email protected]>, 2021\n" "Language-Team: Turkish (https://www.transifex.com/fcitx/teams/12005/tr/)\n" @@ -204,10 +204,15 @@ msgid "Rule" msgstr "Kural" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "Açıklamayı Göster" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Fcitx için Skk GiriÅ Yöntemi" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "Sistem" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/vi.po new/fcitx5-skk-5.0.14/po/vi.po --- old/fcitx5-skk-5.0.11/po/vi.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/vi.po 2022-06-30 06:09:36.925165000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:23+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: csslayer <[email protected]>, 2020\n" "Language-Team: Vietnamese (https://www.transifex.com/fcitx/teams/12005/vi/)\n" @@ -203,10 +203,16 @@ msgid "Rule" msgstr "" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "" +#: src/skk-addon.conf.in.in:4 +#, fuzzy +msgid "SKK Input Method For Fcitx" +msgstr "Bá» nháºp liá»u Skk cho Fcitx" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "" @@ -223,14 +229,6 @@ msgid "Show Annotation" msgstr "" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Bá» nháºp liá»u Skk cho Fcitx" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "" @@ -257,3 +255,6 @@ #, kde-format msgid "localhost" msgstr "" + +#~ msgid "Skk" +#~ msgstr "Skk" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/zh_CN.po new/fcitx5-skk-5.0.14/po/zh_CN.po --- old/fcitx5-skk-5.0.11/po/zh_CN.po 2022-03-09 19:24:49.018663000 +0100 +++ new/fcitx5-skk-5.0.14/po/zh_CN.po 2022-07-03 19:52:32.143636500 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-09 05:18+0000\n" +"POT-Creation-Date: 2022-06-30 04:22+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" "Last-Translator: csslayer <[email protected]>, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/fcitx/teams/12005/"; @@ -204,10 +204,15 @@ msgid "Rule" msgstr "è§å" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "Fcitx ç SKK æ¥è¯è¾å ¥æ³" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "SKK æ¥è¯è¾å ¥æ³" @@ -224,14 +229,6 @@ msgid "Show Annotation" msgstr "æ¾ç¤ºæ³¨é" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Fcitx ç Skk æ¥è¯è¾å ¥æ³" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "ç³»ç»" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/po/zh_TW.po new/fcitx5-skk-5.0.14/po/zh_TW.po --- old/fcitx5-skk-5.0.11/po/zh_TW.po 2022-03-08 02:54:32.046221300 +0100 +++ new/fcitx5-skk-5.0.14/po/zh_TW.po 2022-06-30 06:09:36.925165000 +0200 @@ -8,14 +8,15 @@ # Walter Cheuk <[email protected]>, 2020 # bruh, 2020 # Steve Nian, 2022 +# èè <[email protected]>, 2022 # msgid "" msgstr "" "Project-Id-Version: fcitx5-skk\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-03 20:24+0000\n" +"POT-Creation-Date: 2022-06-17 20:25+0000\n" "PO-Revision-Date: 2020-05-22 22:25+0000\n" -"Last-Translator: Steve Nian, 2022\n" +"Last-Translator: èè <[email protected]>, 2022\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/fcitx/teams/12005/"; "zh_TW/)\n" "Language: zh_TW\n" @@ -29,7 +30,7 @@ #: rc.cpp:6 #, kde-format msgid "&Add" -msgstr "" +msgstr "&æ°å¢" #. i18n: file: gui/adddictdialog.ui:73 #. i18n: ectx: property (text), widget (QLabel, hostLabel) @@ -57,7 +58,7 @@ #: rc.cpp:18 #, kde-format msgid "&Revert" -msgstr "" +msgstr "&æ¤é·" #. i18n: file: gui/adddictdialog.ui:25 #. i18n: ectx: property (text), widget (QLabel, typeLabel) @@ -164,14 +165,14 @@ #: rc.cpp:15 #, kde-format msgid "Move &Down" -msgstr "" +msgstr "ä¸ç§»" #. i18n: file: gui/dictwidget.ui:64 #. i18n: ectx: property (text), widget (QToolButton, moveUpDictButton) #: rc.cpp:12 #, kde-format msgid "Move &Up" -msgstr "" +msgstr "ä¸ç§»" #: src/skk.h:35 msgid "Not set" @@ -198,7 +199,7 @@ #: rc.cpp:9 #, kde-format msgid "R&emove" -msgstr "" +msgstr "åªé¤" #: src/skk.h:84 msgid "Return-key does not insert new line on commit" @@ -208,10 +209,15 @@ msgid "Rule" msgstr "è¦å" -#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 +#: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:7 src/skk.conf.in:3 +#: src/skk-addon.conf.in.in:3 msgid "SKK" msgstr "SKK" +#: src/skk-addon.conf.in.in:4 +msgid "SKK Input Method For Fcitx" +msgstr "" + #: org.fcitx.Fcitx5.Addon.Skk.metainfo.xml.in:8 msgid "SKK Japanese input method" msgstr "SKK æ¥èªè¼¸å ¥æ³" @@ -228,14 +234,6 @@ msgid "Show Annotation" msgstr "顯示注é" -#: src/skk.conf.in:3 src/skk-addon.conf.in.in:3 -msgid "Skk" -msgstr "Skk" - -#: src/skk-addon.conf.in.in:4 -msgid "Skk Input Method For Fcitx" -msgstr "Fcitx ç Skk æ¥èªè¼¸å ¥æ³" - #: gui/adddictdialog.cpp:24 msgid "System" msgstr "系統" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/src/skk-addon.conf.in.in new/fcitx5-skk-5.0.14/src/skk-addon.conf.in.in --- old/fcitx5-skk-5.0.11/src/skk-addon.conf.in.in 2021-03-05 04:23:37.063286800 +0100 +++ new/fcitx5-skk-5.0.14/src/skk-addon.conf.in.in 2022-06-17 06:43:48.841794000 +0200 @@ -1,6 +1,6 @@ [Addon] -Name=Skk -Comment=Skk Input Method For Fcitx +Name=SKK +Comment=SKK Input Method For Fcitx Category=InputMethod Version=@PROJECT_VERSION@ Library=skk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/src/skk.conf.in new/fcitx5-skk-5.0.14/src/skk.conf.in --- old/fcitx5-skk-5.0.11/src/skk.conf.in 2021-02-14 13:21:36.268164600 +0100 +++ new/fcitx5-skk-5.0.14/src/skk.conf.in 2022-06-17 06:43:53.552008000 +0200 @@ -1,5 +1,5 @@ [InputMethod] -Name=Skk +Name=SKK Icon=fcitx-skk LangCode=ja Addon=skk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/src/skk.cpp new/fcitx5-skk-5.0.14/src/skk.cpp --- old/fcitx5-skk-5.0.11/src/skk.cpp 2022-02-14 00:43:28.612631800 +0100 +++ new/fcitx5-skk-5.0.14/src/skk.cpp 2022-06-01 20:51:13.078862700 +0200 @@ -381,9 +381,7 @@ void SkkEngine::reset(const InputMethodEntry &entry, InputContextEvent &event) { FCITX_UNUSED(entry); auto state = this->state(event.inputContext()); - auto context = state->context(); - skk_context_reset(context); - state->updateUI(); + state->reset(); } void SkkEngine::save() {} @@ -441,6 +439,7 @@ if (!fp) { return; } + file.release(); UniqueCPtr<char> buf; size_t len = 0; @@ -573,6 +572,8 @@ lastMode_ = skk_context_get_input_mode(context); g_signal_connect(context, "notify::input-mode", G_CALLBACK(SkkState::input_mode_changed_cb), this); + g_signal_connect(context, "notify::preedit", + G_CALLBACK(SkkState::preedit_changed_cb), this); g_signal_connect(context, "retrieve_surrounding_text", G_CALLBACK(retrieve_surrounding_text_cb), this); g_signal_connect(context, "delete_surrounding_text", @@ -694,10 +695,12 @@ if (auto str = UniqueCPtr<char, g_free>{skk_context_poll_output(context)}) { if (str && str.get()[0]) { + // Skk doesn't clear preedit after poll output, do this on our own. + preedit_ = Text(); ic_->commitString(str.get()); } } - Text preedit = skkContextGetPreedit(context); + Text preedit = preedit_; // Skk almost filter every key, which makes it calls updateUI on release. // We add an additional check here for checking if the UI is empty or not. @@ -765,11 +768,22 @@ modeChanged_ = true; } } +void SkkState::updatePreedit() { preedit_ = skkContextGetPreedit(context()); } + +void SkkState::reset() { + skk_context_reset(context()); + preedit_ = Text(); + updateUI(); +} void SkkState::input_mode_changed_cb(GObject *, GParamSpec *, SkkState *skk) { skk->updateInputMode(); } +void SkkState::preedit_changed_cb(GObject *, GParamSpec *, SkkState *skk) { + skk->updatePreedit(); +} + gboolean SkkState::retrieve_surrounding_text_cb(GObject *, gchar **text, guint *cursor_pos, SkkState *skk) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-skk-5.0.11/src/skk.h new/fcitx5-skk-5.0.14/src/skk.h --- old/fcitx5-skk-5.0.11/src/skk.h 2021-03-21 19:04:15.870111700 +0100 +++ new/fcitx5-skk-5.0.14/src/skk.h 2022-06-01 20:51:13.078862700 +0200 @@ -199,14 +199,18 @@ void applyConfig(); bool needCopy() const override { return true; } void copyTo(InputContextProperty *state) override; + void reset(); private: bool handleCandidate(KeyEvent &keyEvent); void updateInputMode(); + void updatePreedit(); // callbacks and their handlers static void input_mode_changed_cb(GObject *gobject, GParamSpec *pspec, SkkState *skk); + static void preedit_changed_cb(GObject *gobject, GParamSpec *pspec, + SkkState *skk); static gboolean retrieve_surrounding_text_cb(GObject *, gchar **text, guint *cursor_pos, SkkState *skk); @@ -219,6 +223,7 @@ bool modeChanged_ = false; SkkInputMode lastMode_ = SKK_INPUT_MODE_DEFAULT; bool lastIsEmpty_ = true; + Text preedit_; }; } // namespace fcitx
