Hello community, here is the log from the commit of package kcm5-fcitx for openSUSE:Factory checked in at 2017-02-15 10:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm5-fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2015-12-24 12:17:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new/kcm5-fcitx.changes 2017-02-15 10:05:52.448688635 +0100 @@ -1,0 +2,6 @@ +Sat Feb 11 23:04:16 UTC 2017 - [email protected] + +- update version 0.5.4 + * use gui wrapper instead of embed. + +------------------------------------------------------------------- Old: ---- kcm-fcitx-0.5.3.tar.xz New: ---- kcm-fcitx-0.5.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm5-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.0czHhI/_old 2017-02-15 10:05:52.884627230 +0100 +++ /var/tmp/diff_new_pack.0czHhI/_new 2017-02-15 10:05:52.888626668 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcm5-fcitx # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,8 @@ %define pkgname kf5-kcm-fcitx - Name: kcm5-fcitx -Version: 0.5.3 +Version: 0.5.4 Release: 0 Summary: KF5 control module for Fcitx License: GPL-2.0+ @@ -28,18 +27,11 @@ Source: http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz Source1: input-keyboard.svg #PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx -Patch: %{name}-po.patch -BuildRequires: fcitx-devel -BuildRequires: fcitx-qt5-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: rsvg-view -%if 0%{?suse_version} <= 1140 -BuildRequires: libunique-devel -%else -BuildRequires: libunique1-devel -%endif +Patch0: %{name}-po.patch BuildRequires: cmake BuildRequires: extra-cmake-modules +BuildRequires: fcitx-devel +BuildRequires: fcitx-qt5-devel BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -50,10 +42,17 @@ BuildRequires: kitemviews-devel BuildRequires: knewstuff-devel BuildRequires: kwidgetsaddons-devel +BuildRequires: libqt5-qtbase-devel BuildRequires: libtool +BuildRequires: rsvg-view BuildRequires: xz Requires: fcitx-kcm-icons BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} <= 1140 +BuildRequires: libunique-devel +%else +BuildRequires: libunique1-devel +%endif %description KF5 control module for Fcitx. @@ -65,13 +64,13 @@ Group: System/I18n/Chinese Requires: fcitx-qt5 Requires: plasma5-workspace -Provides: locale(plasma5-workspace:ko;zh_CN;zh_SG) Supplements: packageand(fcitx:plasma5-workspace) +Provides: locale(plasma5-workspace:ko;zh_CN;zh_SG) # for better user experience Provides: fcitx-config-kde5 = %{version} Provides: fcitx-config-kf5 = %{version} Obsoletes: fcitx-config-kde5 < %{version} -%fcitx_requires +%{fcitx_requires} %description -n %{pkgname} KF5 control module for Fcitx. @@ -82,11 +81,11 @@ Summary: Keyboard icons for %{pkgname} Group: System/I18n/Chinese Requires: %{pkgname} = %{version} +Supplements: packageand(%{pkgname}:plasma5-workspace-branding-openSUSE) +Conflicts: otherproviders(fcitx-kcm-icons) Provides: fcitx-config-kde5-icons = %{version} Obsoletes: fcitx-config-kde5-icons < %{version} Provides: fcitx-kcm-icons = %{version} -Conflicts: otherproviders(fcitx-kcm-icons) -Supplements: packageand(%{pkgname}:plasma5-workspace-branding-openSUSE) BuildArch: noarch %description -n %{pkgname}-icons @@ -94,11 +93,11 @@ %prep %setup -q -n kcm-fcitx-%{version} -%patch -p1 +%patch0 -p1 %build %cmake_kf5 -d build -make +make %{?_smp_mflags} %install pushd build @@ -113,10 +112,9 @@ %find_lang kcm5_fcitx -%kf5_post_install +%{kf5_post_install} %post -n %{pkgname} -p /sbin/ldconfig - %postun -n %{pkgname} -p /sbin/ldconfig %files -n %{pkgname} -f kcm5_fcitx.lang ++++++ kcm-fcitx-0.5.3.tar.xz -> kcm-fcitx-0.5.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/CMakeLists.txt new/kcm-fcitx-0.5.4/CMakeLists.txt --- old/kcm-fcitx-0.5.3/CMakeLists.txt 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/CMakeLists.txt 2017-02-08 18:22:35.000000000 +0100 @@ -22,8 +22,8 @@ NewStuff ) -find_package(FcitxQt5DBusAddons REQUIRED) -find_package(FcitxQt5WidgetsAddons REQUIRED) +find_package(FcitxQt5DBusAddons 1.1.0 REQUIRED) +find_package(FcitxQt5WidgetsAddons 1.1.0 REQUIRED) set(MAJOR_VERSION "0") set(MINOR_VERSION "5") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/po/ca.po new/kcm-fcitx-0.5.4/po/ca.po --- old/kcm-fcitx-0.5.3/po/ca.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kcm-fcitx-0.5.4/po/ca.po 2017-02-08 18:22:35.000000000 +0100 @@ -0,0 +1,300 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Walter Garcia-Fontes <[email protected]>, 2017 +msgid "" +msgstr "" +"Project-Id-Version: fcitx\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2014-08-07 18:03+0200\n" +"PO-Revision-Date: 2017-01-08 11:50+0000\n" +"Last-Translator: Walter Garcia-Fontes <[email protected]>\n" +"Language-Team: Catalan (http://www.transifex.com/fcitx/fcitx/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: layout/main.cpp:32 layout/main.cpp:59 +msgid "Keyboard Layout viewer" +msgstr "Visualitzador de disposició de teclat" + +#: layout/main.cpp:34 +msgid "A general keyboard layout viewer" +msgstr "Un visualitzador general de disposició de teclat" + +#: layout/main.cpp:38 +msgid "Keyboard layout group (0-3)" +msgstr "Grup de disposició de teclat (0-3)" + +#: layout/main.cpp:40 +msgid "Keyboard layout" +msgstr "Disposició de teclat" + +#: layout/main.cpp:42 +msgid "Keyboard layout variant" +msgstr "Variant de disposició de teclat" + +#: src/addonselector.cpp:378 +msgid "Search Addons" +msgstr "Cerca complements" + +#: src/addonselector.cpp:385 src/configwidget.cpp:609 +msgid "Show &Advance option" +msgstr "Mostra l'opció &avançada" + +#: src/configwidget.cpp:453 +msgid "<b>Other</b>" +msgstr "<b>Altre</b>" + +#: src/configwidget.cpp:563 +msgid "Other" +msgstr "Altre" + +#: src/erroroverlay.cpp:43 +msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" +msgstr "No es pot connectar al fcitx per DBus, s'està executant el fcitx?" + +#: src/fontbutton.cpp:106 +msgid "Select Font" +msgstr "Seleccioneu el tipus de lletra" + +#: src/imconfigdialog.cpp:40 +msgid "<b>Keyboard Layout:</b>" +msgstr "<b>Disposició de teclat:</b>" + +#: src/imconfigdialog.cpp:45 +msgid "Default" +msgstr "Predeterminat" + +#: src/imconfigdialog.cpp:47 +msgid "Input Method Default" +msgstr "Mètode d'entrada predeterminat" + +#: src/imconfigdialog.cpp:92 +msgid "<b>Input Method Setting:</b>" +msgstr "<b>Configuració del mètode d'entrada:</b>" + +#: src/impage.cpp:64 src/impage.cpp:71 +msgid "Unknown" +msgstr "Desconegut" + +#: src/impage.cpp:67 +msgid "Multilingual" +msgstr "Plurilingüe" + +#: src/impage.cpp:467 +msgid "Search Input Method" +msgstr "Cerca el mètode d'entrada" + +#: src/module.cpp:85 +msgid "Fcitx Configuration Module" +msgstr "Mòdul de configuració del fcitx" + +#: src/module.cpp:87 +msgid "Configure Fcitx" +msgstr "Configura el fcitx" + +#: src/module.cpp:89 +msgid "Copyright 2012 Xuetian Weng" +msgstr "Copyright 2012 Xuetian Weng" + +#: src/module.cpp:93 +msgid "Xuetian Weng" +msgstr "Xuetian Weng" + +#: src/module.cpp:108 src/module.cpp:110 src/kcm_fcitx.desktop.in:11 +msgid "Input Method" +msgstr "Mètode d'entrada" + +#: src/module.cpp:121 +msgid "Global Config" +msgstr "Configuració global" + +#: src/module.cpp:123 +msgid "Global Config for Fcitx" +msgstr "Configuració global per al fcitx" + +#: src/module.cpp:133 src/module.cpp:135 +msgid "Appearance" +msgstr "Aparença" + +#: src/module.cpp:145 +msgid "Addon Config" +msgstr "Configuració del complement" + +#: src/module.cpp:147 +msgid "Configure Fcitx addon" +msgstr "Configura el complement del fcitx" + +#: src/module.cpp:199 +msgid "Manage Skin" +msgstr "Gestiona l'aparença" + +#: src/module.cpp:201 +msgid "Manage Fcitx Skin" +msgstr "Gestiona l'aparença del fcitx" + +#: src/skinpage.cpp:221 +msgid "First candidate" +msgstr "Primera candidata" + +#: src/skinpage.cpp:222 +msgid "Other candidate" +msgstr "Una altra candidata" + +#: src/skinpage.cpp:391 +#, kde-format +msgid "Skin %1 Cannot be loaded" +msgstr "No es pot carregar l'aparença %1" + +#: src/subconfigwidget.cpp:232 +msgid "" +"User config doesn't exisits, do you want to open system file or copy system " +"file to user file?" +msgstr "No existeix la configuració d'usuari, voleu obrir el fitxer del sistema o copiar el fitxer del sistema al fitxer d'usuari?" + +#: src/subconfigwidget.cpp:233 +msgid "What to do" +msgstr "Què fer" + +#: src/subconfigwidget.cpp:234 +msgid "Copy" +msgstr "Copia" + +#: src/subconfigwidget.cpp:235 +msgid "View system" +msgstr "Visualitza el sistema" + +#: src/subconfigwidget.cpp:247 +msgid "Copy failed" +msgstr "Ha fallat la còpia" + +#: src/uipage.cpp:16 +msgid "Cannot load currently used user interface info" +msgstr "No es pot carregar la informació d'interfície d'usuari usada actualment" + +#: src/uipage.cpp:45 +#, kde-format +msgid "No configuration options for %1." +msgstr "Cap opció de configuració per a %1." + +#: layout/kbd-layout-viewer.desktop.in:6 +msgid "Keyboard layout viewer" +msgstr "Visualitzador de disposició de teclat" + +#: layout/kbd-layout-viewer.desktop.in:7 +msgid "View keyboard layout" +msgstr "Visualitza la disposició de teclat" + +#: layout/kbd-layout-viewer.desktop.in:9 +msgid "keyboard;input;im" +msgstr "teclat;entrada;mètode d'entrada" + +#: src/kcm_fcitx.desktop.in:12 +msgid "Configure Input Method" +msgstr "Configura el mètode d'entrada" + +#: src/kcm_fcitx.desktop.in:14 +msgid "keyboard,input,im,fcitx" +msgstr "teclat;entrada;mètode d'entrada;fcitx" + +#. i18n: file: src/configpage.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigPage) +#. i18n: file: src/fontbutton.ui:20 +#. i18n: ectx: property (windowTitle), widget (QWidget, FontButton) +msgid "Form" +msgstr "Forrma" + +#. i18n: file: src/configpage.ui:54 +#. i18n: ectx: property (text), widget (QLabel, infoLabel) +msgid "" +"Options listed here might be overridden by specific input method, usually " +"including candidate number, hotkey of previous page and next page. You may " +"need go to configuration of corresponding input method to change them." +msgstr "Les opcions que es llisten aquí poden ser anul·lades per mètodes d'entrada específics, generalment incloent-hi el nombre de candidates, la drecera de teclat de pàgina prèvia i pàgina següent. Potser heu d'anar a la configuració del mètode d'entrada corresponent per canviar-les." + +#. i18n: file: src/fontbutton.ui:51 +#. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) +msgid "Select &Font..." +msgstr "Seleccioneu el &tipus de lletra" + +#. i18n: file: src/impage.ui:38 +#. i18n: ectx: property (toolTip), widget (KPushButton, defaultLayoutButton) +msgid "Keyboard layout to use when no input method active" +msgstr "Disposició de teclat a usar quan no hi ha cap mètode d'entrada actiu" + +#. i18n: file: src/impage.ui:41 +#. i18n: ectx: property (text), widget (KPushButton, defaultLayoutButton) +msgid "Select default keyboard layout" +msgstr "Seleccioneu la disposició de teclat predeterminada" + +#. i18n: file: src/impage.ui:83 +#. i18n: ectx: property (text), widget (QLabel, label) +msgid "Available Input Method:" +msgstr "Mètode d'entrada disponible:" + +#. i18n: file: src/impage.ui:133 +#. i18n: ectx: property (text), widget (QCheckBox, +#. onlyCurrentLanguageCheckBox) +msgid "Only &Show Current Language" +msgstr "Mo%stra sols la llengua actual" + +#. i18n: file: src/impage.ui:194 +#. i18n: ectx: property (text), widget (QLabel, label_2) +msgid "Current Input Method:" +msgstr "Mètode d'entrada actual:" + +#. i18n: file: src/impage.ui:295 +#. i18n: ectx: property (text), widget (QLabel, infoLabel) +msgid "" +"The first input method will be inactive state. Usually you need to put " +"<b>Keyboard</b> or <b>Keyboard - <i>layout name</i></b> in the first place." +msgstr "El primer mètode d'entrada serà l'estat inactiu. Generalment heu de posar <b>Keyboard</b> o <b>Keyboard - <i>nom de disposició</i></b> en el primer lloc." + +#. i18n: file: src/impage.ui:310 +#. i18n: ectx: property (text), widget (QLabel, label_3) +msgid "<b>Default keyboard layout:</b>" +msgstr "<b>Disposició de teclat predeterminada:</b>" + +#. i18n: file: src/impage.ui:320 +#. i18n: ectx: property (text), widget (QLabel, label_4) +msgid "<b>Select Input Method:</b>" +msgstr "<b>Seleccioneu el mètode d'entrada:</b>" + +#. i18n: file: src/skinpage.ui:41 +#. i18n: ectx: property (text), widget (KPushButton, configureSkinButton) +msgid "&Configure Skin" +msgstr "&Configura l'aparença" + +#. i18n: file: src/skinpage.ui:51 +#. i18n: ectx: property (text), widget (KPushButton, deleteSkinButton) +msgid "&Delete Skin" +msgstr "%Elimina l'aparença" + +#. i18n: file: src/skinpage.ui:58 +#. i18n: ectx: property (text), widget (KPushButton, installSkinButton) +msgid "Get New &Skin..." +msgstr "Obté una nova &aparença" + +#. i18n: file: src/skinpage.ui:72 +#. i18n: ectx: property (text), widget (QLabel, label) +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">You need to use Classic UI to use skin function.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">He d'usar la interfície d'usuari clàssica per usar la funció d'aparença.</p></body></html>" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Els vostres noms" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "Els vostres correus electrònics" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/po/ru.po new/kcm-fcitx-0.5.4/po/ru.po --- old/kcm-fcitx-0.5.3/po/ru.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kcm-fcitx-0.5.4/po/ru.po 2017-02-08 18:22:35.000000000 +0100 @@ -0,0 +1,300 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# TotalCaesar659 <[email protected]>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: fcitx\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2014-08-07 18:03+0200\n" +"PO-Revision-Date: 2016-12-01 02:11+0000\n" +"Last-Translator: TotalCaesar659 <[email protected]>\n" +"Language-Team: Russian (http://www.transifex.com/fcitx/fcitx/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\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" + +#: layout/main.cpp:32 layout/main.cpp:59 +msgid "Keyboard Layout viewer" +msgstr "Просмотрщик раскладки клавиатуры" + +#: layout/main.cpp:34 +msgid "A general keyboard layout viewer" +msgstr "Основной просмотрщик раскладки клавиатуры" + +#: layout/main.cpp:38 +msgid "Keyboard layout group (0-3)" +msgstr "Группа раскладок клавиатуры (0-3)" + +#: layout/main.cpp:40 +msgid "Keyboard layout" +msgstr "Раскладка клавиатуры" + +#: layout/main.cpp:42 +msgid "Keyboard layout variant" +msgstr "Вариант раскладки клавиатуры" + +#: src/addonselector.cpp:378 +msgid "Search Addons" +msgstr "Найти дополнения" + +#: src/addonselector.cpp:385 src/configwidget.cpp:609 +msgid "Show &Advance option" +msgstr "Показать &дополнительные настройки" + +#: src/configwidget.cpp:453 +msgid "<b>Other</b>" +msgstr "<b>Другое</b>" + +#: src/configwidget.cpp:563 +msgid "Other" +msgstr "Другое" + +#: src/erroroverlay.cpp:43 +msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" +msgstr "Не удалось соединиться с Fcitx через DBus, запущен ли Fcitx?" + +#: src/fontbutton.cpp:106 +msgid "Select Font" +msgstr "Выбрать шрифт" + +#: src/imconfigdialog.cpp:40 +msgid "<b>Keyboard Layout:</b>" +msgstr "<b>Раскладка клавиатуры:</b>" + +#: src/imconfigdialog.cpp:45 +msgid "Default" +msgstr "По умолчанию" + +#: src/imconfigdialog.cpp:47 +msgid "Input Method Default" +msgstr "Метод ввода по умолчанию" + +#: src/imconfigdialog.cpp:92 +msgid "<b>Input Method Setting:</b>" +msgstr "<b>Настройка метода ввода:</b>" + +#: src/impage.cpp:64 src/impage.cpp:71 +msgid "Unknown" +msgstr "Неизвестно" + +#: src/impage.cpp:67 +msgid "Multilingual" +msgstr "Многоязычный" + +#: src/impage.cpp:467 +msgid "Search Input Method" +msgstr "Поиск метода ввода" + +#: src/module.cpp:85 +msgid "Fcitx Configuration Module" +msgstr "Модуль настройки Fcitx" + +#: src/module.cpp:87 +msgid "Configure Fcitx" +msgstr "Настроить Fcitx" + +#: src/module.cpp:89 +msgid "Copyright 2012 Xuetian Weng" +msgstr "Copyright 2012 Xuetian Weng" + +#: src/module.cpp:93 +msgid "Xuetian Weng" +msgstr "Xuetian Weng" + +#: src/module.cpp:108 src/module.cpp:110 src/kcm_fcitx.desktop.in:11 +msgid "Input Method" +msgstr "Метод ввода" + +#: src/module.cpp:121 +msgid "Global Config" +msgstr "Глобальные настройки" + +#: src/module.cpp:123 +msgid "Global Config for Fcitx" +msgstr "Глобальные настройки Fcitx" + +#: src/module.cpp:133 src/module.cpp:135 +msgid "Appearance" +msgstr "Внешний вид" + +#: src/module.cpp:145 +msgid "Addon Config" +msgstr "Настройки дополнения" + +#: src/module.cpp:147 +msgid "Configure Fcitx addon" +msgstr "Настроить дополнение Fcitx" + +#: src/module.cpp:199 +msgid "Manage Skin" +msgstr "Выбрать скин" + +#: src/module.cpp:201 +msgid "Manage Fcitx Skin" +msgstr "Выбрать скин Fcitx" + +#: src/skinpage.cpp:221 +msgid "First candidate" +msgstr "Первый кандидат" + +#: src/skinpage.cpp:222 +msgid "Other candidate" +msgstr "Другой кандидат" + +#: src/skinpage.cpp:391 +#, kde-format +msgid "Skin %1 Cannot be loaded" +msgstr "Невозможно выбрать скин %1" + +#: src/subconfigwidget.cpp:232 +msgid "" +"User config doesn't exisits, do you want to open system file or copy system " +"file to user file?" +msgstr "Файл настроек пользователя не существует, вы хотите открыть системный файл или копировать его на место файла пользователя?" + +#: src/subconfigwidget.cpp:233 +msgid "What to do" +msgstr "Что сделать" + +#: src/subconfigwidget.cpp:234 +msgid "Copy" +msgstr "Копировать" + +#: src/subconfigwidget.cpp:235 +msgid "View system" +msgstr "Открыть системный файл" + +#: src/subconfigwidget.cpp:247 +msgid "Copy failed" +msgstr "Не удалось копировать файл" + +#: src/uipage.cpp:16 +msgid "Cannot load currently used user interface info" +msgstr "Невозможно загрузить информацию о текущем интерфейсе пользователя" + +#: src/uipage.cpp:45 +#, kde-format +msgid "No configuration options for %1." +msgstr "Нет настроек для %1." + +#: layout/kbd-layout-viewer.desktop.in:6 +msgid "Keyboard layout viewer" +msgstr "Просмотрщик раскладки клавиатуры" + +#: layout/kbd-layout-viewer.desktop.in:7 +msgid "View keyboard layout" +msgstr "Просмотреть раскладку клавиатуры" + +#: layout/kbd-layout-viewer.desktop.in:9 +msgid "keyboard;input;im" +msgstr "keyboard;input;im" + +#: src/kcm_fcitx.desktop.in:12 +msgid "Configure Input Method" +msgstr "Настроить метод ввода" + +#: src/kcm_fcitx.desktop.in:14 +msgid "keyboard,input,im,fcitx" +msgstr "keyboard,input,im,fcitx" + +#. i18n: file: src/configpage.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, ConfigPage) +#. i18n: file: src/fontbutton.ui:20 +#. i18n: ectx: property (windowTitle), widget (QWidget, FontButton) +msgid "Form" +msgstr "Форма" + +#. i18n: file: src/configpage.ui:54 +#. i18n: ectx: property (text), widget (QLabel, infoLabel) +msgid "" +"Options listed here might be overridden by specific input method, usually " +"including candidate number, hotkey of previous page and next page. You may " +"need go to configuration of corresponding input method to change them." +msgstr "Приведенные здесь настройки могут быть отменены определенным методом ввода, обычно включающим номер кандидата, горячую клавишу предыдущей и следующей страницы. Для их изменения вам может потребоваться перейти в настройки соответствующего метода ввода." + +#. i18n: file: src/fontbutton.ui:51 +#. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) +msgid "Select &Font..." +msgstr "Выбрать &шрифт..." + +#. i18n: file: src/impage.ui:38 +#. i18n: ectx: property (toolTip), widget (KPushButton, defaultLayoutButton) +msgid "Keyboard layout to use when no input method active" +msgstr "Раскладка клавиатуры при неактивных методах ввода" + +#. i18n: file: src/impage.ui:41 +#. i18n: ectx: property (text), widget (KPushButton, defaultLayoutButton) +msgid "Select default keyboard layout" +msgstr "Выбрать раскладку клавиатуры по умолчанию" + +#. i18n: file: src/impage.ui:83 +#. i18n: ectx: property (text), widget (QLabel, label) +msgid "Available Input Method:" +msgstr "Доступный метод ввода:" + +#. i18n: file: src/impage.ui:133 +#. i18n: ectx: property (text), widget (QCheckBox, +#. onlyCurrentLanguageCheckBox) +msgid "Only &Show Current Language" +msgstr "&Показывать только текущий язык" + +#. i18n: file: src/impage.ui:194 +#. i18n: ectx: property (text), widget (QLabel, label_2) +msgid "Current Input Method:" +msgstr "Текущий метод ввода:" + +#. i18n: file: src/impage.ui:295 +#. i18n: ectx: property (text), widget (QLabel, infoLabel) +msgid "" +"The first input method will be inactive state. Usually you need to put " +"<b>Keyboard</b> or <b>Keyboard - <i>layout name</i></b> in the first place." +msgstr "Первый метод ввода будет неактивным. Обычно вам потребуется установить <b>Клавиатура</b> или <b>Клавиатура - <i>название раскладки</i></b> на первое место." + +#. i18n: file: src/impage.ui:310 +#. i18n: ectx: property (text), widget (QLabel, label_3) +msgid "<b>Default keyboard layout:</b>" +msgstr "<b>Раскладка клавиатуры по умолчанию:</b>" + +#. i18n: file: src/impage.ui:320 +#. i18n: ectx: property (text), widget (QLabel, label_4) +msgid "<b>Select Input Method:</b>" +msgstr "<b>Выбрать метод ввода:</b>" + +#. i18n: file: src/skinpage.ui:41 +#. i18n: ectx: property (text), widget (KPushButton, configureSkinButton) +msgid "&Configure Skin" +msgstr "&Настроить скин" + +#. i18n: file: src/skinpage.ui:51 +#. i18n: ectx: property (text), widget (KPushButton, deleteSkinButton) +msgid "&Delete Skin" +msgstr "&Удалить скин" + +#. i18n: file: src/skinpage.ui:58 +#. i18n: ectx: property (text), widget (KPushButton, installSkinButton) +msgid "Get New &Skin..." +msgstr "Получить &новый скин..." + +#. i18n: file: src/skinpage.ui:72 +#. i18n: ectx: property (text), widget (QLabel, label) +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">You need to use Classic UI to use skin function.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Примечание:</span></p>\\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Для использования функций скина необходим классический интерфейс.</p></body></html>" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Ваши имена" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "Ваши адреса электронной почты" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/CMakeLists.txt new/kcm-fcitx-0.5.4/src/CMakeLists.txt --- old/kcm-fcitx-0.5.3/src/CMakeLists.txt 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/CMakeLists.txt 2017-02-08 18:22:35.000000000 +0100 @@ -19,7 +19,6 @@ verticalscrollarea.cpp fontbutton.cpp configpage.cpp - plugindialog.cpp erroroverlay.cpp # ../layout/keyboardlayoutwidget.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/configwidget.cpp new/kcm-fcitx-0.5.4/src/configwidget.cpp --- old/kcm-fcitx-0.5.3/src/configwidget.cpp 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/configwidget.cpp 2017-02-08 18:22:35.000000000 +0100 @@ -30,7 +30,6 @@ #include <QListView> #include <QComboBox> #include <QLineEdit> -#include <QProcess> // KDE #include <KColorButton> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/global.cpp new/kcm-fcitx-0.5.4/src/global.cpp --- old/kcm-fcitx-0.5.3/src/global.cpp 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/global.cpp 2017-02-08 18:22:35.000000000 +0100 @@ -21,7 +21,6 @@ #include <fcitx-config/fcitx-config.h> #include <fcitx-config/xdg.h> #include <fcitxqtconnection.h> -#include <fcitxqtconfiguifactory.h> #include <fcitxqtinputmethodproxy.h> // self @@ -49,7 +48,6 @@ Global::Global() : m_hash(new QHash<QString, FcitxConfigFileDesc*>), - m_factory(new FcitxQtConfigUIFactory(this)), m_connection(new FcitxQtConnection(this)), m_inputmethod(0), m_keyboard(0) @@ -129,4 +127,26 @@ return (*m_hash) [name]; } +QString Global::testWrapper(const QString &path) const { + char* qtguiwrapper[] = { + fcitx_utils_get_fcitx_path_with_filename ("libdir", "fcitx/libexec/fcitx-qt-gui-wrapper"), + fcitx_utils_get_fcitx_path_with_filename ("libdir", "fcitx/libexec/fcitx-qt5-gui-wrapper") + }; + QString wrapper; + for (int i = 0; i < FCITX_ARRAY_SIZE(qtguiwrapper); i++) { + if (qtguiwrapper[i]) { + QStringList args; + args << QLatin1String("--test"); + args << path; + int exit_status =QProcess::execute(QString::fromLocal8Bit(qtguiwrapper[i]), args); + if (exit_status == 0) { + wrapper = QString::fromLatin1(qtguiwrapper[i]); + break; + } + } + } + + return wrapper; +} + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/global.h new/kcm-fcitx-0.5.4/src/global.h --- old/kcm-fcitx-0.5.3/src/global.h 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/global.h 2017-02-08 18:22:35.000000000 +0100 @@ -30,7 +30,6 @@ class FcitxQtKeyboardProxy; class FcitxQtInputMethodProxy; -class FcitxQtConfigUIFactory; class FcitxQtConnection; namespace Fcitx { @@ -43,10 +42,10 @@ static void deInit(); virtual ~Global(); FcitxConfigFileDesc* GetConfigDesc(const QString& name); - FcitxQtConfigUIFactory* factory() { return m_factory; } FcitxQtConnection* connection() { return m_connection; } FcitxQtInputMethodProxy* inputMethodProxy() { return (m_inputmethod && m_inputmethod->isValid()) ? m_inputmethod : 0; } FcitxQtKeyboardProxy* keyboardProxy() { return (m_keyboard && m_keyboard->isValid()) ? m_keyboard : 0; } + QString testWrapper(const QString &path) const; signals: void connectStatusChanged(bool connected); @@ -58,7 +57,6 @@ private: Global(); QHash<QString, FcitxConfigFileDesc*>* m_hash; - FcitxQtConfigUIFactory* m_factory; FcitxQtConnection* m_connection; FcitxQtInputMethodProxy* m_inputmethod; FcitxQtKeyboardProxy* m_keyboard; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/plugindialog.cpp new/kcm-fcitx-0.5.4/src/plugindialog.cpp --- old/kcm-fcitx-0.5.3/src/plugindialog.cpp 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/plugindialog.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2013~2013 by CSSlayer * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include "plugindialog.h" -#include <QIcon> -#include <QVBoxLayout> -#include <QDialogButtonBox> -#include <QPushButton> - -namespace Fcitx { - -PluginDialog::PluginDialog(FcitxQtConfigUIWidget* widget, QWidget* parent, Qt::WindowFlags flags) : QDialog(parent, flags) - ,m_widget(widget) -{ - setWindowTitle(widget->title()); - setWindowIcon(QIcon::fromTheme(widget->icon())); - QVBoxLayout* dialogLayout = new QVBoxLayout; - setLayout(dialogLayout); - m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); - dialogLayout->addWidget(m_widget); - dialogLayout->addWidget(m_buttonBox); - connect(m_widget, SIGNAL(changed(bool)), this, SLOT(changed(bool))); - if (m_widget->asyncSave()) - connect(m_widget, SIGNAL(saveFinished()), this, SLOT(saveFinished())); - connect(m_buttonBox, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button) { - slotButtonClicked(m_buttonBox->standardButton(button)); - }); - connect(m_buttonBox, &QDialogButtonBox::accepted, this, &PluginDialog::accept); - connect(m_buttonBox, &QDialogButtonBox::rejected, this, &PluginDialog::reject); -} - -void PluginDialog::saveFinished() -{ - if (m_widget->asyncSave()) - m_widget->setEnabled(true); - m_buttonBox->button(QDialogButtonBox::Ok)->click(); -} - -void PluginDialog::slotButtonClicked(QDialogButtonBox::StandardButton button) -{ - switch (button) { - case QDialogButtonBox::Reset: - m_widget->load(); - break; - case QDialogButtonBox::Ok: - if (m_widget->asyncSave()) - m_widget->setEnabled(false); - m_widget->save(); - if (!m_widget->asyncSave()) { - m_buttonBox->button(button)->click(); - } - break; - default: - m_buttonBox->button(button)->click(); - } -} - -void PluginDialog::changed(bool changed) -{ - m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(changed); - m_buttonBox->button(QDialogButtonBox::Reset)->setEnabled(changed); -} - -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/plugindialog.h new/kcm-fcitx-0.5.4/src/plugindialog.h --- old/kcm-fcitx-0.5.3/src/plugindialog.h 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/plugindialog.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2013~2013 by CSSlayer * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef PLUGINDIALOG_H -#define PLUGINDIALOG_H - -#include <QDialog> -#include <QDialogButtonBox> -#include <fcitxqtconfiguiwidget.h> - -namespace Fcitx { - -class PluginDialog : public QDialog { - Q_OBJECT -public: - explicit PluginDialog(FcitxQtConfigUIWidget* widget, QWidget* parent = 0, Qt::WindowFlags flags = 0); - virtual void slotButtonClicked(QDialogButtonBox::StandardButton button); - -private: - FcitxQtConfigUIWidget* m_widget; - QDialogButtonBox* m_buttonBox; -public slots: - void changed(bool changed); - void saveFinished(); -}; - -} - -#endif // PLUGINDIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/subconfig.cpp new/kcm-fcitx-0.5.4/src/subconfig.cpp --- old/kcm-fcitx-0.5.3/src/subconfig.cpp 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/subconfig.cpp 2017-02-08 18:22:35.000000000 +0100 @@ -24,7 +24,6 @@ #include <fcitx-utils/utils.h> #include <fcitx-config/xdg.h> -#include <fcitxqtconfiguifactory.h> // self #include "subconfig.h" @@ -215,7 +214,7 @@ case SC_Program: return !m_progam.isEmpty(); case SC_Plugin: - return Global::instance()->factory()->test(m_nativepath); + return !Global::instance()->testWrapper(m_nativepath).isEmpty(); default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/subconfigwidget.cpp new/kcm-fcitx-0.5.4/src/subconfigwidget.cpp --- old/kcm-fcitx-0.5.3/src/subconfigwidget.cpp 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/subconfigwidget.cpp 2017-02-08 18:22:35.000000000 +0100 @@ -32,7 +32,6 @@ // Fcitx #include <fcitx-config/xdg.h> -#include <fcitxqtconfiguifactory.h> // self #include "global.h" @@ -40,7 +39,6 @@ #include "subconfigparser.h" #include "subconfigwidget.h" #include "subconfigwidget_p.h" -#include "plugindialog.h" namespace Fcitx { @@ -190,28 +188,27 @@ } } -void SubConfigWidget::openPlugin() -{ - FcitxQtConfigUIWidget* widget = Global::instance()->factory()->create(m_subConfig->nativepath()); - if (widget) { - QPointer<QDialog> pluginDialog(new PluginDialog(widget, 0)); +bool SubConfigWidget::launchGuiWrapper(const QString &path) { + QString wrapper = Global::instance()->testWrapper(path); - pluginDialog->exec(); - delete pluginDialog; - return; + if (!wrapper.isEmpty()) { + QStringList args; + args << path; + return QProcess::startDetached(wrapper, args); } + return false; +} + +void SubConfigWidget::openPlugin() +{ + launchGuiWrapper(m_subConfig->nativepath()); } void SubConfigWidget::openNativeFile() { char *newpath = NULL; - FcitxQtConfigUIWidget* widget = Global::instance()->factory()->create(m_subConfig->nativepath()); - if (widget) { - QPointer<QDialog> pluginDialog(new PluginDialog(widget, 0)); - - pluginDialog->exec(); - delete pluginDialog; + if (launchGuiWrapper(m_subConfig->nativepath())) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.3/src/subconfigwidget.h new/kcm-fcitx-0.5.4/src/subconfigwidget.h --- old/kcm-fcitx-0.5.3/src/subconfigwidget.h 2015-12-17 22:47:03.000000000 +0100 +++ new/kcm-fcitx-0.5.4/src/subconfigwidget.h 2017-02-08 18:22:35.000000000 +0100 @@ -44,6 +44,7 @@ void openPlugin(); private: + bool launchGuiWrapper(const QString &path); SubConfig* m_subConfig; ConfigFileItemModel* m_model; QListView* m_listView;
