Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-unikey for openSUSE:Factory checked in at 2026-02-09 11:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-unikey (Old) and /work/SRC/openSUSE:Factory/.fcitx5-unikey.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-unikey" Mon Feb 9 11:43:25 2026 rev:13 rq:1331832 version:5.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-unikey/fcitx5-unikey.changes 2025-06-23 15:05:19.697872570 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx5-unikey.new.1670/fcitx5-unikey.changes 2026-02-09 11:44:03.263499788 +0100 @@ -1,0 +2,6 @@ +Sun Feb 8 06:39:17 UTC 2026 - Marguerite Su <[email protected]> + +- update to 5.1.9 + * Use QT_NO_KEYWORDS and clean up qt plugin includes + +------------------------------------------------------------------- Old: ---- fcitx5-unikey-5.1.7.tar.zst New: ---- fcitx5-unikey-5.1.9.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-unikey.spec ++++++ --- /var/tmp/diff_new_pack.YSrLqI/_old 2026-02-09 11:44:03.715518805 +0100 +++ /var/tmp/diff_new_pack.YSrLqI/_new 2026-02-09 11:44:03.715518805 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-unikey # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fcitx5-unikey -Version: 5.1.7 +Version: 5.1.9 Release: 0 Summary: Unikey engine support for Fcitx5 License: GPL-2.0-or-later AND LGPL-2.0-or-later ++++++ fcitx5-unikey-5.1.7.tar.zst -> fcitx5-unikey-5.1.9.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/CMakeLists.txt new/fcitx5-unikey-5.1.9/CMakeLists.txt --- old/fcitx5-unikey-5.1.7/CMakeLists.txt 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/CMakeLists.txt 2025-12-22 07:18:16.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.6) -project(fcitx5-unikey VERSION 5.1.7) +project(fcitx5-unikey VERSION 5.1.9) set(REQUIRED_FCITX_VERSION 5.1.13) find_package(ECM 1.0.0 REQUIRED) @@ -24,6 +24,7 @@ include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-unikey\") +add_definitions(-DQT_NO_KEYWORDS) fcitx5_add_i18n_definition() if (ENABLE_QT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/keymap-editor/editor.h new/fcitx5-unikey-5.1.9/keymap-editor/editor.h --- old/fcitx5-unikey-5.1.7/keymap-editor/editor.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/keymap-editor/editor.h 2025-12-22 07:18:16.000000000 +0100 @@ -50,7 +50,7 @@ QString icon() override; static QString getData(CKeymapTable *table, int i, bool iskey); -private slots: +private Q_SLOTS: void addKeymap(); void deleteKeymap(); void deleteAllKeymap(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/keymap-editor/model.cpp new/fcitx5-unikey-5.1.9/keymap-editor/model.cpp --- old/fcitx5-unikey-5.1.7/keymap-editor/model.cpp 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/keymap-editor/model.cpp 2025-12-22 07:18:16.000000000 +0100 @@ -165,7 +165,7 @@ void KeymapModel::setNeedSave(bool needSave) { if (needSave_ != needSave) { needSave_ = needSave; - emit needSaveChanged(needSave_); + Q_EMIT needSaveChanged(needSave_); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/keymap-editor/model.h new/fcitx5-unikey-5.1.9/keymap-editor/model.h --- old/fcitx5-unikey-5.1.7/keymap-editor/model.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/keymap-editor/model.h 2025-12-22 07:18:16.000000000 +0100 @@ -41,7 +41,7 @@ void save(const QString &fileName); void load(int profile); -signals: +Q_SIGNALS: void needSaveChanged(bool); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/dialog.cpp new/fcitx5-unikey-5.1.9/macro-editor/dialog.cpp --- old/fcitx5-unikey-5.1.7/macro-editor/dialog.cpp 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/dialog.cpp 2025-12-22 07:18:16.000000000 +0100 @@ -5,15 +5,15 @@ * */ #include "dialog.h" -#include "ui_dialog.h" +#include <QDialog> +#include <QString> +#include <QWidget> -namespace fcitx { -namespace unikey { +namespace fcitx::unikey { MacroDialog::MacroDialog(QWidget *parent) : QDialog(parent) { setupUi(this); } QString MacroDialog::macro() const { return macroLineEdit->text(); } QString MacroDialog::word() const { return wordLineEdit->text(); } -} // namespace unikey -} // namespace fcitx +} // namespace fcitx::unikey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/dialog.h new/fcitx5-unikey-5.1.9/macro-editor/dialog.h --- old/fcitx5-unikey-5.1.7/macro-editor/dialog.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/dialog.h 2025-12-22 07:18:16.000000000 +0100 @@ -9,11 +9,11 @@ #include "ui_dialog.h" #include <QDialog> +#include <QString> +#include <QWidget> -class CMacroTable; +namespace fcitx::unikey { -namespace fcitx { -namespace unikey { class MacroDialog : public QDialog, private Ui::Dialog { Q_OBJECT public: @@ -21,7 +21,6 @@ QString macro() const; QString word() const; }; -} // namespace unikey -} // namespace fcitx +} // namespace fcitx::unikey #endif // _MACRO_EDITOR_DIALOG_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/editor.cpp new/fcitx5-unikey-5.1.9/macro-editor/editor.cpp --- old/fcitx5-unikey-5.1.7/macro-editor/editor.cpp 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/editor.cpp 2025-12-22 07:18:16.000000000 +0100 @@ -76,7 +76,7 @@ void MacroEditor::deleteAllWord() { model_->deleteAllItem(); } void MacroEditor::addWord() { - MacroDialog *dialog = new MacroDialog(this); + auto *dialog = new MacroDialog(this); dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->open(); connect(dialog, &QDialog::accepted, this, &MacroEditor::addWordAccepted); @@ -118,8 +118,7 @@ } void MacroEditor::addWordAccepted() { - const MacroDialog *dialog = - qobject_cast<const MacroDialog *>(QObject::sender()); + const auto *dialog = qobject_cast<const MacroDialog *>(QObject::sender()); model_->addItem(dialog->macro(), dialog->word()); } @@ -142,7 +141,7 @@ } void MacroEditor::importMacro() { - QFileDialog *dialog = new QFileDialog(this); + auto *dialog = new QFileDialog(this); dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setFileMode(QFileDialog::ExistingFile); dialog->setAcceptMode(QFileDialog::AcceptOpen); @@ -152,8 +151,7 @@ } void MacroEditor::importFileSelected() { - const QFileDialog *dialog = - qobject_cast<const QFileDialog *>(QObject::sender()); + const auto *dialog = qobject_cast<const QFileDialog *>(QObject::sender()); if (dialog->selectedFiles().length() <= 0) { return; } @@ -162,7 +160,7 @@ } void MacroEditor::exportMacro() { - QFileDialog *dialog = new QFileDialog(this); + auto *dialog = new QFileDialog(this); dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setDirectory("macro"); dialog->setAcceptMode(QFileDialog::AcceptSave); @@ -172,8 +170,7 @@ } void MacroEditor::exportFileSelected() { - const QFileDialog *dialog = - qobject_cast<const QFileDialog *>(QObject::sender()); + const auto *dialog = qobject_cast<const QFileDialog *>(QObject::sender()); if (dialog->selectedFiles().length() <= 0) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/editor.h new/fcitx5-unikey-5.1.9/macro-editor/editor.h --- old/fcitx5-unikey-5.1.7/macro-editor/editor.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/editor.h 2025-12-22 07:18:16.000000000 +0100 @@ -8,13 +8,14 @@ #define _MACRO_EDITOR_EDITOR_H_ #include "ui_editor.h" +#include <QString> +#include <QWidget> #include <fcitxqtconfiguiwidget.h> #include <memory> class CMacroTable; -namespace fcitx { -namespace unikey { +namespace fcitx::unikey { class MacroModel; class MacroEditor : public FcitxQtConfigUIWidget, public Ui::Editor { @@ -28,7 +29,7 @@ QString icon() override; static QString getData(CMacroTable *table, int i, bool iskey); -private slots: +private Q_SLOTS: void addWord(); void deleteWord(); void deleteAllWord(); @@ -43,7 +44,6 @@ std::unique_ptr<CMacroTable> table_; MacroModel *model_; }; -} // namespace unikey -} // namespace fcitx +} // namespace fcitx::unikey #endif // _MACRO_EDITOR_EDITOR_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/main.cpp new/fcitx5-unikey-5.1.9/macro-editor/main.cpp --- old/fcitx5-unikey-5.1.7/macro-editor/main.cpp 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/main.cpp 2025-12-22 07:18:16.000000000 +0100 @@ -6,9 +6,13 @@ */ #include "main.h" #include "editor.h" -#include "model.h" #include <QApplication> -#include <qplugin.h> +#include <QObject> +#include <QtPlugin> +#include <fcitx-utils/i18n.h> +#include <fcitx-utils/macros.h> +#include <fcitxqtconfiguiplugin.h> +#include <fcitxqtconfiguiwidget.h> namespace fcitx { @@ -18,7 +22,7 @@ } FcitxQtConfigUIWidget *MacroEditorPlugin::create(const QString &key) { - Q_UNUSED(key); + FCITX_UNUSED(key); return new fcitx::unikey::MacroEditor; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/main.h new/fcitx5-unikey-5.1.9/macro-editor/main.h --- old/fcitx5-unikey-5.1.7/macro-editor/main.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/main.h 2025-12-22 07:18:16.000000000 +0100 @@ -7,6 +7,8 @@ #ifndef _MACRO_EDITOR_MAIN_H_ #define _MACRO_EDITOR_MAIN_H_ +#include <QObject> +#include <QString> #include <fcitxqtconfiguiplugin.h> namespace fcitx { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/model.cpp new/fcitx5-unikey-5.1.9/macro-editor/model.cpp --- old/fcitx5-unikey-5.1.7/macro-editor/model.cpp 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/model.cpp 2025-12-22 07:18:16.000000000 +0100 @@ -8,12 +8,18 @@ #include "editor.h" #include "model.h" +#include "vnconv.h" +#include <QAbstractTableModel> +#include <QObject> +#include <QString> +#include <QVariant> +#include <Qt> #include <fcitx-utils/i18n.h> +#include <utility> -namespace fcitx { -namespace unikey { +namespace fcitx::unikey { -typedef std::pair<QString, QString> ItemType; +using ItemType = std::pair<QString, QString>; MacroModel::MacroModel(QObject *parent) : QAbstractTableModel(parent), needSave_(false) {} @@ -23,24 +29,29 @@ QVariant MacroModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { - if (section == 0) + if (section == 0) { return _("Macro"); - else if (section == 1) + } + if (section == 1) { return _("Word"); + } } - return QVariant(); + return {}; } -int MacroModel::rowCount(const QModelIndex &) const { return list_.count(); } +int MacroModel::rowCount(const QModelIndex & /*parent*/) const { + return list_.count(); +} -int MacroModel::columnCount(const QModelIndex &) const { return 2; } +int MacroModel::columnCount(const QModelIndex & /*parent*/) const { return 2; } QVariant MacroModel::data(const QModelIndex &index, int role) const { do { if (role == Qt::DisplayRole && index.row() < list_.count()) { if (index.column() == 0) { return list_[index.row()].first; - } else if (index.column() == 1) { + } + if (index.column() == 1) { return list_[index.row()].second; } } @@ -49,8 +60,9 @@ } void MacroModel::addItem(const QString ¯o, const QString &word) { - if (keyset_.contains(macro)) + if (keyset_.contains(macro)) { return; + } beginInsertRows(QModelIndex(), list_.size(), list_.size()); list_.append(std::pair<QString, QString>(macro, word)); keyset_.insert(macro); @@ -59,8 +71,9 @@ } void MacroModel::deleteItem(int row) { - if (row >= list_.count()) + if (row >= list_.count()) { return; + } std::pair<QString, QString> item = list_.at(row); QString key = item.first; beginRemoveRows(QModelIndex(), row, row); @@ -71,8 +84,9 @@ } void MacroModel::deleteAllItem() { - if (list_.count()) + if (list_.count()) { setNeedSave(true); + } beginResetModel(); list_.clear(); keyset_.clear(); @@ -82,11 +96,11 @@ void MacroModel::setNeedSave(bool needSave) { if (needSave_ != needSave) { needSave_ = needSave; - emit needSaveChanged(needSave_); + Q_EMIT needSaveChanged(needSave_); } } -bool MacroModel::needSave() { return needSave_; } +bool MacroModel::needSave() const { return needSave_; } void MacroModel::load(CMacroTable *table) { beginResetModel(); @@ -103,12 +117,11 @@ void MacroModel::save(CMacroTable *table) { table->resetContent(); - foreach(const ItemType &item, list_) { + for (const ItemType &item : list_) { table->addItem(item.first.toUtf8().data(), item.second.toUtf8().data(), CONV_CHARSET_XUTF8); } setNeedSave(false); } -} // namespace unikey -} // namespace fcitx +} // namespace fcitx::unikey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/macro-editor/model.h new/fcitx5-unikey-5.1.9/macro-editor/model.h --- old/fcitx5-unikey-5.1.7/macro-editor/model.h 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/macro-editor/model.h 2025-12-22 07:18:16.000000000 +0100 @@ -9,30 +9,34 @@ #include "mactab.h" #include <QAbstractItemModel> +#include <QObject> #include <QSet> +#include <QString> +#include <QVariant> +#include <Qt> +#include <utility> -namespace fcitx { -namespace unikey { +namespace fcitx::unikey { class MacroModel : public QAbstractTableModel { Q_OBJECT public: explicit MacroModel(QObject *parent = 0); virtual ~MacroModel(); - virtual QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, - int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, + int role = Qt::DisplayRole) const override; void load(CMacroTable *table); void addItem(const QString ¯o, const QString &word); void deleteItem(int row); void deleteAllItem(); void save(CMacroTable *table); - bool needSave(); + bool needSave() const; -signals: +Q_SIGNALS: void needSaveChanged(bool); private: @@ -41,7 +45,7 @@ QSet<QString> keyset_; QList<std::pair<QString, QString>> list_; }; -} // namespace unikey -} // namespace fcitx + +} // namespace fcitx::unikey #endif // _MACRO_EDITOR_MODEL_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in new/fcitx5-unikey-5.1.9/org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in --- old/fcitx5-unikey-5.1.7/org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in 2025-12-22 07:18:16.000000000 +0100 @@ -14,6 +14,8 @@ <url type="vcs-browser">https://github.com/fcitx/fcitx5-unikey</url> <project_group>Fcitx</project_group> <releases> + <release version="5.1.9" date="2025-12-21"/> + <release version="5.1.8" date="2025-10-16"/> <release version="5.1.7" date="2025-06-15"/> <release version="5.1.6" date="2025-01-22"/> <release version="5.1.5" date="2024-10-08"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/po/fr.po new/fcitx5-unikey-5.1.9/po/fr.po --- old/fcitx5-unikey-5.1.7/po/fr.po 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/po/fr.po 2025-12-22 07:18:16.000000000 +0100 @@ -4,15 +4,16 @@ # # Translators: # roxfr <[email protected]>, 2022 +# Popolon_Github, 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5-unikey\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2023-01-04 20:25+0000\n" +"POT-Creation-Date: 2025-09-12 20:24+0000\n" "PO-Revision-Date: 2018-06-12 22:55+0000\n" -"Last-Translator: roxfr <[email protected]>, 2022\n" -"Language-Team: French (https://www.transifex.com/fcitx/teams/12005/fr/)\n" +"Last-Translator: Popolon_Github, 2025\n" +"Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,19 +84,19 @@ msgid "Action:" msgstr "Action :" -#: src/unikey-config.h:60 +#: src/unikey-config.h:61 msgid "Allow to modify surrounding text (experimental)" -msgstr "" +msgstr "Permettre la modification du texte environnant (expérimental)" -#: src/unikey-config.h:54 +#: src/unikey-config.h:55 msgid "Allow type with more freedom" msgstr "Autoriser le type avec plus de liberté" -#: src/unikey-config.h:49 +#: src/unikey-config.h:50 msgid "Auto restore keys with invalid words" msgstr "Clés de restauration automatique avec des mots invalides" -#: src/unikey-config.h:29 +#: src/unikey-config.h:30 msgid "BK HCM 2" msgstr "BK HCM 2" @@ -110,7 +111,7 @@ msgid "Built-in Input Methods" msgstr "Méthodes de saisie intégrées" -#: src/unikey-config.h:30 +#: src/unikey-config.h:31 msgid "CString" msgstr "CString" @@ -121,7 +122,7 @@ msgid "Category:" msgstr "Catégorie :" -#: keymap-editor/editor.cpp:58 +#: keymap-editor/editor.cpp:68 msgid "Character complements" msgstr "Compléments de caractères" @@ -165,11 +166,11 @@ msgid "E with circumflex [E^]" msgstr "E avec circonflexe [E^]" -#: src/unikey-config.h:45 +#: src/unikey-config.h:46 msgid "Enable Macro" msgstr "Activer la macro" -#: src/unikey-config.h:44 +#: src/unikey-config.h:45 msgid "Enable spell check" msgstr "Activer la vérification orthographique" @@ -197,7 +198,7 @@ msgid "Horn: U, O become U+, O+" msgstr "Corne : U, O deviennent U+, O+" -#: src/unikey-config.h:41 src/unikey-im.cpp:331 +#: src/unikey-config.h:42 src/unikey-im.cpp:368 msgid "Input Method" msgstr "Méthode de saisie" @@ -222,27 +223,27 @@ msgid "Key definition" msgstr "Définition de clé" -#: keymap-editor/model.cpp:32 +#: keymap-editor/model.cpp:43 msgid "Keymap" msgstr "Keymap" -#: src/unikey-config.h:66 +#: src/unikey-config.h:67 msgid "Keymap Editor" msgstr "Éditeur de Keymap" -#: macro-editor/model.cpp:27 src/unikey-im.cpp:394 +#: macro-editor/model.cpp:33 src/unikey-im.cpp:431 msgid "Macro" msgstr "Macro" -#: src/unikey-im.cpp:645 +#: src/unikey-im.cpp:691 msgid "Macro Disabled" msgstr "Macro désactivée" -#: src/unikey-config.h:64 +#: src/unikey-config.h:65 msgid "Macro Editor" msgstr "Éditeur de macros" -#: src/unikey-im.cpp:644 +#: src/unikey-im.cpp:690 msgid "Macro Enabled" msgstr "Macro activée" @@ -253,7 +254,7 @@ msgid "Macro:" msgstr "Macro :" -#: keymap-editor/editor.cpp:53 src/unikey-config.h:34 +#: keymap-editor/editor.cpp:63 src/unikey-config.h:35 msgid "Microsoft Vietnamese" msgstr "Microsoft Vietnamien" @@ -271,11 +272,11 @@ msgid "Move &Up" msgstr "Déplacer &Haut" -#: src/unikey-config.h:30 +#: src/unikey-config.h:31 msgid "NCR Decimal" msgstr "NCR décimal" -#: src/unikey-config.h:31 +#: src/unikey-config.h:32 msgid "NCR Hex" msgstr "NCR Hex" @@ -287,15 +288,15 @@ msgid "O with horn [O+]" msgstr "O avec klaxon [O+]" -#: src/unikey-config.h:43 +#: src/unikey-config.h:44 msgid "Output Charset" msgstr "Jeu de caractères de sortie" -#: src/unikey-im.cpp:357 +#: src/unikey-im.cpp:394 msgid "Output charset" msgstr "Jeu de caractères de sortie" -#: src/unikey-config.h:47 +#: src/unikey-config.h:48 msgid "Process W at word begin" msgstr "Traiter W au début du mot" @@ -303,27 +304,27 @@ msgid "Remove existing tone" msgstr "Supprimer la tonalité existante" -#: src/unikey-config.h:57 +#: src/unikey-config.h:58 msgid "Restore typing state from surrounding text" msgstr "Restaurer l'état de saisie à partir du texte environnant" -#: keymap-editor/editor.cpp:54 src/unikey-config.h:35 +#: keymap-editor/editor.cpp:64 src/unikey-config.h:36 msgid "Simple Telex" msgstr "Télex simple" -#: keymap-editor/editor.cpp:55 src/unikey-config.h:36 +#: keymap-editor/editor.cpp:65 src/unikey-config.h:37 msgid "Simple Telex2" msgstr "Télex2 simple" -#: src/unikey-im.cpp:653 +#: src/unikey-im.cpp:699 msgid "Spell Check Disabled" msgstr "Vérification orthographique désactivée" -#: src/unikey-im.cpp:652 +#: src/unikey-im.cpp:698 msgid "Spell Check Enabled" msgstr "Vérification orthographique activée" -#: src/unikey-im.cpp:382 +#: src/unikey-im.cpp:419 msgid "Spell check" msgstr "Vérification orthographique" @@ -331,11 +332,11 @@ msgid "Stroke: D becomes -D" msgstr "Trait : D devient -D" -#: src/unikey-config.h:28 +#: src/unikey-config.h:29 msgid "TCVN3" msgstr "TCVN3" -#: keymap-editor/editor.cpp:50 src/unikey-config.h:33 +#: keymap-editor/editor.cpp:60 src/unikey-config.h:34 msgid "Telex" msgstr "Télex" @@ -351,7 +352,7 @@ msgid "Tone ` (grave)" msgstr "Ton ` (grave)" -#: keymap-editor/editor.cpp:57 +#: keymap-editor/editor.cpp:67 msgid "Tone marks" msgstr "Marques de tonalité" @@ -367,65 +368,65 @@ msgid "U with horn [U+]" msgstr "U avec klaxon [U+]" -#: src/unikey-config.h:62 +#: src/unikey-config.h:63 msgid "Underline the preedit text" -msgstr "" +msgstr "Souligne le texte de pré-édition" -#: src/unikey-config.h:28 +#: src/unikey-config.h:29 msgid "Unicode" msgstr "Unicode" -#: org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in:7 src/unikey.conf.in:3 +#: org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in:7 src/unikey.conf.in:2 msgid "Unikey" msgstr "Unikey" #. i18n: file: keymap-editor/editor.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, Editor) -#: keymap-editor/editor.cpp:103 rc.cpp:3 +#: keymap-editor/editor.cpp:113 rc.cpp:3 #, kde-format msgid "Unikey Keymap Editor" msgstr "Unikey Keymap Editor" #. i18n: file: macro-editor/editor.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, Editor) -#: macro-editor/editor.cpp:52 rc.cpp:57 +#: macro-editor/editor.cpp:62 rc.cpp:57 #, kde-format msgid "Unikey Macro Editor" msgstr "Éditeur de macros Unikey" -#: src/unikey-addon.conf.in.in:3 +#: src/unikey-addon.conf.in.in:2 msgid "Unikey Wrapper For Fcitx" msgstr "Unikey Wrapper pour Fcitx" -#: src/unikey-config.h:52 +#: src/unikey-config.h:53 msgid "Use oà, _uý (instead of òa, úy)" msgstr "Utilisez oà, _uý (au lieu de òa, úy)" -#: src/unikey-config.h:35 +#: src/unikey-config.h:36 msgid "UserIM" msgstr "UserIM" -#: keymap-editor/editor.cpp:52 src/unikey-config.h:29 src/unikey-config.h:34 +#: keymap-editor/editor.cpp:62 src/unikey-config.h:30 src/unikey-config.h:35 msgid "VIQR" msgstr "VIQR" -#: keymap-editor/editor.cpp:51 src/unikey-config.h:33 +#: keymap-editor/editor.cpp:61 src/unikey-config.h:34 msgid "VNI" msgstr "VNI" -#: src/unikey-config.h:29 +#: src/unikey-config.h:30 msgid "VNI Win" msgstr "VNI Win" -#: keymap-editor/editor.cpp:59 +#: keymap-editor/editor.cpp:69 msgid "Vietnamese characters" msgstr "Caractères vietnamiens" #: org.fcitx.Fcitx5.Addon.Unikey.metainfo.xml.in:8 msgid "Vietnamese input method" -msgstr "Méthode de saisie vietnamienne" +msgstr "Méthode de saisie du vietnamien" -#: keymap-editor/model.cpp:34 macro-editor/model.cpp:29 +#: keymap-editor/model.cpp:46 macro-editor/model.cpp:36 msgid "Word" msgstr "Mot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-unikey-5.1.7/po/vi.po new/fcitx5-unikey-5.1.9/po/vi.po --- old/fcitx5-unikey-5.1.7/po/vi.po 2025-06-16 08:26:18.000000000 +0200 +++ new/fcitx5-unikey-5.1.9/po/vi.po 2025-12-22 07:18:16.000000000 +0100 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the fcitx5-unikey package. # # Translators: -# csslayer <[email protected]>, 2018 +# Xuetian Weng <[email protected]>, 2018 # zenfas, 2022 # trmdi, 2023 # Huy Võ <[email protected]>, 2025 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: fcitx5-unikey\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-03-12 20:24+0000\n" +"POT-Creation-Date: 2025-11-18 20:24+0000\n" "PO-Revision-Date: 2018-06-12 22:55+0000\n" "Last-Translator: Huy Võ <[email protected]>, 2025\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" @@ -43,7 +43,7 @@ #: rc.cpp:36 rc.cpp:63 #, kde-format msgid "&Delete" -msgstr "&Xóa" +msgstr "Xóa" #. i18n: file: keymap-editor/editor.ui:201 #. i18n: ectx: property (text), widget (QPushButton, exportButton) @@ -123,7 +123,7 @@ msgid "Category:" msgstr "Loại:" -#: keymap-editor/editor.cpp:58 +#: keymap-editor/editor.cpp:68 msgid "Character complements" msgstr "Các thành phần ghép" @@ -199,7 +199,7 @@ msgid "Horn: U, O become U+, O+" msgstr "Dấu móc: U, O thành Ư, Ơ" -#: src/unikey-config.h:42 src/unikey-im.cpp:364 +#: src/unikey-config.h:42 src/unikey-im.cpp:368 msgid "Input Method" msgstr "Phương Thức Nhập" @@ -224,7 +224,7 @@ msgid "Key definition" msgstr "Định nghĩa phím" -#: keymap-editor/model.cpp:33 +#: keymap-editor/model.cpp:43 msgid "Keymap" msgstr "Phím" @@ -232,11 +232,11 @@ msgid "Keymap Editor" msgstr "Biên tập bàn phím" -#: macro-editor/model.cpp:27 src/unikey-im.cpp:427 +#: macro-editor/model.cpp:33 src/unikey-im.cpp:431 msgid "Macro" msgstr "Gõ tắt" -#: src/unikey-im.cpp:687 +#: src/unikey-im.cpp:691 msgid "Macro Disabled" msgstr "Tắt gõ tắt" @@ -244,7 +244,7 @@ msgid "Macro Editor" msgstr "Bảng gõ tắt" -#: src/unikey-im.cpp:686 +#: src/unikey-im.cpp:690 msgid "Macro Enabled" msgstr "Cho phép gõ tắt" @@ -255,7 +255,7 @@ msgid "Macro:" msgstr "Gõ tắt:" -#: keymap-editor/editor.cpp:53 src/unikey-config.h:35 +#: keymap-editor/editor.cpp:63 src/unikey-config.h:35 msgid "Microsoft Vietnamese" msgstr "Microsoft Vietnamese" @@ -293,7 +293,7 @@ msgid "Output Charset" msgstr "Bảng Mã" -#: src/unikey-im.cpp:390 +#: src/unikey-im.cpp:394 msgid "Output charset" msgstr "Bảng mã" @@ -309,23 +309,23 @@ msgid "Restore typing state from surrounding text" msgstr "Phục hồi trạng thái gõ phím bằng surrounding " -#: keymap-editor/editor.cpp:54 src/unikey-config.h:36 +#: keymap-editor/editor.cpp:64 src/unikey-config.h:36 msgid "Simple Telex" msgstr "Simple Telex" -#: keymap-editor/editor.cpp:55 src/unikey-config.h:37 +#: keymap-editor/editor.cpp:65 src/unikey-config.h:37 msgid "Simple Telex2" msgstr "Simple Telex2" -#: src/unikey-im.cpp:695 +#: src/unikey-im.cpp:699 msgid "Spell Check Disabled" msgstr "Tắt kiểm tra chính tả" -#: src/unikey-im.cpp:694 +#: src/unikey-im.cpp:698 msgid "Spell Check Enabled" msgstr "Bật kiểm tra chính tả" -#: src/unikey-im.cpp:415 +#: src/unikey-im.cpp:419 msgid "Spell check" msgstr "Kiểm tra chính tả" @@ -337,7 +337,7 @@ msgid "TCVN3" msgstr "TCVN3" -#: keymap-editor/editor.cpp:50 src/unikey-config.h:34 +#: keymap-editor/editor.cpp:60 src/unikey-config.h:34 msgid "Telex" msgstr "Telex" @@ -353,7 +353,7 @@ msgid "Tone ` (grave)" msgstr "Dấu huyền" -#: keymap-editor/editor.cpp:57 +#: keymap-editor/editor.cpp:67 msgid "Tone marks" msgstr "Các dấu thanh" @@ -383,14 +383,14 @@ #. i18n: file: keymap-editor/editor.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, Editor) -#: keymap-editor/editor.cpp:103 rc.cpp:3 +#: keymap-editor/editor.cpp:113 rc.cpp:3 #, kde-format msgid "Unikey Keymap Editor" msgstr "Biên tập bàn phím Unikey" #. i18n: file: macro-editor/editor.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, Editor) -#: macro-editor/editor.cpp:52 rc.cpp:57 +#: macro-editor/editor.cpp:62 rc.cpp:57 #, kde-format msgid "Unikey Macro Editor" msgstr "Bảng gõ tắt Unikey" @@ -407,11 +407,11 @@ msgid "UserIM" msgstr "Tự định nghĩa" -#: keymap-editor/editor.cpp:52 src/unikey-config.h:30 src/unikey-config.h:35 +#: keymap-editor/editor.cpp:62 src/unikey-config.h:30 src/unikey-config.h:35 msgid "VIQR" msgstr "VIQR" -#: keymap-editor/editor.cpp:51 src/unikey-config.h:34 +#: keymap-editor/editor.cpp:61 src/unikey-config.h:34 msgid "VNI" msgstr "VNI" @@ -419,7 +419,7 @@ msgid "VNI Win" msgstr "VNI Win" -#: keymap-editor/editor.cpp:59 +#: keymap-editor/editor.cpp:69 msgid "Vietnamese characters" msgstr "Chữ cái tiếng Việt" @@ -427,7 +427,7 @@ msgid "Vietnamese input method" msgstr "Kiểu gõ tiếng Việt" -#: keymap-editor/model.cpp:35 macro-editor/model.cpp:29 +#: keymap-editor/model.cpp:46 macro-editor/model.cpp:36 msgid "Word" msgstr "Từ"
