diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | engine/engine.py | 10 | ||||
| -rw-r--r-- | po/ja.po | 36 | ||||
| -rw-r--r-- | setup/anthyprefs.py | 2 | ||||
| -rw-r--r-- | setup/setup.glade | 12 |
5 files changed, 31 insertions, 30 deletions
@@ -1,6 +1,7 @@ Huang Peng <shawn.p.huang@gmail.com> Hideaki ABE <abe.sendai@gmail.com> +Takao Fujiwara <takao.fujiwara1@gmail.com> Translators: ----------- diff --git a/engine/engine.py b/engine/engine.py index 2b0bddd..7069b0a 100644 --- a/engine/engine.py +++ b/engine/engine.py @@ -71,16 +71,16 @@ CONV_MODE_PREDICTION = range(14) CLIPBOARD_RECONVERT = range(1) KP_Table = {} -for k, v in zip(['KP_Add', 'KP_Decimal', 'KP_Divide', 'KP_Enter', 'KP_Equal', - 'KP_Multiply', 'KP_Separator', 'KP_Space', 'KP_Subtract'], - ['plus', 'period', 'slash', 'Return', 'equal', - 'asterisk', 'comma', 'space', 'minus']): - KP_Table[keysyms.__getattribute__(k)] = keysyms.__getattribute__(v) for s in dir(keysyms): if s.startswith('KP_'): v = keysyms.name_to_keycode(s[3:]) if v: KP_Table[keysyms.name_to_keycode(s)] = v +for k, v in zip(['KP_Add', 'KP_Decimal', 'KP_Divide', 'KP_Enter', 'KP_Equal', + 'KP_Multiply', 'KP_Separator', 'KP_Space', 'KP_Subtract'], + ['plus', 'period', 'slash', 'Return', 'equal', + 'asterisk', 'comma', 'space', 'minus']): + KP_Table[keysyms.__getattribute__(k)] = keysyms.__getattribute__(v) class Engine(ibus.EngineBase): __typing_mode = jastring.TYPING_MODE_ROMAJI @@ -148,24 +148,16 @@ msgid "_Period Style:" msgstr "句読点スタイル(_P):" #: setup/setup.glade:155 -msgid "Ten _Key Type:" +msgid "Numpad _Key Type:" msgstr "テンキータイプ(_K):" #: setup/setup.glade:169 msgid "" -"Ten Key Mode\n" -"Usual Mode\n" +"Keep Numpad Codes\n" +"Convert Characters\n" msgstr "" "テンキーコードのまま\n" -"非テンキーコードに変換\n" - -#: setup/setup.glade:185 -msgid "" -"、。\n" -"，．\n" -msgstr "" -"、。\n" -"，．\n" +"文字を変換\n" #: setup/setup.glade:200 msgid "_Behavior on Period:" @@ -218,8 +210,8 @@ msgid "<b>Other</b>" msgstr "<b>その他</b>" #: setup/setup.glade:410 -msgid "Co_mmon" -msgstr "全般(_M)" +msgid "_General" +msgstr "全般(_G)" #: setup/setup.glade:431 msgid "_Shortcut Type:" @@ -261,7 +253,7 @@ msgstr "" #: setup/setup.glade:601 msgid "Abo_ut" -msgstr "このプログラムについて(_U)" +msgstr "情報(_U)" #: setup/setup.glade:685 msgid "Edit Shortcut" @@ -271,10 +263,6 @@ msgstr "ショートカットの編集" msgid "Key Code:" msgstr "キーコード:" -#: setup/setup.glade:743 -msgid "..." -msgstr "..." - #: setup/setup.glade:770 msgid "Modifier:" msgstr "キー修飾:" @@ -290,3 +278,13 @@ msgstr "Co_ntrol" #: setup/setup.glade:809 msgid "_Shift" msgstr "_Shift" + +#~ msgid "" +#~ "、。\n" +#~ "，．\n" +#~ msgstr "" +#~ "、。\n" +#~ "，．\n" + +#~ msgid "..." +#~ msgstr "..." diff --git a/setup/anthyprefs.py b/setup/anthyprefs.py index af15139..24631c9 100644 --- a/setup/anthyprefs.py +++ b/setup/anthyprefs.py @@ -102,7 +102,7 @@ _config = { 'typing_method': 0, 'period_style': 0, - 'ten_key_mode': 0, + 'ten_key_mode': 1, 'behivior_on_focus_out': 0, 'behivior_on_period': 0, diff --git a/setup/setup.glade b/setup/setup.glade index 770658d..bf433f0 100644 --- a/setup/setup.glade +++ b/setup/setup.glade @@ -153,7 +153,7 @@ Thumb shift</property> <widget class="GtkLabel" id="label26"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ten _Key Type:</property> + <property name="label" translatable="yes">Numpad _Key Type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ten_key_mode</property> </widget> @@ -167,8 +167,8 @@ Thumb shift</property> <child> <widget class="GtkComboBox" id="ten_key_mode"> <property name="visible">True</property> - <property name="items" translatable="yes">Ten Key Mode -Usual Mode + <property name="items" translatable="yes">Keep Numpad Codes +Convert Characters </property> <signal name="changed" handler="on_cb_changed"/> </widget> @@ -374,7 +374,7 @@ Hold <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_ck_toggled"/> - <accelerator key="h" signal="activate" modifiers="GDK_MOD1_MASK"/> + <accelerator key="v" signal="activate" modifiers="GDK_MOD1_MASK"/> </widget> <packing> <property name="top_attach">3</property> @@ -408,7 +408,7 @@ Hold <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label" translatable="yes">Co_mmon</property> + <property name="label" translatable="yes">_General</property> <property name="use_underline">True</property> <property name="mnemonic_widget">vbox1</property> </widget> @@ -1023,6 +1023,8 @@ URL : http://code.google.com/p/ibus/ <property name="buttons">cancel</property> <property name="text">Please press a key (or a key combination)</property> <property name="secondary_text">The dialog willbe closed when the key is released</property> + <signal name="key_press_event" handler="on_key_input_dialog_key_press_event"/> + <signal name="key_release_event" handler="on_key_input_dialog_key_release_event"/> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox8"> <property name="visible">True</property> |