Hello community, here is the log from the commit of package fcitx-configtool for openSUSE:Factory checked in at 2012-10-16 11:30:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-configtool (Old) and /work/SRC/openSUSE:Factory/.fcitx-configtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-configtool", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-configtool/fcitx-configtool.changes 2012-09-20 15:25:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-configtool.new/fcitx-configtool.changes 2012-10-16 11:30:44.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Oct 13 17:48:11 UTC 2012 - [email protected] + +- update version 0.4.5.1 + * many gtk3 fixes. + +------------------------------------------------------------------- Old: ---- fcitx-configtool-0.4.5.tar.bz2 New: ---- fcitx-configtool-0.4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-configtool.spec ++++++ --- /var/tmp/diff_new_pack.OZ4e0o/_old 2012-10-16 11:30:45.000000000 +0200 +++ /var/tmp/diff_new_pack.OZ4e0o/_new 2012-10-16 11:30:45.000000000 +0200 @@ -23,7 +23,7 @@ %endif Name: fcitx-configtool -Version: 0.4.5 +Version: 0.4.5.1 Release: 0 Summary: GTK GUI config tool for FCITX License: GPL-2.0+ ++++++ fcitx-configtool-0.4.5.tar.bz2 -> fcitx-configtool-0.4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/gtk/im_widget.c new/fcitx-configtool-0.4.5.1/gtk/im_widget.c --- old/fcitx-configtool-0.4.5/gtk/im_widget.c 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/gtk/im_widget.c 2012-10-11 15:30:34.000000000 +0200 @@ -26,7 +26,7 @@ #include "gdm-languages.h" #include "im.h" -G_DEFINE_TYPE(FcitxImWidget, fcitx_im_widget, GTK_TYPE_HBOX) +G_DEFINE_TYPE(FcitxImWidget, fcitx_im_widget, GTK_TYPE_VBOX) enum { AVAIL_TREE_IM_STRING, @@ -77,6 +77,7 @@ static void fcitx_im_widget_init(FcitxImWidget* self) { + GtkWidget* hbox = gtk_hbox_new(FALSE, 0); self->availimstore = gtk_tree_store_new(AVAIL_N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); self->filtermodel = gtk_tree_model_filter_new(GTK_TREE_MODEL(self->availimstore), NULL); @@ -123,7 +124,7 @@ gtk_container_add(GTK_CONTAINER(scrolledwindow), self->availimview); gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(vbox), self->onlycurlangcheckbox, FALSE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(self), vbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5); vbox = gtk_vbox_new(FALSE, 0); @@ -140,7 +141,7 @@ gtk_box_pack_start(GTK_BOX(vbox), self->delimbutton, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(""), TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(self), vbox, FALSE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, TRUE, 5); label = gtk_label_new(_("Current Input Method")); @@ -166,7 +167,7 @@ gtk_container_add(GTK_CONTAINER(scrolledwindow), self->imview); gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(self), GTK_WIDGET(vbox), TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(vbox), TRUE, TRUE, 5); vbox = gtk_vbox_new(FALSE, 0); @@ -183,7 +184,22 @@ gtk_box_pack_start(GTK_BOX(vbox), self->movedownbutton, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(""), TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(self), vbox, FALSE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, TRUE, 5); + + label = gtk_label_new(NULL); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_label_set_markup(GTK_LABEL(label), + _("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.")); + GtkWidget* image = gtk_image_new_from_stock(GTK_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON); + GtkWidget* infohbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(infohbox), gtk_label_new(NULL), TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(infohbox), image, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(infohbox), label, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(infohbox), gtk_label_new(NULL), TRUE, TRUE, 0); + + gtk_box_pack_start(GTK_BOX(self), hbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(self), infohbox, FALSE, TRUE, 0); 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.5/gtk/im_widget.h new/fcitx-configtool-0.4.5.1/gtk/im_widget.h --- old/fcitx-configtool-0.4.5/gtk/im_widget.h 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/gtk/im_widget.h 2012-10-11 15:30:34.000000000 +0200 @@ -46,7 +46,7 @@ #define IC_NAME_MAX 64 typedef struct { - GtkHBox parent; + GtkVBox parent; GtkTreeStore* availimstore; GtkListStore* imstore; GtkWidget* availimview; @@ -67,7 +67,7 @@ } FcitxImWidget; typedef struct { - GtkHBoxClass parent_class; + GtkVBoxClass parent_class; } FcitxImWidgetClass; GtkWidget* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/gtk3/config_widget.c new/fcitx-configtool-0.4.5.1/gtk3/config_widget.c --- old/fcitx-configtool-0.4.5/gtk3/config_widget.c 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/gtk3/config_widget.c 2012-10-11 15:30:34.000000000 +0200 @@ -42,7 +42,7 @@ #define D_(d, x) dgettext (d, x) #define RoundColor(c) ((c)>=0?((c)<=255?c:255):0) -G_DEFINE_TYPE(FcitxConfigWidget, fcitx_config_widget, GTK_TYPE_BOX) +G_DEFINE_TYPE(FcitxConfigWidget, fcitx_config_widget, GTK_TYPE_GRID) typedef struct { int i; @@ -200,12 +200,13 @@ argument = *inputWidget; break; case T_Font: { - *inputWidget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + *inputWidget = gtk_grid_new(); g_object_set(*inputWidget, "hexpand", TRUE, NULL); GtkWidget* arg = gtk_font_button_new(); GtkWidget *button = gtk_button_new_with_label(_("Clear font setting")); - gtk_box_pack_start(GTK_BOX(*inputWidget), arg, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(*inputWidget), button, FALSE, FALSE, 0); + g_object_set(arg, "hexpand", TRUE, NULL); + gtk_grid_attach(GTK_GRID(*inputWidget), arg, 0, 0, 1, 1); + gtk_grid_attach(GTK_GRID(*inputWidget), button, 1, 0, 2, 1); gtk_font_button_set_use_size(GTK_FONT_BUTTON(arg), FALSE); gtk_font_button_set_show_size(GTK_FONT_BUTTON(arg), FALSE); g_signal_connect(G_OBJECT(button), "clicked", (GCallback) set_none_font_clicked, arg); @@ -235,9 +236,9 @@ GtkWidget *button[2]; button[0] = keygrab_button_new(); button[1] = keygrab_button_new(); - *inputWidget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start(GTK_BOX(*inputWidget), button[0], FALSE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(*inputWidget), button[1], FALSE, TRUE, 0); + *inputWidget = gtk_grid_new(); + gtk_grid_attach(GTK_GRID(*inputWidget), button[0], 0, 0, 1, 1); + gtk_grid_attach(GTK_GRID(*inputWidget), button[1], 1, 0, 2, 1); g_object_set(G_OBJECT(button[0]), "hexpand", TRUE, NULL); g_object_set(G_OBJECT(button[1]), "hexpand", TRUE, NULL); if (oldarg) { @@ -409,7 +410,8 @@ gtk_grid_attach(GTK_GRID(configGrid), plabel, 0, 2, 1, 1); i ++; } - + gtk_widget_set_hexpand(configGrid, TRUE); + gtk_widget_set_vexpand(configGrid, TRUE); return configGrid; } @@ -429,7 +431,6 @@ if (codesc == NULL) continue; - GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); GtkWidget *grid = gtk_grid_new(); gtk_widget_set_margin_left(grid, 12); gtk_widget_set_margin_top(grid, 6); @@ -441,9 +442,8 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwnd), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwnd), grid); - gtk_box_pack_start(GTK_BOX(hbox), scrollwnd, TRUE, TRUE, 0); gtk_notebook_append_page(GTK_NOTEBOOK(configNotebook), - hbox, + scrollwnd, plabel); int i = 0; @@ -499,6 +499,8 @@ gtk_widget_set_size_request(configNotebook, 500, -1); gtk_notebook_set_scrollable(GTK_NOTEBOOK(configNotebook), TRUE); + gtk_widget_set_hexpand(configNotebook, TRUE); + gtk_widget_set_vexpand(configNotebook, TRUE); return configNotebook; } @@ -510,13 +512,13 @@ if (gtk_toggle_button_get_active(button)) { if (gtk_widget_get_parent(self->simpleWidget)) gtk_container_remove(GTK_CONTAINER(self), self->simpleWidget); - gtk_box_pack_start(GTK_BOX(self), self->fullWidget, TRUE, TRUE, 0); + gtk_grid_attach(GTK_GRID(self), self->fullWidget, 0, 0, 1, 1); gtk_widget_show_all(self->fullWidget); } else { if (gtk_widget_get_parent(self->fullWidget)) gtk_container_remove(GTK_CONTAINER(self), self->fullWidget); - gtk_box_pack_start(GTK_BOX(self), self->simpleWidget, TRUE, TRUE, 0); + gtk_grid_attach(GTK_GRID(self), self->simpleWidget, 0, 0, 1, 1); gtk_widget_show_all(self->simpleWidget); } } @@ -550,14 +552,14 @@ self->fullWidget = fcitx_config_widget_create_simple_ui(self, false); else self->fullWidget = fcitx_config_widget_create_full_ui(self); - gtk_box_pack_start(GTK_BOX(self), self->fullWidget, TRUE, TRUE, 0); + gtk_grid_attach(GTK_GRID(self), self->fullWidget, 0, 0, 1, 1); g_object_ref(self->fullWidget); } if (self->simpleWidget && self->fullWidget) { self->advanceCheckBox = gtk_check_button_new(); - gtk_box_pack_end(GTK_BOX(self), self->advanceCheckBox, FALSE, TRUE, 0); + 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")); g_signal_connect(self->advanceCheckBox, "toggled", (GCallback) _fcitx_config_widget_toggle_simple_full, self); @@ -569,7 +571,7 @@ } FcitxConfigWidget* -fcitx_config_widget_new(FcitxConfigFileDesc* cfdesc, const gchar* prefix, const gchar* name, const char* subconfig) +fcitx_config_widget_new(FcitxConfigFileDesc* cfdesc, const gchar* prefix, const gchar* name, const gchar* subconfig) { FcitxConfigWidget* widget = g_object_new(FCITX_TYPE_CONFIG_WIDGET, @@ -631,8 +633,8 @@ case T_Integer: { int i = *(int*) value; gtk_spin_button_set_value(GTK_SPIN_BUTTON(arg), i); + break; } - break; case T_Color: { int r = 0, g = 0, b = 0; FcitxConfigColor* rawcolor = (FcitxConfigColor*) value; @@ -648,23 +650,22 @@ #else gtk_color_button_set_rgba(GTK_COLOR_BUTTON(arg), &color); #endif + break; } - break; case T_Boolean: { boolean *bl = (boolean*) value; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(arg), *bl); + break; } - break; - case T_Font: { + case T_Font: gtk_font_button_set_font_name(GTK_FONT_BUTTON(arg), *(char**) value); - } - break; + break; case T_Enum: { int index = *(int*) value; gtk_combo_box_set_active(GTK_COMBO_BOX(arg), index); + break; } - break; case T_Hotkey: { FcitxHotkey* hotkey = (FcitxHotkey*) value; int j; @@ -674,14 +675,17 @@ GtkWidget *button = g_array_index(array, GtkWidget*, j); keygrab_button_set_key(KEYGRAB_BUTTON(button), hotkey[j].sym, hotkey[j].state); } + break; } - break; case T_File: - case T_Char: - case T_String: { + case T_String: gtk_entry_set_text(GTK_ENTRY(arg), *(char**) value); + break; + case T_Char: { + char str[2] = {*(char*)value}; + gtk_entry_set_text(GTK_ENTRY(arg), str); + break; } - break; } } else { if (codesc->type != T_I18NString && option->rawValue) { @@ -694,8 +698,8 @@ case T_Integer: { int* i = (int*) value; *i = gtk_spin_button_get_value(GTK_SPIN_BUTTON(arg));; + break; } - break; case T_Color: { GdkRGBA color; #if GTK_CHECK_VERSION(3,3,0) @@ -707,8 +711,8 @@ rawcolor->r = color.red; rawcolor->g = color.green; rawcolor->b = color.blue; + break; } - break; case T_Boolean: { boolean* bl = (boolean*) value; *bl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(arg)); @@ -734,13 +738,13 @@ fcitx_utils_string_swap(fontname, font); } fcitx_utils_free_string_list(array); + break; } - break; case T_Enum: { int* index = (int*) value; *index = gtk_combo_box_get_active(GTK_COMBO_BOX(arg)); + break; } - break; case T_Hotkey: { GArray *array = (GArray*) arg; FcitxHotkey* hotkey = value; @@ -753,17 +757,18 @@ fcitx_utils_string_swap(&hotkey[j].desc, keystring); fcitx_utils_free(keystring); } + break; } - break; case T_File: - case T_Char: case T_String: { char** str = (char**) value; fcitx_utils_string_swap(str, gtk_entry_get_text(GTK_ENTRY(arg))); + break; } - break; + case T_Char: + *(char*)value = *gtk_entry_get_text(GTK_ENTRY(arg)); + break; } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/gtk3/config_widget.h new/fcitx-configtool-0.4.5.1/gtk3/config_widget.h --- old/fcitx-configtool-0.4.5/gtk3/config_widget.h 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/gtk3/config_widget.h 2012-10-11 15:30:34.000000000 +0200 @@ -56,7 +56,7 @@ }; typedef struct { - GtkBox parent; + GtkGrid parent; FcitxConfigFileDesc* cfdesc; gchar* prefix; gchar* name; @@ -71,7 +71,7 @@ } FcitxConfigWidget; typedef struct { - GtkBoxClass parent_class; + GtkGridClass parent_class; } FcitxConfigWidgetClass; typedef enum { @@ -82,7 +82,7 @@ GType fcitx_config_widget_get_type(void); -FcitxConfigWidget* fcitx_config_widget_new(FcitxConfigFileDesc* cfdesc, const gchar* prefix, const gchar* name, const char* subconfig); +FcitxConfigWidget* fcitx_config_widget_new(FcitxConfigFileDesc* cfdesc, const gchar* prefix, const gchar* name, const gchar* subconfig); void fcitx_config_widget_response(FcitxConfigWidget* config_widget, ConfigWidgetAction action); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/gtk3/im_widget.c new/fcitx-configtool-0.4.5.1/gtk3/im_widget.c --- old/fcitx-configtool-0.4.5/gtk3/im_widget.c 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/gtk3/im_widget.c 2012-10-11 15:30:34.000000000 +0200 @@ -176,7 +176,19 @@ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); gtk_style_context_add_class (context, "inline-toolbar"); + GtkWidget* label = gtk_label_new(NULL); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_label_set_markup(GTK_LABEL(label), + _("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.")); + GtkWidget* image = gtk_image_new_from_stock(GTK_STOCK_ABOUT, GTK_ICON_SIZE_BUTTON); + GtkWidget* grid = gtk_grid_new(); + g_object_set(G_OBJECT(label), "hexpand", TRUE, NULL); + gtk_grid_attach(GTK_GRID(grid), image, 0, 0, 1, 1); + gtk_grid_attach(GTK_GRID(grid), label, 1, 0, 2, 1); + gtk_box_pack_start(GTK_BOX(self), scrolledwindow, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(self), grid, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(self), toolbar, FALSE, TRUE, 0); g_object_set(G_OBJECT(self), "margin", 5, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/po/fcitx-configtool.pot new/fcitx-configtool-0.4.5.1/po/fcitx-configtool.pot --- old/fcitx-configtool-0.4.5/po/fcitx-configtool.pot 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/po/fcitx-configtool.pot 2012-10-11 15:30:34.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-06 18:33-0400\n" +"POT-Creation-Date: 2012-09-29 12: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" @@ -23,16 +23,16 @@ msgstr "" #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/config_widget.c:270 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:479 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:478 msgid "Other" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:91 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:92 msgid "Available Input Method" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:101 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:152 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:102 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:153 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/main_window.c:278 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:98 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:86 @@ -40,17 +40,24 @@ msgid "Input Method" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:114 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:115 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:115 msgid "Only Show Current Language" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:145 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:146 msgid "Current Input Method" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:290 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:292 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:192 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:182 +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 "" + +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:306 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:308 msgid "Unknown" msgstr "" @@ -85,7 +92,7 @@ msgid "Addon" msgstr "" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:562 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:561 msgid "Show Advance Option" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/po/zh_CN.po new/fcitx-configtool-0.4.5.1/po/zh_CN.po --- old/fcitx-configtool-0.4.5/po/zh_CN.po 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/po/zh_CN.po 2012-10-11 15:30:34.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-06 18:33-0400\n" -"PO-Revision-Date: 2012-09-06 18:34-0400\n" +"POT-Creation-Date: 2012-09-29 12:07-0400\n" +"PO-Revision-Date: 2012-09-29 12:08-0400\n" "Last-Translator: Weng Xuetian <[email protected]>\n" "Language-Team: Chinese Simplified <[email protected]>\n" "Language: zh_CN\n" @@ -36,7 +36,7 @@ msgid "Appearance" msgstr "外观" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:91 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:92 msgid "Available Input Method" msgstr "可用的输入法" @@ -54,7 +54,7 @@ msgid "Configure" msgstr "配置 " -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:145 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:146 msgid "Current Input Method" msgstr "当前的输入法" @@ -82,8 +82,8 @@ msgid "Global Config" msgstr "全局配置" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:101 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:152 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:102 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:153 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/main_window.c:278 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:98 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:86 @@ -112,13 +112,13 @@ msgid "No configuration option for %s." msgstr "%s 无配置选项。" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:114 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:115 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:115 msgid "Only Show Current Language" msgstr "仅显示当前语言" #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/config_widget.c:270 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:479 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:478 msgid "Other" msgstr "其他" @@ -135,12 +135,19 @@ msgid "Search Input Method" msgstr "搜索输入法" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:562 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:561 msgid "Show Advance Option" msgstr "显示高级选项" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:290 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:292 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:192 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:182 +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>放在第一个。" + +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:306 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:308 msgid "Unknown" msgstr "未知" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-configtool-0.4.5/po/zh_TW.po new/fcitx-configtool-0.4.5.1/po/zh_TW.po --- old/fcitx-configtool-0.4.5/po/zh_TW.po 2012-09-11 21:40:29.000000000 +0200 +++ new/fcitx-configtool-0.4.5.1/po/zh_TW.po 2012-10-11 15:30:34.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-06 18:33-0400\n" -"PO-Revision-Date: 2012-09-06 18:35-0400\n" +"POT-Creation-Date: 2012-09-29 12:07-0400\n" +"PO-Revision-Date: 2012-09-29 12:18-0400\n" "Last-Translator: Weng Xuetian <[email protected]>\n" "Language-Team: Chinese Simplified <[email protected]>\n" "Language: zh_TW\n" @@ -37,7 +37,7 @@ msgid "Appearance" msgstr "外观" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:91 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:92 msgid "Available Input Method" msgstr "可用輸入法" @@ -55,7 +55,7 @@ msgid "Configure" msgstr "設定" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:145 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:146 msgid "Current Input Method" msgstr "目前輸入法" @@ -83,8 +83,8 @@ msgid "Global Config" msgstr "全局設定" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:101 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:152 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:102 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:153 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/main_window.c:278 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:98 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:86 @@ -113,13 +113,13 @@ msgid "No configuration option for %s." msgstr "%s 無設定選項。" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:114 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:115 #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_dialog.c:115 msgid "Only Show Current Language" msgstr "僅顯示当前語言" #: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/config_widget.c:270 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:479 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:478 msgid "Other" msgstr "其他" @@ -136,12 +136,19 @@ msgid "Search Input Method" msgstr "搜尋輸入法" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:562 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/config_widget.c:561 msgid "Show Advance Option" msgstr "顯示高級選項" -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:290 -#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:292 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:192 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk3/im_widget.c:182 +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>放到第一個。" + +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:306 +#: /home/saber/Develop/fcitx-configtool/build/po/../..//gtk/im_widget.c:308 msgid "Unknown" msgstr "未知" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
