Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2022-05-12 23:00:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc"
Thu May 12 23:00:15 2022 rev:42 rq:976431 version:2.28.4715.102
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2022-04-05
19:56:27.337563170 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.1538/mozc.changes 2022-05-12
23:00:35.764815792 +0200
@@ -1,0 +2,16 @@
+Thu May 5 07:28:39 UTC 2022 - Fuminobu Takeyama <ft...@geeko.jp> -
2.28.4715.102
+
+- Upstream update to 2.28.4715.102
+ * Update dictionaries
+ * Enable Qt candidate window on Wayland session
+- Update fcitx5-mozc
+ * Improve system tray menus
+- Fix fcitx5-mozc cannot find icons
+- Use icons from Mozc for Fcitx5 since their quality is now
+ improved
+- Update postcode dictionaries
+- Refresh add-sha256sum-for-zipcode-archives.patch
+- Refresh fcitx-mozc-bazel-build.patch
+- Fix icon path in ibus-setup-mozc-jp.desktop
+
+-------------------------------------------------------------------
Old:
----
fcitx-mozc-b423557b.tar.xz
mozc-2.26.4660.102.tar.xz
New:
----
fcitx-mozc-27a5bd7e.tar.xz
mozc-2.28.4715.102.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozc.spec ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:36.812817199 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:36.816817205 +0200
@@ -36,7 +36,6 @@
%endif
%if %{with_fcitx5}
-%define fcitx5_icon_dir %{_datadir}/pixmaps/
%define fcitx5_addon_dir %{_datadir}/fcitx5/addon/
%define fcitx5_inputmethod_dir %{_datadir}/fcitx5/inputmethod/
%define fcitx5_lib_dir %{_libdir}/fcitx5/
@@ -51,7 +50,7 @@
%define makebazelcache() mkdir -p
%{bz_cachdir}/content_addressable/sha256/%{?2:%2}%{?!2:$(sha256sum %1 | cut -f
1 -d ' ')}/; cp %1
%{bz_cachdir}/content_addressable/sha256/%{?2:%2}%{?!2:$(sha256sum %1 | cut -f
1 -d ' ')}/file ;
Name: mozc
-Version: 2.26.4660.102
+Version: 2.28.4715.102
Release: 0
Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License: Apache-2.0 AND BSD-3-Clause AND SUSE-Public-Domain
@@ -93,7 +92,7 @@
# https://github.com/fcitx/mozc/tree/fcitx/src/unix/fcitx{,5}
# Run ./make_archive.sh to make tar.xz
%if %{with_fcitx4} || %{with_fcitx5}
-Source20: fcitx-mozc-b423557b.tar.xz
+Source20: fcitx-mozc-27a5bd7e.tar.xz
Source21: fcitx-mozc-icons.tar.gz
Patch20: fcitx-mozc-bazel-build.patch
%endif
@@ -382,28 +381,38 @@
done
install -m755 -d %{buildroot}%{fcitx5_addon_dir}
install -m755 -d %{buildroot}%{fcitx5_inputmethod_dir}
-install -m755 -d %{buildroot}%{fcitx5_icon_dir}
install -m755 -d %{buildroot}%{fcitx5_lib_dir}
install -m 755 %{output_dir}/unix/fcitx5/fcitx5-mozc.so
%{buildroot}%{fcitx5_lib_dir}/mozc.so
install -m 644 src/unix/fcitx5/mozc-addon.conf
%{buildroot}%{fcitx5_addon_dir}/mozc.conf
install -m 644 src/unix/fcitx5/mozc.conf %{buildroot}%{fcitx5_inputmethod_dir}
-install -m 644 src/data/images/product_icon_32bpp-128.png
%{buildroot}%{fcitx5_icon_dir}/mozc.png
-install -m 644 src/data/images/unix/ui-alpha_full.png
%{buildroot}%{fcitx5_icon_dir}/mozc-alpha_full.png
-install -m 644 src/data/images/unix/ui-alpha_half.png
%{buildroot}%{fcitx5_icon_dir}/mozc-alpha_half.png
-install -m 644 src/data/images/unix/ui-direct.png
%{buildroot}%{fcitx5_icon_dir}/mozc-direct.png
-install -m 644 src/data/images/unix/ui-hiragana.png
%{buildroot}%{fcitx5_icon_dir}/mozc-hiragana.png
-install -m 644 src/data/images/unix/ui-katakana_full.png
%{buildroot}%{fcitx5_icon_dir}/mozc-katakana_full.png
-install -m 644 src/data/images/unix/ui-katakana_half.png
%{buildroot}%{fcitx5_icon_dir}/mozc-katakana_half.png
-install -m 644 src/data/images/unix/ui-dictionary.png
%{buildroot}%{fcitx5_icon_dir}/mozc-dictionary.png
-install -m 644 src/data/images/unix/ui-properties.png
%{buildroot}%{fcitx5_icon_dir}/mozc-properties.png
-install -m 644 src/data/images/unix/ui-tool.png
%{buildroot}%{fcitx5_icon_dir}/mozc-tool.png
-# fix mozc icons. they're too ugly that even lose face for openSUSE.
-cp -r %{SOURCE21} ./
-tar -xzf fcitx-mozc-icons.tar.gz
-cp -r fcitx-mozc-icons/* %{buildroot}%{fcitx5_icon_dir}/
-rm -rf fcitx-mozc-icons
-rm -rf fcitx-mozc-icons.tar.gz
+unzip -d icons %{output_dir}/unix/icons.zip
+install -D -m 644 src/data/images/product_icon_32bpp-128.png
"%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx-mozc.png"
+install -D -m 644 src/data/images/unix/ime_product_icon_opensource-32.png
"%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/org.fcitx.Fcitx5.fcitx-mozc.png"
+install -D -m 644 icons/mozc.svg
"%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.fcitx.Fcitx5.fcitx-mozc.svg"
+install -D -m 644 icons/alpha_full.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-full.png"
+install -D -m 644 icons/alpha_half.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-alpha-half.png"
+install -D -m 644 icons/direct.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-direct.png"
+install -D -m 644 icons/hiragana.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-hiragana.png"
+install -D -m 644 icons/katakana_full.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-full.png"
+install -D -m 644 icons/katakana_half.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-katakana-half.png"
+install -D -m 644 icons/dictionary.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-dictionary.png"
+install -D -m 644 icons/properties.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-properties.png"
+install -D -m 644 icons/tool.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-mozc-tool.png"
+
+ln -sf org.fcitx.Fcitx5.fcitx-mozc.png
"%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/fcitx-mozc.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc.png
"%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/fcitx-mozc.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc.svg
"%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/fcitx-mozc.svg"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-alpha-full.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-alpha-full.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-alpha-half.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-alpha-half.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-direct.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-direct.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-hiragana.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-hiragana.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-katakana-full.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-katakana-full.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-katakana-half.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-katakana-half.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-dictionary.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-dictionary.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-properties.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-properties.png"
+ln -sf org.fcitx.Fcitx5.fcitx-mozc-tool.png
"%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/fcitx-mozc-tool.png"
+
%endif
%if %{install_mozc}
@@ -492,16 +501,7 @@
%{fcitx5_addon_dir}/mozc.conf
%dir %{fcitx5_inputmethod_dir}
%{fcitx5_inputmethod_dir}/mozc.conf
-%{fcitx5_icon_dir}/mozc.png
-%{fcitx5_icon_dir}/mozc-alpha_full.png
-%{fcitx5_icon_dir}/mozc-alpha_half.png
-%{fcitx5_icon_dir}/mozc-direct.png
-%{fcitx5_icon_dir}/mozc-hiragana.png
-%{fcitx5_icon_dir}/mozc-katakana_full.png
-%{fcitx5_icon_dir}/mozc-katakana_half.png
-%{fcitx5_icon_dir}/mozc-dictionary.png
-%{fcitx5_icon_dir}/mozc-properties.png
-%{fcitx5_icon_dir}/mozc-tool.png
+%{_datadir}/icons/hicolor/
%endif
%changelog
++++++ add-sha256sum-for-zipcode-archives.patch ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:36.864817269 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:36.868817274 +0200
@@ -1,17 +1,18 @@
diff --git a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
-index d9f63844..eaab8c4b 100644
+index 3538db2d..849cbc4f 100644
--- a/src/WORKSPACE.bazel
+++ b/src/WORKSPACE.bazel
-@@ -167,9 +167,11 @@ http_archive(
+@@ -181,10 +181,12 @@ http_archive(
name = "zip_code_ken_all",
- url = "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip";,
build_file_content = "exports_files([\"KEN_ALL.CSV\"])",
-+ sha256 =
"de6e164c3e8431bacf59e3a19b6948a27343a070ed9102c4ee8bc6ec28b93e2a"
+ url = "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip";,
++ sha256 =
"509c94df91e51c6f6ae95d133b26a2d57e0d257e47a0aa54945c1cdb8afd0134"
)
+
http_archive(
name = "zip_code_jigyosyo",
- url =
"https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip";,
build_file_content = "exports_files([\"JIGYOSYO.CSV\"])",
-+ sha256 =
"b3b02234260502c7f11fc2b2c6f36de8c4007d83dd620edfce96d2d80df62e9f"
+ url =
"https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip";,
++ sha256 =
"6e7925ac9f5dd0bc457a7682fc2eeecba141d2d2916ffc3507a2f44eb009740f"
)
++++++ add-sha256sum-for-zipcode-archives.patch.in ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:36.884817296 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:36.888817301 +0200
@@ -1,17 +1,18 @@
diff --git a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
-index d9f63844..eaab8c4b 100644
+index 3538db2d..849cbc4f 100644
--- a/src/WORKSPACE.bazel
+++ b/src/WORKSPACE.bazel
-@@ -167,9 +167,11 @@ http_archive(
+@@ -181,10 +181,12 @@ http_archive(
name = "zip_code_ken_all",
- url = "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip";,
build_file_content = "exports_files([\"KEN_ALL.CSV\"])",
+ url = "https://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip";,
+ sha256 = "@kenallsha256@"
)
+
http_archive(
name = "zip_code_jigyosyo",
- url =
"https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip";,
build_file_content = "exports_files([\"JIGYOSYO.CSV\"])",
+ url =
"https://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip";,
+ sha256 = "@jigyosyosha256@"
)
++++++ fcitx-mozc-b423557b.tar.xz -> fcitx-mozc-27a5bd7e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx/po/ko.po new/src/unix/fcitx/po/ko.po
--- old/src/unix/fcitx/po/ko.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx/po/ko.po 2022-04-23 06:54:25.000000000 +0200
@@ -4,14 +4,16 @@
#
# Translators:
# Bon Keun Seo <scoby...@gmail.com>, 2017
-# JungHee Lee <daemu...@gmail.com>, 2020
+# Junghee Lee <daemu...@gmail.com>, 2020
+# Junghee Lee <daemu...@gmail.com>, 2022
+# Junghee Lee <daemu...@gmail.com>, 2020,2022
msgid ""
msgstr ""
"Project-Id-Version: fcitx\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2020-11-11 00:03-0800\n"
-"PO-Revision-Date: 2020-11-10 08:03+0000\n"
-"Last-Translator: csslayer <wen...@gmail.com>\n"
+"POT-Creation-Date: 2022-04-10 20:28+0000\n"
+"PO-Revision-Date: 2012-03-06 06:51+0000\n"
+"Last-Translator: Junghee Lee <daemu...@gmail.com>, 2022\n"
"Language-Team: Korean (http://www.transifex.com/fcitx/fcitx/language/ko/)\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
@@ -21,60 +23,60 @@
#: ../eim.cc:187
msgid "Press Escape to go back"
-msgstr "??????????????? ESC??? ????????????"
+msgstr "??????????????? Esc ?????? ?????? ???????????????"
-#: ../fcitx_mozc.cc:65
+#: ../fcitx_mozc.cc:68
msgid "Direct"
msgstr "????????????"
-#: ../fcitx_mozc.cc:70
+#: ../fcitx_mozc.cc:73
msgid "Hiragana"
msgstr "????????????"
-#: ../fcitx_mozc.cc:75
+#: ../fcitx_mozc.cc:78
msgid "Full Katakana"
-msgstr "?????? ????????????"
+msgstr "?????? ????????????"
-#: ../fcitx_mozc.cc:80
+#: ../fcitx_mozc.cc:83
msgid "Half ASCII"
msgstr "?????? ?????????"
-#: ../fcitx_mozc.cc:85
+#: ../fcitx_mozc.cc:88
msgid "Full ASCII"
msgstr "?????? ?????????"
-#: ../fcitx_mozc.cc:90
+#: ../fcitx_mozc.cc:93
msgid "Half Katakana"
-msgstr "?????? ????????????"
+msgstr "?????? ????????????"
-#: ../fcitx_mozc.cc:406 ../fcitx_mozc.cc:407 ../fcitx_mozc.cc:469
+#: ../fcitx_mozc.cc:409 ../fcitx_mozc.cc:410 ../fcitx_mozc.cc:472
msgid "Composition Mode"
msgstr "?????? ??????"
-#: ../fcitx_mozc.cc:417 ../fcitx_mozc.cc:418
+#: ../fcitx_mozc.cc:420 ../fcitx_mozc.cc:421
msgid "Tool"
msgstr "??????"
-#: ../fcitx_mozc.cc:482
+#: ../fcitx_mozc.cc:485
msgid "Mozc Tool"
msgstr "Mozc ??????"
-#: ../fcitx_mozc.cc:488
+#: ../fcitx_mozc.cc:491
msgid "Configuration Tool"
-msgstr "???????????? ??????"
+msgstr "?????? ??????"
-#: ../fcitx_mozc.cc:489
+#: ../fcitx_mozc.cc:492
msgid "Dictionary Tool"
msgstr "?????? ??????"
-#: ../fcitx_mozc.cc:490
+#: ../fcitx_mozc.cc:493
msgid "Add Word"
msgstr "?????? ??????"
-#: ../fcitx_mozc.cc:491
+#: ../fcitx_mozc.cc:494
msgid "About Mozc"
msgstr "Mozc??? ??????"
#: ../mozc_response_parser.cc:365
msgid "Press Ctrl+Alt+H to show usages."
-msgstr "???????????? ????????? Ctrl+Alt+H??? ???????????????."
+msgstr "???????????? ????????? Ctrl+Alt+H??? ????????????."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/mozc_engine.cc
new/src/unix/fcitx5/mozc_engine.cc
--- old/src/unix/fcitx5/mozc_engine.cc 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/mozc_engine.cc 2022-04-23 06:54:25.000000000 +0200
@@ -92,20 +92,6 @@
};
const size_t kNumCompositionModes = arraysize(kPropCompositionModes);
-std::string MozcModeAction::shortText(InputContext *) const {
- return _("Composition Mode");
-}
-
-std::string MozcModeAction::longText(InputContext *ic) const {
- auto mozc_state = engine_->mozcState(ic);
- return
_(kPropCompositionModes[mozc_state->GetCompositionMode()].description);
-}
-
-std::string MozcModeAction::icon(InputContext *ic) const {
- auto mozc_state = engine_->mozcState(ic);
- return kPropCompositionModes[mozc_state->GetCompositionMode()].icon;
-}
-
MozcModeSubAction::MozcModeSubAction(MozcEngine *engine,
mozc::commands::CompositionMode mode)
: engine_(engine), mode_(mode) {
@@ -145,8 +131,7 @@
client_(connection_->CreateClient()),
factory_([this](InputContext &ic) {
return new MozcState(&ic, connection_->CreateClient(), this);
- }),
- modeAction_(this) {
+ }) {
for (auto command :
{mozc::commands::DIRECT, mozc::commands::HIRAGANA,
mozc::commands::FULL_KATAKANA, mozc::commands::FULL_ASCII,
@@ -154,17 +139,16 @@
modeActions_.push_back(std::make_unique<MozcModeSubAction>(this, command));
}
instance_->inputContextManager().registerProperty("mozcState", &factory_);
- instance_->userInterfaceManager().registerAction("mozc-mode", &modeAction_);
instance_->userInterfaceManager().registerAction("mozc-tool", &toolAction_);
- toolAction_.setShortText(_("Tool"));
- toolAction_.setLongText(_("Tool"));
+ toolAction_.setShortText(_("Mozc Settings"));
+ toolAction_.setLongText(_("Mozc Settings"));
toolAction_.setIcon("fcitx-mozc-tool");
int i = 0;
for (auto &modeAction : modeActions_) {
instance_->userInterfaceManager().registerAction(
kPropCompositionModes[i].name, modeAction.get());
- modeMenu_.addAction(modeAction.get());
+ toolMenu_.addAction(modeAction.get());
i++;
}
@@ -203,7 +187,6 @@
toolMenu_.addAction(&addWordAction_);
toolMenu_.addAction(&aboutAction_);
- modeAction_.setMenu(&modeMenu_);
toolAction_.setMenu(&toolMenu_);
reloadConfig();
@@ -225,7 +208,6 @@
auto ic = event.inputContext();
auto mozc_state = mozcState(ic);
mozc_state->FocusIn();
- ic->statusArea().addAction(StatusGroup::InputMethod, &modeAction_);
ic->statusArea().addAction(StatusGroup::InputMethod, &toolAction_);
}
void MozcEngine::deactivate(const fcitx::InputMethodEntry &,
@@ -266,7 +248,14 @@
std::string MozcEngine::subMode(const fcitx::InputMethodEntry &,
fcitx::InputContext &ic) {
- return modeAction_.longText(&ic);
+ auto mozc_state = mozcState(&ic);
+ return
_(kPropCompositionModes[mozc_state->GetCompositionMode()].description);
+}
+
+std::string MozcEngine::subModeIconImpl(const fcitx::InputMethodEntry &,
+ fcitx::InputContext &ic) {
+ auto mozc_state = mozcState(&ic);
+ return _(kPropCompositionModes[mozc_state->GetCompositionMode()].icon);
}
MozcState *MozcEngine::mozcState(InputContext *ic) {
@@ -274,10 +263,10 @@
}
void MozcEngine::compositionModeUpdated(InputContext *ic) {
- modeAction_.update(ic);
for (const auto &modeAction : modeActions_) {
modeAction->update(ic);
}
+ ic->updateUserInterface(UserInterfaceComponent::StatusArea);
}
AddonInstance *MozcEngine::clipboardAddon() { return clipboard(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/mozc_engine.h
new/src/unix/fcitx5/mozc_engine.h
--- old/src/unix/fcitx5/mozc_engine.h 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/mozc_engine.h 2022-04-23 06:54:25.000000000 +0200
@@ -84,18 +84,6 @@
ExternalOption aboutTool{this, "About Mozc", _("About Mozc"),
toolCommand("--mode=about_dialog")};);
-class MozcModeAction : public Action {
- public:
- MozcModeAction(MozcEngine *engine) : engine_(engine) {}
-
- std::string shortText(fcitx::InputContext *) const override;
- std::string longText(fcitx::InputContext *) const override;
- std::string icon(fcitx::InputContext *) const override;
-
- private:
- MozcEngine *engine_;
-};
-
class MozcModeSubAction : public SimpleAction {
public:
MozcModeSubAction(MozcEngine *engine, mozc::commands::CompositionMode mode);
@@ -107,7 +95,7 @@
mozc::commands::CompositionMode mode_;
};
-class MozcEngine final : public InputMethodEngine {
+class MozcEngine final : public InputMethodEngineV2 {
public:
MozcEngine(Instance *instance);
~MozcEngine();
@@ -122,6 +110,9 @@
void save() override;
std::string subMode(const fcitx::InputMethodEntry &,
fcitx::InputContext &) override;
+ std::string subModeIconImpl(const InputMethodEntry &entry,
+ InputContext &ic) override;
+
const Configuration *getConfig() const override { return &config_; }
void setConfig(const RawConfig &config) override;
@@ -140,14 +131,12 @@
std::unique_ptr<MozcConnection> connection_;
std::unique_ptr<mozc::client::ClientInterface> client_;
FactoryFor<MozcState> factory_;
- MozcModeAction modeAction_;
SimpleAction toolAction_;
std::vector<std::unique_ptr<MozcModeSubAction>> modeActions_;
SimpleAction configToolAction_, dictionaryToolAction_, addWordAction_,
aboutAction_;
Menu toolMenu_;
- Menu modeMenu_;
MozcEngineConfig config_;
uint64 lastSyncTime_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/mozc_state.cc
new/src/unix/fcitx5/mozc_state.cc
--- old/src/unix/fcitx5/mozc_state.cc 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/mozc_state.cc 2022-04-23 06:54:25.000000000 +0200
@@ -71,7 +71,7 @@
if (TrySendCompositionMode(*engine_->config().initialMode, &raw_response,
&error)) {
if (raw_response.has_mode()) {
- SetCompositionMode(raw_response.mode());
+ SetCompositionMode(raw_response.mode(), /*updateUI=*/false);
}
}
}
@@ -317,10 +317,13 @@
void MozcState::SetAuxString(const std::string& str) { aux_ = str; }
-void MozcState::SetCompositionMode(mozc::commands::CompositionMode mode) {
+void MozcState::SetCompositionMode(mozc::commands::CompositionMode mode,
+ bool updateUI) {
composition_mode_ = mode;
DCHECK(composition_mode_ < mozc::commands::NUM_OF_COMPOSITIONS);
- engine_->compositionModeUpdated(ic_);
+ if (updateUI) {
+ engine_->compositionModeUpdated(ic_);
+ }
}
void MozcState::SendCompositionMode(mozc::commands::CompositionMode mode) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/mozc_state.h
new/src/unix/fcitx5/mozc_state.h
--- old/src/unix/fcitx5/mozc_state.h 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/mozc_state.h 2022-04-23 06:54:25.000000000 +0200
@@ -79,7 +79,8 @@
// currently being displayed.
void SetAuxString(const std::string &str);
// Sets a current composition mode (e.g., Hankaku Katakana).
- void SetCompositionMode(mozc::commands::CompositionMode mode);
+ void SetCompositionMode(mozc::commands::CompositionMode mode,
+ bool updateUI = true);
void SendCompositionMode(mozc::commands::CompositionMode mode);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/ca.po new/src/unix/fcitx5/po/ca.po
--- old/src/unix/fcitx5/po/ca.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/ca.po 2022-04-23 06:54:25.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: csslayer <wen...@gmail.com>, 2017\n"
"Language-Team: Catalan (https://www.transifex.com/fcitx/teams/12005/ca/)\n"
@@ -19,11 +19,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr ""
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr ""
@@ -31,15 +31,11 @@
msgid "Always"
msgstr ""
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr ""
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "Eina de configuraci??"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "Eina de diccionari"
@@ -95,6 +91,10 @@
msgid "Japanese input method based on Mozc"
msgstr ""
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr ""
@@ -114,10 +114,6 @@
msgid "Press Escape to go back"
msgstr ""
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr ""
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/da.po new/src/unix/fcitx5/po/da.po
--- old/src/unix/fcitx5/po/da.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/da.po 2022-04-23 06:54:25.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: scootergrisen, 2020\n"
"Language-Team: Danish (https://www.transifex.com/fcitx/teams/12005/da/)\n"
@@ -19,11 +19,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "Om Mozc"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "Tilf??j ord"
@@ -31,15 +31,11 @@
msgid "Always"
msgstr "Altid"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "Kompositionstilstand"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "Konfigurationsv??rkt??j"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "Ordbogsv??rkt??j"
@@ -95,6 +91,10 @@
msgid "Japanese input method based on Mozc"
msgstr "Japansk-inputmetode baseret p?? Mozc"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr "Mozc til Fcitx 5"
@@ -114,10 +114,6 @@
msgid "Press Escape to go back"
msgstr "Tryk p?? Escape for at g?? tilbage"
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "V??rkt??j"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/de.po new/src/unix/fcitx5/po/de.po
--- old/src/unix/fcitx5/po/de.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/de.po 2022-04-23 06:54:25.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2022-01-15 20:24+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: Ettore Atalan <atalantt...@googlemail.com>, 2022\n"
"Language-Team: German (https://www.transifex.com/fcitx/teams/12005/de/)\n"
@@ -20,11 +20,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr ""
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "Wort hinzuf??gen"
@@ -32,15 +32,11 @@
msgid "Always"
msgstr "Immer"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "Kompositionsmodus"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "Konfigurationswerkzeug"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "W??rterbuchwerkzeug"
@@ -96,6 +92,10 @@
msgid "Japanese input method based on Mozc"
msgstr ""
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr ""
@@ -115,10 +115,6 @@
msgid "Press Escape to go back"
msgstr ""
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "Werkzeug"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/fcitx5-mozc.pot
new/src/unix/fcitx5/po/fcitx5-mozc.pot
--- old/src/unix/fcitx5/po/fcitx5-mozc.pot 2022-02-25 14:39:27.000000000
+0100
+++ new/src/unix/fcitx5/po/fcitx5-mozc.pot 2022-04-23 06:54:25.000000000
+0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr ""
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr ""
@@ -27,15 +27,11 @@
msgid "Always"
msgstr ""
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr ""
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr ""
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr ""
@@ -91,6 +87,10 @@
msgid "Japanese input method based on Mozc"
msgstr ""
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr ""
@@ -110,10 +110,6 @@
msgid "Press Escape to go back"
msgstr ""
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr ""
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/he.po new/src/unix/fcitx5/po/he.po
--- old/src/unix/fcitx5/po/he.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/he.po 2022-04-23 06:54:25.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: Omer I.S. <omeritzicschwa...@gmail.com>, 2021\n"
"Language-Team: Hebrew (https://www.transifex.com/fcitx/teams/12005/he/)\n"
@@ -20,11 +20,11 @@
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "???? ?????????? Mozc"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "?????????? ????????"
@@ -32,15 +32,11 @@
msgid "Always"
msgstr ""
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr ""
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr ""
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr ""
@@ -96,6 +92,10 @@
msgid "Japanese input method based on Mozc"
msgstr ""
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr ""
@@ -115,10 +115,6 @@
msgid "Press Escape to go back"
msgstr ""
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr ""
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/ja.po new/src/unix/fcitx5/po/ja.po
--- old/src/unix/fcitx5/po/ja.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/ja.po 2022-04-23 06:54:25.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2022-01-16 20:24+0000\n"
+"POT-Creation-Date: 2022-03-26 20:24+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: UTUMI Hirosi <utuhir...@yahoo.co.jp>, 2022\n"
"Language-Team: Japanese (https://www.transifex.com/fcitx/teams/12005/ja/)\n"
@@ -20,11 +20,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "Mozc ????????????"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "???????????????"
@@ -32,15 +32,11 @@
msgid "Always"
msgstr "??????"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "?????????"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "???????????????"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "???????????????"
@@ -96,6 +92,10 @@
msgid "Japanese input method based on Mozc"
msgstr "Mozc ????????????????????????????????????????????????"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr "Mozc ?????????"
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr "Fcitx 5 ?????? Mozc"
@@ -115,10 +115,6 @@
msgid "Press Escape to go back"
msgstr "Esc ????????????????????????"
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "?????????"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr "????????????????????????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/ko.po new/src/unix/fcitx5/po/ko.po
--- old/src/unix/fcitx5/po/ko.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/ko.po 2022-04-23 06:54:25.000000000 +0200
@@ -4,16 +4,16 @@
#
# Translators:
# csslayer <wen...@gmail.com>, 2017
-# Jung Hee Lee <daemu...@gmail.com>, 2021
# Bon Keun Seo <scoby...@gmail.com>, 2021
+# Junghee Lee <daemu...@gmail.com>, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-04-10 20:24+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
-"Last-Translator: Bon Keun Seo <scoby...@gmail.com>, 2021\n"
+"Last-Translator: Junghee Lee <daemu...@gmail.com>, 2022\n"
"Language-Team: Korean (https://www.transifex.com/fcitx/teams/12005/ko/)\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "Mozc ??????"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "?????? ??????"
@@ -33,15 +33,11 @@
msgid "Always"
msgstr "??????"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "?????? ??????"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
-msgstr "???????????? ??????"
+msgstr "?????? ??????"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "?????? ??????"
@@ -51,11 +47,11 @@
#: mozc_engine.h:69
msgid "Expand Usage (Requires vertical candidate list)"
-msgstr ""
+msgstr "?????? ?????? (?????? ?????? ?????? ??????)"
#: mozc_engine.h:73
msgid "Fix embedded preedit cursor at the beginning of the preedit"
-msgstr ""
+msgstr "???????????? ?????? ????????? ????????? ???????????? ?????? ??????"
#. Full width ASCII letter A.
#: mozc_engine.h:53 mozc_engine.cc:82
@@ -65,7 +61,7 @@
#. Katakana letter A.
#: mozc_engine.h:52 mozc_engine.cc:66
msgid "Full Katakana"
-msgstr "?????? ????????????"
+msgstr "?????? ????????????"
#: mozc_engine.h:52 mozc_engine.cc:74
msgid "Half ASCII"
@@ -74,7 +70,7 @@
#. Half width Katakana letter A.
#: mozc_engine.h:53 mozc_engine.cc:89
msgid "Half Katakana"
-msgstr "?????? ????????????"
+msgstr "?????? ????????????"
#. Hiragana letter A in UTF-8.
#: mozc_engine.h:51 mozc_engine.cc:59
@@ -87,23 +83,27 @@
#: mozc_engine.h:75
msgid "Hotkey to expand usage"
-msgstr ""
+msgstr "????????? ????????? ?????????"
#: mozc_engine.h:63
msgid "Initial Mode"
-msgstr ""
+msgstr "?????? ??????"
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:8
msgid "Japanese input method based on Mozc"
msgstr "Mozc ?????? ????????? ?????????"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr "Mozc ??????"
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
-msgstr "Fcitx 5 ??? Mozc"
+msgstr "Fcitx5??? Mozc"
#: mozc_engine.h:48
msgid "On Focus"
-msgstr ""
+msgstr "?????? ?????????"
#. We don't have a good library option for this, just do the simple
#. replace. absl's runtime parsed format string is too copmlex.
@@ -114,12 +114,8 @@
#: mozc_state.cc:405
msgid "Press Escape to go back"
-msgstr "??????????????? Esc ?????? ???????????????."
-
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "??????"
+msgstr "??????????????? Esc ?????? ?????? ???????????????"
#: mozc_engine.h:65
msgid "Vertical candidate list"
-msgstr ""
+msgstr "?????? ?????? ??????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/ru.po new/src/unix/fcitx5/po/ru.po
--- old/src/unix/fcitx5/po/ru.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/ru.po 2022-04-23 06:54:25.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2022-01-31 20:24+0000\n"
+"POT-Creation-Date: 2022-03-25 20:24+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: Dmitry <dmitrydmitry...@gmail.com>, 2022\n"
"Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n"
@@ -22,11 +22,11 @@
"%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"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "?? Mozc"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "???????????????? ??????????"
@@ -34,15 +34,11 @@
msgid "Always"
msgstr "????????????"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "???????????????????????????? ??????????"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "???????????????????? ??????????????????"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "???????????????????? ??????????????"
@@ -100,6 +96,10 @@
msgid "Japanese input method based on Mozc"
msgstr "???????????????? ?????????? ?????????? ???? ???????????? Mozc"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr "?????????????????? Mozc"
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr "Mozc ?????? Fcitx 5"
@@ -119,10 +119,6 @@
msgid "Press Escape to go back"
msgstr "?????????????? Escape, ?????????? ?????????????????? ??????????"
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "????????????????????"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr "???????????????????????? ???????????? ????????????????????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/tr.po new/src/unix/fcitx5/po/tr.po
--- old/src/unix/fcitx5/po/tr.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/tr.po 2022-04-23 06:54:25.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: abc Def <hdogan1...@gmail.com>, 2021\n"
"Language-Team: Turkish (https://www.transifex.com/fcitx/teams/12005/tr/)\n"
@@ -19,11 +19,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "Mozc Hakk??nda"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "Kelime Ekle"
@@ -31,15 +31,11 @@
msgid "Always"
msgstr ""
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr ""
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr ""
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr ""
@@ -95,6 +91,10 @@
msgid "Japanese input method based on Mozc"
msgstr ""
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr ""
@@ -114,10 +114,6 @@
msgid "Press Escape to go back"
msgstr ""
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr ""
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/zh_CN.po
new/src/unix/fcitx5/po/zh_CN.po
--- old/src/unix/fcitx5/po/zh_CN.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/zh_CN.po 2022-04-23 06:54:25.000000000 +0200
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the fcitx5-mozc package.
#
# Translators:
-# csslayer <wen...@gmail.com>, 2021
+# csslayer <wen...@gmail.com>, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 20:24+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
-"Last-Translator: csslayer <wen...@gmail.com>, 2021\n"
+"Last-Translator: csslayer <wen...@gmail.com>, 2022\n"
"Language-Team: Chinese (China) (https://www.transifex.com/fcitx/teams/12005/";
"zh_CN/)\n"
"Language: zh_CN\n"
@@ -20,11 +20,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "?????? Mozc"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "????????????"
@@ -32,15 +32,11 @@
msgid "Always"
msgstr "??????"
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "????????????"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "????????????"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "????????????"
@@ -96,6 +92,10 @@
msgid "Japanese input method based on Mozc"
msgstr "?????? Mozc ??????????????????"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr "Mozc ??????"
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr "Fcitx 5 ??? Mozc ??????"
@@ -115,10 +115,6 @@
msgid "Press Escape to go back"
msgstr "??? Escape ??????"
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "??????"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr "??????????????????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/src/unix/fcitx5/po/zh_TW.po
new/src/unix/fcitx5/po/zh_TW.po
--- old/src/unix/fcitx5/po/zh_TW.po 2022-02-25 14:39:27.000000000 +0100
+++ new/src/unix/fcitx5/po/zh_TW.po 2022-04-23 06:54:25.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: fcitx5-mozc\n"
"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n"
-"POT-Creation-Date: 2021-12-30 02:39+0000\n"
+"POT-Creation-Date: 2022-03-25 04:41+0000\n"
"PO-Revision-Date: 2017-11-23 05:28+0000\n"
"Last-Translator: bruh, 2020\n"
"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fcitx/teams/12005/";
@@ -21,11 +21,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: mozc_engine.h:84 mozc_engine.cc:196
+#: mozc_engine.h:84 mozc_engine.cc:180
msgid "About Mozc"
msgstr "?????? Mozc"
-#: mozc_engine.h:82 mozc_engine.cc:189
+#: mozc_engine.h:82 mozc_engine.cc:173
msgid "Add Word"
msgstr "????????????"
@@ -33,15 +33,11 @@
msgid "Always"
msgstr ""
-#: mozc_engine.cc:96
-msgid "Composition Mode"
-msgstr "????????????"
-
-#: mozc_engine.h:78 mozc_engine.cc:173
+#: mozc_engine.h:78 mozc_engine.cc:157
msgid "Configuration Tool"
msgstr "????????????"
-#: mozc_engine.h:80 mozc_engine.cc:181
+#: mozc_engine.h:80 mozc_engine.cc:165
msgid "Dictionary Tool"
msgstr "????????????"
@@ -97,6 +93,10 @@
msgid "Japanese input method based on Mozc"
msgstr "?????? Mozc ??????????????????"
+#: mozc_engine.cc:143 mozc_engine.cc:144
+msgid "Mozc Settings"
+msgstr ""
+
#: org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in:7
msgid "Mozc for Fcitx 5"
msgstr "Fcitx 5 ??? Mozc ??????"
@@ -116,10 +116,6 @@
msgid "Press Escape to go back"
msgstr "?????? Escape ??????"
-#: mozc_engine.cc:159 mozc_engine.cc:160
-msgid "Tool"
-msgstr "??????"
-
#: mozc_engine.h:65
msgid "Vertical candidate list"
msgstr ""
++++++ fcitx-mozc-bazel-build.patch ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:36.976817419 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:36.980817425 +0200
@@ -1,9 +1,7 @@
-diff --git a/src/WORKSPACE.bazel b/src/WORKSPACE.bazel
-index d9f63844..3df16a96 100644
---- a/src/WORKSPACE.bazel
-+++ b/src/WORKSPACE.bazel
-@@ -61,6 +61,22 @@ new_local_repository(
- build_file = "BUILD.ibus.bazel",
+--- mozc/src/WORKSPACE.bazel 2022-05-05 15:24:58.212937973 +0900
++++ fcitx-mozc/src/WORKSPACE.bazel 2022-05-05 15:25:36.117662215 +0900
+@@ -66,6 +66,22 @@
+ path = "/usr", # For Debian
)
+# Fcitx
++++++ ibus-setup-mozc-jp.desktop.in ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:37.008817462 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:37.012817468 +0200
@@ -2,7 +2,7 @@
Name=IBus Mozc Setup
Comment=Set up IBus Mozc engine
Exec=@libdir@/mozc/mozc_tool --mode=config_dialog
-Icon=/usr/share/ibus-mozc/product_icon.png
+Icon=/usr/share/ibus-mozc/mozc.png
NoDisplay=true
Type=Application
StartupNotify=true
++++++ jigyosyo.zip ++++++
Binary files /var/tmp/diff_new_pack.GMjuP5/_old and
/var/tmp/diff_new_pack.GMjuP5/_new differ
++++++ ken_all.zip ++++++
Binary files /var/tmp/diff_new_pack.GMjuP5/_old and
/var/tmp/diff_new_pack.GMjuP5/_new differ
++++++ make_archive.sh ++++++
--- /var/tmp/diff_new_pack.GMjuP5/_old 2022-05-12 23:00:37.084817564 +0200
+++ /var/tmp/diff_new_pack.GMjuP5/_new 2022-05-12 23:00:37.088817570 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
-commit=063c41f1d7c1a877f44c1f8caad6be1897350336
-fcitxcommit=b423557b5057cff239d15461b64c0f3d83a1c658
+commit=4c5d516fdff227039305eef3411f12bac9f02246
+fcitxcommit=27a5bd7e78ab70329ed5cc75e29dcbacfd788e3f
set -e
++++++ mozc-2.26.4660.102.tar.xz -> mozc-2.28.4715.102.tar.xz ++++++
/work/SRC/openSUSE:Factory/mozc/mozc-2.26.4660.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new.1538/mozc-2.28.4715.102.tar.xz differ:
char 26, line 1
