[uim-commit] r515 - in trunk: helper po

makeinu at freedesktop.org makeinu at freedesktop.org
Fri Feb 4 00:07:51 PST 2005 

Author: makeinu
Date: 2005-02-04 00:07:49 -0800 (Fri, 04 Feb 2005)
New Revision: 515

Modified:
   trunk/helper/input-pad-ja.c
   trunk/helper/pref-gtk.c
   trunk/po/ja.po
Log:
* helper/pref-gtk.c 
  - (sync_value_bool): New function to unify synchronizing view.
  - (sync_value_int): Ditto.
  - (sync_value_string): Ditto.
  - (sync_value_choice): Ditto.
  - (update_custom_type_int_cb): Ditto
  - (update_custom_type_bool_cb): Use above function.
  - (add_custom_type_bool): Ditto
  - (update_custom_type_int_cb) Ditto
  - (add_custom_type_integer): Ditto
  - (update_custom_type_string_cb): Ditto
  - (add_custom_type_string_cb): Ditto
  - (update_custom_type_choice_cb): Ditto
  - (add_custom_type_choice_cb): Ditto
--Tthi/e line, and those below, will be ignored--

M    po/ja.po
M    helper/pref-gtk.c
M    helper/input-pad-ja.c


Modified: trunk/helper/input-pad-ja.c
===================================================================
--- trunk/helper/input-pad-ja.c	2005-02-04 04:15:57 UTC (rev 514)
+++ trunk/helper/input-pad-ja.c	2005-02-04 08:07:49 UTC (rev 515)
@@ -127,6 +127,91 @@
   NULL
 };
 
+gchar *kigou[] = {
+  "○", "●", "◎", "♂", "♀",
+  "☆", "★", "□", "■", "△",
+  "▲", "▽", "▼", "〒",
+  NULL
+};
+
+gchar *bracket[] = {
+  "‘", "’", "“", "”", "（",
+  "）", "〔", "〕", "［", "］",
+  "｛", "｝", "〈", "〉", "《",
+  "》", "「", "」", "『", "』",
+  "【", "】", "〝", "〟",
+  NULL
+};
+
+gchar *arrow[] = {
+  "→", "←", "↑", "↓",
+  NULL
+};
+
+gchar *omission[] = {
+  "㍻", "№", "㏍", "℡", "㊤",
+  "㊥", "㊦", "㊧", "㊨", "㈱",
+  "㈲", "㈹", "㍾", "㍽", "㍼",
+  "™", "©", "®",
+  NULL
+};
+
+gchar *unit[] = {
+  "℃", "￥", "＄", "£",
+  "％", "㍉", "㌔", "㌢", "㍍",
+  "㌘", "㌧", "㌃", "㌶", "㍑",
+  "㍗", "㌍", "㌦", "㌣", "㌫",
+  "㍊", "㌻", "㎜", "㎝", "㎞",
+  "㎎", "㎏", "㏄", "ℓ",  "㎟",
+  "㎠", "㎡", "㎢", "㎣", "㎤",
+  "㎥", "㎦", "Å", "‰",
+};
+
+gchar *dot[] = {
+  "、", "。", "，", "．", "・",
+  "：", "；", "？", "！", "゛",
+  "゜", "´", "｀", "¨", "＾",
+  "ヽ", "ヾ", "ゝ", "ゞ", "〃",
+  "…", "‥", "°", "′", "″",
+  NULL
+};
+
+gchar *academic[] = {
+  "＋", "－", "±", "×", "÷",
+  "＝", "≠", "＜", "＞", "≦",
+  "≧", "∞", "∴", "≒", "≡",
+  "∫", "∮", "∑", "√", "⊥",
+  "∠", "∟", "⊿", "∵", "∩",
+  "∪", "∈", "∋", "⊆", "⊇",
+  "⊂", "⊃", "∧", "∨", "￢",
+  "⇒", "⇔", "∀", "∃", "⌒",
+  "∂", "∇", "≪", "≫", "∽",
+  "∝", "∬",
+  NULL
+};
+
+gchar *number[] = {
+  "①", "②", "③", "④", "⑤",
+  "⑥", "⑦", "⑧", "⑨", "⑩",
+  "⑪", "⑫", "⑬", "⑭", "⑮",
+  "⑯", "⑰", "⑱", "⑲", "⑳",
+  "â… ", "â…¡", "â…¢", "â…£", "â…¤",
+  "â…¦", "â…§", "â…¨", "â…©", "â…°",
+  "â…±", "â…²", "â…³", "â…´", "â…µ",
+  "â…¶", "â…·", "â…¸", "â…¹",
+};
+
+gchar *line[] = {
+  "─", "│", "┌", "┐", "┘",
+  "└", "├", "┬", "┤", "┴",
+  "┴", "┼", "━", "┏", "┓",
+  "┛", "┗", "┣", "┳", "┫",
+  "┻", "╋", "┠", "┯", "┨",
+  "┷", "┿", "┝", "┰", "┥",
+  "┸", "╂",
+  NULL
+};
+
 static int uim_fd = -1;
 
 static GtkWidget *buttontable_create(char **table, int tablelen);
@@ -210,6 +295,20 @@
 }
 
 static GtkWidget *
+create_tab(gchar *table[], guint len)
+{
+  GtkWidget *vbox;
+
+  vbox = gtk_vbox_new(FALSE, 10);
+
+  gtk_box_pack_start(GTK_BOX(vbox),
+		     buttontable_create(table, len),
+		     FALSE, FALSE, 0);
+
+  return vbox;
+}
+
+static GtkWidget *
 create_hiragana_tab(void)
 {
   GtkWidget *vbox;
@@ -288,6 +387,7 @@
   GtkWidget *notebook;
   
   notebook = gtk_notebook_new();
+  gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
 			   create_hiragana_tab(),
 			   gtk_label_new(_("hiragana")));
@@ -297,6 +397,33 @@
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
 			   create_eisu_tab(),
 			   gtk_label_new(_("eisu")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(kigou, sizeof(kigou)/sizeof(gchar*)),
+			   gtk_label_new(_("symbol")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(bracket, sizeof(bracket)/sizeof(gchar*)),
+			   gtk_label_new(_("bracket")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(arrow, sizeof(arrow)/sizeof(gchar*)),
+			   gtk_label_new(_("arrow")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(omission, sizeof(omission)/sizeof(gchar*)),
+			   gtk_label_new(_("omission")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(unit, sizeof(unit)/sizeof(gchar*)),
+			   gtk_label_new(_("unit")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(dot, sizeof(dot)/sizeof(gchar*)),
+			   gtk_label_new(_("dot")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(number, sizeof(number)/sizeof(gchar*)),
+			   gtk_label_new(_("number")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(academic, sizeof(academic)/sizeof(gchar*)),
+			   gtk_label_new(_("academic")));
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+			   create_tab(line, sizeof(line)/sizeof(gchar*)),
+			   gtk_label_new(_("line")));
   return notebook;
 }
 

Modified: trunk/helper/pref-gtk.c
===================================================================
--- trunk/helper/pref-gtk.c	2005-02-04 04:15:57 UTC (rev 514)
+++ trunk/helper/pref-gtk.c	2005-02-04 08:07:49 UTC (rev 515)
@@ -296,24 +296,39 @@
   uim_custom_free(custom);
 }
 
-
 static void
-update_custom_type_bool_cb(void *ptr, const char *custom_sym)
+sync_value_bool(GtkCheckButton *button)
 {
-  struct uim_custom *custom = uim_custom_get(custom_sym);
-  GtkWidget *check_button = GTK_WIDGET(ptr);
-  
-  if (!custom || custom->type != UCustom_Bool)
-    return;
+  const char *custom_sym;
+  struct uim_custom *custom;
 
-  gtk_widget_set_sensitive(check_button, custom->is_active);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button),
-			       custom->value->as_bool);
+  g_signal_handlers_block_by_func(G_OBJECT(button),
+				  (gpointer) custom_check_button_toggled_cb,
+				  NULL);
 
+  custom_sym = g_object_get_data(G_OBJECT(button), OBJECT_DATA_UIM_CUSTOM_SYM);
+  g_return_if_fail(custom_sym);
+
+  custom = uim_custom_get(custom_sym);
+  g_return_if_fail(custom && custom->type == UCustom_Bool);
+
+  gtk_widget_set_sensitive(GTK_WIDGET(button), custom->is_active);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), custom->value->as_bool);
+
   uim_custom_free(custom);
+
+  g_signal_handlers_unblock_by_func(G_OBJECT(button),
+				    (gpointer) custom_check_button_toggled_cb,
+				    NULL);
 }
 
 static void
+update_custom_type_bool_cb(void *ptr, const char *custom_sym)
+{
+  sync_value_bool(GTK_CHECK_BUTTON(ptr));
+}
+
+static void
 add_custom_type_bool(GtkWidget *vbox, struct uim_custom *custom)
 {
   GtkWidget *hbox;
@@ -325,9 +340,7 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
 
-  gtk_widget_set_sensitive(check_button, custom->is_active);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button),
-			       custom->value->as_bool);
+  sync_value_bool(GTK_CHECK_BUTTON(check_button));
 
   g_signal_connect(G_OBJECT(check_button), "toggled",
 		   G_CALLBACK(custom_check_button_toggled_cb), NULL);
@@ -364,6 +377,42 @@
 }
 
 static void
+sync_value_int(GtkAdjustment *adj)
+{
+  const char *custom_sym;
+  struct uim_custom *custom;
+
+  g_signal_handlers_block_by_func(G_OBJECT(adj),
+				  (gpointer) custom_adjustment_value_changed,
+				  NULL);
+
+  custom_sym = g_object_get_data(G_OBJECT(adj), OBJECT_DATA_UIM_CUSTOM_SYM);
+  g_return_if_fail(custom_sym);
+
+  custom = uim_custom_get(custom_sym);
+  g_return_if_fail(custom && custom->type == UCustom_Int);
+
+  /* gtk_widget_set_sensitive(GTK_WIDGET(widget), custom->is_active); */
+
+  adj->value = custom->value->as_int;
+  adj->lower = custom->range->as_int.min;
+  adj->upper = custom->range->as_int.max;
+  gtk_adjustment_changed(adj);
+
+  uim_custom_free(custom);
+
+  g_signal_handlers_unblock_by_func(G_OBJECT(adj),
+				    (gpointer) custom_adjustment_value_changed,
+				    NULL);
+}
+
+static void
+update_custom_type_int_cb(void *ptr, const char *custom_sym)
+{
+  sync_value_int(GTK_ADJUSTMENT(ptr));
+}
+
+static void
 add_custom_type_integer(GtkWidget *vbox, struct uim_custom *custom)
 {
   GtkWidget *hbox;
@@ -391,8 +440,11 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
 
+  sync_value_int(adjustment);
+
   g_signal_connect(G_OBJECT(adjustment), "value-changed",
 		   G_CALLBACK(custom_adjustment_value_changed), NULL);
+  uim_custom_cb_add(custom->symbol, adjustment, update_custom_type_int_cb);
 }
 
 static void
@@ -435,23 +487,46 @@
   uim_custom_free(custom);
 }
 
-
 static void
-update_custom_type_string_cb(void *ptr, const char *custom_sym)
+sync_value_string(GtkEntry *entry)
 {
-  struct uim_custom *custom = uim_custom_get(custom_sym);
-  GtkWidget *entry = GTK_WIDGET(ptr);
-  
-  if (!custom || custom->type != UCustom_Str)
-    return;
-  
-  gtk_widget_set_sensitive(entry, custom->is_active);
-  gtk_entry_set_text(GTK_ENTRY(entry), custom->value->as_str);
+  const char *custom_sym;
+  struct uim_custom *custom;
 
+  g_signal_handlers_block_by_func(G_OBJECT(entry),
+				  (gpointer) custom_entry_changed_cb,
+				  NULL);
+
+  custom_sym = g_object_get_data(G_OBJECT(entry), OBJECT_DATA_UIM_CUSTOM_SYM);
+  g_return_if_fail(custom_sym);
+
+  custom = uim_custom_get(custom_sym);
+  g_return_if_fail(custom &&
+		   (custom->type == UCustom_Str ||
+		    custom->type == UCustom_Pathname));
+
+  if (custom->type == UCustom_Str) {
+    gtk_widget_set_sensitive(GTK_WIDGET(entry), custom->is_active);
+    gtk_entry_set_text(GTK_ENTRY(entry), custom->value->as_str);
+  } else if (custom->type == UCustom_Pathname) {
+    gtk_widget_set_sensitive(GTK_WIDGET(entry)->parent, custom->is_active);
+    gtk_entry_set_text(GTK_ENTRY(entry), custom->value->as_pathname);
+  }
+
   uim_custom_free(custom);
+
+  g_signal_handlers_unblock_by_func(G_OBJECT(entry),
+				    (gpointer) custom_entry_changed_cb,
+				    NULL);
 }
 
 static void
+update_custom_type_string_cb(void *ptr, const char *custom_sym)
+{
+  sync_value_string(GTK_ENTRY(ptr));
+}
+
+static void
 add_custom_type_string(GtkWidget *vbox, struct uim_custom *custom)
 {
   GtkWidget *hbox;
@@ -471,8 +546,7 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
 
-  gtk_widget_set_sensitive(entry, custom->is_active);
-  gtk_entry_set_text(GTK_ENTRY(entry), custom->value->as_str);
+  sync_value_string(GTK_ENTRY(entry));
 
   g_signal_connect(G_OBJECT(entry), "changed",
 		   G_CALLBACK(custom_entry_changed_cb), NULL);
@@ -529,8 +603,7 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
 
-  gtk_widget_set_sensitive(entry, custom->is_active);
-  gtk_entry_set_text(GTK_ENTRY(entry), custom->value->as_pathname);
+  sync_value_string(GTK_ENTRY(entry));
 
   g_signal_connect(G_OBJECT(entry), "changed",
 		   G_CALLBACK(custom_entry_changed_cb), NULL);
@@ -589,26 +662,28 @@
 }
 
 static void
-update_custom_type_choice_cb(void *ptr, const char *custom_sym)
+sync_value_choice(GtkComboBox *combobox)
 {
-  struct uim_custom *custom = uim_custom_get(custom_sym);
-  GtkWidget *combobox = GTK_WIDGET(ptr);
+  const char *custom_sym;
+  struct uim_custom *custom;
   struct uim_custom_choice **item;
   gint i = 0, default_index = 0;
   gchar *default_symbol;
 
-  if (!custom || custom->type != UCustom_Choice)
-    return;
-  
-  gtk_widget_set_sensitive(combobox, custom->is_active);
+  custom_sym = g_object_get_data(G_OBJECT(combobox), OBJECT_DATA_UIM_CUSTOM_SYM);
+  g_return_if_fail(custom_sym);
 
+  custom = uim_custom_get(custom_sym);
+  g_return_if_fail (custom && custom->type == UCustom_Choice);
+
   item = custom->range->as_choice.valid_items;
   if(item == NULL || *item == NULL) {
     uim_custom_free(custom);
     return;
   }
   
-  g_signal_handlers_disconnect_by_func(G_OBJECT(combobox), (gpointer)custom_combo_box_changed, NULL);
+  g_signal_handlers_block_by_func(G_OBJECT(combobox),
+				  (gpointer)custom_combo_box_changed, NULL);
 
   gtk_list_store_clear(GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox))));
   
@@ -622,21 +697,27 @@
     item++;
   }
   gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), default_index);
-  g_signal_connect(G_OBJECT(combobox), "changed",
-		   G_CALLBACK(custom_combo_box_changed), NULL);
 
+  gtk_widget_set_sensitive(GTK_WIDGET(combobox), custom->is_active);
+
+  g_signal_handlers_unblock_by_func(G_OBJECT(combobox),
+				    (gpointer)custom_combo_box_changed, NULL);
+
   uim_custom_free(custom);
 }
 
 static void
+update_custom_type_choice_cb(void *ptr, const char *custom_sym)
+{
+  sync_value_choice(GTK_COMBO_BOX(ptr));
+}
+
+static void
 add_custom_type_choice(GtkWidget *vbox, struct uim_custom *custom)
 {
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *combobox;
-  struct uim_custom_choice **item;
-  gint i, default_index = 0;
-  gchar *default_symbol;
 
   hbox = gtk_hbox_new(FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
@@ -651,20 +732,10 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
   
-  default_symbol = custom->value->as_choice->symbol;
+  sync_value_choice(GTK_COMBO_BOX(combobox));
 
-  for(i = 0, item = custom->range->as_choice.valid_items; *item; i++, item++) {
-    gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-			      (*item)->label);
-    if(!strcmp(default_symbol, (*item)->symbol))
-      default_index = i;
-  }
-  gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), default_index);
-  gtk_widget_set_sensitive(combobox, custom->is_active);
-
   g_signal_connect(G_OBJECT(combobox), "changed",
 		   G_CALLBACK(custom_combo_box_changed), NULL);
-
   uim_custom_cb_add(custom->symbol, combobox, update_custom_type_choice_cb);
 }
 
@@ -705,6 +776,7 @@
   }
 
   gtk_entry_set_text(GTK_ENTRY(entry), str->str);
+  gtk_widget_set_sensitive(GTK_WIDGET(entry)->parent, custom->is_active);
 
   g_string_free(str, TRUE);
   uim_custom_free(custom);
@@ -1079,7 +1151,6 @@
     olist_pref_entry_set_value(GTK_ENTRY(olist_entry));
     olist_pref_tree_view_set_value(GTK_ENTRY(olist_entry), TRUE, TRUE);
     value_changed = TRUE;
-    /* FIXME! reset the selection */
   } else {
     /* error message */
   }
@@ -1365,6 +1436,7 @@
   g_object_set_data_full(G_OBJECT(entry),
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
+
   olist_pref_entry_set_value(GTK_ENTRY(entry));
 
   g_signal_connect(G_OBJECT(button), "clicked",
@@ -1607,6 +1679,7 @@
   }
 
   gtk_entry_set_text(GTK_ENTRY(entry), str->str);
+  gtk_widget_set_sensitive(GTK_WIDGET(entry)->parent, custom->is_active);
 
   g_string_free(str, TRUE);
   uim_custom_free(custom);
@@ -1950,6 +2023,7 @@
 			 OBJECT_DATA_UIM_CUSTOM_SYM, g_strdup(custom->symbol),
 			 (GDestroyNotify) g_free);
   gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+
   key_pref_entry_set_value(GTK_ENTRY(entry));
 
   button = gtk_button_new_with_label(_("Choose..."));

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2005-02-04 04:15:57 UTC (rev 514)
+++ trunk/po/ja.po	2005-02-04 08:07:49 UTC (rev 515)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uim 0.4.6-alpha1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-04 07:45+0900\n"
+"POT-Creation-Date: 2005-02-04 17:06+0900\n"
 "PO-Revision-Date: 2005-02-04 08:17+0900\n"
 "Last-Translator: YamaKen <yamaken at bp.iij4u.or.jp>\n"
 "Language-Team: Japanese <LL at li.org>\n"
@@ -352,55 +352,55 @@
 msgid "Group"
 msgstr "¥°¥ë¡¼¥×"
 
-#: helper/pref-gtk.c:483
+#: helper/pref-gtk.c:560
 msgid "Specify file"
 msgstr "¥Õ¥¡¥¤¥ë¤Î»ØÄê"
 
-#: helper/pref-gtk.c:526 qt/pref-customwidgets.cpp:168
+#: helper/pref-gtk.c:597 qt/pref-customwidgets.cpp:168
 msgid "File"
 msgstr "»²¾È"
 
-#: helper/pref-gtk.c:1109
+#: helper/pref-gtk.c:1271
 msgid "Enabled"
 msgstr "Í­¸ú"
 
-#: helper/pref-gtk.c:1135
+#: helper/pref-gtk.c:1297
 msgid "Enabled items"
 msgstr "Í­¸ú¤Ê¹àÌÜ"
 
-#: helper/pref-gtk.c:1213
+#: helper/pref-gtk.c:1375
 msgid "Disabled"
 msgstr "̵¸ú"
 
-#: helper/pref-gtk.c:1239
+#: helper/pref-gtk.c:1401
 msgid "Disabled items"
 msgstr "̵¸ú¤Ê¹àÌÜ"
 
-#: helper/pref-gtk.c:1273 helper/pref-gtk.c:1839
+#: helper/pref-gtk.c:1433 helper/pref-gtk.c:2029
 msgid "Choose..."
 msgstr "ÁªÂò..."
 
-#: helper/pref-gtk.c:1469
+#: helper/pref-gtk.c:1634
 msgid "Press any key to grab..."
 msgstr "¼èÆÀ¤¹¤ë¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤..."
 
-#: helper/pref-gtk.c:1705
+#: helper/pref-gtk.c:1894
 msgid "Key preference"
 msgstr "¥­¡¼ÀßÄê"
 
-#: helper/pref-gtk.c:1751
+#: helper/pref-gtk.c:1940
 msgid "_Shift"
 msgstr "_Shift"
 
-#: helper/pref-gtk.c:1756
+#: helper/pref-gtk.c:1945
 msgid "_Control"
 msgstr "_Control"
 
-#: helper/pref-gtk.c:1761
+#: helper/pref-gtk.c:1950
 msgid "_Alt"
 msgstr "_Alt"
 
-#: helper/pref-gtk.c:1777
+#: helper/pref-gtk.c:1966
 msgid "..."
 msgstr "..."
 
@@ -418,22 +418,58 @@
 msgid "Quit this toolbar"
 msgstr "¤³¤Î¥Ä¡¼¥ë¥Ð¡¼¤òÊĤ¸¤ë"
 
-#: helper/input-pad-ja.c:272
+#: helper/input-pad-ja.c:371
 msgid "ja-pad"
 msgstr ""
 
-#: helper/input-pad-ja.c:293
+#: helper/input-pad-ja.c:393
 msgid "hiragana"
 msgstr "¤Ò¤é¤¬¤Ê"
 
-#: helper/input-pad-ja.c:296
+#: helper/input-pad-ja.c:396
 msgid "katakana"
 msgstr "¥«¥¿¥«¥Ê"
 
-#: helper/input-pad-ja.c:299
+#: helper/input-pad-ja.c:399
 msgid "eisu"
 msgstr "񥨓"
 
+#: helper/input-pad-ja.c:402
+msgid "symbol"
+msgstr "µ­¹æ"
+
+#: helper/input-pad-ja.c:405
+msgid "bracket"
+msgstr "³ç¸Ì"
+
+#: helper/input-pad-ja.c:408
+msgid "arrow"
+msgstr "Ìð°õ"
+
+#: helper/input-pad-ja.c:411
+msgid "omission"
+msgstr "¾Êάµ­¹æ"
+
+#: helper/input-pad-ja.c:414
+msgid "unit"
+msgstr "ñ°Ì"
+
+#: helper/input-pad-ja.c:417
+msgid "dot"
+msgstr "ÅÀ"
+
+#: helper/input-pad-ja.c:420
+msgid "number"
+msgstr "¿ô»ú"
+
+#: helper/input-pad-ja.c:423
+msgid "academic"
+msgstr "³Ø½Ñ"
+
+#: helper/input-pad-ja.c:426
+msgid "line"
+msgstr "Àþ"
+
 #: qt/switcher-qt.cpp:115 qt/pref-qt.cpp:118 qt/pref-qt.cpp:258
 msgid "OK"
 msgstr ""
@@ -502,16 +538,17 @@
 #: scm/canna-key-custom.lisp:41 scm/canna-key-custom.lisp:45
 #: scm/generic-custom.lisp:37 scm/generic-custom.lisp:43
 #: scm/generic-custom.lisp:49 scm/generic-custom.lisp:55
-#: scm/generic-custom.lisp:61 scm/generic-key-custom.lisp:37
-#: scm/generic-key-custom.lisp:41 scm/im-custom.lisp:46 scm/im-custom.lisp:51
-#: scm/im-custom.lisp:56 scm/im-custom.lisp:61 scm/im-custom.lisp:66
-#: scm/im-custom.lisp:71 scm/im-custom.lisp:76 scm/im-custom.lisp:81
-#: scm/im-custom.lisp:86 scm/im-custom.lisp:94 scm/im-custom.lisp:101
-#: scm/im-custom.lisp:111 scm/im-custom.lisp:204 scm/im-custom.lisp:264
-#: scm/im-custom.lisp:280 scm/im-custom.lisp:286 scm/im-custom.lisp:292
-#: scm/im-custom.lisp:299 scm/prime-custom.lisp:58 scm/prime-custom.lisp:64
-#: scm/prime-custom.lisp:70 scm/prime-custom.lisp:76 scm/prime-custom.lisp:82
-#: scm/prime-custom.lisp:90 scm/prime-custom.lisp:96 scm/prime-custom.lisp:102
+#: scm/generic-custom.lisp:61 scm/generic-custom.lisp:67
+#: scm/generic-key-custom.lisp:37 scm/generic-key-custom.lisp:41
+#: scm/im-custom.lisp:46 scm/im-custom.lisp:51 scm/im-custom.lisp:56
+#: scm/im-custom.lisp:61 scm/im-custom.lisp:66 scm/im-custom.lisp:71
+#: scm/im-custom.lisp:76 scm/im-custom.lisp:81 scm/im-custom.lisp:86
+#: scm/im-custom.lisp:94 scm/im-custom.lisp:101 scm/im-custom.lisp:111
+#: scm/im-custom.lisp:204 scm/im-custom.lisp:264 scm/im-custom.lisp:280
+#: scm/im-custom.lisp:286 scm/im-custom.lisp:292 scm/im-custom.lisp:299
+#: scm/prime-custom.lisp:58 scm/prime-custom.lisp:64 scm/prime-custom.lisp:70
+#: scm/prime-custom.lisp:76 scm/prime-custom.lisp:82 scm/prime-custom.lisp:90
+#: scm/prime-custom.lisp:96 scm/prime-custom.lisp:102
 #: scm/prime-custom.lisp:145 scm/prime-custom.lisp:154
 #: scm/prime-key-custom.lisp:61 scm/prime-key-custom.lisp:65
 #: scm/prime-key-custom.lisp:69 scm/skk-custom.lisp:55 scm/skk-custom.lisp:61
@@ -974,6 +1011,11 @@
 msgid "Other input methods"
 msgstr "¤½¤Î¾¤ÎÆþÎÏÊý¼°"
 
+#: scm/generic-custom.lisp:66
+#, fuzzy
+msgid "Use dictionary search"
+msgstr "¸Ä¿Í¼­½ñ¥Õ¥¡¥¤¥ë"
+
 #: scm/generic-key-custom.lisp:36
 msgid "Global key bindings 1"
 msgstr "Á´ÂÎ¥­¡¼ÀßÄê 1"
@@ -2234,33 +2276,6 @@
 #~ msgid "Edit dictionary"
 #~ msgstr "¼­½ñ¤òÊÔ½¸"
 
-#~ msgid "symbol"
-#~ msgstr "µ­¹æ"
-
-#~ msgid "bracket"
-#~ msgstr "³ç¸Ì"
-
-#~ msgid "arrow"
-#~ msgstr "Ìð°õ"
-
-#~ msgid "omission"
-#~ msgstr "¾Êάµ­¹æ"
-
-#~ msgid "unit"
-#~ msgstr "ñ°Ì"
-
-#~ msgid "dot"
-#~ msgstr "ÅÀ"
-
-#~ msgid "number"
-#~ msgstr "¿ô»ú"
-
-#~ msgid "academic"
-#~ msgstr "³Ø½Ñ"
-
-#~ msgid "line"
-#~ msgstr "Àþ"
-
 #~ msgid "About Sumika"
 #~ msgstr "uim-dict¤Ë¤Ä¤¤¤Æ"

More information about the Uim-commit mailing list