Mercurial Mercurial > upstream > oracle > g11n > inputmethod / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug fix for 7060930 Menu names for input method/selector are not appropriate
authormkaz
Fri, 01 Jul 2011 03:38:17 +0900
changeset 694 aed1d741dbc7
parent 692 e11dc1087f6f
child 695 09df0025cbef
Bug fix for 7060930 Menu names for input method/selector are not appropriate
iiim/build/src/im-sdk/program/iiim-properties/iiim-properties.desktop file | annotate | diff | comparison | revisions
imf-selector/imf-selector.desktop.in file | annotate | diff | comparison | revisions
imf-selector/po/ja.po file | annotate | diff | comparison | revisions
specs/ext-sources/imf-selector-1.0.tar.gz file | annotate | diff | comparison | revisions
specs/ibus.spec file | annotate | diff | comparison | revisions
specs/patches/ibus-menu.patch.diff file | annotate | diff | comparison | revisions
specs/patches/scim-menu-patch.diff file | annotate | diff | comparison | revisions
specs/scim.spec file | annotate | diff | comparison | revisions 
--- a/iiim/build/src/im-sdk/program/iiim-properties/iiim-properties.desktop	Fri Jun 17 15:45:12 2011 +0900
+++ b/iiim/build/src/im-sdk/program/iiim-properties/iiim-properties.desktop	Fri Jul 01 03:38:17 2011 +0900
@@ -1,22 +1,22 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=IIIM Input Methods
-Name[bn]=IIIM ইনপুট পদ্ধতি
-Name[de]=IIIM Eingabemethoden
-Name[es]=IIIM Métodos de entrada
-Name[fr]=IIIM Méthodes d'entrée
-Name[gu]=IIIM ઈનપુટ પદ્ધતિઓ
-Name[hi]=IIIM आगत विधि
-Name[it]=IIIM Metodi di input
-Name[ja]=IIIM 入力方式
-Name[ko]=IIIM 입력 방법
-Name[pa]=IIIM ਇੰਪੁੱਟ ਢੰਗ
-Name[pt_BR]=IIIM Métodos de entrada
-Name[sv]=IIIM Indatametoder
-Name[ta]=IIIM உள்ளிடும் முறை
-Name[zh_CN]=IIIM 输入方法
-Name[zh_HK]=IIIM 輸入法
-Name[zh_TW]=IIIM 輸入法
+Name=Input Methods - IIIM
+Name[bn]=ইনপুট পদ্ধতি - IIIM
+Name[de]=Eingabemethoden - IIIM
+Name[es]=Métodos de entrada - IIIM
+Name[fr]=Méthodes d'entrée - IIIM
+Name[gu]=ઈનપુટ પદ્ધતિઓ - IIIM
+Name[hi]=आगत विधि - IIIM
+Name[it]=Metodi di input - IIIM
+Name[ja]=入力方式 - IIIM
+Name[ko]=입력 방법 - IIIM
+Name[pa]=ਇੰਪੁੱਟ ਢੰਗ - IIIM
+Name[pt_BR]=Métodos de entrada - IIIM
+Name[sv]=Indatametoder - IIIM
+Name[ta]=உள்ளிடும் முறை - IIIM
+Name[zh_CN]=输入方法 - IIIM
+Name[zh_HK]=輸入法 - IIIM
+Name[zh_TW]=輸入法 - IIIM
 Comment=Configure multilingual (keyboard) input preferences
 Comment[bn]=Configure multilingual (keyboard) input preferences
 Comment[de]=Configure multilingual (keyboard) input preferences
--- a/imf-selector/imf-selector.desktop.in	Fri Jun 17 15:45:12 2011 +0900
+++ b/imf-selector/imf-selector.desktop.in	Fri Jul 01 03:38:17 2011 +0900
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=Input Method
+_Name=Input Method Selector
 _GenericName=Input Method Selector
 _Comment=Input Method Selector
 Exec=imf-selector
--- a/imf-selector/po/ja.po	Fri Jun 17 15:45:12 2011 +0900
+++ b/imf-selector/po/ja.po	Fri Jul 01 03:38:17 2011 +0900
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-22 14:46+0900\n"
+"POT-Creation-Date: 2011-06-30 20:50+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -16,35 +16,50 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/imf-selector:64
+#: ../src/imf-selector:54
+#, c-format
+msgid ""
+"Notification:\n"
+"\n"
+"If you use ATOK or Wnn8 with Japanese type7 keyobard, you will need to set "
+"'Sun Japanese keyboard compatible' variant for Japanese keyboard. Please set "
+"it through setxkbmap, gnome-keyboard-properties or GDM keyboard menu. \n"
+"\n"
+"% setxkbmap -model sun_type7_jp_usb -layout jp -variant suncompat\n"
+"\n"
+"Or select 'Japan (Sun Japanese keyboard compatible)' on gnome-keyboard-"
+"properties or GDM keyboard menu."
+msgstr ""
+
+#: ../src/imf-selector:75
 msgid "Input Method Framework Selector"
 msgstr "入力方式フレームワークの選択"
 
-#: ../src/imf-selector:74
+#: ../src/imf-selector:86
 msgid "_Enable Input Method Framework"
 msgstr "入力方式フレームワークの有効化(_E)"
 
-#: ../src/imf-selector:85
+#: ../src/imf-selector:98
 msgid "Available Input Method Framework"
 msgstr "使用可能な入力方式フレームワーク"
 
-#: ../src/imf-selector:92
+#: ../src/imf-selector:105
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/imf-selector:93
+#: ../src/imf-selector:106
 msgid "_Reset"
 msgstr "リセット(_R)"
 
-#: ../src/imf-selector:94
+#: ../src/imf-selector:107
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/imf-selector:95
+#: ../src/imf-selector:108
 msgid "_OK"
 msgstr "了解(_O)"
 
-#: ../src/imf-selector:163
+#: ../src/imf-selector:177
 msgid ""
 "Following error occured :\n"
 "\n"
@@ -52,11 +67,11 @@
 "次のエラーが発生しました:\n"
 "\n"
 
-#: ../src/imf-selector:170
+#: ../src/imf-selector:184
 msgid "Can not execute configuration script: "
 msgstr "設定スクリプトを実行できません: "
 
-#: ../src/imf-selector:198
+#: ../src/imf-selector:213
 msgid ""
 "Do you update your configuration ?\n"
 "This configuration becomes effective from next desktop login."
@@ -64,20 +79,22 @@
 "設定を更新しますか。\n"
 "この設定は、次回のデスクトップログインから有効になります。"
 
-#: ../src/imf-selector:234
+#: ../src/imf-selector:251
+#, fuzzy
 msgid ""
-"Found Input Method '%s' under '%s' framework on system for this locale.\n"
+"Found Input Method '%(engine)s' under '%(imf)s' framework on system for this "
+"locale.\n"
 " Do you use this Input Method in your desktop ?\n"
 "This configuration becomes effective from next desktop login."
 msgstr ""
-"%2s フレームワークで動作する %1s 入力方式エンジンがシステム上で見つかりました。\n"
+"%2s フレームワークで動作する %1s 入力方式エンジンがシステム上で見つかりまし"
+"た。\n"
 "この入力方式をデスクトップで使用しますか？\n"
 "この設定は、次回のデスクトップログインから有効になります。"
 
 #: ../imf-selector.desktop.in.h:1
+msgid "Input Method Selector"
+msgstr "入力方式の選択"
+
 msgid "Input Method"
 msgstr "入力方式"
-
-#: ../imf-selector.desktop.in.h:2
-msgid "Input Method Selector"
-msgstr "入力方式の選択"
Binary file specs/ext-sources/imf-selector-1.0.tar.gz has changed
--- a/specs/ibus.spec	Fri Jun 17 15:45:12 2011 +0900
+++ b/specs/ibus.spec	Fri Jul 01 03:38:17 2011 +0900
@@ -16,6 +16,7 @@
 Patch3:     ibus-autostart.patch.diff
 Patch4:     ibus-for-xkbc.patch.diff
 Patch5:     ibus-panel-i18n.patch.diff
+Patch6:     ibus-menu.patch.diff
 BuildRoot:      %{_tmppath}/%{src_name}-%{version}-build
 SUNW_Copyright: %{src_name}.copyright
 IPS_Package_Name:	system/input-method/ibus
@@ -55,6 +56,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %ifarch amd64 sparcv9
 cd ..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/specs/patches/ibus-menu.patch.diff	Fri Jul 01 03:38:17 2011 +0900
@@ -0,0 +1,92 @@
+diff -ruNa ibus-1.3.9.org/setup/ibus-setup.desktop.in ibus-1.3.9.org/setup/ibus-setup.desktop.in 
+--- ibus-1.3.9.org/setup/ibus-setup.desktop.in	2011-06-30 14:50:35.290884150 +0900
++++ ibus-1.3.9/setup/ibus-setup.desktop.in	2011-06-30 14:50:46.982029250 +0900
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=IBus Preferences
++_Name=Input Method - IBus
+ _Comment=Set IBus Preferences
+ Exec=ibus-setup
+ Icon=ibus-setup
+diff -ruNa po.org/de.po ibus-1.3.9/po/de.po
+--- ibus-1.3.9.org/po/de.po	2011-06-30 14:48:07.727231500 +0900
++++ ibus-1.3.9/po/de.po	2011-06-30 14:48:27.508182850 +0900
+@@ -519,3 +519,5 @@
+ msgid "When active"
+ msgstr "Wenn aktiv"
+ 
++msgid "Input Method - IBus"
++msgstr "Eingabemethode - IBus"
+diff -ruNa ibus-1.3.9.org/po/es.po ibus-1.3.9/po/es.po
+--- ibus-1.3.9.org/po/es.po	2011-06-30 14:48:07.971499900 +0900
++++ ibus-1.3.9/po/es.po	2011-06-30 14:48:27.660816800 +0900
+@@ -539,3 +539,5 @@
+ 
+ #~ msgid "Use Custom Font"
+ #~ msgstr "Usar Fuente Personalizada"
++msgid "Input Method - IBus"
++msgstr "Método de entrada - IBus"
+diff -ruNa ibus-1.3.9.org/po/fr.po ibus-1.3.9/po/fr.po
+--- ibus-1.3.9.org/po/fr.po	2011-06-30 14:48:07.066030800 +0900
++++ ibus-1.3.9/po/fr.po	2011-06-30 14:48:27.805255450 +0900
+@@ -524,3 +524,5 @@
+ msgid "When active"
+ msgstr "Uniquement lorsque active"
+ 
++msgid "Input Method - IBus"
++msgstr "Méthode d'entrée - IBus"
+diff -ruNa ibus-1.3.9.org/po/it.po ibus-1.3.9/po/it.po
+--- ibus-1.3.9.org/po/it.po	2011-06-30 14:48:07.334926400 +0900
++++ ibus-1.3.9/po/it.po	2011-06-30 14:48:27.943446550 +0900
+@@ -518,3 +518,5 @@
+ msgid "When active"
+ msgstr "Quando attivoB"
+ 
++msgid "Input Method - IBus"
++msgstr "Metodo di input - IBus"
+diff -ruNa ibus-1.3.9.org/po/ja.po ibus-1.3.9/po/ja.po
+--- ibus-1.3.9.org/po/ja.po	2011-06-30 14:48:08.089426600 +0900
++++ ibus-1.3.9/po/ja.po	2011-06-30 14:48:28.093303550 +0900
+@@ -524,3 +524,5 @@
+ #: ../setup/setup.ui.h:56
+ msgid "When active"
+ msgstr "アクティブであるとき"
++msgid "Input Method - IBus"
++msgstr "入力方式 - IBus"
+diff -ruNa ibus-1.3.9.org/po/ko.po ibus-1.3.9/po/ko.po
+--- ibus-1.3.9.org/po/ko.po	2011-06-30 14:48:06.869122500 +0900
++++ ibus-1.3.9/po/ko.po	2011-06-30 14:48:28.239189900 +0900
+@@ -504,3 +504,5 @@
+ msgid "When active"
+ msgstr "활성화 되었을 때"
+ 
++msgid "Input Method - IBus"
++msgstr "입력기 - IBus"
+diff -ruNa ibus-1.3.9.org/po/pt_BR.po ibus-1.3.9/po/pt_BR.po
+--- ibus-1.3.9.org/po/pt_BR.po	2011-06-30 14:48:08.038568250 +0900
++++ ibus-1.3.9/po/pt_BR.po	2011-06-30 14:48:28.382296850 +0900
+@@ -520,3 +520,5 @@
+ msgid "When active"
+ msgstr "Quando ativado"
+ 
++msgid "Input Method - IBus"
++msgstr "Input Method - IBus"
+diff -ruNa ibus-1.3.9.org/po/zh_CN.po ibus-1.3.9/po/zh_CN.po
+--- ibus-1.3.9.org/po/zh_CN.po	2011-06-30 14:48:07.446680850 +0900
++++ ibus-1.3.9/po/zh_CN.po	2011-06-30 14:48:28.598776400 +0900
+@@ -501,3 +501,5 @@
+ msgid "When active"
+ msgstr "活动时"
+ 
++msgid "Input Method - IBus"
++msgstr "输入法 - IBus"
+diff -ruNa ibus-1.3.9.org/po/zh_TW.po ibus-1.3.9/po/zh_TW.po
+--- ibus-1.3.9.org/po/zh_TW.po	2011-06-30 14:48:07.565229800 +0900
++++ ibus-1.3.9/po/zh_TW.po	2011-06-30 14:48:28.731928050 +0900
+@@ -502,3 +502,5 @@
+ #: ../setup/setup.ui.h:56
+ msgid "When active"
+ msgstr "當啟用時"
++msgid "Input Method - IBus"
++msgstr "輸入法 - IBus"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/specs/patches/scim-menu-patch.diff	Fri Jul 01 03:38:17 2011 +0900
@@ -0,0 +1,101 @@
+--- scim-1.4.7.org.org/extras/setup/scim-setup.desktop.in	2011-06-30 15:26:30.476939500 +0900
++++ scim-1.4.7/extras/setup/scim-setup.desktop.in	2011-06-30 15:26:47.010042450 +0900
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=SCIM Input Method Setup
++_Name=Input Method - SCIM
+ _Comment=Setup utility for Smart Common Input Method platform
+ Exec=scim-setup
+ Icon=scim-setup.png
+diff -ruNa scim-1.4.7.org/po/de.po scim-1.4.7/po/de.po
+--- scim-1.4.7.org/po/de.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/de.po	2011-06-30 18:01:52.310902400 +0900
+@@ -1383,6 +1383,9 @@
+ msgid "The orientation of the tray."
+ msgstr "Die Ausrichtung des Systemabschnitts der Kontrollleiste."
+ 
++msgid "Input Method - SCIM"
++msgstr "Eingabemethode - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
+diff -ruNa scim-1.4.7.org/po/fr.po scim-1.4.7/po/fr.po
+--- scim-1.4.7.org/po/fr.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/fr.po	2011-06-30 18:01:53.139799600 +0900
+@@ -1369,6 +1369,9 @@
+ msgid "The orientation of the tray."
+ msgstr "Orientation du tiroir."
+ 
++msgid "Input Method - SCIM"
++msgstr "Méthode d'entrée - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
+diff -ruNa scim-1.4.7.org/po/it.po scim-1.4.7/po/it.po
+--- scim-1.4.7.org/po/it.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/it.po	2011-06-30 18:01:53.275341150 +0900
+@@ -1378,6 +1378,9 @@
+ msgid "The orientation of the tray."
+ msgstr "L'orientazione del vassoio."
+ 
++msgid "Input Method - SCIM"
++msgstr "Metodo di input - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
+diff -ruNa scim-1.4.7.org/po/ja.po scim-1.4.7/po/ja.po
+--- scim-1.4.7.org/po/ja.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/ja.po	2011-06-30 18:01:52.195213500 +0900
+@@ -1357,6 +1357,9 @@
+ msgid "The orientation of the tray."
+ msgstr "トレイの方向"
+ 
++msgid "Input Method - SCIM"
++msgstr "入力方式 - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
+diff -ruNa scim-1.4.7.org/po/ko.po scim-1.4.7/po/ko.po
+--- scim-1.4.7.org/po/ko.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/ko.po	2011-06-30 18:01:52.970242750 +0900
+@@ -1325,6 +1325,9 @@
+ msgid "The orientation of the tray."
+ msgstr "트레이의 방향."
+ 
++msgid "Input Method - SCIM"
++msgstr "입력기 - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
+diff -ruNa scim-1.4.7.org/po/zh_CN.po scim-1.4.7/po/zh_CN.po
+--- scim-1.4.7.org/po/zh_CN.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/zh_CN.po	2011-06-30 18:01:51.960709150 +0900
+@@ -1309,6 +1309,9 @@
+ msgid "The orientation of the tray."
+ msgstr ""
+ 
++msgid "Input Method - SCIM"
++msgstr "输入法 - SCIM"
++
+ #~ msgid "En"
+ #~ msgstr "英"
+ 
+diff -ruNa scim-1.4.7.org/po/zh_TW.po scim-1.4.7/po/zh_TW.po
+--- scim-1.4.7.org/po/zh_TW.po	2007-06-26 23:31:56.000000000 +0900
++++ scim-1.4.7/po/zh_TW.po	2011-06-30 18:01:51.718186600 +0900
+@@ -1310,6 +1310,9 @@
+ msgid "The orientation of the tray."
+ msgstr "狀態列的方位。"
+ 
++msgid "Input Method - SCIM"
++msgstr "輸入法 - SCIM"
++
+ #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
+ 
--- a/specs/scim.spec	Fri Jun 17 15:45:12 2011 +0900
+++ b/specs/scim.spec	Fri Jul 01 03:38:17 2011 +0900
@@ -14,6 +14,7 @@
 Patch1:		scim-with-solaris-iconv-patch.diff
 Patch2:		scim-1.4.7-on-nv-ss12-patch.diff
 Patch3:		scim-no-default-imm-patch.diff
+Patch4:		scim-menu-patch.diff
 BuildRoot:      %{_tmppath}/%{src_name}-%{version}-build
 SUNW_Copyright: %{src_name}.copyright
 
@@ -40,6 +41,7 @@
 %patch1 -p1
 %patch2 -p0
 %patch3 -p0
+%patch4 -p1
 touch ChangeLog
 
 %ifarch amd64 sparcv9
upstream/oracle/g11n/inputmethod