diff -Nru fcitx-configtool-0.4.9/CMakeLists.txt fcitx-configtool-0.4.10/CMakeLists.txt --- fcitx-configtool-0.4.9/CMakeLists.txt 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/CMakeLists.txt 2017-09-14 22:30:03.000000000 +0000 @@ -1,7 +1,10 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.1) project(fcitx-configtool) +set(CMAKE_C_STANDARD_REQUIRED TRUE) +set(CMAKE_C_STANDARD 99) + option(ENABLE_GTK2 "Enable GTK2 Version" Off) option(ENABLE_GTK3 "Enable GTK3 Version" On) @@ -11,7 +14,7 @@ if(ENABLE_GTK3) pkg_check_modules(FCITX_GCLIENT "fcitx-gclient>=4.2.6" REQUIRED) - pkg_check_modules(GTK3 "gtk+-3.0>=3.12" REQUIRED) + pkg_check_modules(GTK3 "gtk+-3.0>=3.20" REQUIRED) endif() if(ENABLE_GTK2) diff -Nru fcitx-configtool-0.4.9/debian/changelog fcitx-configtool-0.4.10/debian/changelog --- fcitx-configtool-0.4.9/debian/changelog 2018-02-06 08:22:07.000000000 +0000 +++ fcitx-configtool-0.4.10/debian/changelog 2018-02-05 10:53:48.000000000 +0000 @@ -1,8 +1,14 @@ -fcitx-configtool (0.4.9-1build1) bionic; urgency=medium +fcitx-configtool (0.4.10-1) unstable; urgency=medium - * No-change rebuild against libfcitx-gclient1 + * Team upload. + * New upstream release. + * Bump version requirement for CMake and GTK+3. + * Bump Standards-Version to 4.1.3, no changes required. + * Bump debhelper compat to v11. + * Switch to debian-input-method maillist for maintainer field. + * d/control: Use "dh_missing --fail-missing". - -- Steve Langasek Tue, 06 Feb 2018 08:22:07 +0000 + -- Boyuan Yang <073plan@gmail.com> Mon, 05 Feb 2018 18:53:48 +0800 fcitx-configtool (0.4.9-1) unstable; urgency=medium @@ -57,7 +63,7 @@ fcitx-configtool (0.4.6-2) unstable; urgency=low - * fcitx-config-gtk depends on + * fcitx-config-gtk depends on gnome-icon-theme-symbolic (Closes: #699418). -- YunQiang Su Sat, 16 Feb 2013 17:20:23 +0800 diff -Nru fcitx-configtool-0.4.9/debian/compat fcitx-configtool-0.4.10/debian/compat --- fcitx-configtool-0.4.9/debian/compat 2017-09-29 03:09:23.000000000 +0000 +++ fcitx-configtool-0.4.10/debian/compat 2018-02-05 10:53:48.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru fcitx-configtool-0.4.9/debian/control fcitx-configtool-0.4.10/debian/control --- fcitx-configtool-0.4.9/debian/control 2018-02-06 08:22:07.000000000 +0000 +++ fcitx-configtool-0.4.10/debian/control 2018-02-05 10:53:48.000000000 +0000 @@ -1,23 +1,22 @@ Source: fcitx-configtool Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: IME Packaging Team +Maintainer: Debian Input Method Team Uploaders: Aron Xu , YunQiang Su , Build-Depends: - cmake, - debhelper (>= 10), + cmake (>= 3.1), + debhelper (>= 11), fcitx-bin, fcitx-libs-dev (>= 1:4.2.8), iso-codes, libdbus-glib-1-dev, - libgtk-3-dev (>= 3.12), + libgtk-3-dev (>= 3.20), libgtk2.0-dev (>= 2.22), libunique-dev, pkg-config, -Standards-Version: 4.1.0 +Standards-Version: 4.1.3 Homepage: https://github.com/fcitx/fcitx-configtool Vcs-Git: https://anonscm.debian.org/git/pkg-ime/fcitx-configtool.git Vcs-Browser: https://anonscm.debian.org/git/pkg-ime/fcitx-configtool.git diff -Nru fcitx-configtool-0.4.9/debian/rules fcitx-configtool-0.4.10/debian/rules --- fcitx-configtool-0.4.9/debian/rules 2017-09-29 03:09:23.000000000 +0000 +++ fcitx-configtool-0.4.10/debian/rules 2018-02-05 10:53:47.000000000 +0000 @@ -8,3 +8,6 @@ override_dh_auto_configure: dh_auto_configure -- -DENABLE_GTK2=On -DENABLE_GTK3=On + +dh_missing: + dh_missing --fail-missing diff -Nru fcitx-configtool-0.4.9/gtk3/config_widget.c fcitx-configtool-0.4.10/gtk3/config_widget.c --- fcitx-configtool-0.4.9/gtk3/config_widget.c 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/gtk3/config_widget.c 2017-09-14 22:30:03.000000000 +0000 @@ -611,7 +611,7 @@ self->advanceCheckBox = gtk_check_button_new(); gtk_grid_attach(GTK_GRID(self), self->advanceCheckBox, 0, 1, 1, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->advanceCheckBox), FALSE); - gtk_button_set_label(GTK_BUTTON(self->advanceCheckBox), _("Show Advance Option")); + gtk_button_set_label(GTK_BUTTON(self->advanceCheckBox), _("Show Advanced Options")); g_signal_connect(self->advanceCheckBox, "toggled", (GCallback) _fcitx_config_widget_toggle_simple_full, self); _fcitx_config_widget_toggle_simple_full(GTK_TOGGLE_BUTTON(self->advanceCheckBox), self); } diff -Nru fcitx-configtool-0.4.9/gtk3/keygrab.c fcitx-configtool-0.4.10/gtk3/keygrab.c --- fcitx-configtool-0.4.9/gtk3/keygrab.c 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/gtk3/keygrab.c 2017-09-14 22:30:03.000000000 +0000 @@ -85,17 +85,10 @@ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(b->popup)); GdkDisplay* display = gdk_window_get_display (window); - GdkDeviceManager* device_manager = gdk_display_get_device_manager (display); - GdkDevice* pointer = gdk_device_manager_get_client_pointer (device_manager); - GdkDevice* keyboard = gdk_device_get_associated_device (pointer); - - while (gdk_device_grab( - keyboard, - window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_KEY_PRESS | GDK_KEY_RELEASE, - NULL, - GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) + GdkSeat* seat = gdk_display_get_default_seat (display); + while (gdk_seat_grab (seat, window, + GDK_SEAT_CAPABILITY_ALL, FALSE, + NULL, NULL, NULL, NULL) != GDK_GRAB_SUCCESS) usleep(100); } @@ -104,10 +97,8 @@ KeyGrabButton* b = KEYGRAB_BUTTON(self); GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(b->popup)); GdkDisplay* display = gdk_window_get_display (window); - GdkDeviceManager* device_manager = gdk_display_get_device_manager (display); - GdkDevice* pointer = gdk_device_manager_get_client_pointer (device_manager); - GdkDevice* keyboard = gdk_device_get_associated_device (pointer); - gdk_device_ungrab(keyboard, gtk_get_current_event_time()); + GdkSeat* seat = gdk_display_get_default_seat (display); + gdk_seat_ungrab(seat); g_signal_handler_disconnect(b->popup, b->handler); gtk_widget_destroy(b->popup); } diff -Nru fcitx-configtool-0.4.9/gtk3/main_window.c fcitx-configtool-0.4.10/gtk3/main_window.c --- fcitx-configtool-0.4.9/gtk3/main_window.c 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/gtk3/main_window.c 2017-09-14 22:30:03.000000000 +0000 @@ -280,7 +280,7 @@ GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); /* advance check box */ - self->advancecheckbox = gtk_check_button_new_with_label(_("Advance")); + self->advancecheckbox = gtk_check_button_new_with_label(_("Advanced")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->advancecheckbox), FALSE); g_signal_connect(G_OBJECT(self->advancecheckbox), "toggled", G_CALLBACK(_fcitx_main_window_checkbox_changed), self); diff -Nru fcitx-configtool-0.4.9/po/ca.po fcitx-configtool-0.4.10/po/ca.po --- fcitx-configtool-0.4.9/po/ca.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/ca.po 2017-09-14 22:30:03.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Walter Garcia-Fontes , 2016 +# Walter Garcia-Fontes , 2016-2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" "POT-Creation-Date: 2014-07-06 10:09+0200\n" -"PO-Revision-Date: 2016-12-01 13:26+0000\n" +"PO-Revision-Date: 2017-07-13 06:43+0000\n" "Last-Translator: Walter Garcia-Fontes \n" "Language-Team: Catalan (http://www.transifex.com/fcitx/fcitx/language/ca/)\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgstr "Una altra" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" -msgstr "Mostra l'opció avançada" +msgid "Show Advanced Options" +msgstr "Mostra les opcions avançades" #: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 #: gtk3/sub_config_widget.c:168 @@ -107,8 +107,8 @@ msgstr "Aparença" #: gtk3/main_window.c:283 -msgid "Advance" -msgstr "Avança" +msgid "Advanced" +msgstr "Avançat" #: gtk3/main_window.c:294 msgid "Search Addon" diff -Nru fcitx-configtool-0.4.9/po/CMakeLists.txt fcitx-configtool-0.4.10/po/CMakeLists.txt --- fcitx-configtool-0.4.9/po/CMakeLists.txt 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/CMakeLists.txt 2017-09-14 22:30:03.000000000 +0000 @@ -1,5 +1,7 @@ -set(PO_LANGS de ja zh_CN zh_TW) -foreach(lang ${PO_LANGS}) - fcitx_translate_add_po_file("${lang}" "${lang}.po") +file(GLOB PO_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.po) + +foreach(po_file ${PO_FILES}) + string(REPLACE ".po" "" po_lang "${po_file}") + fcitx_translate_add_po_file("${po_lang}" "${po_file}") endforeach() fcitx_translate_set_pot_target(pot fcitx-configtool fcitx-configtool.pot) diff -Nru fcitx-configtool-0.4.9/po/da.po fcitx-configtool-0.4.10/po/da.po --- fcitx-configtool-0.4.9/po/da.po 1970-01-01 00:00:00.000000000 +0000 +++ fcitx-configtool-0.4.10/po/da.po 2017-09-14 22:30:03.000000000 +0000 @@ -0,0 +1,159 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# scootergrisen, 2017 +# scootergrisen, 2017 +msgid "" +msgstr "" +"Project-Id-Version: fcitx\n" +"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" +"POT-Creation-Date: 2014-07-06 10:09+0200\n" +"PO-Revision-Date: 2017-07-21 13:07+0000\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish (http://www.transifex.com/fcitx/fcitx/language/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: gtk3/config_widget.c:239 gtk/config_widget.c:192 +msgid "Clear font setting" +msgstr "Ryd skrifttypeindstilling" + +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 +msgid "Other" +msgstr "Andet" + +#: gtk3/config_widget.c:614 +msgid "Show Advanced Options" +msgstr "Vis avancerede valgmuligheder" + +#: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 +#: gtk3/sub_config_widget.c:168 +msgid "_Cancel" +msgstr "_Annuller" + +#: gtk3/config_widget.c:939 gtk3/im_config_dialog.c:75 gtk3/im_dialog.c:129 +#: gtk3/sub_config_widget.c:170 +msgid "_OK" +msgstr "_OK" + +#: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 +msgid "Unspecified" +msgstr "Uspecificeret" + +#: gtk3/im_config_dialog.c:132 +msgid "Default keyboard layout" +msgstr "Standardtastaturlayout" + +#: gtk3/im_config_dialog.c:164 +msgid "Input Method Default" +msgstr "Inputmetode standard" + +#: gtk3/im_config_dialog.c:164 +msgid "Default" +msgstr "Standard" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout:" +msgstr "Tastaturlayout:" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout to use when no input window:" +msgstr "Tastaturlayout som skal bruges når der ikke er noget inputvindue:" + +#: gtk3/im_config_dialog.c:209 +msgid "Input method settings:" +msgstr "Indstillinger for inputmetode:" + +#: gtk3/im_dialog.c:123 +msgid "Add input method" +msgstr "Tilføj inputmetode" + +#: gtk3/im_dialog.c:168 +msgid "Search Input Method" +msgstr "Søg efter inputmetode" + +#: gtk3/im_dialog.c:256 gtk3/im_dialog.c:258 gtk3/im_widget.c:259 +#: gtk3/im_widget.c:261 gtk/im_widget.c:314 gtk/im_widget.c:316 +msgid "Unknown" +msgstr "Ukendt" + +#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +msgid "Empty" +msgstr "Tom" + +#: gtk3/keygrab.c:80 gtk/keygrab.c:74 +msgid "Please press the new key combination" +msgstr "Tryk venligst den nye tastekombination" + +#: gtk3/main_window.c:106 gtk/main_window.c:149 +msgid "Input Method Configuration" +msgstr "Konfiguration af inputmetode" + +#: gtk3/main_window.c:203 gtk/main_window.c:294 +msgid "Global Config" +msgstr "Global konfiguration" + +#: gtk3/main_window.c:209 gtk/im_widget.c:102 gtk/im_widget.c:153 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 +msgid "Input Method" +msgstr "Inputmetode" + +#: gtk3/main_window.c:221 +msgid "Appearance" +msgstr "Udseende" + +#: gtk3/main_window.c:283 +msgid "Advanced" +msgstr "Avanceret" + +#: gtk3/main_window.c:294 +msgid "Search Addon" +msgstr "Søg efter tilføjelse" + +#: gtk3/main_window.c:357 gtk/main_window.c:360 +msgid "Configure" +msgstr "Konfigurer" + +#: gtk3/main_window.c:374 gtk/main_window.c:375 +msgid "Addon" +msgstr "Tilføjelse" + +#: gtk3/sub_config_widget.c:287 +msgid "Didn't install related component." +msgstr "Installerede ikke relaterede komponent." + +#: gtk3/ui_widget.c:48 +msgid "Cannot load currently used user interface info" +msgstr "Kan ikke indlæse brugergrænsefladeinfo som bruges i øjeblikket" + +#: gtk3/ui_widget.c:106 +#, c-format +msgid "No configuration option for %s." +msgstr "Ingen konfigurationsvalgmulighed for %s." + +#: gtk/im_widget.c:92 +msgid "Available Input Method" +msgstr "Tilgængelig inputmetode" + +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 +msgid "Only Show Current Language" +msgstr "Vis kun nuværende sprog" + +#: gtk/im_widget.c:146 +msgid "Current Input Method" +msgstr "Nuværende inputmetode" + +#: gtk/im_widget.c:192 gtk3/im_widget.ui:115 +msgid "" +"The first input method will be inactive state. Usually you need to put " +"Keyboard or Keyboard - layout name in the first place." +msgstr "Den første inputmetode vil være i inaktiv tilstand. Typisk skal der først stå Tastatur eller Tastatur - layoutnavn." + +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 +msgid "Language" +msgstr "Sprog" diff -Nru fcitx-configtool-0.4.9/po/de.po fcitx-configtool-0.4.10/po/de.po --- fcitx-configtool-0.4.9/po/de.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/de.po 2017-09-14 22:30:03.000000000 +0000 @@ -5,14 +5,14 @@ # Translators: # Lucius Annaeus Seneca, 2013 # mar well , 2013-2014 -# mar well , 2014 +# mar well , 2014,2017 # csslayer , 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2015-12-11 23:17-0800\n" -"PO-Revision-Date: 2014-12-09 09:47+0000\n" +"POT-Creation-Date: 2017-07-28 06:02-0700\n" +"PO-Revision-Date: 2017-07-28 12:36+0000\n" "Last-Translator: mar well \n" "Language-Team: German (http://www.transifex.com/fcitx/fcitx/language/de/)\n" "Language: de\n" @@ -30,8 +30,8 @@ msgstr "Addon" #: gtk3/main_window.c:283 -msgid "Advance" -msgstr "Fortschritt" +msgid "Advanced" +msgstr "Erweitert" #: gtk3/main_window.c:221 msgid "Appearance" @@ -65,11 +65,11 @@ msgid "Default keyboard layout" msgstr "Standard Tastaturlayout" -#: gtk3/sub_config_widget.c:287 +#: gtk3/sub_config_widget.c:310 msgid "Didn't install related component." -msgstr "Die verwandte Komponente wurde nicht installiert." +msgstr "Die betreffende Komponente wurde nicht installiert." -#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +#: gtk3/keygrab.c:66 gtk3/keygrab.c:172 gtk/keygrab.c:138 msgid "Empty" msgstr "Leer" @@ -132,8 +132,8 @@ msgstr "Eingabemethode suchen" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" -msgstr "Erweiterte Einstellungen anzeigen" +msgid "Show Advanced Options" +msgstr "Erweiterte Einstellungen zeigen" #: gtk/im_widget.c:192 gtk3/im_widget.ui:87 msgid "" diff -Nru fcitx-configtool-0.4.9/po/fcitx-configtool.pot fcitx-configtool-0.4.10/po/fcitx-configtool.pot --- fcitx-configtool-0.4.9/po/fcitx-configtool.pot 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/fcitx-configtool.pot 2017-09-14 22:30:03.000000000 +0000 @@ -26,7 +26,7 @@ msgstr "" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" +msgid "Show Advanced Options" msgstr "" #: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 @@ -106,7 +106,7 @@ msgstr "" #: gtk3/main_window.c:283 -msgid "Advance" +msgid "Advanced" msgstr "" #: gtk3/main_window.c:294 diff -Nru fcitx-configtool-0.4.9/po/ja.po fcitx-configtool-0.4.10/po/ja.po --- fcitx-configtool-0.4.9/po/ja.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/ja.po 2017-09-14 22:30:03.000000000 +0000 @@ -4,16 +4,16 @@ # # Translators: # しろう <>, 2013 -# AWASHIRO Ikuya , 2014 -# WAKAYAMA Shirou , 2013 +# あわしろいくや , 2014 +# shirou - しろう , 2013 # csslayer , 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2015-12-11 23:17-0800\n" -"PO-Revision-Date: 2014-07-06 08:33+0000\n" -"Last-Translator: AWASHIRO Ikuya \n" +"POT-Creation-Date: 2017-05-11 19:02-0700\n" +"PO-Revision-Date: 2017-05-12 01:02+0000\n" +"Last-Translator: csslayer \n" "Language-Team: Japanese (http://www.transifex.com/fcitx/fcitx/language/ja/)\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -30,8 +30,8 @@ msgstr "アドオン" #: gtk3/main_window.c:283 -msgid "Advance" -msgstr "拡張" +msgid "Advanced" +msgstr "" #: gtk3/main_window.c:221 msgid "Appearance" @@ -65,11 +65,11 @@ msgid "Default keyboard layout" msgstr "既定のキーボードレイアウト" -#: gtk3/sub_config_widget.c:287 +#: gtk3/sub_config_widget.c:310 msgid "Didn't install related component." msgstr "関連コンポーネントがインストールされていません" -#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +#: gtk3/keygrab.c:66 gtk3/keygrab.c:172 gtk/keygrab.c:138 msgid "Empty" msgstr "空" @@ -132,8 +132,8 @@ msgstr "入力メソッドの検索" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" -msgstr "拡張オプションの表示" +msgid "Show Advanced Options" +msgstr "" #: gtk/im_widget.c:192 gtk3/im_widget.ui:87 msgid "" diff -Nru fcitx-configtool-0.4.9/po/ko.po fcitx-configtool-0.4.10/po/ko.po --- fcitx-configtool-0.4.9/po/ko.po 1970-01-01 00:00:00.000000000 +0000 +++ fcitx-configtool-0.4.10/po/ko.po 2017-09-14 22:30:03.000000000 +0000 @@ -0,0 +1,158 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Bon Keun Seo , 2017 +msgid "" +msgstr "" +"Project-Id-Version: fcitx\n" +"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" +"POT-Creation-Date: 2014-07-06 10:09+0200\n" +"PO-Revision-Date: 2017-07-09 22:14+0000\n" +"Last-Translator: Bon Keun Seo \n" +"Language-Team: Korean (http://www.transifex.com/fcitx/fcitx/language/ko/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: gtk3/config_widget.c:239 gtk/config_widget.c:192 +msgid "Clear font setting" +msgstr "글꼴 설정 초기화" + +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 +msgid "Other" +msgstr "기타" + +#: gtk3/config_widget.c:614 +msgid "Show Advanced Options" +msgstr "추가 설정 보기" + +#: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 +#: gtk3/sub_config_widget.c:168 +msgid "_Cancel" +msgstr "취소(_C)" + +#: gtk3/config_widget.c:939 gtk3/im_config_dialog.c:75 gtk3/im_dialog.c:129 +#: gtk3/sub_config_widget.c:170 +msgid "_OK" +msgstr "선택(_O)" + +#: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 +msgid "Unspecified" +msgstr "미정" + +#: gtk3/im_config_dialog.c:132 +msgid "Default keyboard layout" +msgstr "기본 키보드 배열" + +#: gtk3/im_config_dialog.c:164 +msgid "Input Method Default" +msgstr "기본 입력기" + +#: gtk3/im_config_dialog.c:164 +msgid "Default" +msgstr "기본" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout:" +msgstr "키보드 배열:" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout to use when no input window:" +msgstr "입력창이 없을 때 사용할 키보드 배열:" + +#: gtk3/im_config_dialog.c:209 +msgid "Input method settings:" +msgstr "입력기 설정:" + +#: gtk3/im_dialog.c:123 +msgid "Add input method" +msgstr "입력기 추가" + +#: gtk3/im_dialog.c:168 +msgid "Search Input Method" +msgstr "입력기 검색" + +#: gtk3/im_dialog.c:256 gtk3/im_dialog.c:258 gtk3/im_widget.c:259 +#: gtk3/im_widget.c:261 gtk/im_widget.c:314 gtk/im_widget.c:316 +msgid "Unknown" +msgstr "모름" + +#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +msgid "Empty" +msgstr "비어있음" + +#: gtk3/keygrab.c:80 gtk/keygrab.c:74 +msgid "Please press the new key combination" +msgstr "새 키 조합을 입력하세요" + +#: gtk3/main_window.c:106 gtk/main_window.c:149 +msgid "Input Method Configuration" +msgstr "입력기 설정" + +#: gtk3/main_window.c:203 gtk/main_window.c:294 +msgid "Global Config" +msgstr "전역 설정" + +#: gtk3/main_window.c:209 gtk/im_widget.c:102 gtk/im_widget.c:153 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 +msgid "Input Method" +msgstr "입력 방법" + +#: gtk3/main_window.c:221 +msgid "Appearance" +msgstr "모양새" + +#: gtk3/main_window.c:283 +msgid "Advanced" +msgstr "추가" + +#: gtk3/main_window.c:294 +msgid "Search Addon" +msgstr "부가기능 검색" + +#: gtk3/main_window.c:357 gtk/main_window.c:360 +msgid "Configure" +msgstr "설정" + +#: gtk3/main_window.c:374 gtk/main_window.c:375 +msgid "Addon" +msgstr "부가기능" + +#: gtk3/sub_config_widget.c:287 +msgid "Didn't install related component." +msgstr "관련 구성요소 설치하지 않음" + +#: gtk3/ui_widget.c:48 +msgid "Cannot load currently used user interface info" +msgstr "현재 사용된 사용자 인터페이스 정보를 불러올 수 없음" + +#: gtk3/ui_widget.c:106 +#, c-format +msgid "No configuration option for %s." +msgstr "%s에 대한 설정이 없음" + +#: gtk/im_widget.c:92 +msgid "Available Input Method" +msgstr "사용가능한 입력 방법" + +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 +msgid "Only Show Current Language" +msgstr "현재 언어만 표시" + +#: gtk/im_widget.c:146 +msgid "Current Input Method" +msgstr "현재 입력 방법" + +#: gtk/im_widget.c:192 gtk3/im_widget.ui:115 +msgid "" +"The first input method will be inactive state. Usually you need to put " +"Keyboard or Keyboard - layout name in the first place." +msgstr "첫 입력 방법이 비활성화 상태입니다. 대체로 키보드 또는 키보드 - 배열명 를 첫 항목으로 하여야 합니다." + +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 +msgid "Language" +msgstr "언어" diff -Nru fcitx-configtool-0.4.9/po/ru.po fcitx-configtool-0.4.10/po/ru.po --- fcitx-configtool-0.4.9/po/ru.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/ru.po 2017-09-14 22:30:03.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# TotalCaesar659 , 2016 +# TotalCaesar659 , 2016-2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" "POT-Creation-Date: 2014-07-06 10:09+0200\n" -"PO-Revision-Date: 2016-11-29 02:04+0000\n" +"PO-Revision-Date: 2017-05-24 17:14+0000\n" "Last-Translator: TotalCaesar659 \n" "Language-Team: Russian (http://www.transifex.com/fcitx/fcitx/language/ru/)\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgstr "Другие" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" -msgstr "Показать дополнительные параметры" +msgid "Show Advanced Options" +msgstr "Показать дополнительные настройки" #: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 #: gtk3/sub_config_widget.c:168 @@ -107,7 +107,7 @@ msgstr "Внешний вид" #: gtk3/main_window.c:283 -msgid "Advance" +msgid "Advanced" msgstr "Дополнительно" #: gtk3/main_window.c:294 diff -Nru fcitx-configtool-0.4.9/po/tr.po fcitx-configtool-0.4.10/po/tr.po --- fcitx-configtool-0.4.9/po/tr.po 1970-01-01 00:00:00.000000000 +0000 +++ fcitx-configtool-0.4.10/po/tr.po 2017-09-14 22:30:03.000000000 +0000 @@ -0,0 +1,158 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Gökhan Kalayci , 2017 +msgid "" +msgstr "" +"Project-Id-Version: fcitx\n" +"Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" +"POT-Creation-Date: 2014-07-06 10:09+0200\n" +"PO-Revision-Date: 2017-05-12 01:02+0000\n" +"Last-Translator: csslayer \n" +"Language-Team: Turkish (http://www.transifex.com/fcitx/fcitx/language/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: gtk3/config_widget.c:239 gtk/config_widget.c:192 +msgid "Clear font setting" +msgstr "Yazı tipi ayarını temizle" + +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 +msgid "Other" +msgstr "Diğer" + +#: gtk3/config_widget.c:614 +msgid "Show Advanced Options" +msgstr "" + +#: gtk3/config_widget.c:937 gtk3/im_config_dialog.c:73 gtk3/im_dialog.c:127 +#: gtk3/sub_config_widget.c:168 +msgid "_Cancel" +msgstr "_İptal" + +#: gtk3/config_widget.c:939 gtk3/im_config_dialog.c:75 gtk3/im_dialog.c:129 +#: gtk3/sub_config_widget.c:170 +msgid "_OK" +msgstr "_OK" + +#: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 +msgid "Unspecified" +msgstr "Belirtilmemiş" + +#: gtk3/im_config_dialog.c:132 +msgid "Default keyboard layout" +msgstr "Varsayılan klavye düzeni" + +#: gtk3/im_config_dialog.c:164 +msgid "Input Method Default" +msgstr "Giriş Yöntemi Varsayılanı" + +#: gtk3/im_config_dialog.c:164 +msgid "Default" +msgstr "Varsayılan" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout:" +msgstr "Klavye düzeni:" + +#: gtk3/im_config_dialog.c:192 +msgid "Keyboard layout to use when no input window:" +msgstr "Giriş penceresi olmadığında kullanılacak klavye düzeni:" + +#: gtk3/im_config_dialog.c:209 +msgid "Input method settings:" +msgstr "Giriş Yöntemi Ayarları:" + +#: gtk3/im_dialog.c:123 +msgid "Add input method" +msgstr "Giriş yöntemi ekle" + +#: gtk3/im_dialog.c:168 +msgid "Search Input Method" +msgstr "Giriş Yöntemi Ara" + +#: gtk3/im_dialog.c:256 gtk3/im_dialog.c:258 gtk3/im_widget.c:259 +#: gtk3/im_widget.c:261 gtk/im_widget.c:314 gtk/im_widget.c:316 +msgid "Unknown" +msgstr "Bilinmeyen" + +#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +msgid "Empty" +msgstr "Boş" + +#: gtk3/keygrab.c:80 gtk/keygrab.c:74 +msgid "Please press the new key combination" +msgstr "ütfen yeni tuş kombinasyonuna basınız" + +#: gtk3/main_window.c:106 gtk/main_window.c:149 +msgid "Input Method Configuration" +msgstr "Giriş Yöntemi Yapılandırması" + +#: gtk3/main_window.c:203 gtk/main_window.c:294 +msgid "Global Config" +msgstr "Küresel Yapılandırma" + +#: gtk3/main_window.c:209 gtk/im_widget.c:102 gtk/im_widget.c:153 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 +msgid "Input Method" +msgstr "Giriş Yöntemi" + +#: gtk3/main_window.c:221 +msgid "Appearance" +msgstr "Görünüm" + +#: gtk3/main_window.c:283 +msgid "Advanced" +msgstr "" + +#: gtk3/main_window.c:294 +msgid "Search Addon" +msgstr "Arama Eklentisi" + +#: gtk3/main_window.c:357 gtk/main_window.c:360 +msgid "Configure" +msgstr "Yapılandır" + +#: gtk3/main_window.c:374 gtk/main_window.c:375 +msgid "Addon" +msgstr "Eklenti" + +#: gtk3/sub_config_widget.c:287 +msgid "Didn't install related component." +msgstr "İlgili bileşen yüklemedi." + +#: gtk3/ui_widget.c:48 +msgid "Cannot load currently used user interface info" +msgstr "Şu anda kullanılan kullanıcı arabirimi bilgileri yüklenemiyor" + +#: gtk3/ui_widget.c:106 +#, c-format +msgid "No configuration option for %s." +msgstr "%s için yapılandırma seçeneği yok." + +#: gtk/im_widget.c:92 +msgid "Available Input Method" +msgstr "Kullanılabilir Giriş Yöntemi" + +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 +msgid "Only Show Current Language" +msgstr "Sadece Geçerli Dili Göster" + +#: gtk/im_widget.c:146 +msgid "Current Input Method" +msgstr "Geçerli Giriş Yöntemi" + +#: gtk/im_widget.c:192 gtk3/im_widget.ui:115 +msgid "" +"The first input method will be inactive state. Usually you need to put " +"Keyboard or Keyboard - layout name in the first place." +msgstr "İlk giriş yöntemi aktif değildirr. Genellikle Klavye veya Klavye - düzen adı koymanız gerekir." + +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 +msgid "Language" +msgstr "Dil" diff -Nru fcitx-configtool-0.4.9/po/zh_CN.po fcitx-configtool-0.4.10/po/zh_CN.po --- fcitx-configtool-0.4.9/po/zh_CN.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/zh_CN.po 2017-09-14 22:30:03.000000000 +0000 @@ -4,16 +4,16 @@ # # Translators: # marguerite su , 2014 -# csslayer , 2013 +# csslayer , 2013,2017 # csslayer , 2010-2012 # csslayer , 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2015-12-11 23:17-0800\n" -"PO-Revision-Date: 2014-07-14 09:35+0000\n" -"Last-Translator: marguerite su \n" +"POT-Creation-Date: 2017-06-09 11:12-0700\n" +"PO-Revision-Date: 2017-06-09 18:05+0000\n" +"Last-Translator: csslayer \n" "Language-Team: Chinese (China) (http://www.transifex.com/fcitx/fcitx/" "language/zh_CN/)\n" "Language: zh_CN\n" @@ -31,7 +31,7 @@ msgstr "附加组件" #: gtk3/main_window.c:283 -msgid "Advance" +msgid "Advanced" msgstr "高级" #: gtk3/main_window.c:221 @@ -66,11 +66,11 @@ msgid "Default keyboard layout" msgstr "默认键盘布局" -#: gtk3/sub_config_widget.c:287 +#: gtk3/sub_config_widget.c:310 msgid "Didn't install related component." msgstr "未安装相关组件。" -#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +#: gtk3/keygrab.c:66 gtk3/keygrab.c:172 gtk/keygrab.c:138 msgid "Empty" msgstr "空" @@ -133,7 +133,7 @@ msgstr "搜索输入法" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" +msgid "Show Advanced Options" msgstr "显示高级选项" #: gtk/im_widget.c:192 gtk3/im_widget.ui:87 diff -Nru fcitx-configtool-0.4.9/po/zh_TW.po fcitx-configtool-0.4.10/po/zh_TW.po --- fcitx-configtool-0.4.9/po/zh_TW.po 2017-09-28 09:21:31.000000000 +0000 +++ fcitx-configtool-0.4.10/po/zh_TW.po 2017-09-14 22:30:03.000000000 +0000 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# PHLin , 2017 # Hiunn-hué , 2012 # Jeff Huang , 2015 # csslayer , 2013 @@ -11,9 +12,9 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-dev@googlegroups.com\n" -"POT-Creation-Date: 2015-12-11 23:17-0800\n" -"PO-Revision-Date: 2015-09-28 14:16+0000\n" -"Last-Translator: Jeff Huang \n" +"POT-Creation-Date: 2017-07-12 10:02-0700\n" +"PO-Revision-Date: 2017-07-12 16:35+0000\n" +"Last-Translator: PHLin \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/fcitx/fcitx/" "language/zh_TW/)\n" "Language: zh_TW\n" @@ -31,8 +32,8 @@ msgstr "附加元件" #: gtk3/main_window.c:283 -msgid "Advance" -msgstr "進階" +msgid "Advanced" +msgstr "" #: gtk3/main_window.c:221 msgid "Appearance" @@ -66,11 +67,11 @@ msgid "Default keyboard layout" msgstr "預設鍵盤配置" -#: gtk3/sub_config_widget.c:287 +#: gtk3/sub_config_widget.c:310 msgid "Didn't install related component." msgstr "沒有安裝相關組件。" -#: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 +#: gtk3/keygrab.c:66 gtk3/keygrab.c:172 gtk/keygrab.c:138 msgid "Empty" msgstr "空" @@ -133,8 +134,8 @@ msgstr "搜尋輸入法" #: gtk3/config_widget.c:614 -msgid "Show Advance Option" -msgstr "顯示進階選項" +msgid "Show Advanced Options" +msgstr "顯示進階設定選項" #: gtk/im_widget.c:192 gtk3/im_widget.ui:87 msgid ""