Oops, my bad. T_T
Here comes the fixed one.
On Sun, Feb 5, 2012 at 8:26 AM, Osamu Aoki <os...@debian.org> wrote:
> Hi,
>
> I think you forgot to do "git add ..." for new gcin input method data
> files. Can you fix that?
>
>> -#: ../share/xinputrc.common:37 ../share/xinputrc.common.in:37
>> +#: ../share/xinputrc.common.in:37
>> #, sh-format
>> msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
>> msgstr "E: $IM_CONFIG_NAME 使用的 script 在 $IM_CONFIG_CODE 找不到"
>> +
>> +#~ msgid ""
>> +#~ "Chinese input method (gcin)\n"
>> +#~ " * XIM and GNOME/GTK+: gcin\n"
>> +#~ " * KDE/Qt4: gcin-qt4-immodule"
>> +#~ msgstr ""
>> +#~ "gcin 中文输入法 (gcin)\n"
>> +#~ " * XIM 与 GNOME/GTK+: gcin\n"
>> +#~ " * KDE/Qt4: gcin-qt4-immodule"
>
> These text are removed.
>
> This means you have moved /data/50_gcin.conf to /data/26_gcin.conf
>
> But your patch is missing /data/26_gcin.conf data.
>
--
Yao Wei
diff --git a/data/25_hime.rc b/data/25_hime.rc
index 4d299a8..bf8fe44 100644
--- a/data/25_hime.rc
+++ b/data/25_hime.rc
@@ -11,8 +11,8 @@ GTK_IM_MODULE=xim
# use hime immodule only when available for both GTK 2.0 and 3.0
IM_CONFIG_MARKER2=0
-for IM_CONFIG_MARKER in /usr/lib/*/gtk-2.0/*/immodules/hime.so \
- /usr/lib/gtk-2.0/*/immodules/hime.so ; do
+for IM_CONFIG_MARKER in /usr/lib/*/gtk-2.0/*/immodules/im-hime.so \
+ /usr/lib/gtk-2.0/*/immodules/im-hime.so ; do
if [ -e $IM_CONFIG_MARKER ]; then
IM_CONFIG_MARKER2=1
break
@@ -20,8 +20,8 @@ for IM_CONFIG_MARKER in /usr/lib/*/gtk-2.0/*/immodules/hime.so \
done
IM_CONFIG_MARKER3=0
-for IM_CONFIG_MARKER in /usr/lib/*/gtk-3.0/*/immodules/hime.so \
- /usr/lib/gtk-3.0/*/immodules/hime.so ; do
+for IM_CONFIG_MARKER in /usr/lib/*/gtk-3.0/*/immodules/im-hime.so \
+ /usr/lib/gtk-3.0/*/immodules/im-hime.so ; do
if [ -e $IM_CONFIG_MARKER ]; then
IM_CONFIG_MARKER3=1
break
diff --git a/data/26_gcin.conf b/data/26_gcin.conf
new file mode 100644
index 0000000..f69ae1a
--- /dev/null
+++ b/data/26_gcin.conf
@@ -0,0 +1,19 @@
+# vim: set sts=4 expandtab:
+IM_CONFIG_SHORT="$(gettext "activate Chinese input method (gcin)")"
+
+IM_CONFIG_LONG="$(gettext "Chinese input method (gcin)
+ * Required for all: gcin
+ * Language specific input conversion support:
+ * Traditional Chinese: gcin-chewing
+ * Japanese: gcin-anthy
+ * Application platform support:
+ * GNOME/GTK+: gcin-gtk3-immodule
+ * KDE/Qt: gcin-qt4-immodule")"
+
+package_auto () {
+ package_status gcin
+}
+
+package_menu () {
+ package_status gcin
+}
diff --git a/data/26_gcin.rc b/data/26_gcin.rc
new file mode 100644
index 0000000..0219689
--- /dev/null
+++ b/data/26_gcin.rc
@@ -0,0 +1,45 @@
+# start gcin
+# vim: set sts=4 expandtab:
+
+# start gcin daemon
+/usr/bin/gcin &
+
+# set variables for the plain XIM
+XMODIFIERS=@im=gcin
+
+GTK_IM_MODULE=xim
+# use gcin immodule only when available for both GTK 2.0 and 3.0
+
+IM_CONFIG_MARKER2=0
+for IM_CONFIG_MARKER in /usr/lib/*/gtk-2.0/*/immodules/im-gcin.so \
+ /usr/lib/gtk-2.0/*/immodules/im-gcin.so ; do
+ if [ -e $IM_CONFIG_MARKER ]; then
+ IM_CONFIG_MARKER2=1
+ break
+ fi
+done
+
+IM_CONFIG_MARKER3=0
+for IM_CONFIG_MARKER in /usr/lib/*/gtk-3.0/*/immodules/im-gcin.so \
+ /usr/lib/gtk-3.0/*/immodules/im-gcin.so ; do
+ if [ -e $IM_CONFIG_MARKER ]; then
+ IM_CONFIG_MARKER3=1
+ break
+ fi
+done
+if [ $IM_CONFIG_MARKER2 = 1 ] && [ $IM_CONFIG_MARKER3 = 1 ] ; then
+ GTK_IM_MODULE=gcin
+fi
+
+QT4_IM_MODULE=xim
+# use immodule when available for Qt4
+for IM_CONFIG_MARKER in /usr/lib/*/qt4/plugins/inputmethods/im-gcin.so \
+ /usr/lib/qt4/plugins/inputmethods/im-gcin.so ; do
+ if [ -e $IM_CONFIG_MARKER ]; then
+ QT4_IM_MODULE=gcin
+ break
+ fi
+done
+
+# gcin has no clutter support, and qt3 immodule is not compiled.
+CLUTTER_IM_MODULE=xim
diff --git a/data/50_gcin.conf b/data/50_gcin.conf
deleted file mode 100644
index 1629f3a..0000000
--- a/data/50_gcin.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# vim: set sts=4 expandtab:
-IM_CONFIG_SHORT="$(gettext "activate Chinese input method (gcin)")"
-
-IM_CONFIG_LONG="$(gettext "Chinese input method (gcin)
- * XIM and GNOME/GTK+: gcin
- * KDE/Qt4: gcin-qt4-immodule")"
-
-package_auto () {
- package_status gcin
-}
-
-package_menu () {
- package_status gcin
-}
diff --git a/data/50_gcin.rc b/data/50_gcin.rc
deleted file mode 100644
index e004f40..0000000
--- a/data/50_gcin.rc
+++ /dev/null
@@ -1,57 +0,0 @@
-# start gcin
-# vim: set sts=4 expandtab:
-
-# start gcin daemon
-/usr/bin/gcin &
-
-# set variables for the plain XIM
-XMODIFIERS=@im=gcin
-
-GTK_IM_MODULE=xim
-# use scim immodule only when available for both GTK 2.0 and 3.0
-IM_CONFIG_MARKER2=0
-for IM_CONFIG_MARKER in /usr/lib/*/gtk-2.0/*/immodules/gcin.so \
- /usr/lib/gtk-2.0/*/immodules/gcin.so ; do
- if [ -e $IM_CONFIG_MARKER ]; then
- IM_CONFIG_MARKER2=1
- break
- fi
-done
-
-# There is no gtk3 module for SCIM for wheezy at this moment.
-# This ensures to use xim for wheezy unless this is fixed.
-IM_CONFIG_MARKER3=0
-for IM_CONFIG_MARKER in /usr/lib/*/gtk-3.0/*/immodules/gcin.so \
- /usr/lib/gtk-3.0/*/immodules/gcin.so ; do
- if [ -e $IM_CONFIG_MARKER ]; then
- IM_CONFIG_MARKER3=1
- break
- fi
-done
-if [ $IM_CONFIG_MARKER2 = 1 ] && [ $IM_CONFIG_MARKER3 = 1 ] ; then
- GTK_IM_MODULE=gcin
-fi
-
-QT_IM_MODULE=xim
-# use immodule when available for Qt3
-for IM_CONFIG_MARKER in /usr/lib/*/qt3/plugins/inputmethods/libqgcin.so \
- /usr/lib/qt3/plugins/inputmethods/libqgcin.so ; do
- if [ -e $IM_CONFIG_MARKER ]; then
- QT_IM_MODULE=gcin
- break
- fi
-done
-
-# This is placeholder for now.
-QT4_IM_MODULE=xim
-# use immodule when available for Qt4
-for IM_CONFIG_MARKER in /usr/lib/*/qt4/plugins/inputmethods/libqgcin.so \
- /usr/lib/qt4/plugins/inputmethods/libqgcin.so ; do
- if [ -e $IM_CONFIG_MARKER ]; then
- QT4_IM_MODULE=gcin
- break
- fi
-done
-
-# scim has no clutter support
-CLUTTER_IM_MODULE=xim
diff --git a/po/de.po b/po/de.po
index 20f06ee..53f71b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 21:49+0800\n"
+"POT-Creation-Date: 2012-02-04 19:30+0800\n"
"PO-Revision-Date: 2012-01-02 11:53+0200\n"
"Last-Translator: Hendrik Knackstedt <kn.hend...@gmail.com>\n"
"Language-Team: Ubuntu German Translators\n"
@@ -431,6 +431,32 @@ msgstr ""
" * GNOME/GTK+: fcitx-frontend-gtk2 und fcitx-frontend-gtk3 (beide)\n"
" * KDE/Qt4: fcitx-frontend-qt4"
+#: ../data/26_gcin.conf:2
+msgid "activate Chinese input method (gcin)"
+msgstr "Chinesische Eingabemethode (gcin) aktivieren"
+
+#: ../data/26_gcin.conf:4
+#, fuzzy
+msgid ""
+"Chinese input method (gcin)\n"
+" * Required for all: gcin\n"
+" * Language specific input conversion support:\n"
+" * Traditional Chinese: gcin-chewing\n"
+" * Japanese: gcin-anthy\n"
+" * Application platform support:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+msgstr ""
+"Flexibles Eingabemethodenrahmenwerk (fcitx)\n"
+" * Immer erforderlich: fcitx\n"
+" * Sprachspezifische Unterstützung der Eingabemethode:\n"
+" * Vereinfachtes Chinesisch: fcitx-pinyin oder fcitx-sunpinyin oder fcitx-"
+"googlepinyin\n"
+" * Generische Tastaturübersetzungstabelle: fcitx-table*-Pakete\n"
+" * Anwendungsplattformunterstützung:\n"
+" * GNOME/GTK+: fcitx-frontend-gtk2 und fcitx-frontend-gtk3 (beide)\n"
+" * KDE/Qt4: fcitx-frontend-qt4"
+
#: ../data/48_scim.conf:2
msgid "activate Smart Common Input Method (SCIM)"
msgstr "Smart Common-Eingabemethode (SCIM) aktivieren "
@@ -467,20 +493,6 @@ msgstr ""
"(beide) \n"
" * KDE/Qt4: scim-bridge-client-qt4"
-#: ../data/50_gcin.conf:2
-msgid "activate Chinese input method (gcin)"
-msgstr "Chinesische Eingabemethode (gcin) aktivieren"
-
-#: ../data/50_gcin.conf:4
-msgid ""
-"Chinese input method (gcin)\n"
-" * XIM and GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-msgstr ""
-"Chinesische Eingabemethode (gcin)\n"
-" * XIM und GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-
#: ../data/50_hangul.conf:2
msgid "activate Hangul (Korean) input method"
msgstr "Hangul-Eingabemethode (Koreanisch) aktivieren"
@@ -581,19 +593,27 @@ msgid "Missing configuration file."
msgstr "Konfigurationsdatei fehlt."
#: ../share/im-config.common:46 ../share/im-config.common:64
-#: ../share/im-config.common:82 ../share/xinputrc.common:77
-#: ../share/xinputrc.common.in:77
+#: ../share/im-config.common:82 ../share/xinputrc.common.in:77
#, sh-format
msgid "E: Configuration for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr ""
"E: Konfiguration für $IM_CONFIG_NAME unter $IM_CONFIG_CODE nicht gefunden."
-#: ../share/xinputrc.common:33 ../share/xinputrc.common.in:33
+#: ../share/xinputrc.common.in:33
#, sh-format
msgid "Script for $IM_CONFIG_NAME started at $IM_CONFIG_CODE."
msgstr "Skript für $IM_CONFIG_NAME unter $IM_CONFIG_CODE gestartet."
-#: ../share/xinputrc.common:37 ../share/xinputrc.common.in:37
+#: ../share/xinputrc.common.in:37
#, sh-format
msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: Skript für $IM_CONFIG_NAME unter $IM_CONFIG_CODE nicht gefunden."
+
+#~ msgid ""
+#~ "Chinese input method (gcin)\n"
+#~ " * XIM and GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
+#~ msgstr ""
+#~ "Chinesische Eingabemethode (gcin)\n"
+#~ " * XIM und GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
diff --git a/po/im-config.pot b/po/im-config.pot
index cc8c377..3fa65cc 100644
--- a/po/im-config.pot
+++ b/po/im-config.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 21:49+0800\n"
+"POT-Creation-Date: 2012-02-04 19:30+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -306,6 +306,22 @@ msgid ""
" * KDE/Qt: hime-qt4-immodule"
msgstr ""
+#: ../data/26_gcin.conf:2
+msgid "activate Chinese input method (gcin)"
+msgstr ""
+
+#: ../data/26_gcin.conf:4
+msgid ""
+"Chinese input method (gcin)\n"
+" * Required for all: gcin\n"
+" * Language specific input conversion support:\n"
+" * Traditional Chinese: gcin-chewing\n"
+" * Japanese: gcin-anthy\n"
+" * Application platform support:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+msgstr ""
+
#: ../data/48_scim.conf:2
msgid "activate Smart Common Input Method (SCIM)"
msgstr ""
@@ -327,17 +343,6 @@ msgid ""
" * KDE/Qt4: scim-bridge-client-qt4"
msgstr ""
-#: ../data/50_gcin.conf:2
-msgid "activate Chinese input method (gcin)"
-msgstr ""
-
-#: ../data/50_gcin.conf:4
-msgid ""
-"Chinese input method (gcin)\n"
-" * XIM and GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-msgstr ""
-
#: ../data/50_hangul.conf:2
msgid "activate Hangul (Korean) input method"
msgstr ""
@@ -420,18 +425,17 @@ msgid "Missing configuration file."
msgstr ""
#: ../share/im-config.common:46 ../share/im-config.common:64
-#: ../share/im-config.common:82 ../share/xinputrc.common:77
-#: ../share/xinputrc.common.in:77
+#: ../share/im-config.common:82 ../share/xinputrc.common.in:77
#, sh-format
msgid "E: Configuration for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr ""
-#: ../share/xinputrc.common:33 ../share/xinputrc.common.in:33
+#: ../share/xinputrc.common.in:33
#, sh-format
msgid "Script for $IM_CONFIG_NAME started at $IM_CONFIG_CODE."
msgstr ""
-#: ../share/xinputrc.common:37 ../share/xinputrc.common.in:37
+#: ../share/xinputrc.common.in:37
#, sh-format
msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index beed133..13315ce 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: im-config 0.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 21:49+0800\n"
+"POT-Creation-Date: 2012-02-04 19:30+0800\n"
"PO-Revision-Date: 2012-01-17 21:43+0900\n"
"Last-Translator: Osamu Aoki <os...@debian.org>\n"
"Language-Team: Japanese <japan...@example.org>\n"
@@ -39,12 +39,21 @@ msgstr ""
"im-config(8)、/usr/share/doc/im-config/README.Debian.gz を参照。"
#: ../im-config:63
-msgid "Explicit selection is not required to enable the automatic configuration if the active one is default/auto/cjkv/missing."
-msgstr "もし有効設定がdefault/auto/cjkv/missingの場合は、自動設定を有効にするために明示的選択の必要はありません。"
+msgid ""
+"Explicit selection is not required to enable the automatic configuration if "
+"the active one is default/auto/cjkv/missing."
+msgstr ""
+"もし有効設定がdefault/auto/cjkv/missingの場合は、自動設定を有効にするために明"
+"示的選択の必要はありません。"
#: ../im-config:64
-msgid "If a daemon program for the previous configuration is re-started by the X session manager, you may need to kill it manually with kill(1)."
-msgstr "もし過去の設定によるデーモンプログラムが X セッションマネージャーにより再起動される場合には、kill(1) を用いてそのプロセスをマニュアルで殺す必要があるかもしれません。"
+msgid ""
+"If a daemon program for the previous configuration is re-started by the X "
+"session manager, you may need to kill it manually with kill(1)."
+msgstr ""
+"もし過去の設定によるデーモンプログラムが X セッションマネージャーにより再起動"
+"される場合には、kill(1) を用いてそのプロセスをマニュアルで殺す必要があるかも"
+"しれません。"
#: ../im-config:65
#, sh-format
@@ -59,11 +68,13 @@ msgstr ""
#, sh-format
msgid ""
"The $IM_CONFIG_XINPUTRC_TYPE has been manually modified.\n"
-"Remove the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC manually to use im-config.\n"
+"Remove the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC manually to use im-"
+"config.\n"
"$IM_CONFIG_RTFM"
msgstr ""
"$IM_CONFIG_XINPUTRC_TYPE が手動で変更された。\n"
-"im-config を使うには $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を手動で削除して下さい。\n"
+"im-config を使うには $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を手動で削"
+"除して下さい。\n"
"$IM_CONFIG_RTFM"
#: ../im-config:87
@@ -71,20 +82,23 @@ msgstr ""
msgid ""
"Current configuration for the input method:\n"
" * Active configuration: $IM_CONFIG_ACTIVE (normally missing)\n"
-" * Automatic configuration: $IM_CONFIG_AUTOMATIC (normally ibus or fcitx or uim)\n"
+" * Automatic configuration: $IM_CONFIG_AUTOMATIC (normally ibus or fcitx or "
+"uim)\n"
" * Number of valid choices: $IM_CONFIG_NUMBER (normally 1)\n"
"The configuration set by im-config is activated by re-starting X."
msgstr ""
"インプットメソッドの現在の設定:\n"
" * 有効設定: $IM_CONFIG_ACTIVE (通常 missing)\n"
" * 自動設定: $IM_CONFIG_AUTOMATIC (通常 ibus か fcitx か uim)\n"
-" * 有効選択肢数: $IM_CONFIG_NUMBER (通常 1)im-config による設定は X を再起動することで有効になります。"
+" * 有効選択肢数: $IM_CONFIG_NUMBER (通常 1)im-config による設定は X を再起動"
+"することで有効になります。"
#: ../im-config:95
#, sh-format
msgid ""
"$IM_CONFIG_MSG\n"
-"In order to enter non-ASCII native characters, you must install one set of input method tools:\n"
+"In order to enter non-ASCII native characters, you must install one set of "
+"input method tools:\n"
" * ibus and its assocoated packages (recommended)\n"
" * multilingual support\n"
" * GUI configuration\n"
@@ -99,7 +113,8 @@ msgid ""
"$IM_CONFIG_MSGA"
msgstr ""
"$IM_CONFIG_MSG\n"
-"non-ASCII の各国語文字入力をするには、インプットメソッドツールを1セット導入する必要がある:\n"
+"non-ASCII の各国語文字入力をするには、インプットメソッドツールを1セット導入す"
+"る必要がある:\n"
" * ibus とその関連パッケージ (推奨)\n"
" * 多言語サポート\n"
" * GUI 設定\n"
@@ -128,12 +143,14 @@ msgid ""
"$IM_CONFIG_MSG\n"
"$IM_CONFIG_MSGA\n"
" Available input methods:$IM_CONFIG_AVAIL\n"
-"Unless you really need them all, please make sure to install only one input method tool."
+"Unless you really need them all, please make sure to install only one input "
+"method tool."
msgstr ""
"$IM_CONFIG_MSG\n"
"$IM_CONFIG_MSGA\n"
" 使用可能なインプットメソッド:$IM_CONFIG_AVAIL\n"
-"これらすべてが必要でない場合は、必ず一つだけのインプットメソッドツールをインストールするようにしましょう。"
+"これらすべてが必要でない場合は、必ず一つだけのインプットメソッドツールをイン"
+"ストールするようにしましょう。"
#: ../im-config:124
#, sh-format
@@ -150,8 +167,12 @@ msgstr ""
#: ../im-config:132
#, sh-format
-msgid "Select $IM_CONFIG_XINPUTRC_TYPE. The user configuration supercedes the system one."
-msgstr "$IM_CONFIG_XINPUTRC_TYPE を選択する。ユーザー設定はシステム設定より優先される。"
+msgid ""
+"Select $IM_CONFIG_XINPUTRC_TYPE. The user configuration supercedes the "
+"system one."
+msgstr ""
+"$IM_CONFIG_XINPUTRC_TYPE を選択する。ユーザー設定はシステム設定より優先され"
+"る。"
#: ../im-config:133
msgid "select"
@@ -170,8 +191,7 @@ msgstr "内容"
msgid "Removing the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC."
msgstr "IM $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を削除。"
-#: ../im-config:164
-#: ../im-config:181
+#: ../im-config:164 ../im-config:181
#, sh-format
msgid ""
"The $IM_CONFIG_XINPUTRC_TYPE is modified by im-config.\n"
@@ -179,25 +199,32 @@ msgid ""
"$IM_CONFIG_RTFM"
msgstr ""
"$IM_CONFIG_XINPUTRC_TYPE が im-config により変更された。\n"
-"新たな$IM_CONFIG_XINPUTRC_TYPEファイルを有効にするには X セッションを再起動します。\n"
+"新たな$IM_CONFIG_XINPUTRC_TYPEファイルを有効にするには X セッションを再起動し"
+"ます。\n"
"$IM_CONFIG_RTFM"
-#: ../im-config:170
-#: ../im-config:195
+#: ../im-config:170 ../im-config:195
#, sh-format
msgid "Keeping the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC as missing."
msgstr "IM $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC が無いままとする。"
-#: ../im-config:172
-#: ../im-config:197
+#: ../im-config:172 ../im-config:197
#, sh-format
-msgid "Keeping the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC unchanged as $IM_CONFIG_ACTIVE."
-msgstr "$IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を変更せずに $IM_CONFIG_ACTIVE のまま維持する。"
+msgid ""
+"Keeping the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC unchanged as "
+"$IM_CONFIG_ACTIVE."
+msgstr ""
+"$IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を変更せずに $IM_CONFIG_ACTIVE "
+"のまま維持する。"
#: ../im-config:180
#, sh-format
-msgid "Setting the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC to $IM_CONFIG_ACTIVE."
-msgstr "$IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を $IM_CONFIG_ACTIVE と設定する。"
+msgid ""
+"Setting the $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC to "
+"$IM_CONFIG_ACTIVE."
+msgstr ""
+"$IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC を $IM_CONFIG_ACTIVE と設定す"
+"る。"
#: ../im-config:187
#, sh-format
@@ -244,12 +271,14 @@ msgstr "$IM_CONFIG_DEFAULT_MODE モードを使用 ($IM_CONFIG_DEFAULT が欠落
#: ../data/00_default.conf:7
#, sh-format
msgid "use $IM_CONFIG_DEFAULT_MODE mode (bogus content in $IM_CONFIG_DEFAULT)"
-msgstr "$IM_CONFIG_DEFAULT_MODE モードを使用 ($IM_CONFIG_DEFAULT の内容に問題あり)"
+msgstr ""
+"$IM_CONFIG_DEFAULT_MODE モードを使用 ($IM_CONFIG_DEFAULT の内容に問題あり)"
#: ../data/00_default.conf:9
#, sh-format
msgid "use $IM_CONFIG_DEFAULT_MODE mode set by $IM_CONFIG_DEFAULT"
-msgstr "$IM_CONFIG_DEFAULT により設定された $IM_CONFIG_DEFAULT_MODE モードを使用"
+msgstr ""
+"$IM_CONFIG_DEFAULT により設定された $IM_CONFIG_DEFAULT_MODE モードを使用"
#: ../data/01_auto.conf:2
msgid "activate IM with @-mark for all locales"
@@ -313,7 +342,8 @@ msgid ""
"Flexible Input Method Framework (fcitx)\n"
" * Required for all: fcitx\n"
" * Language specific input conversion support:\n"
-" * Simplified Chinese: fcitx-pinyin or fcitx-sunpinyin or fcitx-googlepinyin\n"
+" * Simplified Chinese: fcitx-pinyin or fcitx-sunpinyin or fcitx-"
+"googlepinyin\n"
" * Generic keyboard translation table: fcitx-table* packages\n"
" * Application platform support:\n"
" * GNOME/GTK+: fcitx-frontend-gtk2 and fcitx-frontend-gtk3 (both)\n"
@@ -322,7 +352,8 @@ msgstr ""
"フレキシブルインプットメソッド (fcitx)\n"
" * 必ず必要: fcitx\n"
" * 言語固有の入力変換サポート:\n"
-" * 簡体中国語: fcitx-pinyin または fcitx-sunpinyin または fcitx-googlepinyin\n"
+" * 簡体中国語: fcitx-pinyin または fcitx-sunpinyin または fcitx-"
+"googlepinyin\n"
" * 汎用キーボード変換テーブル: fcitx-table* パッケージ\n"
" * アプリケーションプラットフォームサポート:\n"
" * GNOME/GTK+: fcitx-frontend-gtk2 と fcitx-frontend-gtk3 (両方)\n"
@@ -382,11 +413,35 @@ msgstr ""
" * 言語固有の入力変換サポート:\n"
" * 繁体中国語: hime-chewing\n"
" * 日本語: hime-anthy\n"
-" * 汎用キーボード変換テーブル: fcitx-table* パッケージ\n"
" * アプリケーションプラットフォームサポート:\n"
" * GNOME/GTK+: hime-gtk3-immodule\n"
" * KDE/Qt4: hime-qt4-immodule"
+#: ../data/26_gcin.conf:2
+msgid "activate Chinese input method (gcin)"
+msgstr "中国語インプットメソッド (gcin) を有効にする"
+
+#: ../data/26_gcin.conf:4
+#, fuzzy
+msgid ""
+"Chinese input method (gcin)\n"
+" * Required for all: gcin\n"
+" * Language specific input conversion support:\n"
+" * Traditional Chinese: gcin-chewing\n"
+" * Japanese: gcin-anthy\n"
+" * Application platform support:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+msgstr ""
+"中国語インプットメソッド (gcin)\n"
+" * 必ず必要: gcin\n"
+" * 言語固有の入力変換サポート:\n"
+" * 繁体中国語: gcin-chewing\n"
+" * 日本語: gcin-anthy\n"
+" * アプリケーションプラットフォームサポート:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule\n"
+" * KDE/Qt4: gcin-qt4-immodule"
+
#: ../data/48_scim.conf:2
msgid "activate Smart Common Input Method (SCIM)"
msgstr "スマートコモンインプットメソッド (SCIM) を有効にする"
@@ -421,20 +476,6 @@ msgstr ""
" * GNOME/GTK+: scim-bridge-client-gtk と scim-bridge-client-gtk3 (両方)\n"
" * KDE/Qt4: scim-bridge-client-qt4"
-#: ../data/50_gcin.conf:2
-msgid "activate Chinese input method (gcin)"
-msgstr "中国語インプットメソッド (gcin) を有効にする"
-
-#: ../data/50_gcin.conf:4
-msgid ""
-"Chinese input method (gcin)\n"
-" * XIM and GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-msgstr ""
-"中国語インプットメソッド (gcin)\n"
-" * XIM と GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-
#: ../data/50_hangul.conf:2
msgid "activate Hangul (Korean) input method"
msgstr "ハングル(韓国語)インプットメソッドを有効にする"
@@ -474,10 +515,12 @@ msgstr "いかなる IM も入力に使用しない"
#: ../data/79_none.conf:4
msgid ""
"This forces not to use any IM for input.\n"
-"This is the automatic configuration choice if no required IM packages are installed."
+"This is the automatic configuration choice if no required IM packages are "
+"installed."
msgstr ""
"強制的にIM を一切使用しなくする。\n"
-"これは必要な IM パッケージがインストールされていない場合の自動設定の選択肢です。"
+"これは必要な IM パッケージがインストールされていない場合の自動設定の選択肢で"
+"す。"
#: ../data/80_kinput2.conf:2
msgid "activate XIM for Japanese with kinput2"
@@ -518,7 +561,8 @@ msgid "Custom Configuration"
msgstr "カスタム設定"
#: ../data/90_custom.conf:4
-msgid "Custom configuration is created by the user or administrator using editor."
+msgid ""
+"Custom configuration is created by the user or administrator using editor."
msgstr "ユーザーまたは管理者がエディターを用いてカスタム設定を作成した。"
#: ../data/90_missing.conf:2
@@ -529,24 +573,27 @@ msgstr "欠落"
msgid "Missing configuration file."
msgstr "設定ファイルの欠落。"
-#: ../share/im-config.common:46
-#: ../share/im-config.common:64
-#: ../share/im-config.common:82
-#: ../share/xinputrc.common:77
-#: ../share/xinputrc.common.in:77
+#: ../share/im-config.common:46 ../share/im-config.common:64
+#: ../share/im-config.common:82 ../share/xinputrc.common.in:77
#, sh-format
msgid "E: Configuration for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 用の設定が $IM_CONFIG_CODE にありません。"
-#: ../share/xinputrc.common:33
#: ../share/xinputrc.common.in:33
#, sh-format
msgid "Script for $IM_CONFIG_NAME started at $IM_CONFIG_CODE."
msgstr "$IM_CONFIG_CODE で起動される $IM_CONFIG_NAME 用のスクリプト。"
-#: ../share/xinputrc.common:37
#: ../share/xinputrc.common.in:37
#, sh-format
msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 用のスクリプトが $IM_CONFIG_CODE にありません。"
+#~ msgid ""
+#~ "Chinese input method (gcin)\n"
+#~ " * XIM and GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
+#~ msgstr ""
+#~ "中国語インプットメソッド (gcin)\n"
+#~ " * XIM と GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a432e96..56cb4ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: im-config 0.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 21:49+0800\n"
+"POT-Creation-Date: 2012-02-04 19:30+0800\n"
"PO-Revision-Date: 2012-01-24 00:18+0800\n"
"Last-Translator: Aron Xu <a...@debian.org>\n"
"Language-Team: Chinese (simplified) <i18n...@googlegroups.com>\n"
-"Language: Chinese (Simplified)>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,16 +45,16 @@ msgid ""
"Explicit selection is not required to enable the automatic configuration if "
"the active one is default/auto/cjkv/missing."
msgstr ""
-"如果正在使用的是 default/auto/cjkv/missing，您不需要另外进行选择"
-"即可使用默认配置。"
+"如果正在使用的是 default/auto/cjkv/missing，您不需要另外进行选择即可使用默认"
+"配置。"
#: ../im-config:64
msgid ""
"If a daemon program for the previous configuration is re-started by the X "
"session manager, you may need to kill it manually with kill(1)."
msgstr ""
-"如果使用旧配置的守护进程被 X 会话管理器重启，您可能需要使用 kill(1) 手工"
-"将其杀死。"
+"如果使用旧配置的守护进程被 X 会话管理器重启，您可能需要使用 kill(1) 手工将其"
+"杀死。"
#: ../im-config:65
#, sh-format
@@ -413,6 +412,30 @@ msgstr ""
" * GNOME/GTK+：hime-gtk3-immodule\n"
" * KDE/Qt：hime-qt4-immodule"
+#: ../data/26_gcin.conf:2
+msgid "activate Chinese input method (gcin)"
+msgstr "启用 gcin 中文输入法"
+
+#: ../data/26_gcin.conf:4
+msgid ""
+"Chinese input method (gcin)\n"
+" * Required for all: gcin\n"
+" * Language specific input conversion support:\n"
+" * Traditional Chinese: gcin-chewing\n"
+" * Japanese: gcin-anthy\n"
+" * Application platform support:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+msgstr ""
+"gcin 中文输入法\n"
+" * 必须组件：gcin\n"
+" * 输入特定语言所需的组件：\n"
+" * 繁体中文：gcin-chewing\n"
+" * 日文：gcin-anthy\n"
+" * 应用程序支持:\n"
+" * GNOME/GTK+：gcin-gtk3-immodule\n"
+" * KDE/Qt：gcin-qt4-immodule"
+
#: ../data/48_scim.conf:2
msgid "activate Smart Common Input Method (SCIM)"
msgstr "启动 Smart Common Input Method (SCIM)"
@@ -448,20 +471,6 @@ msgstr ""
" (强烈建议同时安装)\n"
" * KDE/Qt4: scim-bridge-client-qt4"
-#: ../data/50_gcin.conf:2
-msgid "activate Chinese input method (gcin)"
-msgstr "启用 gcin 中文输入法"
-
-#: ../data/50_gcin.conf:4
-msgid ""
-"Chinese input method (gcin)\n"
-" * XIM and GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-msgstr ""
-"gcin 中文输入法 (gcin)\n"
-" * XIM 与 GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-
#: ../data/50_hangul.conf:2
msgid "activate Hangul (Korean) input method"
msgstr "启用 Hangul (韩文)输入法"
@@ -559,18 +568,26 @@ msgid "Missing configuration file."
msgstr "缺少配置文件。"
#: ../share/im-config.common:46 ../share/im-config.common:64
-#: ../share/im-config.common:82 ../share/xinputrc.common:77
-#: ../share/xinputrc.common.in:77
+#: ../share/im-config.common:82 ../share/xinputrc.common.in:77
#, sh-format
msgid "E: Configuration for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 使用的设置在 $IM_CONFIG_CODE 找不到。"
-#: ../share/xinputrc.common:33 ../share/xinputrc.common.in:33
+#: ../share/xinputrc.common.in:33
#, sh-format
msgid "Script for $IM_CONFIG_NAME started at $IM_CONFIG_CODE."
msgstr "$IM_CONFIG_NAME 使用的 script 从 $IM_CONFIG_CODE 启动。"
-#: ../share/xinputrc.common:37 ../share/xinputrc.common.in:37
+#: ../share/xinputrc.common.in:37
#, sh-format
msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 使用的 script 在 $IM_CONFIG_CODE 找不到"
+
+#~ msgid ""
+#~ "Chinese input method (gcin)\n"
+#~ " * XIM and GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
+#~ msgstr ""
+#~ "gcin 中文输入法 (gcin)\n"
+#~ " * XIM 与 GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 289a05f..b976cf0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: im-config 0.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 21:49+0800\n"
+"POT-Creation-Date: 2012-02-04 19:30+0800\n"
"PO-Revision-Date: 2012-01-15 21:42+0800\n"
"Last-Translator: Yao Wei (魏銘廷) <m...@lxde.org>\n"
-"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-b...@lists.debian.org>"
-"Language: Chinese (Taiwan)>\n"
+"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
+"debian.org>Language: Chinese (Taiwan)>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -409,6 +409,30 @@ msgstr ""
" * GNOME/GTK+: hime-gtk3-immodule \n"
" * KDE/Qt: hime-qt4-immodule"
+#: ../data/26_gcin.conf:2
+msgid "activate Chinese input method (gcin)"
+msgstr "啟動 gcin 中文輸入法 (gcin)"
+
+#: ../data/26_gcin.conf:4
+msgid ""
+"Chinese input method (gcin)\n"
+" * Required for all: gcin\n"
+" * Language specific input conversion support:\n"
+" * Traditional Chinese: gcin-chewing\n"
+" * Japanese: gcin-anthy\n"
+" * Application platform support:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+msgstr ""
+"gcin 中文輸入法 (gcin)\n"
+" * 必要套件: gcin\n"
+" * 輸入特定語言的支援套件:\n"
+" * 正體中文: gcin-chewing\n"
+" * 日文: gcin-anthy\n"
+" * 應用程式平台支援:\n"
+" * GNOME/GTK+: gcin-gtk3-immodule \n"
+" * KDE/Qt: gcin-qt4-immodule"
+
#: ../data/48_scim.conf:2
msgid "activate Smart Common Input Method (SCIM)"
msgstr "啟動 Smart Common Input Method (SCIM)"
@@ -444,20 +468,6 @@ msgstr ""
"裝) \n"
" * KDE/Qt4: scim-bridge-client-qt4"
-#: ../data/50_gcin.conf:2
-msgid "activate Chinese input method (gcin)"
-msgstr "啟動 gcin 中文輸入法 (gcin)"
-
-#: ../data/50_gcin.conf:4
-msgid ""
-"Chinese input method (gcin)\n"
-" * XIM and GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-msgstr ""
-"gcin 中文輸入法 (gcin)\n"
-" * XIM 與 GNOME/GTK+: gcin\n"
-" * KDE/Qt4: gcin-qt4-immodule"
-
#: ../data/50_hangul.conf:2
msgid "activate Hangul (Korean) input method"
msgstr "啟動 Hangul (韓文) 輸入法"
@@ -555,18 +565,26 @@ msgid "Missing configuration file."
msgstr "缺少設定檔案。"
#: ../share/im-config.common:46 ../share/im-config.common:64
-#: ../share/im-config.common:82 ../share/xinputrc.common:77
-#: ../share/xinputrc.common.in:77
+#: ../share/im-config.common:82 ../share/xinputrc.common.in:77
#, sh-format
msgid "E: Configuration for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 使用的設定在 $IM_CONFIG_CODE 找不到。"
-#: ../share/xinputrc.common:33 ../share/xinputrc.common.in:33
+#: ../share/xinputrc.common.in:33
#, sh-format
msgid "Script for $IM_CONFIG_NAME started at $IM_CONFIG_CODE."
msgstr "$IM_CONFIG_NAME 使用的 script 從 $IM_CONFIG_CODE 啟動。"
-#: ../share/xinputrc.common:37 ../share/xinputrc.common.in:37
+#: ../share/xinputrc.common.in:37
#, sh-format
msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
msgstr "E: $IM_CONFIG_NAME 使用的 script 在 $IM_CONFIG_CODE 找不到"
+
+#~ msgid ""
+#~ "Chinese input method (gcin)\n"
+#~ " * XIM and GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
+#~ msgstr ""
+#~ "gcin 中文輸入法 (gcin)\n"
+#~ " * XIM 與 GNOME/GTK+: gcin\n"
+#~ " * KDE/Qt4: gcin-qt4-immodule"
