Hello community, here is the log from the commit of package fcitx-configtool for openSUSE:Factory checked in at 2013-10-29 11:03:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-configtool (Old) and /work/SRC/openSUSE:Factory/.fcitx-configtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-configtool" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-configtool/fcitx-configtool.changes 2013-10-18 13:39:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-configtool.new/fcitx-configtool.changes 2013-10-29 11:03:27.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Oct 26 07:46:28 UTC 2013 - [email protected] + +- update version 0.4.8 + * This version fixes some look & feel issue caused by gtk 3.8 + * Now toolbar icon not shown issue should be fixed + * Removed some outdated function in gtk 3.8 and 3.10 + * Other fixes include bnc#846037 +- remove patch: fcitx-configtool-gnome-3.10-fixes.patch, upstreamed + +------------------------------------------------------------------- Old: ---- fcitx-configtool-0.4.7.tar.xz fcitx-configtool-gnome-3.10-fixes.patch New: ---- fcitx-configtool-0.4.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-configtool.spec ++++++ --- /var/tmp/diff_new_pack.ZajQdx/_old 2013-10-29 11:03:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ZajQdx/_new 2013-10-29 11:03:28.000000000 +0100 @@ -19,15 +19,13 @@ %define pkgname fcitx-config-gtk3 Name: fcitx-configtool -Version: 0.4.7 +Version: 0.4.8 Release: 0 Summary: GTK GUI config tool for FCITX License: GPL-2.0+ Group: System/I18n/Chinese Url: http://code.google.com/p/fcitx Source: http://download.fcitx-im.org/fcitx-configtool/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM [email protected] - fix gtk depreciated functions and bnc#846037 -Patch: fcitx-configtool-gnome-3.10-fixes.patch %if 0%{?suse_version} BuildRequires: dbus-1-glib-devel %if 0%{?suse_version} <= 1140 @@ -74,7 +72,6 @@ %prep %setup -q -%patch -p1 %build mkdir -pv build @@ -91,12 +88,12 @@ %find_lang %{name} -%files -n %{pkgname} -f %{name}.lang -%defattr(-,root,root) -%{_bindir}/* - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%files -n %{pkgname} -f %{name}.lang +%defattr(-,root,root) +%{_bindir}/* + %changelog ++++++ fcitx-configtool-0.4.7.tar.xz -> fcitx-configtool-0.4.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/config_widget.c new/fcitx-configtool-0.4.8/gtk3/config_widget.c --- old/fcitx-configtool-0.4.7/gtk3/config_widget.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/config_widget.c 2013-10-27 01:45:38.000000000 +0200 @@ -483,7 +483,15 @@ g_object_set(G_OBJECT(scrollwnd), "shadow-type", GTK_SHADOW_NONE, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwnd), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + +#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 7) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 7 && GTK_MICRO_VERSION < 8)) + /* http://developer.gnome.org/gtk3/unstable/GtkScrolledWindow.html#gtk-scrolled-window-add-with-viewport */ + /* gtk_scrolled_window_add_with_viewport has been deprecated since version 3.8 and should not be used in newly-written code. */ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwnd), grid); +#else + /* gtk_container_add() will now automatically add a GtkViewport if the child doesn't implement GtkScrollable. */ + gtk_container_add(GTK_CONTAINER(scrollwnd), grid); +#endif gtk_notebook_append_page(GTK_NOTEBOOK(configNotebook), scrollwnd, plabel); @@ -926,9 +934,9 @@ GtkWidget* dialog = gtk_dialog_new_with_buttons(addon->generalname, parent, GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/im_config_dialog.c new/fcitx-configtool-0.4.8/gtk3/im_config_dialog.c --- old/fcitx-configtool-0.4.7/gtk3/im_config_dialog.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/im_config_dialog.c 2013-10-27 01:45:38.000000000 +0200 @@ -70,9 +70,9 @@ gtk_window_set_modal(GTK_WINDOW(self), TRUE); gtk_dialog_add_buttons(GTK_DIALOG(self), - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/im_dialog.c new/fcitx-configtool-0.4.8/gtk3/im_dialog.c --- old/fcitx-configtool-0.4.7/gtk3/im_dialog.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/im_dialog.c 2013-10-27 01:45:38.000000000 +0200 @@ -124,9 +124,9 @@ gtk_window_set_modal(GTK_WINDOW(self), TRUE); gtk_dialog_add_buttons(GTK_DIALOG(self), - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/im_dialog.ui new/fcitx-configtool-0.4.8/gtk3/im_dialog.ui --- old/fcitx-configtool-0.4.7/gtk3/im_dialog.ui 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/im_dialog.ui 2013-10-27 01:45:38.000000000 +0200 @@ -45,6 +45,12 @@ <object class="GtkBox" id="im_dialog"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">5</property> + <property name="margin_right">5</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/im_widget.c new/fcitx-configtool-0.4.8/gtk3/im_widget.c --- old/fcitx-configtool-0.4.7/gtk3/im_widget.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/im_widget.c 2013-10-27 01:45:38.000000000 +0200 @@ -137,12 +137,12 @@ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); gtk_style_context_add_class (context, "inline-toolbar"); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->addimbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("list-add-symbolic"), GTK_ICON_SIZE_BUTTON)); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->delimbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("list-remove-symbolic"), GTK_ICON_SIZE_BUTTON)); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->moveupbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("go-up-symbolic"), GTK_ICON_SIZE_BUTTON)); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->movedownbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("go-down-symbolic"), GTK_ICON_SIZE_BUTTON)); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->configurebutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("preferences-system-symbolic"), GTK_ICON_SIZE_BUTTON)); - gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->default_layout_button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("input-keyboard-symbolic"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->addimbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("list-add-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->delimbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("list-remove-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->moveupbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("go-up-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->movedownbutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("go-down-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->configurebutton), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("preferences-system-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); + gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(self->default_layout_button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("input-keyboard-symbolic-hack"), GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(self->addimbutton), "clicked", G_CALLBACK(_fcitx_im_widget_addim_button_clicked), self); g_signal_connect(G_OBJECT(self->delimbutton), "clicked", G_CALLBACK(_fcitx_im_widget_delim_button_clicked), self); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/main_window.c new/fcitx-configtool-0.4.8/gtk3/main_window.c --- old/fcitx-configtool-0.4.7/gtk3/main_window.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/main_window.c 2013-10-27 01:45:38.000000000 +0200 @@ -50,7 +50,7 @@ static void _fcitx_main_window_add_ui_page(FcitxMainWindow* self); -void _fcitx_main_window_add_page(FcitxMainWindow* self, const char* name, GtkWidget* widget, const char* stock); +void _fcitx_main_window_add_page(FcitxMainWindow* self, const char* name, GtkWidget* widget); static void _fcitx_main_window_addon_selection_changed(GtkTreeSelection *selection, gpointer data); @@ -124,7 +124,7 @@ G_OBJECT_CLASS (fcitx_main_window_parent_class)->finalize (object); } -void _fcitx_main_window_add_page(FcitxMainWindow* self, const char* name, GtkWidget* widget, const char* stock) +void _fcitx_main_window_add_page(FcitxMainWindow* self, const char* name, GtkWidget* widget) { gtk_widget_show_all(widget); @@ -200,13 +200,13 @@ g_signal_connect(config_widget, "changed", (GCallback) _fcitx_main_window_config_widget_changed, NULL); - _fcitx_main_window_add_page(self, _("Global Config"), vbox, GTK_STOCK_PREFERENCES); + _fcitx_main_window_add_page(self, _("Global Config"), vbox); } void _fcitx_main_window_add_im_page(FcitxMainWindow* self) { GtkWidget* imwidget = fcitx_im_widget_new(); - _fcitx_main_window_add_page(self, _("Input Method"), imwidget, GTK_STOCK_EDIT); + _fcitx_main_window_add_page(self, _("Input Method"), imwidget); } gboolean _ui_connect(gpointer user_data) @@ -218,7 +218,7 @@ void _fcitx_main_window_add_ui_page(FcitxMainWindow* self) { GtkWidget* uiwidget = fcitx_ui_widget_new(); - _fcitx_main_window_add_page(self, _("Appearance"), uiwidget, GTK_STOCK_ABOUT); + _fcitx_main_window_add_page(self, _("Appearance"), uiwidget); g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, (GSourceFunc)_ui_connect, g_object_ref(uiwidget), (GDestroyNotify) g_object_unref); } @@ -286,9 +286,9 @@ /* filter entry */ self->filterentry = gtk_entry_new(); - gtk_entry_set_icon_from_stock (GTK_ENTRY (self->filterentry), + gtk_entry_set_icon_from_gicon (GTK_ENTRY (self->filterentry), GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_CLEAR); + g_themed_icon_new_with_default_fallbacks("edit-clear")); g_object_set(G_OBJECT(self->filterentry), "margin", 5, NULL); #if GTK_CHECK_VERSION(3,2,0) gtk_entry_set_placeholder_text(GTK_ENTRY (self->filterentry), _("Search Addon")); @@ -356,7 +356,7 @@ self->button = gtk_button_new_with_label(_("Configure")); gtk_widget_set_sensitive(self->button, FALSE); - gtk_button_set_image(GTK_BUTTON(self->button), gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image(GTK_BUTTON(self->button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("preferences-system"), GTK_ICON_SIZE_BUTTON)); gtk_box_pack_start(GTK_BOX(hbuttonbox), self->button, TRUE, TRUE, 0); g_signal_connect(G_OBJECT(self->button), "clicked", G_CALLBACK(_fcitx_main_window_configure_button_clicked), self); @@ -371,7 +371,7 @@ "row-activated", G_CALLBACK(_fcitx_main_window_addon_row_activated), self); - _fcitx_main_window_add_page(self, _("Addon"), vbox, GTK_STOCK_ADD); + _fcitx_main_window_add_page(self, _("Addon"), vbox); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/sub_config_widget.c new/fcitx-configtool-0.4.8/gtk3/sub_config_widget.c --- old/fcitx-configtool-0.4.7/gtk3/sub_config_widget.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/sub_config_widget.c 2013-10-27 01:45:38.000000000 +0200 @@ -110,7 +110,7 @@ g_hash_table_foreach(widget->subconfig->filelist, push_into_store_cb, store); GtkWidget* button = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("preferences-system"), GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(open_subconfig_file), widget); GtkWidget* hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); g_object_set(G_OBJECT(hbuttonbox), "margin", 5, NULL); @@ -121,21 +121,21 @@ break; case SC_NativeFile: { GtkWidget* button = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("document-open"), GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(open_native_file), widget); gtk_box_pack_start(GTK_BOX(widget), button, FALSE, FALSE, 0); } break; case SC_Program: { GtkWidget* button = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("system-run"), GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(run_program), widget); gtk_box_pack_start(GTK_BOX(widget), button, FALSE, FALSE, 0); } break; case SC_Plugin: { GtkWidget* button = gtk_button_new(); - gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_gicon(g_themed_icon_new_with_default_fallbacks("system-run"), GTK_ICON_SIZE_BUTTON)); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(run_plugin), widget); gtk_box_pack_start(GTK_BOX(widget), button, FALSE, FALSE, 0); } @@ -165,10 +165,10 @@ GtkWidget* dialog = gtk_dialog_new_with_buttons(configfile, GTK_WINDOW(gtk_widget_get_ancestor(GTK_WIDGET(widget), GTK_TYPE_WINDOW)), GTK_DIALOG_MODAL, - GTK_STOCK_OK, - GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_OK"), + GTK_RESPONSE_OK, NULL ); FcitxConfigWidget* config_widget = fcitx_config_widget_new(cfdesc, "", configfile, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/gtk3/ui_widget.c new/fcitx-configtool-0.4.8/gtk3/ui_widget.c --- old/fcitx-configtool-0.4.7/gtk3/ui_widget.c 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/gtk3/ui_widget.c 2013-10-27 01:45:38.000000000 +0200 @@ -32,7 +32,7 @@ static void fcitx_ui_widget_dispose(GObject* object); static void _fcitx_ui_widget_load(FcitxUIWidget* self, const gchar* uiname); -static void _fcitx_ui_widget_apply_button_clicked(GtkButton* button, gpointer user_data); +static void _fcitx_ui_widget_config_widget_changed(FcitxConfigWidget* widget, gpointer user_data); static void fcitx_ui_widget_class_init(FcitxUIWidgetClass *klass) @@ -120,15 +120,12 @@ gtk_box_pack_start(GTK_BOX(self), hbuttonbox, FALSE, TRUE, 0); g_object_set(G_OBJECT(hbuttonbox), "margin", 5, NULL); - GtkWidget* applybutton = gtk_button_new_from_stock(GTK_STOCK_APPLY); - gtk_box_pack_start(GTK_BOX(hbuttonbox), applybutton, TRUE, TRUE, 0); - g_signal_connect(G_OBJECT(applybutton), "clicked", G_CALLBACK(_fcitx_ui_widget_apply_button_clicked), config_widget); + g_signal_connect(config_widget, "changed", (GCallback) _fcitx_ui_widget_config_widget_changed, NULL); gtk_widget_show_all(GTK_WIDGET(self)); } } -void _fcitx_ui_widget_apply_button_clicked(GtkButton* button, gpointer user_data) +void _fcitx_ui_widget_config_widget_changed(FcitxConfigWidget* widget, gpointer user_data) { - FcitxConfigWidget* config_widget = user_data; - fcitx_config_widget_response(config_widget, CONFIG_WIDGET_SAVE); + fcitx_config_widget_response(widget, CONFIG_WIDGET_SAVE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/po/de.po new/fcitx-configtool-0.4.8/po/de.po --- old/fcitx-configtool-0.4.7/po/de.po 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/po/de.po 2013-10-27 01:45:38.000000000 +0200 @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Seneca, 2013 # mar well <[email protected]>, 2013 +# Xuetian Weng <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-29 18:02-0400\n" -"PO-Revision-Date: 2013-06-01 10:02+0000\n" -"Last-Translator: mar well <[email protected]>\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-10-26 18:34+0000\n" +"Last-Translator: Xuetian Weng <[email protected]>\n" "Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/"; "de/)\n" "Language: de\n" @@ -45,7 +47,7 @@ #: gtk3/config_widget.c:239 gtk/config_widget.c:192 msgid "Clear font setting" -msgstr "Font Einstellungen zurücksetzen" +msgstr "Font-Einstellungen zurücksetzen" #: gtk3/main_window.c:357 gtk/main_window.c:360 msgid "Configure" @@ -65,7 +67,7 @@ #: gtk3/sub_config_widget.c:287 msgid "Didn't install related component." -msgstr "" +msgstr "Die verwandte Komponente wurde nicht installiert." #: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 msgid "Empty" @@ -76,7 +78,7 @@ msgstr "Globale Einstellungen" #: gtk3/main_window.c:209 gtk/im_widget.c:102 gtk/im_widget.c:153 -#: gtk/main_window.c:300 gtk3/im_dialog.ui:68 gtk3/im_widget.ui:63 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 msgid "Input Method" msgstr "Eingabemethode" @@ -86,7 +88,7 @@ #: gtk3/im_config_dialog.c:164 msgid "Input Method Default" -msgstr "Standard Eingabemethode" +msgstr "Standard-Eingabemethode" #: gtk3/im_config_dialog.c:209 msgid "Input method settings:" @@ -100,7 +102,7 @@ msgid "Keyboard layout:" msgstr "Tastaturlayout:" -#: gtk3/im_dialog.ui:80 gtk3/im_widget.ui:75 +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 msgid "Language" msgstr "Sprache" @@ -109,11 +111,11 @@ msgid "No configuration option for %s." msgstr "Für %s sind keine Einstellmöglichkeiten vorhanden" -#: gtk/im_widget.c:115 gtk3/im_dialog.ui:100 +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 msgid "Only Show Current Language" msgstr "Nur gegenwärtige Sprache anzeigen" -#: gtk3/config_widget.c:432 gtk3/config_widget.c:521 gtk/config_widget.c:270 +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 msgid "Other" msgstr "Andere" @@ -129,7 +131,7 @@ msgid "Search Input Method" msgstr "Eingabemethode suchen" -#: gtk3/config_widget.c:606 +#: gtk3/config_widget.c:614 msgid "Show Advance Option" msgstr "Erweiterte Einstellungen anzeigen" @@ -150,3 +152,13 @@ #: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 msgid "Unspecified" msgstr "Nicht angegeben" + +#: 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 "_Abbrechen" + +#: 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/po/fcitx-configtool.pot new/fcitx-configtool-0.4.8/po/fcitx-configtool.pot --- old/fcitx-configtool-0.4.7/po/fcitx-configtool.pot 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/po/fcitx-configtool.pot 2013-10-27 01:45:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-29 18:02-0400\n" +"POT-Creation-Date: 2013-10-18 03:07-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -21,14 +21,24 @@ msgid "Clear font setting" msgstr "" -#: gtk3/config_widget.c:432 gtk3/config_widget.c:521 gtk/config_widget.c:270 +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 msgid "Other" msgstr "" -#: gtk3/config_widget.c:606 +#: gtk3/config_widget.c:614 msgid "Show Advance Option" 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 "" + +#: 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 "" + #: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 msgid "Unspecified" msgstr "" @@ -87,7 +97,7 @@ 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:68 gtk3/im_widget.ui:63 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 msgid "Input Method" msgstr "" @@ -128,7 +138,7 @@ msgid "Available Input Method" msgstr "" -#: gtk/im_widget.c:115 gtk3/im_dialog.ui:100 +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 msgid "Only Show Current Language" msgstr "" @@ -142,6 +152,6 @@ "<b>Keyboard</b> or <b>Keyboard - <i>layout name</i></b> in the first place." msgstr "" -#: gtk3/im_dialog.ui:80 gtk3/im_widget.ui:75 +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 msgid "Language" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/po/ja.po new/fcitx-configtool-0.4.8/po/ja.po --- old/fcitx-configtool-0.4.7/po/ja.po 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/po/ja.po 2013-10-27 01:45:38.000000000 +0200 @@ -4,12 +4,14 @@ # # Translators: # しろう <>, 2013 +# しろう, 2013 +# Xuetian Weng <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-29 18:02-0400\n" -"PO-Revision-Date: 2013-04-29 10:04+0000\n" +"POT-Creation-Date: 2013-10-26 19:45-0400\n" +"PO-Revision-Date: 2013-10-26 23:48+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"; "ja/)\n" @@ -65,7 +67,7 @@ #: gtk3/sub_config_widget.c:287 msgid "Didn't install related component." -msgstr "" +msgstr "関連コンポーネントがインストールされていません" #: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 msgid "Empty" @@ -76,7 +78,7 @@ 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:68 gtk3/im_widget.ui:63 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 msgid "Input Method" msgstr "入力メソッド" @@ -100,7 +102,7 @@ msgid "Keyboard layout:" msgstr "キーボードレイアウト:" -#: gtk3/im_dialog.ui:80 gtk3/im_widget.ui:75 +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 msgid "Language" msgstr "言語" @@ -109,11 +111,11 @@ msgid "No configuration option for %s." msgstr "%s に設定オプションはありません" -#: gtk/im_widget.c:115 gtk3/im_dialog.ui:100 +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 msgid "Only Show Current Language" msgstr "現在の言語のみ表示" -#: gtk3/config_widget.c:432 gtk3/config_widget.c:521 gtk/config_widget.c:270 +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 msgid "Other" msgstr "その他" @@ -129,7 +131,7 @@ msgid "Search Input Method" msgstr "入力メソッドの検索" -#: gtk3/config_widget.c:606 +#: gtk3/config_widget.c:614 msgid "Show Advance Option" msgstr "拡張オプションの表示" @@ -149,3 +151,13 @@ #: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 msgid "Unspecified" 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 "OK(_O)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/po/zh_CN.po new/fcitx-configtool-0.4.8/po/zh_CN.po --- old/fcitx-configtool-0.4.7/po/zh_CN.po 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/po/zh_CN.po 2013-10-27 01:45:38.000000000 +0200 @@ -10,10 +10,11 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-30 00:02-0400\n" -"PO-Revision-Date: 2013-06-30 02:40+0000\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-10-18 08:07+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" -"Language-Team: Chinese (China) <[email protected]>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/"; +"language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +78,7 @@ 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:68 gtk3/im_widget.ui:63 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 msgid "Input Method" msgstr "输入法" @@ -101,7 +102,7 @@ msgid "Keyboard layout:" msgstr "键盘布局：" -#: gtk3/im_dialog.ui:80 gtk3/im_widget.ui:75 +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 msgid "Language" msgstr "语言" @@ -110,11 +111,11 @@ msgid "No configuration option for %s." msgstr "%s 无配置选项。" -#: gtk/im_widget.c:115 gtk3/im_dialog.ui:100 +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 msgid "Only Show Current Language" msgstr "仅显示当前语言" -#: gtk3/config_widget.c:432 gtk3/config_widget.c:521 gtk/config_widget.c:270 +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 msgid "Other" msgstr "其他" @@ -130,7 +131,7 @@ msgid "Search Input Method" msgstr "搜索输入法" -#: gtk3/config_widget.c:606 +#: gtk3/config_widget.c:614 msgid "Show Advance Option" msgstr "显示高级选项" @@ -150,3 +151,13 @@ #: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 msgid "Unspecified" 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)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.7/po/zh_TW.po new/fcitx-configtool-0.4.8/po/zh_TW.po --- old/fcitx-configtool-0.4.7/po/zh_TW.po 2013-06-30 06:02:55.000000000 +0200 +++ new/fcitx-configtool-0.4.8/po/zh_TW.po 2013-10-27 01:45:38.000000000 +0200 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-29 18:02-0400\n" -"PO-Revision-Date: 2013-04-29 10:04+0000\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-10-26 18:35+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/"; "language/zh_TW/)\n" @@ -67,7 +67,7 @@ #: gtk3/sub_config_widget.c:287 msgid "Didn't install related component." -msgstr "" +msgstr "沒有安裝相關組件。" #: gtk3/keygrab.c:66 gtk3/keygrab.c:181 gtk/keygrab.c:138 msgid "Empty" @@ -78,7 +78,7 @@ 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:68 gtk3/im_widget.ui:63 +#: gtk/main_window.c:300 gtk3/im_dialog.ui:74 gtk3/im_widget.ui:63 msgid "Input Method" msgstr "輸入法" @@ -102,7 +102,7 @@ msgid "Keyboard layout:" msgstr "鍵盤配置：" -#: gtk3/im_dialog.ui:80 gtk3/im_widget.ui:75 +#: gtk3/im_dialog.ui:86 gtk3/im_widget.ui:75 msgid "Language" msgstr "語言" @@ -111,11 +111,11 @@ msgid "No configuration option for %s." msgstr "%s 無設定選項。" -#: gtk/im_widget.c:115 gtk3/im_dialog.ui:100 +#: gtk/im_widget.c:115 gtk3/im_dialog.ui:106 msgid "Only Show Current Language" msgstr "僅顯示目前的語言" -#: gtk3/config_widget.c:432 gtk3/config_widget.c:521 gtk/config_widget.c:270 +#: gtk3/config_widget.c:432 gtk3/config_widget.c:529 gtk/config_widget.c:270 msgid "Other" msgstr "其他" @@ -131,7 +131,7 @@ msgid "Search Input Method" msgstr "搜尋輸入法" -#: gtk3/config_widget.c:606 +#: gtk3/config_widget.c:614 msgid "Show Advance Option" msgstr "顯示進階選項" @@ -151,3 +151,13 @@ #: gtk3/gdm-languages.c:697 gtk/gdm-languages.c:697 msgid "Unspecified" 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)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
