Attachment 20212 Details for Bug 35728 – zhcon.diff

[patch] zhcon.diff

zhcon.diff (text/plain), 8.26 KB, created by Yen-Ming Lee on 2002-03-10 07:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yen-Ming Lee

Created: 2002-03-10 07:30:01 UTC

Size: 8.26 KB

patch

obsolete

>diff -ruN --exclude CVS /usr/ports/chinese/zhcon/Makefile zhcon/Makefile
>--- /usr/ports/chinese/zhcon/Makefile	Wed Mar  6 14:01:23 2002
>+++ zhcon/Makefile	Sun Mar 10 13:08:27 2002
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	zhcon
> PORTVERSION=	0.2
>+PORTREVISION=	1
> CATEGORIES=	chinese
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-po::zh_TW.Big5.po zhcon/files/patch-po::zh_TW.Big5.po
>--- /usr/ports/chinese/zhcon/files/patch-po::zh_TW.Big5.po	Thu Jan  1 08:00:00 1970
>+++ zhcon/files/patch-po::zh_TW.Big5.po	Sun Feb 24 16:30:55 2002
>@@ -0,0 +1,285 @@
>+--- po/zh_TW.Big5.po.orig	Tue Feb 19 12:58:16 2002
>++++ po/zh_TW.Big5.po	Sun Feb 24 14:25:34 2002
>+@@ -6,166 +6,165 @@
>+ msgstr ""
>+ "Project-Id-Version: PACKAGE VERSION\n"
>+ "POT-Creation-Date: 2002-02-16 18:15+0000\n"
>+-"PO-Revision-Date: 2001-10-26 22:22PRC\n"
>++"PO-Revision-Date: 2002-02-24 14:30+0800\n"
>+ "Last-Translator: ejoy <ejoy@users.sourceforge.net>\n"
>+ "Language-Team: \n"
>+ "MIME-Version: 1.0\n"
>+-"Content-Type: text/plain; charset=UTF-8\n"
>++"Content-Type: text/plain; charset=Big5\n"
>+ "Content-Transfer-Encoding: 8bit\n"
>+ "X-Generator: KBabel 0.9.5\n"
>+ 
>+ #: src/overspotclient.cpp:67 src/overspotclient.cpp:72
>+ #: src/overspotclient.cpp:215
>+ msgid "["
>+-msgstr ""
>++msgstr "¡i"
>+ 
>+ #: src/overspotclient.cpp:68
>+ msgid "Full"
>+-msgstr "ï¿½ï¿½"
>++msgstr "¥þ«¬"
>+ 
>+ #: src/overspotclient.cpp:68
>+ msgid "Half"
>+-msgstr "ã¢ï¿½"
>++msgstr "¥b«¬"
>+ 
>+ #: src/overspotclient.cpp:69
>+ msgid "Ch"
>+-msgstr "ã"
>++msgstr "¡C"
>+ 
>+ #: src/overspotclient.cpp:69
>+ msgid "En"
>+-msgstr "â"
>++msgstr ".,"
>+ 
>+ #: src/overspotclient.cpp:70 src/overspotclient.cpp:72
>+ #: src/overspotclient.cpp:217
>+ msgid "]"
>+-msgstr ""
>++msgstr "¡j"
>+ 
>+ #: src/configserver.cpp:27
>+ msgid "input option"
>+-msgstr "è¾å¥æ³éé¡¹"
>++msgstr "¿é¤Jªk¿ï¶µ"
>+ 
>+ #: src/configserver.cpp:28
>+ msgid "Select Encode"
>+-msgstr "å«å¡æè¥æªãÎ:"
>++msgstr "½s½X¤è¦¡"
>+ 
>+ #: src/configserver.cpp:29
>+ msgid "Encode-Detect Method"
>+-msgstr ""
>++msgstr "½s½X°»´ú¤è¦¡"
>+ 
>+ #: src/configserver.cpp:30
>+ msgid "Quit"
>+-msgstr "éåºèå"
>++msgstr "°h¥X¿ï³æ"
>+ 
>+ #: src/configserver.cpp:34 src/configserver.cpp:170
>+-#, fuzzy
>+ msgid "Current Encode-Detect Method:"
>+-msgstr "å½ååç è¯å«æ¹å¼:"
>++msgstr "¥Ø«e½s½X°»´ú¤è¦¡:"
>+ 
>+ #: src/configserver.cpp:39 src/configserver.cpp:48 src/configserver.cpp:58
>+ msgid "Back"
>+-msgstr ""
>++msgstr "ªð¦^¤W¯Å¿ï³æ"
>+ 
>+ #: src/configserver.cpp:43
>+ msgid "Input Option:"
>+-msgstr "è¾å¥æ³éé¡¹:"
>++msgstr "¿é¤Jªk¿ï¶µ:"
>+ 
>+ #: src/configserver.cpp:44 src/configserver.cpp:235
>+ msgid "Auto Select Unique Word"
>+-msgstr "æ éç èªå¨ä¸å±"
>++msgstr "³æ¿W¦r¦Û°Ê¿ï¾Ü"
>+ 
>+ #: src/configserver.cpp:46
>+ msgid "Input Encode"
>+-msgstr "è¾å¥æ³éé¡¹"
>++msgstr "¿é¤Jªk½s½X"
>+ 
>+ #: src/configserver.cpp:52
>+ msgid "Please Select Encode:"
>+-msgstr "è¯·éæ©ç¼ç æ¹å¼:"
>++msgstr "½Ð¿ï¾Ü½s½X¤è¦¡:"
>+ 
>+ #: src/configserver.cpp:63
>+ msgid "System Menu"
>+-msgstr "ç³»ç»èå"
>++msgstr "¨t²Î¿ï³æ"
>+ 
>+ #: src/configserver.cpp:123
>+ msgid "Current Encode:"
>+-msgstr "å½åç¼ç æ¹å¼:"
>++msgstr "¥Ø«e½s½X¤è¦¡:"
>+ 
>+ #: src/configserver.cpp:211
>+ msgid "Current Input Encode(native only)"
>+-msgstr "å½åè¾å¥æ³ç¼ç (native only)"
>++msgstr "¥Ø«e¿é¤Jªk½s½X(native only)"
>+ 
>+ #: src/zhcon.cpp:85
>+ msgid "Please visit zhcon.gnuchina.org for more information."
>+-msgstr ""
>++msgstr "½Ð°Ñ¦Òzhconªºº¶zhcon.gnuchina.org¥HÀò±o§ó¦h¸ê°T¡C"
>+ 
>+ #: src/zhcon.cpp:86
>+ msgid "Zhcon supports GB2312,GBK,BIG5,JIS,KSCM encode."
>+-msgstr ""
>++msgstr "zhcon¤ä´©GB2312,GBK,BIG5,JIS,KSCM¤ºØ½s½X¤è¦¡¡C"
>+ 
>+ #: src/zhcon.cpp:87
>+ msgid "You can use CTRL-ALT-0 to toggle prompt bar."
>+-msgstr ""
>++msgstr "¥i¥H¨Ï¥ÎCTRL-ALT-0¤Á´«´£¥Ü±ø¡C"
>+ 
>+ #: src/zhcon.cpp:88
>+ msgid "Press CTRL-ALT-H for online help."
>+-msgstr ""
>++msgstr "½Ð«ö CTRL-ALT-H Åã¥Ü¨D§U°T®§¡C"
>+ 
>+ #: src/zhcon.cpp:89
>+ msgid "Zhcon supports 12,14,16,24 pixel fonts,you can change in zhcon.conf"
>+-msgstr ""
>++msgstr "zhcon¤ä´©12,14,16,24µ¥¦hºØ¤£¦PÂI°}¦rÅé¡A±z¥i¥H¦bzhcon.conf¤¤³]©w¦rÅé¡C"
>+ 
>+ #: src/zhcon.cpp:90
>+ msgid "You can use 24 pixel font on 17 monitor to get better visual effect."
>+-msgstr ""
>++msgstr "¦b17¦TªºÅã¥Ü¾¹¤W¥i¥H¨Ï¥Î1024X768©M24ÂI°}¦rÅé¨ÓÀò±o§ó¦nªºÅã¥Ü®ÄªG¡C"
>+ 
>+ #: src/zhcon.cpp:91
>+ msgid "Hit CTRL-D to quit zhcon."
>+-msgstr ""
>++msgstr "¥i¥H¨Ï¥ÎCTRL-D¨Ó°h¥Xzhcon."
>+ 
>+ #: src/zhcon.cpp:92
>+ msgid "You can find user manual in doc/."
>+-msgstr ""
>++msgstr "¨Ï¥Î¤â¥U¦bdoc/¥Ø¿ý¤U¡C"
>+ 
>+ #: src/zhcon.cpp:93
>+ msgid ""
>+ "Zhcon can use input methods from Unicon[TurboLinux],read manual for detail."
>+ msgstr ""
>++"zhcon¯à¨Ï¥ÎUnicon[TurboLinux]¤¤ªº¿é¤Jªk¡A½Ð¾\\Åª¤â¥U¥HÀò±o§ó¸Ô²Óªº¸ê°T¡C"
>+ 
>+ #: src/zhcon.cpp:94
>+ msgid "Zhcon is optimized for running under Linux FrameBuffer."
>+-msgstr ""
>++msgstr "zhcon¬°LinuxªºFrameBufferÅX°Ê§@¤F³Ì¨Î¤Æ¡A¦bFrameBuffer¤U¥i¥H±o¨ì³Ì¨Î®ÄªG¡C"
>+ 
>+ #: src/zhcon.cpp:95
>+ msgid "Press CTRL-F7 to change input style"
>+-msgstr ""
>++msgstr "¥i¥H¥ÎCTRL-F7¤Á´«¿é¤J·®æ¡C"
>+ 
>+ #: src/zhcon.cpp:603
>+ msgid "screen resolution"
>+-msgstr ""
>++msgstr "¿Ã¹õ¸ÑªR«×"
>+ 
>+ #: src/zhcon.cpp:606
>+-#, fuzzy
>+ msgid "default encode"
>+-msgstr "è¯·éæ©ç¼ç æ¹å¼:"
>++msgstr "¹w³]½s½X  "
>+ 
>+ #: src/inputmanager.cpp:706
>+ msgid "Press CTRL-ALT-H to exit help"
>+-msgstr ""
>++msgstr "½Ð«ö CTRL-ALT-H °h¥X¨D§Uµ¡¤f"
>+ 
>+ #: src/inputmanager.cpp:707
>+ msgid "ALT -SPACE  Open/Close CJK mode"
>+-msgstr ""
>++msgstr "ALT-SPACE   ¥´¶}/Ãö³¬CJK¤è¦¡"
>+ 
>+ #: src/inputmanager.cpp:708
>+ msgid "CTRL-SPACE  Open/Close input method"
>+-msgstr ""
>++msgstr "CTRL-SPACE  ¥´¶}/Ãö³¬¿é¤Jªk"
>+ 
>+ #: src/inputmanager.cpp:709
>+ msgid "SHIFT-PageUp/PageDown/Up/Down   Scroll & Display History"
>+-msgstr ""
>++msgstr "SHIFT-PageUp/PageDown/Up/Down  ÂsÄý¾ú¥v¿Ã¹õ"
>+ 
>+ #: src/inputmanager.cpp:711
>+ msgid "CTRL key:"
>+-msgstr ""
>++msgstr "CTRL ¥\\¯àÁä:"
>+ 
>+ #: src/inputmanager.cpp:712
>+ msgid "F1  GB2312"
>+@@ -189,61 +188,60 @@
>+ 
>+ #: src/inputmanager.cpp:717
>+ msgid "F9  Switch & Auto Detect"
>+-msgstr ""
>++msgstr "F9  ¤Á´«¦Û°Ê°»´ú¤è¦¡"
>+ 
>+ #: src/inputmanager.cpp:718
>+-#, fuzzy
>+ msgid "F10 Sys Menu"
>+-msgstr "ç³»ç»èå"
>++msgstr "F10 ¿ï³æ"
>+ 
>+ #: src/inputmanager.cpp:719
>+ msgid "F7  Input Style"
>+-msgstr ""
>++msgstr "F7  ¤Á´«¿é¤J·®æ"
>+ 
>+ #: src/inputmanager.cpp:720
>+ msgid "D   Exit zhcon"
>+-msgstr ""
>++msgstr "D   °h¥Xzhcon"
>+ 
>+ #: src/inputmanager.cpp:722
>+ msgid "Chinese/English Mode:"
>+-msgstr ""
>++msgstr "¤¤^¤å¼Ò¦¡:"
>+ 
>+ #: src/inputmanager.cpp:723
>+ msgid "CTRL-,  Full/Half Char"
>+-msgstr ""
>++msgstr "Ctrl-,  ¤Á´«¥þ«¬/¥b«¬"
>+ 
>+ #: src/inputmanager.cpp:724
>+ msgid "CTRL-.  Full/Half Comma"
>+-msgstr ""
>++msgstr "Ctrl-.  ¤Á´«¤¤¤å¼ÐÂI"
>+ 
>+ #: src/inputmanager.cpp:726
>+ msgid "CTRL-ALT-NUM:"
>+-msgstr ""
>++msgstr "CTRL-ALT-¼Æ¦rÁä:"
>+ 
>+ #: src/inputmanager.cpp:727
>+ msgid "0      Prompt Mode"
>+-msgstr ""
>++msgstr "0      ¶i¤J´£¥Üª¬ºA"
>+ 
>+ #: src/inputmanager.cpp:728
>+ msgid "1..9   Select IME 1..9"
>+-msgstr ""
>++msgstr "1..9   ¿ï¾Ü¿é¤Jªk1..9"
>+ 
>+ #: src/inputmanager.cpp:730
>+ msgid "Special Input Key:"
>+-msgstr ""
>++msgstr "¿é¤J¥\\¯àÁä:"
>+ 
>+ #: src/inputmanager.cpp:731
>+ msgid "CTRL-SHIFT  Next IME"
>+-msgstr ""
>++msgstr "CTRL-SHIFT  ¤Á´«¤U¤@Ó¿é¤Jªk"
>+ 
>+ #: src/inputmanager.cpp:732
>+ msgid "SPACE       Select Number 0"
>+-msgstr ""
>++msgstr "SPACE     ¥Ø«eº~¦r¿ï¾Ü"
>+ 
>+ #: src/inputmanager.cpp:733
>+ msgid "+/-         Next/Prev page"
>+-msgstr ""
>++msgstr "+/-         Ô¿ï¦r«e«áÂ½¶"
>+ 
>+ #: src/inputmanager.cpp:734
>+ msgid "ESC         Reset Input Area"
>+-msgstr ""
>++msgstr "ESC       ²MªÅ¿é¤J±ø"
>diff -ruN --exclude CVS /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp zhcon/files/patch-src::zhcon.cpp
>--- /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp	Wed Mar  6 11:29:13 2002
>+++ zhcon/files/patch-src::zhcon.cpp	Sun Feb 24 18:27:21 2002
>@@ -17,7 +17,7 @@
>      InitInputManager(f);
>      if (f.GetOption("startupmsg",true))
>          StartupMsg();
>-@@ -489,23 +490,23 @@
>+@@ -489,29 +490,30 @@
>      string s;
>      s = f.GetOption(string("defaultencode"), string("gb2312"));
>      if (s == "gb2312") {
>@@ -46,3 +46,10 @@
>          setenv("LC_ALL", "ko", 1);
>          mDefaultEncode = GBK;
>      } else {
>+         throw runtime_error("unable to set default encode!");
>+     }
>+ 
>++    setenv("LC_CTYPE", getenv("LC_ALL"), 1);
>+     s = f.GetOption(string("autoencode"), string("manual"));
>+     if (s == "auto")
>+         mAutoEncode = AUTO;

Actions: View | Diff

Attachments on bug 35728: 20212