[gnome-applets/wip/dont-use-deprecated: 1/3] Remove deprected pygtk and libpanel-applet-2 code



commit 2552b0427d32eedfc7659540e356d2714aa7eb9d
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Nov 15 16:16:16 2010 +0100

    Remove deprected pygtk and libpanel-applet-2 code

 configure.in                                       |   23 +-
 geyes/docs/zh_HK/geyes.xml                         |  232 ++++----
 geyes/docs/zh_TW/geyes.xml                         |  232 ++++----
 invest-applet/invest/about.py                      |    6 +-
 invest-applet/invest/applet.py                     |   95 ++--
 invest-applet/invest/chart.py                      |   23 +-
 invest-applet/invest/help.py                       |    6 +-
 invest-applet/invest/invest-applet.py              |   18 +-
 invest-applet/invest/preferences.py                |   14 +-
 invest-applet/invest/quotes.py                     |   21 +-
 invest-applet/invest/widgets.py                    |   34 +-
 null_applet/Makefile.am                            |   56 +-
 null_applet/null_applet.c                          |   33 +-
 null_applet/null_applet.h                          |   50 ++
 ...org.gnome.applets.NullApplet.panel-applet.in.in |   15 +
 ...gnome.panel.applet.NullAppletFactory.service.in |    3 +
 stickynotes/docs/zh_HK/stickynotes_applet.xml      |  631 +++++++++++++-------
 stickynotes/docs/zh_TW/stickynotes_applet.xml      |  631 +++++++++++++-------
 18 files changed, 1312 insertions(+), 811 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1779cd0..eca3982 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,6 @@ GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
 GCONF_REQUIRED=2.8.0
 SCROLLKEEPER_REQUIRED=0.1.4
-LIBPANEL_REQUIRED=2.13.4
 LIBPANEL3_REQUIRED=2.31.2
 LIBGTOP_REQUIRED=2.11.92
 LIBXKLAVIER_REQUIRED=4.0
@@ -26,9 +25,7 @@ LIBNOTIFY_REQUIRED=0.3.2
 HAL_REQUIRED=0.5.3
 DBUS_REQUIRED=1.1.2
 DBUS_GLIB_REQUIRED=0.74
-PYGTK_REQUIRED=2.6
-PYGOBJECT_REQUIRED=2.6
-GNOME_PYTHON_REQUIRED=2.10
+PYGOBJECT_REQUIRED=2.26
 GNOME_ICON_THEME_REQUIRED=2.15.91
 LIBXML_REQUIRED=2.5.0
 GWEATHER_REQUIRED=2.22.1
@@ -116,11 +113,6 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_FLAGS)
 AC_SUBST(GTK_LIBS)
 
-dnl -- check for libpanelapplet (required) ------------------------------------
-PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0 >= $LIBPANEL_REQUIRED)
-AC_SUBST(GNOME_APPLETS_CFLAGS)
-AC_SUBST(GNOME_APPLETS_LIBS)
-
 dnl -- check for libpanelapplet3 (required) ------------------------------------
 PKG_CHECK_MODULES(GNOME_APPLETS3, libpanelapplet-3.0 >= $LIBPANEL3_REQUIRED)
 AC_SUBST(GNOME_APPLETS3_CFLAGS)
@@ -254,9 +246,7 @@ dnl -- check for Python/GNOME modules (optional) ------------------------------
 PYGTK_CFLAGS=
 PYGTK_LIBS=
 PKG_CHECK_MODULES(PYGTK,
-	pygtk-2.0	>= $PYGTK_REQUIRED
-	pygobject-2.0	>= $PYGOBJECT_REQUIRED
-	gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED,
+	pygobject-2.0	>= $PYGOBJECT_REQUIRED,
 	HAVE_PYGTK="yes", HAVE_PYGTK="no")
 AC_SUBST(PYGTK_LIBS)
 AC_SUBST(PYGTK_CFLAGS)
@@ -559,14 +549,7 @@ dnl ***************************************************************************
 dnl *** invest-applet specific checks                                       ***
 dnl ***************************************************************************
 
-if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
-	AM_CHECK_PYMOD(gnomeapplet,,
-			BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
-else
-	BUILD_INVEST_APPLET="no"
-fi
-
-AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$BUILD_INVEST_APPLET" = "xyes")
+AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGTK" = "xyes")
 
 dnl ***************************************************************************
 dnl *** Check if IPv6 is available                                          ***
diff --git a/geyes/docs/zh_HK/geyes.xml b/geyes/docs/zh_HK/geyes.xml
index 244eeef..66e2335 100644
--- a/geyes/docs/zh_HK/geyes.xml
+++ b/geyes/docs/zh_HK/geyes.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0"?><!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-  <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appletversion "2.3.6">
-  <!ENTITY manrevision "2.5">
-  <!ENTITY date "September 2003">
-  <!ENTITY applet "Geyes">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appletversion "2.8">
+<!ENTITY manrevision "2.8">
+<!ENTITY date "September 2004">
+<!ENTITY applet "Geyes">
 ]>
-
 <!-- 
       (Do not remove this comment block.)
   Maintained by the GNOME Documentation Project
@@ -14,26 +13,28 @@
   Template version: 2.0 beta
   Template last modified Mar 12, 2002  
 -->
-
-<article id="index" lang="zh_hk">
+<article id="index" lang="zh_HK">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
-  <articleinfo>
-	 <title>&applet; Applet æ??å?? V&manrevision;</title>
-	 <abstract role='description'><para/></abstract>
+  <articleinfo> 
+	 <title>Geyes 使ç?¨æ??å??</title> 
+	 <abstract role="description">
+	   <para>Geyes æ??ä¾?ä¸?é??ç?¼ç??é??å??å¾?æ??趣ç??æ?¹å¼?ä¾?è®?ä½ ç?¥é??ä½ ç??é¼ æ¨?å?¨è?¢å¹?ä¸?ç??ç??麼ä½?ç½®</para>
+	 </abstract>
 	 <copyright> 
-		<year>2002 å¹´</year>
-		<year>2003  å¹´</year> 
+		<year>2002</year>
+		<year>2003</year> 
+		<year>2004</year> 
 		<holder>Sun Microsystems</holder> 
 	 </copyright>  
 	 <copyright> 
-		<year>2000 å¹´</year> 
+		<year>2000</year> 
 		<holder>Telsa Gwynne</holder> 
 	 </copyright>
 	 <copyright> 
-		<year>2000 å¹´</year> 
+		<year>2000</year> 
 		<holder>Arjan Scherpenisse</holder> 
-	 </copyright>
+	 </copyright><copyright><year>2010.</year><holder>Kevin_Wei_2 (kevin_wei3 yahoo com tw)</holder></copyright>
 <!-- translators: uncomment this:
 
   <copyright>
@@ -43,36 +44,51 @@
 
    -->
 
-	 <publisher role='maintainer'> 
-		<publishername>GNOME æ??件å°?æ¡?</publishername> 
+	 <publisher role="maintainer"> 
+		<publishername>GNOME æ??件è¨?å??</publishername> 
 	 </publisher> 
-&legal;
+   <legalnotice id="legalnotice">
+         <para>æ ¹æ??è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) æ??ç?¼ä½? ç?? GNU è?ªç?±æ??件æ??æ¬? (GNU Free Documentation License, GFDL) 1.1 (å?«) 以å¾?ç??æ?¬ï¼? 使ç?¨è??å?¯ä»¥è¤?製ã??æ?£ä½?ï¼?æ??ä¿®æ?¹æ?¬æ??件ï¼?ä½?ä¸?å¾?å¢?å?ªç« ç¯?ï¼?ä¸?å¾?å? ä¸?å°?é?¢æ??å­?ï¼? 亦ä¸?å¾?å? ä¸?å°?åº?æ??å­?ã?? å¦?è¦?å??å¾? GFDL ç??å?¯æ?¬ï¼?è«?å??é?±æ­¤<ulink type="help" url="ghelp:fdl">é?£çµ?</ulink>ï¼?æ??æ?¯å??é?±è??æ?¬æ??å??ä¸?å??é?¨é??ç?? COPYING-DOCS æª?æ¡?ã??</para>
+          <para>æ?¬æ??å??æ?¯å±¬æ?¼æ ¹æ?? GFDL æ??æ¬?æ??ç?¼ä½?ä¹? GNOME æ??å??é??中ç??ä¸?é?¨ä»½ã?? å¦?æ??ä½ å?ªè¦?å?®ç?¨æ?£ä½?æ?¬æ??å??ï¼?æ ¹æ??æ??æ??æ¬?è?²æ??第å?­ç¯?ä¹?æ??è¿°ï¼? ä½ å¿?é ?å?¦å¤?å°?æ??æ¬?è?²æ??å? å?¥æ?¬æ??å??中ã??</para>
+ 
+         <para>許å¤?å?¬å?¸ç?ºäº?çª?顯å?¶ç?¢å??è??æ??å??ï¼?æ??使ç?¨ç?¹å?¥å??稱ï¼?並亦已è?²æ??é??äº?å??稱ç?ºå?¶å??æ¨?ã??ç?¶é??äº?å??稱å?ºç?¾å?¨ GNOME æ??件中ï¼?å??æ?? GNOME æ??件 å°?æ¡?å°?çµ?æ??å?¡äº¦æ??ç?½é??äº?å??稱ç?ºå??æ¨?æ??ï¼? é??äº?å??稱æ??以大寫å­?æ¯?æ??æ?¯é¦?å­?æ¯?大寫表示ã??</para>
+ 
+         <para>æ??件以å??æ­¤æ??件ç??ä¿®æ?¹ç??æ?¬å¿?é ?é?µå¾ª GNU è?ªç?±æ??件許å?¯è­?ï¼?é?²ä¸?æ­¥è³?è¨?è«?è¦?ï¼? <orderedlist>
+                 <listitem>
+                   <para>æ??件æ??ä¾?æ?¯ä»¥å?¶ã??å??樣ã??å??ç?¾ï¼?ä¸?管æ??示æ??æ??示ï¼?ç??ä¸?å?·ä»»ä½?ä¿?è­?ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) æ??件æ??修正ç??毫ç?¡é?¯èª¤ã??å?¯è²©å?®ã?? å?·ç?¹æ®?ç?¨é??ï¼?æ??ä¸?ä¾µæ¬?ã??é??æ?¼æ?¬æ??件è??修正ç??æ??件ä¹?å??質ã??正確æ?§å??å??ç?¨ï¼? å?¶é¢¨é?ªä½ å¿?é ?è?ªè¡?æ?¿æ??ã?? è?¥æ?¬æ??件æ??修正ç??æ??ä»»ä½?缺é?·ï¼?ä»»ä½?å¿?é ?ä¹?ä¿?é¤?ï¼?ä¿®ç??å??æ?´æ­£ï¼? æ??ç?±ä½ è?ªè¡?æ?¿æ??ï¼?å??å§?ä½?è??ã??ä½?è??æ??ä»»ä½?æ?£ä½?è??ç?¡é ?負責ã?? æ?¬å??責è?²æ??æ?¯æ?¬æ??æ¬?è?²æ??極é??è¦?è??å¿?è¦?ç??ä¸?é?¨ä»½ï¼?å? æ­¤ä»»ä½?æ??件æ?? 修正ç??ç??æ??æ¬?ï¼?ç??é ?å?¨å??æ??æ?¬å??責è?²æ??ç??æ??æ³?ä¸?é?²è¡?ï¼?å??æ??</para>
+                 </listitem>
+                 <listitem>
+                   <para>å?¨ä»»ä½?æ??æ³?æ??æ³?å¾?ç??è«?ä¸?ï¼?亦å?³ä¸?管æ?¯å?¨ä¾µæ¬? (å??æ?¬ç??忽)ã??å¥?ç´?æ??å?¶ä»?æ??å½¢ï¼?æ??æ?¯å·²é ?å??å??ç?¥æ??æ??ä¸?å??æ??害ä¹?å?¯è?½æ??ï¼?æ?¬æ??件 æ??修正ç??ç??ä»»ä½?ä½?è??ã??å??å§?ä½?è??ã??æ??稿人以å??æ?£ä½?è??ï¼?æ??æ?¯ä»»ä½?æ??ä¾?å?®ä½?ï¼?å°?æ?¼å? ä½¿ç?¨æ?¬æ??件å??修正ç??ï¼?æ??è??æ?¬æ??件å??修正ç??使ç?¨ç?¸é??æ??é? æ??ç??ä»»ä½?ç?´æ?¥ã??é??æ?¥ã??ç?¹æ®?ã??å?¶ç?¶æ??å¿?ç?¶ä¹?æ??害ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) ä¿¡è­½å??æ??ã??å·¥ä½?å??æ­¢ã??é?»è?¦ç?¶ æ©?æ??ä¸?正常é??ä½?ï¼?æ??ä»»ä½?æ??æ??å?¶ä»?æ??害ï¼?ä¸?述人ç­?ç??ä¸?é??è²  ä»»ä½?責任ã??</para>
+                 </listitem>
+           </orderedlist></para>
+   </legalnotice>
+ 
 
-	 <authorgroup>
+	 <authorgroup> 
 		<author> 
 		  <firstname>Sun</firstname> 
-		  <surname>GNOME æ??件å°?çµ?</surname> 
+		  <surname>GNOME æ??件é??ä¼?</surname> 
 		  <affiliation> 
 			 <orgname>Sun Microsystems</orgname> 
-			 <address></address>
-		  </affiliation>
-		</author>
+			 <address/> 
+		  </affiliation> 
+		</author> 
 		<author> 
 		  <firstname>Telsa</firstname> 
 		  <surname>Gwynne</surname> 
 		  <affiliation> 
-			 <orgname>GNOME æ??件å°?æ¡?</orgname> 
-			 <address> <email>hobbit aloss ukuu org uk</email> </address>
-		  </affiliation>
+			 <orgname>GNOME æ??件è¨?å??</orgname> 
+			 <address> <email>hobbit aloss ukuu org uk</email> </address> 
+		  </affiliation> 
 		</author>
 		<author> 
 		  <firstname>Arjan</firstname> 
 		  <surname>Scherpenisse</surname> 
 		  <affiliation> 
-			 <orgname>GNOME æ??件å°?æ¡?</orgname> 
-			 <address> <email>acscherp wins uva nl</email> </address>
-		  </affiliation>
-		</author>
+			 <orgname>GNOME æ??件è¨?å??</orgname> 
+			 <address> <email>acscherp wins uva nl</email> </address> 
+		  </affiliation> 
+		</author> 
       <!-- This is appropriate place for other contributors: translators,
            maintainers,  etc. Commented out by default.
            <othercredit role="translator">
@@ -86,78 +102,93 @@
            </othercredit>
 -->
 	 </authorgroup>
+	 
+	 <releaseinfo revision="2.26" role="review"/>
 
 	 <revhistory>
+	   <revision>
+	     <revnumber>Version 2.8</revnumber>
+	     <date>2004å¹´9æ??</date>
+	     <revdescription>
+	       <para role="author">GNOME æ??件é??ä¼?</para>
+	       <para role="publisher">GNOME æ??件è¨?å??</para>
+	     </revdescription>
+	   </revision>
 		<revision> 
-		  <revnumber>&applet; Applet æ??å?? V&manrevision;</revnumber> 
-		  <date>&date;</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.6</revnumber> 
+		  <date>2004å¹´5æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.4</revnumber> 
-		  <date>2003 å¹´ 8  æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.5</revnumber> 
+		  <date>2003å¹´9æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.3</revnumber> 
-		  <date>2003 å¹´ 1 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.4</revnumber> 
+		  <date>2003å¹´8æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.2</revnumber> 
-		  <date>2002 å¹´ 8 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.3</revnumber> 
+		  <date>2003å¹´1æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.1</revnumber> 
-		  <date>2002 å¹´ 6 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.2</revnumber> 
+		  <date>2002å¹´8æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.0</revnumber> 
-		  <date>2002 å¹´ 3 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.1</revnumber> 
+		  <date>2002å¹´6æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
 		<revision> 
-		  <revnumber>gEyes Applet</revnumber> 
-		  <date>2000 å¹´</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.0</revnumber> 
+		  <date>2002å¹´5æ??</date> 
 		  <revdescription> 
-			 <para role="author">Telsa Gwynne
-				<email>hobbit aloss ukuu org uk</email></para>
-			 <para role="author">Arjan Scherpenisse
-				<email>acscherp wins uva nl</email></para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
-	 </revhistory>
-	 <releaseinfo> æ?¬æ??å??ç??å?§å®¹æ?¯èªªæ?? &appletversion; ç??ç?? &applet;ã??
-		</releaseinfo>
+			 <para role="author">Sun GNOME æ??件é??ä¼?</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
+		<revision> 
+		  <revnumber>gEyes å°?ç?¼ç??ç¨?å¼?</revnumber> 
+		  <date>2000</date> 
+		  <revdescription> 
+			 <para role="author">Telsa Gwynne <email>hobbit aloss ukuu org uk</email></para> 
+			 <para role="author">Arjan Scherpenisse <email>acscherp wins uva nl</email></para>
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
+	 </revhistory> 
+	 <releaseinfo>é??份說æ??æ??å??æ??è¿°ç?? Geyes å°?ç?¼ç??ç??æ?¬æ?¯ 2.8</releaseinfo> 
 	 <legalnotice> 
-		<title>æ??è¦?å??é¥?</title>
-		<para> é??æ?¼ &applet; Applet æ??æ?¬æ??å??ï¼?å¦?æ??è¦?å ±å??é?¯èª¤æ??æ??å?ºå»ºè­°ï¼?è«?é?µç?§ <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink> ç??æ??示ã??</para>
+		<title>å??é¥?</title> 
+		<para>è¦?å??å ±Geyes å°?ç?¼ç??æ??é??æ?¬æ??å??ç??é?¯èª¤æ??給äº?建議ï¼?è«?æ ¹æ?? <ulink url="ghelp:gnome-feedback" type="help">GNOME å??é¥?é ?é?¢</ulink> 中ç??æ??示ã??</para>
 		
-	 </legalnotice>
-  </articleinfo>
+	 </legalnotice> 
+  </articleinfo> 
   <indexterm> 
-	 <primary>Geyes</primary> 
+	 <primary>Geyes å°?ç?¼ç??</primary> 
   </indexterm> 
 
 <!-- ============= Document Body ============================= -->
@@ -166,33 +197,24 @@
 <title>ä»?ç´¹</title>
 <!-- ==== Figure ============================================= -->
 	 <figure id="geyes-fig"> 
-		<title>&applet; Applet</title>
-		<screenshot>
-		  <mediaobject>
+		<title>Geyes å°?ç?¼ç??ç¨?å¼?</title> 
+		<screenshot> 
+		  <mediaobject> 
 			 <imageobject><imagedata fileref="figures/geyes_applet.png" format="PNG"/> 
 			 </imageobject>
-			 <textobject>
-				<phrase>顯示 Geyes Appletã??</phrase>
-			 </textobject>
-		  </mediaobject>
-		</screenshot>
-	 </figure>
+			 <textobject> 
+				<phrase>顯示 Geyes å°?ç?¼ç??ç¨?å¼?</phrase> 
+			 </textobject> 
+		  </mediaobject> 
+		</screenshot> 
+	 </figure> 
     <!-- ==== End of Figure ======================================= -->
-<para><application>&applet;</application> Applet å?¯ä»¥è®?æ?¨è¿½è¹¤è?¢å¹?ä¸?æ»?é¼ æ??æ¨?ç??移å??ã??Applet æ??顯示ç?ºä¸?æ??å¤?å??ç?¼ç??ç??å½±å??ï¼?è·?è??æ»?é¼ æ??æ¨?å?¨è?¢å¹?ä¸?å??è??移å??ã??</para>
-<para>å¦?æ??è¦?å°? <application>&applet;</application> å? å?¥é?¢æ?¿ï¼?è«?å?¨é?¢æ?¿ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??<menuchoice><guimenu>å? å?¥é?¢æ?¿</guimenu><guisubmenu>å¨?æ¨?</guisubmenu><guimenuitem>Geyes</guimenuitem>
-</menuchoice>ã??</para>
+<para><application>Geyes å°?ç?¼ç??</application>æ??ä¾?ä¸?é??ç?¼ç??é??å??å¾?æ??趣ç??æ?¹å¼?ä¾?è®?ä½ ç?¥é??ä½ ç??é¼ æ¨?å?¨è?¢å¹?ä¸?ç??ç??麼ä½?ç½®ã??é??å??ç¨?å¼?æ??ä¾?äº?ä¸?å??æ??å¤?å??ç?¼ç??ä¾?è·?é?¨ä½ é¼ æ¨?ç??ä½?ç½®ã??</para>
+<para>è¦?å?¨é?¢æ?¿ä¸?é?¢æ?°å¢?<application>Geyes å°?ç?¼ç??</application>ï¼?è«?å?¨é?¢æ?¿ä¸?æ??å?³é?µä¸¦é?¸æ??<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>ï¼?並å?¨<application>å? å?¥é?¢æ?¿</application>å°?話ç??中é?¸æ??<application>å°?ç?¼ç??</application></para>
 </sect1>
 <!-- ============= Preferences  ================================ -->
-<sect1 id="geyes-settings"><title>å??好設å®?</title>
-<para>å¦?æ??è¦?é??ç½® <application>&applet;</application>ï¼?è«?å?¨ <application>&applet;</application> Applet ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??<guimenu>å??好設å®?</guimenu>ã??</para>
-<variablelist>
-<varlistentry>
-<term><guilabel>æ¡?é?¢é??è?²</guilabel> </term>
-<listitem>
-<para>è«?å¾?é??å??æ¸?å?®ä¸­é?¸æ?? <application>&applet;</application> ç??é??è?²ã??
-å¾?æ??æ??å?°å¥?ç?°ç??å??種é??è?²ï¼?ç?º <application>&applet;</application> æ??ä¾?å??種ä¸?å??ç??å¤?è§?ã??</para>
-</listitem>
-</varlistentry>
-</variablelist>
+<sect1 id="geyes-settings">
+<title>å??好設å®?</title>
+<para>è¦?設å®?<application>Geyes å°?ç?¼ç??</application>ï¼?è«?å?? <application>Geyes å°?ç?¼ç??</application>ç¨?å¼?ä¸?æ??æ»?é¼ å?³é?µç?¶å¾?é?¸æ??<guimenuitem>å??好設å®?</guimenuitem>ï¼?ä½ å?¯ä»¥é?¸æ??ä¸?äº?ä¸?å??ç??主é¡?ï¼?ä¸?å??ç??主é¡?å°?æ??å½±é?¿ä½ ç??ç?¼ç??å°?å¦?ä½?ä¾?å??ç?»ã??</para>
 </sect1>
 </article>
diff --git a/geyes/docs/zh_TW/geyes.xml b/geyes/docs/zh_TW/geyes.xml
index a860a7e..38f3eb1 100644
--- a/geyes/docs/zh_TW/geyes.xml
+++ b/geyes/docs/zh_TW/geyes.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0"?><!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-  <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appletversion "2.3.6">
-  <!ENTITY manrevision "2.5">
-  <!ENTITY date "September 2003">
-  <!ENTITY applet "Geyes">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appletversion "2.8">
+<!ENTITY manrevision "2.8">
+<!ENTITY date "September 2004">
+<!ENTITY applet "Geyes">
 ]>
-
 <!-- 
       (Do not remove this comment block.)
   Maintained by the GNOME Documentation Project
@@ -14,26 +13,28 @@
   Template version: 2.0 beta
   Template last modified Mar 12, 2002  
 -->
-
-<article id="index" lang="zh_tw">
+<article id="index" lang="zh_TW">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
-  <articleinfo>
-	 <title>&applet; Applet æ??å?? V&manrevision;</title>
-	 <abstract role='description'><para/></abstract>
+  <articleinfo> 
+	 <title>Geyes 使ç?¨æ??å??</title> 
+	 <abstract role="description">
+	   <para>Geyes æ??ä¾?ä¸?é??ç?¼ç??é??å??å¾?æ??趣ç??æ?¹å¼?ä¾?è®?æ?¨ç?¥é??æ?¨ç??æ»?é¼ æ??æ¨?å?¨è?¢å¹?ä¸?ç??ç??麼ä½?ç½®</para>
+	 </abstract>
 	 <copyright> 
-		<year>2002 å¹´</year>
-		<year>2003  å¹´</year> 
+		<year>2002</year>
+		<year>2003</year> 
+		<year>2004</year> 
 		<holder>Sun Microsystems</holder> 
 	 </copyright>  
 	 <copyright> 
-		<year>2000 å¹´</year> 
+		<year>2000</year> 
 		<holder>Telsa Gwynne</holder> 
 	 </copyright>
 	 <copyright> 
-		<year>2000 å¹´</year> 
+		<year>2000</year> 
 		<holder>Arjan Scherpenisse</holder> 
-	 </copyright>
+	 </copyright><copyright><year>2010.</year><holder>Kevin_Wei_2 (kevin_wei3 yahoo com tw)</holder></copyright>
 <!-- translators: uncomment this:
 
   <copyright>
@@ -43,36 +44,51 @@
 
    -->
 
-	 <publisher role='maintainer'> 
-		<publishername>GNOME æ??件å°?æ¡?</publishername> 
+	 <publisher role="maintainer"> 
+		<publishername>GNOME æ??件è¨?å??</publishername> 
 	 </publisher> 
-&legal;
+   <legalnotice id="legalnotice">
+         <para>æ ¹æ??è?ªç?±è»?é«?å?ºé??æ?? (Free Software Foundation) æ??ç?¼ä½? ç?? GNU è?ªç?±æ??件æ??æ¬? (GNU Free Documentation License, GFDL) 1.1 (å?«) 以å¾?ç??æ?¬ï¼? 使ç?¨è??å?¯ä»¥è¤?製ã??æ?£ä½?ï¼?æ??ä¿®æ?¹æ?¬æ??件ï¼?ä½?ä¸?å¾?å¢?å?ªç« ç¯?ï¼?ä¸?å¾?å? ä¸?å°?é?¢æ??å­?ï¼? 亦ä¸?å¾?å? ä¸?å°?åº?æ??å­?ã?? å¦?è¦?å??å¾? GFDL ç??å?¯æ?¬ï¼?è«?å??é?±æ­¤<ulink type="help" url="ghelp:fdl">é?£çµ?</ulink>ï¼?æ??æ?¯å??é?±è??æ?¬æ??å??ä¸?å??é?¨é??ç?? COPYING-DOCS æª?æ¡?ã??</para>
+          <para>æ?¬æ??å??æ?¯å±¬æ?¼ä¾? GFDL æ??æ¬?æ??ç?¼ä½?ä¹? GNOME æ??å??é??中ç??ä¸?é?¨ä»½ã?? å¦?æ??æ?¨å?ªè¦?å?®ç?¨æ?£ä½?æ?¬æ??å??ï¼?ä¾?æ??æ??æ¬?è?²æ??第å?­ç¯?ä¹?æ??è¿°ï¼? æ?¨å¿?é ?å?¦å¤?å°?æ??æ¬?è?²æ??å? å?¥æ?¬æ??å??中ã??</para>
+ 
+         <para>許å¤?å?¬å?¸ç?ºäº?çª?顯å?¶ç?¢å??è??æ??å??ï¼?æ??使ç?¨ç?¹å?¥å??稱ï¼?並亦已è?²æ??é??äº?å??稱ç?ºå?¶å??æ¨?ã??ç?¶é??äº?å??稱å?ºç?¾å?¨ GNOME æ??件中ï¼?å??æ?? GNOME æ??件 å°?æ¡?å°?çµ?æ??å?¡äº¦æ??ç?½é??äº?å??稱ç?ºå??æ¨?æ??ï¼? é??äº?å??稱æ??以大寫å­?æ¯?æ??æ?¯é¦?å­?æ¯?大寫表示ã??</para>
+ 
+         <para>æ??件以å??æ­¤æ??件ç??ä¿®æ?¹ç??æ?¬å¿?é ?é?µå¾ª GNU è?ªç?±æ??件許å?¯è­?ï¼?é?²ä¸?æ­¥è³?è¨?è«?è¦?ï¼? <orderedlist>
+                 <listitem>
+                   <para>æ??件æ??ä¾?æ?¯ä»¥å?¶ã??å??樣ã??å??ç?¾ï¼?ä¸?管æ??示æ??æ??示ï¼?ç??ä¸?å?·ä»»ä½?ä¿?è­?ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) æ??件æ??修正ç??毫ç?¡é?¯èª¤ã??å?¯è²©å?®ã?? å?·ç?¹æ®?ç?¨é??ï¼?æ??ä¸?ä¾µæ¬?ã??é??æ?¼æ?¬æ??件è??修正ç??æ??件ä¹?å??質ã??正確æ?§å??å??ç?¨ï¼? å?¶é¢¨é?ªæ?¨å¿?é ?è?ªè¡?æ?¿æ??ã?? è?¥æ?¬æ??件æ??修正ç??æ??ä»»ä½?缺é?·ï¼?ä»»ä½?å¿?é ?ä¹?ä¿?é¤?ï¼?ä¿®ç??å??æ?´æ­£ï¼? æ??ç?±æ?¨è?ªè¡?æ?¿æ??ï¼?å??å§?ä½?è??ã??ä½?è??æ??ä»»ä½?æ?£ä½?è??ç?¡é ?負責ã?? æ?¬å??責è?²æ??æ?¯æ?¬æ??æ¬?è?²æ??極é??è¦?è??å¿?è¦?ç??ä¸?é?¨ä»½ï¼?å? æ­¤ä»»ä½?æ??件æ?? 修正ç??ç??æ??æ¬?ï¼?ç??é ?å?¨å??æ??æ?¬å??責è?²æ??ç??æ??æ³?ä¸?é?²è¡?ï¼?å??æ??</para>
+                 </listitem>
+                 <listitem>
+                   <para>å?¨ä»»ä½?æ??æ³?æ??æ³?å¾?ç??è«?ä¸?ï¼?亦å?³ä¸?管æ?¯å?¨ä¾µæ¬? (å??æ?¬ç??忽)ã??å¥?ç´?æ??å?¶ä»?æ??å½¢ï¼?æ??æ?¯å·²é ?å??å??ç?¥æ??æ??ä¸?å??æ??害ä¹?å?¯è?½æ??ï¼?æ?¬æ??件 æ??修正ç??ç??ä»»ä½?ä½?è??ã??å??å§?ä½?è??ã??æ??稿人以å??æ?£ä½?è??ï¼?æ??æ?¯ä»»ä½?æ??ä¾?å?®ä½?ï¼?å°?æ?¼å? ä½¿ç?¨æ?¬æ??件å??修正ç??ï¼?æ??è??æ?¬æ??件å??修正ç??使ç?¨ç?¸é??æ??é? æ??ç??ä»»ä½?ç?´æ?¥ã??é??æ?¥ã??ç?¹æ®?ã??å?¶ç?¶æ??å¿?ç?¶ä¹?æ??害ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) ä¿¡è­½å??æ??ã??å·¥ä½?å??æ­¢ã??é?»è?¦ç?¶ æ©?æ??ä¸?正常é??ä½?ï¼?æ??ä»»ä½?æ??æ??å?¶ä»?æ??害ï¼?ä¸?述人ç­?ç??ä¸?é??è²  ä»»ä½?責任ã??</para>
+                 </listitem>
+           </orderedlist></para>
+   </legalnotice>
+ 
 
-	 <authorgroup>
+	 <authorgroup> 
 		<author> 
 		  <firstname>Sun</firstname> 
-		  <surname>GNOME æ??件å°?çµ?</surname> 
+		  <surname>GNOME æ??件å??é??</surname> 
 		  <affiliation> 
 			 <orgname>Sun Microsystems</orgname> 
-			 <address></address>
-		  </affiliation>
-		</author>
+			 <address/> 
+		  </affiliation> 
+		</author> 
 		<author> 
 		  <firstname>Telsa</firstname> 
 		  <surname>Gwynne</surname> 
 		  <affiliation> 
-			 <orgname>GNOME æ??件å°?æ¡?</orgname> 
-			 <address> <email>hobbit aloss ukuu org uk</email> </address>
-		  </affiliation>
+			 <orgname>GNOME æ??件è¨?å??</orgname> 
+			 <address> <email>hobbit aloss ukuu org uk</email> </address> 
+		  </affiliation> 
 		</author>
 		<author> 
 		  <firstname>Arjan</firstname> 
 		  <surname>Scherpenisse</surname> 
 		  <affiliation> 
-			 <orgname>GNOME æ??件å°?æ¡?</orgname> 
-			 <address> <email>acscherp wins uva nl</email> </address>
-		  </affiliation>
-		</author>
+			 <orgname>GNOME æ??件è¨?å??</orgname> 
+			 <address> <email>acscherp wins uva nl</email> </address> 
+		  </affiliation> 
+		</author> 
       <!-- This is appropriate place for other contributors: translators,
            maintainers,  etc. Commented out by default.
            <othercredit role="translator">
@@ -86,78 +102,93 @@
            </othercredit>
 -->
 	 </authorgroup>
+	 
+	 <releaseinfo revision="2.26" role="review"/>
 
 	 <revhistory>
+	   <revision>
+	     <revnumber>Version 2.8</revnumber>
+	     <date>2004å¹´9æ??</date>
+	     <revdescription>
+	       <para role="author">GNOME æ??件å??é??</para>
+	       <para role="publisher">GNOME æ??件è¨?å??</para>
+	     </revdescription>
+	   </revision>
 		<revision> 
-		  <revnumber>&applet; Applet æ??å?? V&manrevision;</revnumber> 
-		  <date>&date;</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.6</revnumber> 
+		  <date>2004å¹´5æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.4</revnumber> 
-		  <date>2003 å¹´ 8  æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.5</revnumber> 
+		  <date>2003å¹´9æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.3</revnumber> 
-		  <date>2003 å¹´ 1 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.4</revnumber> 
+		  <date>2003å¹´8æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.2</revnumber> 
-		  <date>2002 å¹´ 8 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.3</revnumber> 
+		  <date>2003å¹´1æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
 		</revision>
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.1</revnumber> 
-		  <date>2002 å¹´ 6 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.2</revnumber> 
+		  <date>2002å¹´8æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
 		<revision> 
-		  <revnumber>Geyes Applet æ??å?? V2.0</revnumber> 
-		  <date>2002 å¹´ 3 æ??</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.1</revnumber> 
+		  <date>2002å¹´6æ??</date> 
 		  <revdescription> 
-			 <para role="author">Sun GNOME æ??件å°?çµ?</para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
 		<revision> 
-		  <revnumber>gEyes Applet</revnumber> 
-		  <date>2000 å¹´</date> 
+		  <revnumber>Geyes å°?ç?¼ç??ç¨?å¼?æ??å?? V2.0</revnumber> 
+		  <date>2002å¹´5æ??</date> 
 		  <revdescription> 
-			 <para role="author">Telsa Gwynne
-				<email>hobbit aloss ukuu org uk</email></para>
-			 <para role="author">Arjan Scherpenisse
-				<email>acscherp wins uva nl</email></para>
-			 <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		  </revdescription>
-		</revision>
-	 </revhistory>
-	 <releaseinfo> æ?¬æ??å??ç??å?§å®¹æ?¯èªªæ?? &appletversion; ç??ç?? &applet;ã??
-		</releaseinfo>
+			 <para role="author">Sun GNOME æ??件å??é??</para> 
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
+		<revision> 
+		  <revnumber>gEyes å°?ç?¼ç??ç¨?å¼?</revnumber> 
+		  <date>2000</date> 
+		  <revdescription> 
+			 <para role="author">Telsa Gwynne <email>hobbit aloss ukuu org uk</email></para> 
+			 <para role="author">Arjan Scherpenisse <email>acscherp wins uva nl</email></para>
+			 <para role="publisher">GNOME æ??件è¨?å??</para> 
+		  </revdescription> 
+		</revision> 
+	 </revhistory> 
+	 <releaseinfo>é??份說æ??æ??å??æ??è¿°ç?? Geyes å°?ç?¼ç??ç??æ?¬æ?¯ 2.8</releaseinfo> 
 	 <legalnotice> 
-		<title>æ??è¦?å??é¥?</title>
-		<para> é??æ?¼ &applet; Applet æ??æ?¬æ??å??ï¼?å¦?æ??è¦?å ±å??é?¯èª¤æ??æ??å?ºå»ºè­°ï¼?è«?é?µç?§ <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink> ç??æ??示ã??</para>
+		<title>å??é¥?</title> 
+		<para>è¦?å??å ±Geyes å°?ç?¼ç??æ??é??æ?¬æ??å??ç??é?¯èª¤æ??給äº?建議ï¼?è«?ä¾?ç?§ <ulink url="ghelp:gnome-feedback" type="help">GNOME å??é¥?é ?é?¢</ulink> 中ç??æ??示ã??</para>
 		
-	 </legalnotice>
-  </articleinfo>
+	 </legalnotice> 
+  </articleinfo> 
   <indexterm> 
-	 <primary>Geyes</primary> 
+	 <primary>Geyes å°?ç?¼ç??</primary> 
   </indexterm> 
 
 <!-- ============= Document Body ============================= -->
@@ -166,33 +197,24 @@
 <title>ä»?ç´¹</title>
 <!-- ==== Figure ============================================= -->
 	 <figure id="geyes-fig"> 
-		<title>&applet; Applet</title>
-		<screenshot>
-		  <mediaobject>
+		<title>Geyes å°?ç?¼ç??ç¨?å¼?</title> 
+		<screenshot> 
+		  <mediaobject> 
 			 <imageobject><imagedata fileref="figures/geyes_applet.png" format="PNG"/> 
 			 </imageobject>
-			 <textobject>
-				<phrase>顯示 Geyes Appletã??</phrase>
-			 </textobject>
-		  </mediaobject>
-		</screenshot>
-	 </figure>
+			 <textobject> 
+				<phrase>顯示 Geyes å°?ç?¼ç??ç¨?å¼?</phrase> 
+			 </textobject> 
+		  </mediaobject> 
+		</screenshot> 
+	 </figure> 
     <!-- ==== End of Figure ======================================= -->
-<para><application>&applet;</application> Applet å?¯ä»¥è®?æ?¨è¿½è¹¤è?¢å¹?ä¸?æ»?é¼ æ??æ¨?ç??移å??ã??Applet æ??顯示ç?ºä¸?æ??å¤?å??ç?¼ç??ç??å½±å??ï¼?è·?è??æ»?é¼ æ??æ¨?å?¨è?¢å¹?ä¸?å??è??移å??ã??</para>
-<para>å¦?æ??è¦?å°? <application>&applet;</application> å? å?¥é?¢æ?¿ï¼?è«?å?¨é?¢æ?¿ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??<menuchoice><guimenu>å? å?¥é?¢æ?¿</guimenu><guisubmenu>å¨?æ¨?</guisubmenu><guimenuitem>Geyes</guimenuitem>
-</menuchoice>ã??</para>
+<para><application>Geyes å°?ç?¼ç??</application>æ??ä¾?ä¸?é??ç?¼ç??é??å??å¾?æ??趣ç??æ?¹å¼?ä¾?è®?æ?¨ç?¥é??æ?¨ç??æ»?é¼ æ??æ¨?å?¨è?¢å¹?ä¸?ç??ç??麼ä½?ç½®ã??é??å??ç¨?å¼?æ??ä¾?äº?ä¸?å??æ??å¤?å??ç?¼ç??ä¾?è·?é?¨æ?¨æ»?é¼ æ??æ¨?ç??ä½?ç½®ã??</para>
+<para>è¦?å?¨é?¢æ?¿ä¸?é?¢æ?°å¢?<application>Geyes å°?ç?¼ç??</application>ï¼?è«?å?¨é?¢æ?¿ä¸?æ??å?³é?µä¸¦é?¸æ??<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>ï¼?並å?¨<application>å? å?¥é?¢æ?¿</application>å°?話ç??中é?¸æ??<application>å°?ç?¼ç??</application></para>
 </sect1>
 <!-- ============= Preferences  ================================ -->
-<sect1 id="geyes-settings"><title>å??好設å®?</title>
-<para>å¦?æ??è¦?é??ç½® <application>&applet;</application>ï¼?è«?å?¨ <application>&applet;</application> Applet ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??<guimenu>å??好設å®?</guimenu>ã??</para>
-<variablelist>
-<varlistentry>
-<term><guilabel>æ¡?é?¢é??è?²</guilabel> </term>
-<listitem>
-<para>è«?å¾?é??å??æ¸?å?®ä¸­é?¸æ?? <application>&applet;</application> ç??é??è?²ã??
-å¾?æ??æ??å?°å¥?ç?°ç??å??種é??è?²ï¼?ç?º <application>&applet;</application> æ??ä¾?å??種ä¸?å??ç??å¤?è§?ã??</para>
-</listitem>
-</varlistentry>
-</variablelist>
+<sect1 id="geyes-settings">
+<title>å??好設å®?</title>
+<para>è¦?設å®?<application>Geyes å°?ç?¼ç??</application>ï¼?è«?å?? <application>Geyes å°?ç?¼ç??</application>ç¨?å¼?ä¸?æ??æ»?é¼ å?³é?µç?¶å¾?é?¸æ??<guimenuitem>å??好設å®?</guimenuitem>ï¼?æ?¨å?¯ä»¥é?¸æ??ä¸?äº?ä¸?å??ç??主é¡?ï¼?ä¸?å??ç??主é¡?å°?æ??å½±é?¿æ?¨ç??ç?¼ç??å°?å¦?ä½?ä¾?å??ç?»ã??</para>
 </sect1>
 </article>
diff --git a/invest-applet/invest/about.py b/invest-applet/invest/about.py
index e2829e8..f228ae1 100644
--- a/invest-applet/invest/about.py
+++ b/invest-applet/invest/about.py
@@ -3,16 +3,16 @@ from os.path import join
 from gettext import gettext as _
 from invest.defs import VERSION
 import invest
-import gtk, gtk.gdk
+from gi.repository import Gtk, GdkPixbuf
 
 invest_logo = None
 try:
-	invest_logo = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96, 96)
+	invest_logo = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96, 96)
 except Exception, msg:
 	pass
 	
 def show_about():
-	about = gtk.AboutDialog()
+	about = Gtk.AboutDialog()
 	infos = {
 		"program-name" : _("Invest"),
 		"logo" : invest_logo,
diff --git a/invest-applet/invest/applet.py b/invest-applet/invest/applet.py
index 4cd5ad7..197a0f7 100644
--- a/invest-applet/invest/applet.py
+++ b/invest-applet/invest/applet.py
@@ -1,17 +1,16 @@
 import os, time
 from os.path import *
-import gnomeapplet, gtk, gtk.gdk, gconf, gobject
+from gi.repository import Gdk, GdkPixbuf, Gtk, PanelApplet, GObject, GConf
 gobject.threads_init()
 from gettext import gettext as _
-import gconf
 
 import invest, invest.about, invest.chart, invest.preferences, invest.defs
 from invest.quotes import QuoteUpdater
 from invest.widgets import *
 
-gtk.window_set_default_icon_from_file(join(invest.ART_DATA_DIR, "invest_neutral.svg"))
+Gtk.window_set_default_icon_from_file(join(invest.ART_DATA_DIR, "invest_neutral.svg"))
 
-class InvestApplet:
+class InvestApplet(PanelApplet.Applet):
 	def __init__(self, applet):
 		self.applet = applet
 		self.applet.setup_menu_from_file (
@@ -22,8 +21,8 @@ class InvestApplet:
 					("Refresh", self.on_refresh)
 					])
 
-		evbox = gtk.HBox()
-		self.applet_icon = gtk.Image()
+		evbox = Gtk.HBox()
+		self.applet_icon = Gtk.Image()
 		self.set_applet_icon(0)
 		self.applet_icon.show()
 		evbox.add(self.applet_icon)
@@ -43,7 +42,7 @@ class InvestApplet:
 		self.new_ilw()
 
 	def button_clicked(self, widget,event):
-		if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
+		if event.type == Gdk.BUTTON_PRESS and event.button == 1:
 			# Three cases...
 			if len (invest.STOCKS) == 0:
 				# a) We aren't configured yet
@@ -51,7 +50,7 @@ class InvestApplet:
 				self.reload_ilw()
 			elif not self.quotes_updater.quotes_valid:
 				# b) We can't get the data (e.g. offline)
-				alert = gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
+				alert = Gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
 				alert.set_markup(_("<b>No stock quotes are currently available</b>"))
 				alert.format_secondary_text(_("The server could not be contacted. The computer is either offline or the servers are down. Try again later."))
 				alert.run()
@@ -75,19 +74,19 @@ class InvestApplet:
 
 	def set_applet_icon(self, change):
 		if change == 1:
-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_up.png"), -1,-1)
+			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_up.png"), -1,-1)
 		elif change == 0:
-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_neutral.png"), -1,-1)
+			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_neutral.png"), -1,-1)
 		else:
-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_down.png"), -1,-1)
+			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_down.png"), -1,-1)
 		self.applet_icon.set_from_pixbuf(pixbuf)
 	
 	def set_applet_tooltip(self, text):
 		self.applet_icon.set_tooltip_text(text)
 
-class InvestmentsListWindow(gtk.Window):
+class InvestmentsListWindow(Gtk.Window):
 	def __init__(self, applet, list):
-		gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
+		Gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 		self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
 		self.stick()
 		self.set_resizable(False)
@@ -128,58 +127,58 @@ class InvestmentsListWindow(gtk.Window):
 		screen = self.applet.window.get_screen()
 		monitor = screen.get_monitor_geometry (screen.get_monitor_at_window (self.applet.window))
 
-		if self.alignment == gnomeapplet.ORIENT_LEFT:
-				x = ax - ww
-				y = ay
+		if self.alignment == PanelApplet.ORIENT_LEFT:
+			x = ax - ww
+			y = ay
 
-				if (y + wh > monitor.y + monitor.height):
-					y = monitor.y + monitor.height - wh
+			if (y + wh > monitor.y + monitor.height):
+				y = monitor.y + monitor.height - wh
 
-				if (y < 0):
-					y = 0
+			if (y < 0):
+				y = 0
 				
-				if (y + wh > monitor.height / 2):
-					gravity = gtk.gdk.GRAVITY_SOUTH_WEST
-				else:
-					gravity = gtk.gdk.GRAVITY_NORTH_WEST
+			if (y + wh > monitor.height / 2):
+				gravity = gtk.gdk.GRAVITY_SOUTH_WEST
+			else:
+				gravity = gtk.gdk.GRAVITY_NORTH_WEST
 					
 		elif self.alignment == gnomeapplet.ORIENT_RIGHT:
-				x = ax + aw
-				y = ay
+			x = ax + aw
+			y = ay
 
-				if (y + wh > monitor.y + monitor.height):
-					y = monitor.y + monitor.height - wh
+			if (y + wh > monitor.y + monitor.height):
+				y = monitor.y + monitor.height - wh
 				
-				if (y < 0):
-					y = 0
+			if (y < 0):
+				y = 0
 				
-				if (y + wh > monitor.height / 2):
-					gravity = gtk.gdk.GRAVITY_SOUTH_EAST
-				else:
-					gravity = gtk.gdk.GRAVITY_NORTH_EAST
+			if (y + wh > monitor.height / 2):
+				gravity = gtk.gdk.GRAVITY_SOUTH_EAST
+			else:
+				gravity = gtk.gdk.GRAVITY_NORTH_EAST
 
 		elif self.alignment == gnomeapplet.ORIENT_DOWN:
-				x = ax
-				y = ay + ah
+			x = ax
+			y = ay + ah
 
-				if (x + ww > monitor.x + monitor.width):
-					x = monitor.x + monitor.width - ww
+			if (x + ww > monitor.x + monitor.width):
+				x = monitor.x + monitor.width - ww
 
-				if (x < 0):
-					x = 0
+			if (x < 0):
+				x = 0
 
-				gravity = gtk.gdk.GRAVITY_NORTH_WEST
+			gravity = gtk.gdk.GRAVITY_NORTH_WEST
 		elif self.alignment == gnomeapplet.ORIENT_UP:
-				x = ax
-				y = ay - wh
+			x = ax
+			y = ay - wh
 
-				if (x + ww > monitor.x + monitor.width):
-					x = monitor.x + monitor.width - ww
+			if (x + ww > monitor.x + monitor.width):
+				x = monitor.x + monitor.width - ww
 
-				if (x < 0):
-					x = 0
+			if (x < 0):
+				x = 0
 
-				gravity = gtk.gdk.GRAVITY_SOUTH_WEST
+			gravity = gtk.gdk.GRAVITY_SOUTH_WEST
 
 		self.move(x, y)
 		self.set_gravity(gravity)
diff --git a/invest-applet/invest/chart.py b/invest-applet/invest/chart.py
index c6caff7..3e226e0 100644
--- a/invest-applet/invest/chart.py
+++ b/invest-applet/invest/chart.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-import gtk, gtk.gdk
-import gobject
+from gi.repository import Gtk, GdkPixbuf, GObject
 import os
 import invest
 from gettext import gettext as _
@@ -15,16 +14,16 @@ import time
 AUTOREFRESH_TIMEOUT = 20*60*1000 # 15 minutes
 
 # based on http://www.johnstowers.co.nz/blog/index.php/2007/03/12/threading-and-pygtk/
-class _IdleObject(gobject.GObject):
+class _IdleObject(GObject.GObject):
 	"""
 	Override gobject.GObject to always emit signals in the main thread
 	by emmitting on an idle handler
 	"""
 	def __init__(self):
-		gobject.GObject.__init__(self)
+		GObject.GObject.__init__(self)
 
 	def emit(self, *args):
-		gobject.idle_add(gobject.GObject.emit,self,*args)
+		GObject.idle_add(gobject.GObject.emit,self,*args)
 
 class ImageRetriever(Thread, _IdleObject):
 	"""
@@ -33,7 +32,7 @@ class ImageRetriever(Thread, _IdleObject):
 	"""
 	__gsignals__ =  { 
 			"completed": (
-				gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
+				GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
 			# FIXME: should we be making use of this?
 			#"progress": (
 			#	gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [
@@ -47,12 +46,12 @@ class ImageRetriever(Thread, _IdleObject):
 		self.retrieved = False
 		
 	def run(self):
-		self.image = gtk.Image()
+		self.image = Gtk.Image()
 		try: sock = urllib.urlopen(self.image_url, proxies = invest.PROXY)
 		except Exception, msg:
 			invest.debug("Error while opening %s: %s" % (self.image_url, msg))
 		else:
-			loader = gtk.gdk.PixbufLoader()
+			loader = GdkPixbuf.PixbufLoader()
 			loader.connect("closed", lambda loader: self.image.set_from_pixbuf(loader.get_pixbuf()))
 			loader.write(sock.read())
 			sock.close()
@@ -107,7 +106,7 @@ class FinancialChart:
 		win.set_title(_("Financial Chart"))
 		
 		try:
-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96,96)
+			pixbuf = GdkPixbuf.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96,96)
 			self.ui.get_object("plot").set_from_pixbuf(pixbuf)
 		except Exception, msg:
 			invest.debug("Could not load 'invest-neutral.svg' file: %s" % msg)
@@ -241,14 +240,14 @@ class FinancialChart:
 	
 	def on_autorefresh_toggled(self, autorefresh):
 		if self.autorefresh_id != 0:
-			gobject.source_remove(self.autorefresh_id)
+			GObject.source_remove(self.autorefresh_id)
 			self.autorefresh_id = 0
 			
 		if autorefresh.get_active():
-			self.autorefresh_id = gobject.timeout_add(AUTOREFRESH_TIMEOUT, self.on_refresh_chart, True)
+			self.autorefresh_id = GObject.timeout_add(AUTOREFRESH_TIMEOUT, self.on_refresh_chart, True)
 
 def show_chart(tickers):
-	ui = gtk.Builder();
+	ui = Gtk.Builder();
 	ui.add_from_file(os.path.join(invest.BUILDER_DATA_DIR, "financialchart.ui"))
 	chart = FinancialChart(ui)
 	ui.get_object("s").set_text(' '.join(tickers))
diff --git a/invest-applet/invest/help.py b/invest-applet/invest/help.py
index 7dfaabf..66399c5 100644
--- a/invest-applet/invest/help.py
+++ b/invest-applet/invest/help.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-import gtk, gtk.gdk
+from gi.repository import Gdk, Gtk
 
 def show_help():
-	gtk.show_uri(None, "ghelp:invest-applet", gtk.gdk.CURRENT_TIME)
+	Gtk.show_uri(None, "ghelp:invest-applet", Gdk.CURRENT_TIME)
 
 def show_help_section(id):
-	gtk.show_uri(None, "ghelp:invest-applet?%s" % id, gtk.gdk.CURRENT_TIME)
+	Gtk.show_uri(None, "ghelp:invest-applet?%s" % id, Gdk.CURRENT_TIME)
diff --git a/invest-applet/invest/invest-applet.py b/invest-applet/invest/invest-applet.py
index da1fb05..bd667ff 100755
--- a/invest-applet/invest/invest-applet.py
+++ b/invest-applet/invest/invest-applet.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 #
 
-import gobject
-import gtk, gnomeapplet
+from gi.repository import GObject, Gtk, PanelApplet
+from applet import InvestApplet
 
 import getopt, sys
 from os.path import *
@@ -37,12 +37,12 @@ def applet_factory(applet, iid):
 
 # Return a standalone window that holds the applet
 def build_window():
-	app = gtk.Window(gtk.WINDOW_TOPLEVEL)
+	app = Gtk.Window(gtk.WINDOW_TOPLEVEL)
 	app.set_title(_("Invest Applet"))
 	app.connect("destroy", gtk.main_quit)
 	app.set_property('resizable', False)
 
-	applet = gnomeapplet.Applet()
+	applet = PanelApplet.Applet()
 	applet_factory(applet, None)
 	applet.reparent(app)
 
@@ -88,11 +88,9 @@ if __name__ == "__main__":
 
 	if standalone:
 		build_window()
-		gtk.main()
+		Gtk.main()
 	else:
-		gnomeapplet.bonobo_factory(
-			"OAFIID:Invest_Applet_Factory",
-			gnomeapplet.Applet.__gtype__,
-			invest.defs.PACKAGE,
-			invest.defs.VERSION,
+		PanelApplet.factory(
+			"InvestAppletFactory",
+			InvestApplet.__gtype__,
 			applet_factory)
diff --git a/invest-applet/invest/preferences.py b/invest-applet/invest/preferences.py
index 2485e16..018a630 100644
--- a/invest-applet/invest/preferences.py
+++ b/invest-applet/invest/preferences.py
@@ -1,14 +1,14 @@
 from gettext import gettext as _
 import locale
 from os.path import join
-import gtk, gobject, gconf
+from gi.repository import Gtk, GObject, GConf
 import invest
 import currencies
 import cPickle
 
 class PrefsDialog:
 	def __init__(self, applet):
-		self.ui = gtk.Builder()
+		self.ui = Gtk.Builder()
 		self.ui.add_from_file(join(invest.BUILDER_DATA_DIR, "prefs-dialog.ui"))
 
 		self.dialog = self.ui.get_object("preferences")
@@ -29,14 +29,14 @@ class PrefsDialog:
 
 		self.typs = (str, str, float, float, float, float)
 		self.names = (_("Symbol"), _("Label"), _("Amount"), _("Price"), _("Commission"), _("Currency Rate"))
-		store = gtk.ListStore(*self.typs)
+		store = Gtk.ListStore(*self.typs)
 		store.set_sort_column_id(0, gtk.SORT_ASCENDING)
 		self.treeview.set_model(store)
 		self.model = store
 
-		completion = gtk.EntryCompletion()
+		completion = Gtk.EntryCompletion()
 		self.currency.set_completion(completion)
-		liststore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+		liststore = Gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
 		completion.set_model(liststore)
 		completion.set_text_column(0)
 		for code, label in self.currencies.items():
@@ -107,12 +107,12 @@ class PrefsDialog:
 		return len(text) - text.find(".") - 1
 
 	def create_cell (self, view, column, name, typ):
-		cell_description = gtk.CellRendererText ()
+		cell_description = Gtk.CellRendererText ()
 		if typ == float:
 			cell_description.set_property("xalign", 1.0)
 		cell_description.set_property("editable", True)
 		cell_description.connect("edited", self.on_cell_edited, column, typ)
-		column_description = gtk.TreeViewColumn (name, cell_description)
+		column_description = Gtk.TreeViewColumn (name, cell_description)
 		if typ == str:
 			column_description.set_attributes (cell_description, text=column)
 			column_description.set_sort_column_id(column)
diff --git a/invest-applet/invest/quotes.py b/invest-applet/invest/quotes.py
index b7ec21b..69472f3 100644
--- a/invest-applet/invest/quotes.py
+++ b/invest-applet/invest/quotes.py
@@ -1,5 +1,5 @@
 from os.path import join
-import gnomeapplet, gtk, gtk.gdk, gconf, gobject
+from gi.repository import PanelApplet, Gtk, Gdk, GConf, GObject
 from gettext import gettext as _
 import csv
 import locale
@@ -19,16 +19,16 @@ QUOTES_URL="http://finance.yahoo.com/d/quotes.csv?s=%(s)s&f=snc4l1d1t1c1ohgv&e=.
 QUOTES_CSV_FIELDS=["ticker", "label", "currency", ("trade", float), "date", "time", ("variation", float), ("open", float), ("high", float), ("low", float), ("volume", int)]
 
 # based on http://www.johnstowers.co.nz/blog/index.php/2007/03/12/threading-and-pygtk/
-class _IdleObject(gobject.GObject):
+class _IdleObject(GObject.GObject):
 	"""
 	Override gobject.GObject to always emit signals in the main thread
 	by emmitting on an idle handler
 	"""
 	def __init__(self):
-		gobject.GObject.__init__(self)
+		GObject.GObject.__init__(self)
 
 	def emit(self, *args):
-		gobject.idle_add(gobject.GObject.emit,self,*args)
+		GObject.idle_add(gobject.GObject.emit,self,*args)
 
 class QuotesRetriever(Thread, _IdleObject):
 	"""
@@ -37,7 +37,7 @@ class QuotesRetriever(Thread, _IdleObject):
 	"""
 	__gsignals__ =  {
 			"completed": (
-				gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
+				GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
 			# FIXME: We don't monitor progress, yet ...
 			#"progress": (
 			#	gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [
@@ -65,14 +65,14 @@ class QuotesRetriever(Thread, _IdleObject):
 		self.emit("completed")
 
 
-class QuoteUpdater(gtk.ListStore):
+class QuoteUpdater(Gtk.ListStore):
 	updated = False
 	last_updated = None
 	quotes_valid = False
 	timeout_id = None
 	SYMBOL, LABEL, CURRENCY, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB = range(9)
 	def __init__ (self, change_icon_callback, set_tooltip_callback):
-		gtk.ListStore.__init__ (self, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, bool, float, float, float, float, gtk.gdk.Pixbuf)
+		Gtk.ListStore.__init__ (self, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, bool, float, float, float, float, gtk.gdk.Pixbuf)
 		self.set_update_interval(AUTOREFRESH_TIMEOUT)
 		self.change_icon_callback = change_icon_callback
 		self.set_tooltip_callback = set_tooltip_callback
@@ -85,11 +85,11 @@ class QuoteUpdater(gtk.ListStore):
 	def set_update_interval(self, interval):
 		if self.timeout_id != None:
 			invest.debug("Canceling refresh timer")
-			gobject.source_remove(self.timeout_id)
+			GObject.source_remove(self.timeout_id)
 			self.timeout_id = None
 		if interval > 0:
 			invest.debug("Setting refresh timer to %s:%02d.%03d" % ( interval / 60000, interval % 60000 / 1000, interval % 1000) )
-			self.timeout_id = gobject.timeout_add(interval, self.refresh)
+			self.timeout_id = GObject.timeout_add(interval, self.refresh)
 
 	def nm_state_changed(self):
 		# when nm is online but we do not have an update timer, create it and refresh
@@ -406,6 +406,3 @@ class QuoteUpdater(gtk.ListStore):
 					res = False
 					break
 		return res
-
-if gtk.pygtk_version < (2,8,0):
-	gobject.type_register(QuoteUpdater)
diff --git a/invest-applet/invest/widgets.py b/invest-applet/invest/widgets.py
index 13a2ec9..7c9bc91 100644
--- a/invest-applet/invest/widgets.py
+++ b/invest-applet/invest/widgets.py
@@ -1,6 +1,6 @@
 import os, time
 from os.path import *
-import gnomeapplet, gtk, gtk.gdk, gconf, gobject, pango
+from gi.repository import PanelApplet, Gtk, Gdk, GConf, GObject, Pango
 from gettext import gettext as _
 import locale
 import csv
@@ -35,9 +35,9 @@ MEDIUM = -1
 
 TICKER_TIMEOUT = 10000#3*60*1000#
 
-class InvestWidget(gtk.TreeView):
+class InvestWidget(Gtk.TreeView):
 	def __init__(self, quotes_updater):
-		gtk.TreeView.__init__(self)
+		Gtk.TreeView.__init__(self)
 		self.set_property("rules-hint", True)
 		self.set_reorderable(True)
 		self.set_hover_selection(True)
@@ -54,10 +54,10 @@ class InvestWidget(gtk.TreeView):
 			self._getcelldata_balancepct]
 		for i, col_name in enumerate(col_names):
 			if i < 3:
-				cell = gtk.CellRendererText()
+				cell = Gtk.CellRendererText()
 				if i > 0:
 					cell.set_property("xalign", 1.0)
-				column = gtk.TreeViewColumn (col_name, cell)
+				column = Gtk.TreeViewColumn (col_name, cell)
 				if i == 0:
 					column.set_sort_column_id(quotes_updater.LABEL)
 				elif i == 2:
@@ -65,15 +65,15 @@ class InvestWidget(gtk.TreeView):
 				column.set_cell_data_func(cell, col_cellgetdata_functions[i])
 				self.append_column(column)
 			elif i == 3:
-				cell_pb = gtk.CellRendererPixbuf()
-				column = gtk.TreeViewColumn (col_name, cell_pb, pixbuf=quotes_updater.PB)
+				cell_pb = Gtk.CellRendererPixbuf()
+				column = Gtk.TreeViewColumn (col_name, cell_pb, pixbuf=quotes_updater.PB)
 				self.append_column(column)
 			else:
 				# add the last two column only if we have any positions
 				if simple_quotes_only == False:
-					cell = gtk.CellRendererText()
+					cell = Gtk.CellRendererText()
 					cell.set_property("xalign", 1.0)
-					column = gtk.TreeViewColumn (col_name, cell)
+					column = Gtk.TreeViewColumn (col_name, cell)
 					if i == 4:
 						column.set_sort_column_id(quotes_updater.BALANCE)
 					elif i == 5:
@@ -156,12 +156,12 @@ class InvestWidget(gtk.TreeView):
 
 		invest.chart.show_chart([ticker])
 
-#class InvestTicker(gtk.Label):
+#class InvestTicker(Gtk.Label):
 #	def __init__(self):
-#		gtk.Label.__init__(self, _("Waiting..."))
+#		Gtk.Label.__init__(self, _("Waiting..."))
 #
 #		self.quotes = []
-#		gobject.timeout_add(TICKER_TIMEOUT, self.scroll_quotes)
+#		GObject.timeout_add(TICKER_TIMEOUT, self.scroll_quotes)
 #
 #		get_quotes_updater().connect('quotes-updated', self.on_quotes_update)
 #
@@ -190,9 +190,9 @@ class InvestWidget(gtk.TreeView):
 #
 #gobject.type_register(InvestTicker)
 
-class InvestTrend(gtk.Image):
+class InvestTrend(Gtk.Image):
 	def __init__(self):
-		gtk.Image.__init__(self)
+		Gtk.Image.__init__(self)
 		self.pixbuf = None
 		self.previous_allocation = (0,0)
 		self.connect('size-allocate', self.on_size_allocate)
@@ -202,14 +202,14 @@ class InvestTrend(gtk.Image):
 		if self.previous_allocation == (allocation.width, allocation.height):
 			return
 
-		self.pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, allocation.height, allocation.height)
+		self.pixbuf = GdkPixbuf.Pixbuf(Gdk.COLORSPACE_RGB, True, 8, allocation.height, allocation.height)
 		self.set_color("grey")
 		self.previous_allocation = (allocation.width, allocation.height)
 
 	def set_color(self, color, opacity=0xFF):
 		if self.pixbuf != None:
 			try:
-				color = pango.Color(color)
+				color = Pango.Color(color)
 				factor = float(0xFF)/0xFFFF
 				self.pixbuf.fill(
 					int(color.red*factor)<<24|int(color.green*factor)<<16|int(color.blue*factor)<<8|opacity)
@@ -247,4 +247,4 @@ class InvestTrend(gtk.Image):
 
 		self.set_color(color, opacity)
 
-gobject.type_register(InvestTrend)
+GObject.type_register(InvestTrend)
diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
index 2fe1d3e..b072b04 100644
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@ -1,44 +1,40 @@
+applet_in_files = org.gnome.applets.NullApplet.panel-applet.in
+service_in_files = org.gnome.panel.applet.NullAppletFactory.service.in
+
 INCLUDES = 			\
 	-I.			\
 	-I$(srcdir)		\
-	$(GNOME_APPLETS_CFLAGS)
-
-## The null applet takes over if the mixer isn't built.
-if !BUILD_MIXER_APPLET
-mixer_server_in = GNOME_MixerApplet.server.in
-endif
+	$(GNOME_APPLETS3_CFLAGS)
 
 libexec_PROGRAMS = null_applet
 
-null_applet_SOURCES = null_applet.c
+null_applet_SOURCES = null_applet.c null_applet.h
+
+null_applet_LDADD = $(GNOME_APPLETS3_LIBS)
+
+appletdir = $(datadir)/gnome-panel/applets
+applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+$(applet_in_files): $(applet_in_files).in Makefile
+	$(AM_V_GEN)sed \
+	    -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
+	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
+	    $< > $@
 
-serverdir = $(libdir)/bonobo/servers
-server_in_files =				\
-	GNOME_NullApplet_Factory.server.in	\
-	GNOME_CDPlayerApplet.server.in		\
-	GNOME_MailcheckApplet_Factory.server.in	\
-	GNOME_Panel_WirelessApplet.server.in	\
-	GNOME_KeyboardApplet.server.in		\
-	$(mixer_server_in)
-server_DATA = $(server_in_files:.server.in=.server)
+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
- INTLTOOL_SERVER_RULE@
+servicedir   = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
 
-GNOME_NullApplet_Factory.server.in: GNOME_NullApplet_Factory.server.in.in
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+org.gnome.panel.applet.NullAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+	    -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
+	    $< > $@
 
-CLEANFILES = GNOME_NullApplet_Factory.server.in $(server_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA)
 
-## Note that the mixer applet server.in file is always distributed, but
-## note always used.
-EXTRA_DIST =					\
-	GNOME_NullApplet_Factory.server.in.in	\
-	GNOME_CDPlayerApplet.server.in		\
-	GNOME_MailcheckApplet_Factory.server.in	\
-	GNOME_Panel_WirelessApplet.server.in	\
-	GNOME_MixerApplet.server.in		\
-	GNOME_KeyboardApplet.server.in
+EXTRA_DIST = \
+	$(service_in_files) \
+	org.gnome.applets.NullApplet.panel-applet.in.in
 
 -include $(top_srcdir)/git.mk
diff --git a/null_applet/null_applet.c b/null_applet/null_applet.c
index b03521b..d6fb35d 100644
--- a/null_applet/null_applet.c
+++ b/null_applet/null_applet.c
@@ -24,11 +24,22 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <panel-applet.h>
+#include "null_applet.h"
 
-static const char factory_iid[] = "OAFIID:GNOME_NullApplet_Factory";
+G_DEFINE_TYPE(NullApplet, null_applet, PANEL_TYPE_APPLET)
+
+static void
+null_applet_class_init (NullAppletClass *klass)
+{
+}
+
+static void
+null_applet_init (NullApplet *applet)
+{
+}
 
 static inline void
 insert_oafiids (GHashTable *hash_table)
@@ -48,8 +59,6 @@ insert_oafiids (GHashTable *hash_table)
 			     "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
 }
 
-static gboolean already_running;
-
 static void
 response_cb (GtkWidget *dialog, gint arg1, gpointer user_data)
 {
@@ -135,11 +144,8 @@ applet_factory (PanelApplet *applet,
 	char *applet_list;
 	GtkWidget *dialog;
 
-	if (already_running)
-	{
-		return FALSE;
-	}
-	already_running = TRUE;
+	if (!g_str_equal (iid, "NullApplet"))
+	    return FALSE;
 
 	applet_list = get_all_applets ();
 
@@ -167,7 +173,8 @@ applet_factory (PanelApplet *applet,
 	return TRUE;
 }
 
-PANEL_APPLET_BONOBO_FACTORY (factory_iid,
-		PANEL_TYPE_APPLET,
-		"Null-Applet", "0",
-		applet_factory, NULL)
+PANEL_APPLET_OUT_PROCESS_FACTORY ("NullApplet",
+				  TYPE_NULL_APPLET,
+				  "null",
+				  applet_factory,
+				  NULL)
diff --git a/null_applet/null_applet.h b/null_applet/null_applet.h
new file mode 100644
index 0000000..1c5f5bf
--- /dev/null
+++ b/null_applet/null_applet.h
@@ -0,0 +1,50 @@
+/* -*- mode: C; c-basic-offset: 4 -*-
+ * Null Applet - The Applet Deprecation Applet
+ * Copyright (c) 2004, Davyd Madeley
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author:
+ *   Rodrigo Moya <rodrigo gnome org>
+ */
+
+#ifndef __NULL_APPLET_H
+#define __NULL_APPLET_H
+
+#include <panel-applet.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_NULL_APPLET           (null_applet_get_type ())
+#define NULL_APPLET(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NULL_APPLET, NullApplet))
+#define NULL_APPLET_CLASS(obj)     (G_TYPE_CHECK_CLASS_CAST    ((obj), TYPE_NULL_APPLET, NullAppletClass))
+#define IS_NULL_APPLET(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NULL_APPLET))
+#define IS_NULL_APPLET_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE    ((obj), TYPE_NULL_APPLET))
+#define NULL_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS  ((obj), TYPE_NULL_APPLET, NullAppletClass))
+
+typedef struct _NullApplet      NullApplet;
+typedef struct _NullAppletClass NullAppletClass;
+
+struct _NullApplet {
+  PanelApplet parent;
+};
+
+struct _NullAppletClass {
+  PanelAppletClass parent_class;
+};
+
+G_END_DECLS
+
+#endif
diff --git a/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in b/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in
new file mode 100644
index 0000000..b349511
--- /dev/null
+++ b/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in
@@ -0,0 +1,15 @@
+[Applet Factory]
+Id=NullAppletFactory
+Location= LIBEXECDIR@/null_applet
+_Name=Null Applet Factory
+_Description=Null Applet Factory
+
+[NullApplet]
+_Name=Null applet
+_Description=Check for obsolete applets
+BonoboId=OAFIID:GNOME_MailcheckApplet;OAFIID:GNOME_CDPlayerApplet;OAFIID:GNOME_MixerApplet_Factory;OAFIID:GNOME_MixerApplet;OAFIID:GNOME_KeyboardApplet;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-applets
+X-GNOME-Bugzilla-Component=null
+X-GNOME-Bugzilla-Version= VERSION@
+X-GNOME-Bugzilla-OtherBinaries=null_applet
diff --git a/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in b/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in
new file mode 100644
index 0000000..49f8d40
--- /dev/null
+++ b/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.panel.applet.NullAppletFactory
+Exec= LIBEXECDIR@/null_applet
diff --git a/stickynotes/docs/zh_HK/stickynotes_applet.xml b/stickynotes/docs/zh_HK/stickynotes_applet.xml
index 478b4fa..f2c7013 100644
--- a/stickynotes/docs/zh_HK/stickynotes_applet.xml
+++ b/stickynotes/docs/zh_HK/stickynotes_applet.xml
@@ -1,34 +1,45 @@
-<?xml version="1.0"?><!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-  <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appletversion "2.3.6">
-  <!ENTITY manrevision "2.1.1">
-  <!ENTITY date "August 2003">
-  <!ENTITY applet "Sticky Notes">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appletversion "2.12">
+<!ENTITY applet "Sticky Notes">
 ]>
-
 <!-- (Do not remove this comment block.)
 Maintained by the GNOME Documentation Project
 http://developer.gnome.org/projects/gdp
 Template version: 2.0 beta
 Template last modified Mar 12, 2002
 -->
-
-<article id="index" lang="zh_hk">
+<article id="index" lang="zh_HK">
 <!-- please do not change the id; for translations, change lang to appropriate code -->
     
-    <articleinfo>
-	<title>&applet; Applet æ??å?? V&manrevision;</title>
-	<abstract role='description'><para/></abstract>
-	
-	<copyright> 
-	    <year>2003 å¹´</year>  
-	    <holder>Sun Microsystems</holder> 
-	</copyright> 
-	<copyright> 
-	    <year>2003 å¹´</year>  
-	    <holder>Loban A Rahman</holder> 
-	</copyright> 
+    <articleinfo> 
+      <title>便æ¢? 使ç?¨è??æ??å??</title> 
+      <abstract role="description">
+	<para>便æ¢? å??許你製ä½?ã??檢è¦?å??管ç??å?¨ä½ æ¡?ä¸?ç??便æ¢?</para>
+      </abstract>
+
+      <copyright>
+        <year>2005</year>
+	<holder>Davyd Madeley</holder>
+      </copyright>
+      <copyright>
+        <year>2004</year>
+        <holder>Shaun McCance</holder>
+      </copyright>
+      <copyright>
+        <year>2004</year>
+        <holder>Angela Boyle</holder>
+      </copyright>
+      <copyright> 
+        <year>2003</year>  
+        <year>2004</year>  
+        <holder>Sun Microsystems</holder> 
+      </copyright> 
+      <copyright> 
+        <year>2003</year>  
+        <holder>Loban A Rahman</holder> 
+      </copyright><copyright><year>2008.Kevin_Wei_2 &lt;kevin_wei3 yahoo com tw&gt;, 2010.</year><holder>Chao-Hsiung Liao (j_h_liau yahoo com tw)</holder></copyright> 
 
 	<!-- Translators: uncomment this:
 	<copyright>
@@ -37,28 +48,57 @@ Template last modified Mar 12, 2002
 	</copyright>
 	-->
 
-	<publisher role='maintainer'> 
-	    <publishername>GNOME æ??件å°?æ¡?</publishername> 
+	<publisher role="maintainer"> 
+	    <publishername>GNOME æ??件è¨?å??</publishername> 
 	</publisher> 
 	
-	&legal;
+	   <legalnotice id="legalnotice">
+         <para>æ ¹æ??è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) æ??ç?¼ä½? ç?? GNU è?ªç?±æ??件æ??æ¬? (GNU Free Documentation License, GFDL) 1.1 (å?«) 以å¾?ç??æ?¬ï¼? 使ç?¨è??å?¯ä»¥è¤?製ã??æ?£ä½?ï¼?æ??ä¿®æ?¹æ?¬æ??件ï¼?ä½?ä¸?å¾?å¢?å?ªç« ç¯?ï¼?ä¸?å¾?å? ä¸?å°?é?¢æ??å­?ï¼? 亦ä¸?å¾?å? ä¸?å°?åº?æ??å­?ã?? å¦?è¦?å??å¾? GFDL ç??å?¯æ?¬ï¼?è«?å??é?±æ­¤<ulink type="help" url="ghelp:fdl">é?£çµ?</ulink>ï¼?æ??æ?¯å??é?±è??æ?¬æ??å??ä¸?å??é?¨é??ç?? COPYING-DOCS æª?æ¡?ã??</para>
+          <para>æ?¬æ??å??æ?¯å±¬æ?¼æ ¹æ?? GFDL æ??æ¬?æ??ç?¼ä½?ä¹? GNOME æ??å??é??中ç??ä¸?é?¨ä»½ã?? å¦?æ??ä½ å?ªè¦?å?®ç?¨æ?£ä½?æ?¬æ??å??ï¼?æ ¹æ??æ??æ??æ¬?è?²æ??第å?­ç¯?ä¹?æ??è¿°ï¼? ä½ å¿?é ?å?¦å¤?å°?æ??æ¬?è?²æ??å? å?¥æ?¬æ??å??中ã??</para>
+ 
+         <para>許å¤?å?¬å?¸ç?ºäº?çª?顯å?¶ç?¢å??è??æ??å??ï¼?æ??使ç?¨ç?¹å?¥å??稱ï¼?並亦已è?²æ??é??äº? å??稱ç?ºå?¶å??æ¨?ã??ç?¶é??äº?å??稱å?ºç?¾å?¨ GNOME æ??件中ï¼?å??æ?? GNOME æ??件 å°?æ¡?å°?çµ?æ??å?¡äº¦æ??ç?½é??äº?å??稱ç?ºå??æ¨?æ??ï¼? é??äº?å??稱æ??以大寫å­?æ¯?æ??æ?¯é¦?å­?æ¯?大寫表示ã??</para>
+ 
+         <para>æ??件以å??æ­¤æ??件ç??ä¿®æ?¹ç??æ?¬å¿?é ?é?µå¾ª GNU è?ªç?±æ??件許å?¯è­?ï¼?é?²ä¸?æ­¥è³?è¨?è«?è¦?ï¼? <orderedlist>
+                 <listitem>
+                   <para>æ??件æ??ä¾?æ?¯ä»¥å?¶ã??å??樣ã??å??ç?¾ï¼?ä¸?管æ??示æ??æ??示ï¼?ç??ä¸?å?·ä»»ä½?ä¿?è­?ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) æ??件æ??修正ç??毫ç?¡é?¯èª¤ã??å?¯è²©å?®ã?? å?·ç?¹æ®?ç?¨é??ï¼?æ??ä¸?ä¾µæ¬?ã??é??æ?¼æ?¬æ??件è??修正ç??æ??件ä¹?å??質ã??正確æ?§å??å??ç?¨ï¼? å?¶é¢¨é?ªä½ å¿?é ?è?ªè¡?æ?¿æ??ã?? è?¥æ?¬æ??件æ??修正ç??æ??ä»»ä½?缺é?·ï¼?ä»»ä½?å¿?é ?ä¹?ä¿?é¤?ï¼?ä¿®ç??å??æ?´æ­£ï¼? æ??ç?±ä½ è?ªè¡?æ?¿æ??ï¼?å??å§?ä½?è??ã??ä½?è??æ??ä»»ä½?æ?£ä½?è??ç?¡é ?負責ã?? æ?¬å??責è?²æ??æ?¯æ?¬æ??æ¬?è?²æ??極é??è¦?è??å¿?è¦?ç??ä¸?é?¨ä»½ï¼?å? æ­¤ä»»ä½?æ??件æ?? 修正ç??ç??æ??æ¬?ï¼?ç??é ?å?¨å??æ??æ?¬å??責è?²æ??ç??æ??æ³?ä¸?é?²è¡?ï¼?å??æ??</para>
+                 </listitem>
+                 <listitem>
+                   <para>å?¨ä»»ä½?æ??æ³?æ??æ³?å¾?ç??è«?ä¸?ï¼?亦å?³ä¸?管æ?¯å?¨ä¾µæ¬? (å??æ?¬ç??忽)ã??å¥?ç´?æ??å?¶ä»?æ??å½¢ï¼?æ??æ?¯å·²é ?å??å??ç?¥æ??æ??ä¸?å??æ??害ä¹?å?¯è?½æ??ï¼?æ?¬æ??件 æ??修正ç??ç??ä»»ä½?ä½?è??ã??å??å§?ä½?è??ã??æ??稿人以å??æ?£ä½?è??ï¼?æ??æ?¯ä»»ä½?æ??ä¾?å?®ä½?ï¼?å°?æ?¼å? ä½¿ç?¨æ?¬æ??件å??修正ç??ï¼?æ??è??æ?¬æ??件å??修正ç??使ç?¨ç?¸é??æ??é? æ??ç??ä»»ä½?ç?´æ?¥ã??é??æ?¥ã??ç?¹æ®?ã??å?¶ç?¶æ??å¿?ç?¶ä¹?æ??害ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) ä¿¡è­½å??æ??ã??å·¥ä½?å??æ­¢ã??é?»è?¦ç?¶ æ©?æ??ä¸?正常é??ä½?ï¼?æ??ä»»ä½?æ??æ??å?¶ä»?æ??害ï¼?ä¸?述人ç­?ç??ä¸?é??è²  ä»»ä½?責任ã??</para>
+                 </listitem>
+           </orderedlist></para>
+   </legalnotice>
+ 
 
-	<authorgroup> 
-            <author>
-               <firstname>Sun</firstname>
-               <surname>GNOME æ??件å°?çµ?</surname>
-               <affiliation>
-                  <orgname>Sun Microsystems</orgname>
-              </affiliation>
-            </author>
-	    <author> 
-		<firstname>Loban</firstname> 
-		<surname>Rahman</surname> 
-		<affiliation> 
-		    <!-- <orgname></orgname> --> 
-		    <address> <email>loban earthling net</email> </address>
-		</affiliation>
-	    </author>
+	<authorgroup>
+          <author>
+            <firstname>Shaun</firstname>
+            <surname>McCance</surname>
+            <affiliation>
+              <orgname>GNOME æ??件è¨?å??</orgname>
+	      <address><email>shaunm gnome org</email></address>
+            </affiliation>
+          </author>
+          <author>
+            <firstname>Angela</firstname>
+            <surname>Boyle</surname>
+	    <affiliation>
+             <address><email>aboyle aboyle com</email></address>
+	    </affiliation>
+          </author>
+          <author> 
+            <firstname>Loban</firstname> 
+            <surname>Rahman</surname> 
+	    <affiliation>
+             <address><email>loban earthling net</email></address>
+	    </affiliation>
+          </author>
+	  <author>
+	    <firstname>Davyd</firstname><surname>Madeley</surname>
+	    <affiliation>
+	     <orgname>GNOME è¨?å??</orgname>
+	     <address><email>davyd madeley id au</email></address>
+	    </affiliation>
+	  </author>
 
 	    <!-- This is appropriate place for other contributors: translators, maintainers, etc. Commented out by default.
 	    <othercredit role="translator">
@@ -72,195 +112,360 @@ Template last modified Mar 12, 2002
 	    </othercredit>
 	    -->
 	</authorgroup>
+	
+	<releaseinfo revision="2.26" role="review"/>
 
 	<revhistory>
-	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V&manrevision;</revnumber> 
-		<date>&date;</date> 
+	    <revision>
+	      <revnumber>Version 2.12</revnumber>
+	      <date>2005å¹´9æ??</date>
+	      <revdescription>
+	       <para role="author">Davyd Madeley</para>
+	      </revdescription>
+	    </revision>
+	    <revision>
+	      <revnumber>Version 2.10</revnumber>
+	      <date>2005å¹´5æ??</date>
+	      <revdescription>
+	       <para role="author">Davyd Madeley</para>
+	      </revdescription>
+	    </revision>
+	    <revision>
+		<revnumber>Version 2.8</revnumber> 
+		<date>2004å¹´9æ??</date> 
 		<revdescription> 
-                    <para role="author">Sun GNOME æ??件å°?çµ?</para>
-                    <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		</revdescription>
+                    <para role="author">Angela Boyle</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
+	    </revision>
+	    <revision>
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.3</revnumber> 
+		<date>2004å¹´2æ??</date> 
+		<revdescription> 
+                    <para role="author">Sun GNOME æ??件é??ä¼?</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
+	    </revision>
+	    <revision> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.2</revnumber> 
+		<date>2003å¹´å??ä¸?æ??</date> 
+		<revdescription>
+                    <para role="author">Sun GNOME æ??件é??ä¼?</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
 	    </revision>
 	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V2.1</revnumber> 
-		<date>2003 å¹´ 8 æ??</date> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.1</revnumber> 
+		<date>2003å¹´8æ??</date> 
 		<revdescription> 
-                    <para role="author">Sun GNOME æ??件å°?çµ?</para>
-                    <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		</revdescription>
+                    <para role="author">Sun GNOME æ??件é??ä¼?</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
 	    </revision>
 	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V2.0</revnumber> 
-		<date>2003 å¹´ 5 æ??</date> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.0</revnumber> 
+		<date>2003å¹´5æ??</date> 
 		<revdescription> 
-		    <para role="author">Loban A Rahman
-			<email>loban earthling net</email></para>
-		    <para role="publisher"></para>
-		</revdescription>
+		    <para role="author">Loban A Rahman <email>loban earthling net</email></para> 
+		    <para role="publisher"/> 
+		</revdescription> 
 	    </revision>
-	</revhistory>
+	</revhistory> 
 	
-	<releaseinfo>æ?¬æ??å??ç??å?§å®¹æ?¯èªªæ?? &appletversion; ç??ç?? &applet;ã??</releaseinfo>
+	<releaseinfo>é??份æ??件æ??è¿°ç??æ?¬æ?¯ 2.12 ç??便æ¢?ç¨?å¼?</releaseinfo> 
 	
 	<legalnotice> 
-	    <title>建議</title>
-	    <para>é??æ?¼æ?¬<application>&applet;</application> Applet æ??æ?¬æ??å??ã??å¦?æ??è¦?å ±å??é?¯èª¤æ??æ??å?ºå»ºè­°ã??è«?é?µç?§ <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>ç??æ??示ã??</para>
-	</legalnotice>
-    </articleinfo>
+	    <title>å??é¥?</title> 
+	    <para>æ?³è¦?å?¯å ±çµ¦<application>便æ¢?</application>æ??æ?¯æ?¬æ??å??ç??é?¯èª¤æ??æ?¯æ??ä¾?建議ï¼?è«?å??ç?§å?¨<ulink url="ghelp:gnome-feedback" type="help">GNOME å??é¥?é ?é?¢</ulink>ä¸?ç??æ??示</para>
+	</legalnotice> 
+    </articleinfo> 
     
     <indexterm> 
-	<primary>�貼�便��</primary> 
+	<primary>便�</primary> 
     </indexterm> 
 
-    <!-- ============= Document Body ============================= -->
-    
-    <!-- ============= Introduction ============================== -->
-    <sect1 id="stickynotes-introduction">
-	<title>ä»?ç´¹</title>
-	<figure id="stickynotes-fig"> 
-	    <title>&applet; Applet</title>
-	    <screenshot>
-		<mediaobject>
-		    <imageobject><imagedata fileref="figures/stickynotes_applet.png" format="PNG"/></imageobject>
-		    <textobject><phrase>顯示é»?è²¼å¼?便æ¢?ç´? Appletã??</phrase></textobject>
-		</mediaobject>
-	    </screenshot>
-	</figure>
-	<para>æ?¨å?¯ä»¥ä½¿ç?¨ <application>&applet;</application> Applet ä¾?建ç«?ã??檢è¦?å??管ç?? GNOME æ¡?é?¢ä¸?ç??é»?è²¼å¼?便æ¢?ç´?ã??æ?¨å?¯ä»¥ç·¨è¼¯é»?è²¼å¼?便æ¢?ç´?ç??æ¨?é¡?ã??å?§å®¹ ã??維æ?¸å??樣å¼?ã??ä¾?å¦?ï¼?ç?¶æ?¨ç?»å?ºå??ç?»å?¥è??é??æ?°å??å?? Applet å¾?ï¼?å?³æ??å?¨å??ä¸?ä½?置以ç?¸å??ç??維æ?¸å??樣å¼?é??æ?°é??å??æ??æ??å?²å­?ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-        <para>å¦?æ??è¦?å°? <application>&applet;</application> å? å?¥é?¢æ?¿ï¼?è«?å?¨é?¢æ?¿ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??
-            <menuchoice>
-                <guimenu>����</guimenu>
-                <guisubmenu>å?¨é??è£?ç½®</guisubmenu>
-                <guimenuitem>�貼�便��</guimenuitem>
-            </menuchoice>ã??
-        </para>
-    </sect1>
+<sect1 id="stickynotes-introduction">
+  <title>ä»?ç´¹</title>
+  <figure id="stickynotes-fig">
+    <title>便�</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes_applet.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>顯示 便�</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+
+  <para><application>便æ¢?</application>ï¼?é??å??ä½?å?¨GNOMEé?¢æ?¿ä¸?ç??ç¨?å¼?å??許你製ä½?ã??檢è¦?å??管ç??å?¨ä½ æ¡?ä¸?ç??便æ¢?ï¼?ä½ å?¯ä»¥ç·¨è¼¯æ¨?é¡?ã??å?§å®¹ã??大å°?å??便æ¢?ç??樣å¼?ã??ç?¶GNOMEé?¢æ?¿è¢«é??æ?°å??å??æ??ï¼?æ¯?å¦?說你ç?»å?ºå¾?å??ç?»å?¥ï¼?é??äº?便æ¢?å°?æ??è?ªå??å­?æª?並å?¨ä½ ç?»å?¥æ??以ç?¸å??ç??大å°?å??樣å¼?é??æ?°é??å??ã??</para>
+
+  <para>è¦?å?¨é?¢æ?¿ä¸?æ?°å¢?<application>便æ¢?</application>ï¼?å?¨é?¢æ?¿ä¸?æ??å?³é?µä¸¦é?¸æ??<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>ã??å?¨<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>å°?話è¦?çª?中é?¸æ??<application>便æ¢?</application>ï¼?ç?¶å¾?é?¸æ??<guibutton>é??é??</guibutton></para>
+</sect1>
     
-    <!-- ============= Basic Usage ============================ -->
-    <sect1 id="stickynotes-usage"> 
-	<title>使�</title>
-    <sect2 id="stickynotes-create-note">
-        <title>建��貼�便��</title>
-	    <para>æ?¨å?¯ä»¥ä½¿ç?¨ä¸?å??æ?¹å¼?建ç«?é»?è²¼å¼?便æ¢?ç´?ï¼?</para>
-             <itemizedlist>
-               <listitem><para>é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>æ?°å¢?便æ¢?ç´?</guimenuitem>ã??</para></listitem>
-               <listitem><para>å?¨ç?¾æ??便æ¢?ç´?ç??æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>æ?°å¢?便æ¢?ç´?</guimenuitem>ã?? </para></listitem>
-             </itemizedlist>
-    </sect2>
-    <sect2 id="stickynotes-show-notes">
-        <title>顯示æ??é?±è??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é?±è??æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>顯示é»?è²¼å¼?便æ¢?ç´?</guimenuitem>ã??</para>
-	    <para>å¦?æ??è¦?顯示æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>顯示便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect2>
-    <sect2 id="stickynotes-lock-notes">
-        <title>é??å®?æ??解é?¤é??å®?é»?è²¼å¼?便æ¢?ç´?</title>
-            <para>æ?¨å?¯ä»¥å??æ??é??å®?æ??解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?æ??æ?¯é??å®?æ??解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-    <sect3 id="stickynotes-lock-notes-all">
-        <title>é??å®?æ??解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?使å?¶ç?¡æ³?被編輯ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-            <para>å¦?æ??è¦?解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>解é?¤é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    <sect3 id="stickynotes-lock-notes-individual">
-        <title>é??å®?æ??解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-            <para>å¦?æ??è¦?解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    </sect2>
-    <sect2 id="stickynotes-delete-notes">
-        <title>���貼�便��</title>
-            <para>æ?¨å?¯ä»¥å??æ??å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?æ??å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-    <sect3 id="stickynotes-delete-notes-all">
-        <title>å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?·è¡?ä¸?å??ç??æ­¥é©?ï¼?</para>
-              <orderedlist>
-                <listitem><para>é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>å?ªé?¤ä¾¿æ¢?ç´?</guimenuitem>ã??</para></listitem>
-                <listitem><para>æ??ä¸?ä¸?<guibutton>å?¨é?¨å?ªé?¤</guibutton>æ??é??ï¼?確èª?å?ªé?¤ã??</para></listitem>
-              </orderedlist>
-    </sect3>
-    <sect3 id="stickynotes-delete-notes-individual">
-        <title>å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>å?ªé?¤ä¾¿æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    </sect2>
-    </sect1>
+<sect1 id="stickynotes-usage"> 
+  <title>使� 便�</title>
+
+  <sect2 id="stickynotes-show-hide">
+   <title>顯示å??é?±è?? 便æ¢?</title>
+   <para>è¦?é?±è??ä½ å?¨é?¨ç??便æ¢?ï¼?ä½ å?¯ä»¥å??æ??æ¡?é?¢ä¸?ä¸?ï¼?æ??æ?¯å?¨<application>便æ¢?</application>ç¨?å¼?ä¸?æ??å?³é?µä¸¦é?¸æ??guimenuitem&gt;é?±è??便æ¢?</para>
+    <para>è¦?顯示你æ??æ??ç??便æ¢?ï¼?å?¨<application>便æ¢?</application>ç¨?å¼?ä¸?é?¢æ??ä¸?ä¸?</para>
+  </sect2>
+
+  <sect2 id="stickynotes-create-note">
+    <title>建ç«?ä¸?å??便æ¢?</title>
+  <figure id="stickynotes-using-right-new-fig">
+    <title>建ç«?ä¸?å??æ?°ç??便æ¢?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynote-right-menu-new.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>建ç«?ä¸?å??æ?°ç??便æ¢?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+   </figure>
+    <para>You can create a sticky note by right-clicking on the sticky note icon and
+    selecting <guilabel>New Note</guilabel>, or by double-clicking the applet.</para>
+    <para>Creating a note causes all hidden notes to be shown.</para>
+  </sect2>
+
+  <sect2 id="stickynotes-lock-notes">
+    <title>é??å®?å??解é??便æ¢?</title>
+    <para>You can lock or unlock all sticky notes at the same time, or you can
+    lock or unlock individual sticky notes.  Locking a sticky note prevents you
+    from accidentally changing the contents of the note.</para>
+    <variablelist>
+      <varlistentry>
+        <term><phrase>æ?³è¦?é??å®?å??解é??å?¨é?¨ç??便æ¢?</phrase></term>
+        <listitem>
+  <figure id="stickynotes-using-right-lock-fig">
+    <title>å?¨å??示ä¸?é?¢æ??å?³é?µ</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynote-right-menu-lock.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>å?¨å??示ä¸?é?¢æ??å?³é?µ</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+          <para>To lock all sticky notes so that the notes cannot be edited,
+          choose <guimenuitem>Lock Notes</guimenuitem> from the icon
+          right-click menu so that there is a check mark next to it.  To
+          unlock all sticky notes, choose <guimenuitem>Lock Notes</guimenuitem>
+          from the icon right-click menu again so that there is not a check
+          mark next to it.</para>
+          <para>Note that all panel applications have the
+	  <guimenuitem>Lock to Panel</guimenuitem>
+          item in the right-click menu, which locks the position of the panel
+	  application
+          on the panel.  Do not confuse this with the
+          <guimenuitem>Lock Notes</guimenuitem> item.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><phrase>è¦?é??å®?æ??解é??å??å?¥ç??便æ¢?</phrase></term>
+        <listitem><para>To lock an individual sticky note, right-click on the
+        title of the note, then choose <guimenuitem>Lock Note</guimenuitem>
+        from the popup menu.  To unlock an individual note, right-click on the
+        title of the note, then choose <guimenuitem>Lock Note</guimenuitem>
+        from the popup menu again. You can also toggle the lock/unlock state of
+	a sticky note by clicking the lock button in the top left corner of the
+	sticky note.
+	</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+  <sect2 id="stickynotes-delete-notes">
+    <title>����</title>
+    <para>You can delete all sticky notes at the same time, or you can delete
+    individual sticky notes.</para>
+    <variablelist>
+      <varlistentry>
+        <term>è¦?å?ªé?¤æ??æ??便æ¢?</term>
+        <listitem><para>To delete all sticky notes, choose <guimenuitem>Delete
+        Notes</guimenuitem> from the icon right-click menu.  A confirmation
+        dialog will appear; click on the <guibutton>Delete All</guibutton>
+        button to confirm the deletion.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>è¦?å?ªé?¤å??å?¥ç??便æ¢?</term>
+        <listitem><para>To delete an individual sticky note, right-click on the
+        title of the note, then choose <guimenuitem>Delete Note</guimenuitem>
+        from the popup menu. You can also delete a sticky note by clicking the
+	<guibutton>x</guibutton> in the top right corner.
+	</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+</sect1>
+
+<sect1 id="stickynotes-advanced-settings"> 
+  <title>å??好設å®?</title>
+  
+  <figure id="stickynotes-prefs-fig">
+    <title>便æ¢? å??好設å®?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes-prefs.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>顯示便æ¢?ç??å??好設å®?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+
+  <sect2 id="stickynotes-size">
+    <title>調�大�</title> 
+    <para>To configure the default size for all sticky notes, right-click on the
+    sticky notes icon, then choose <guimenu>Preferences</guimenu> from the popup menu. The
+    <application>Sticky Notes Preferences</application> dialog is displayed.</para>
+    <variablelist> 
+      <varlistentry> 
+        <term><guilabel>é??度</guilabel></term> 
+        <listitem><para>Use this spin box to specify the default width of new
+        sticky notes, in pixels.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>�度</guilabel></term> 
+        <listitem><para>Use this spin box to specify the default height of new
+        sticky notes, in pixels.</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+  <sect2 id="stickynotes-color">
+    <title>æ?´æ?¹é¡?è?²å??å­?å??</title>
+    <para>To configure the color and font for all sticky notes, right-click on
+    the icon, then choose <guimenu>Preferences</guimenu> from the popup menu.
+    The <application>Sticky Notes Preferences</application> dialog is
+    displayed.</para>
+    <variablelist>
+      <varlistentry>
+        <term><guilabel>å­?å??é¡?è?²</guilabel></term>
+	<listitem>
+	 <para>
+	  Click on the color selector button to display the color selector
+	  dialog. On the color selector dialog, use the color wheel or spin
+	  boxes to choose the default font color for stickynotes.
+	 </para>
+	 <para>
+	  If you have selected, <guilabel>Use color from the system
+	  theme</guilabel>, then the current theme colors will be used and you
+	  will not be able to select new defaults.
+	 </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>便���</guilabel></term> 
+        <listitem>
+          <para>Click on the color selector button to display the color
+          selector dialog. On the color selector dialog, use the color wheel or
+          spin boxes to choose the default base color for sticky notes.</para>
+          <para>If you have selected, <guilabel>Use color from the system
+	  theme</guilabel>, then the current theme colors will be used and you
+	  will not able to select new defaults.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>å­?å??</guilabel></term> 
+        <listitem>
+          <para>Click on the font selector button to display the font selector
+          dialog. On the font selector dialog, use the list boxes to choose the
+          default font for sticky notes.</para>
+	  <para>
+	   If you have selected, <guilabel>Use font from the system
+	   theme</guilabel>, then the current Application Font set in Font Preferences will be
+	   used and you will not be able to select new defaults.
+	  </para>
+        </listitem>
+      </varlistentry>
+    </variablelist> 
+  </sect2>
+  <sect2 id="stickynotes-behavior">
+    <title>�製��</title>
+    <para>To customize the behavior of <application>Sticky Notes</application>,
+    right-click on the icon, then choose <guimenu>Preferences</guimenu>
+    from the popup menu.  The <application>Sticky Notes Preferences</application>
+    dialog is displayed.</para>
+    <para>To specify that sticky notes are visible on all workspaces on the
+    desktop, select <guilabel>Put notes on all workspaces</guilabel> in the
+    <guilabel>Sticky Notes Preferences</guilabel> dialog.  If you are using
+    multiple workspaces, this will cause all sticky notes to be visible on
+    all workspaces.</para>
+
+    <para>
+     The option, <guilabel>Force default color and font on notes</guilabel>,
+     will force all sticky notes on your desktop to use the color and font
+     settings specified in the <guilabel>Default Note Properties</guilabel>
+     above (see <xref linkend="stickynotes-color"/>).
+    </para>
+  </sect2>
+
+  </sect1>
 
-    <!-- ============= Advanced Settings ============================ -->
-    <sect1 id="stickynotes-advanced-settings"> 
-	<title>å??好設å®?</title>
-    <sect2 id="stickynotes-settings-all"> 
-	<title>ä¸?è?¬å??好設å®?</title>
-	<para>å¦?æ??è¦?é??ç½®æ??æ??é»?è²¼å¼?便æ¢?ç´?ç??設å®?ï¼?è«?å?¨ Applet ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ?? Applet è?½è¡¨ä¸?ç??<guimenu>å??好設å®?</guimenu>ã??</para>
-	<variablelist>
-	    <varlistentry> 
-		<term>寬度</term> 
-		<listitem><para>使ç?¨é??å??æ??è½?æ?¹å¡?å?¯ä»¥å??ç´ ç?ºå?®ä½?æ??å®?æ?°é»?è²¼å¼?便æ¢?ç´?ç??é ?設寬度ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�度</term> 
-		<listitem><para>使ç?¨é??å??æ??è½?æ?¹å¡?å?¯ä»¥å??ç´ ç?ºå?®ä½?æ??å®?æ?°é»?è²¼å¼?便æ¢?ç´?ç??é ?設é«?度ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�彩</term> 
-		<listitem><para>æ??ä¸?ä¸?é¡?è?²é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºé¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨é¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨è?²è¼ªæ??æ??è½?æ?¹å¡?ä¾?é?¸æ??æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨ç³»çµ±é??è?²ç??è?²å½©</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨ç?®å??系統é??è?²ç??è?²å½©ï¼?決å®?æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å­?å??</term> 
-		<listitem><para>æ??ä¸?ä¸?å­?å??é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºå­?å??é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨å­?å??é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨æ¸?å?®æ?¹å¡?ä¾?é?¸æ??æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨ç³»çµ±é??è?²ç??å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨ç?®å??系統ç??é??è?²ï¼?決å®?æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>æ??ä¸?ä¸?</term> 
-		<listitem><para>é?¸å??ä¸?å??ä»»ä¸?é?¸é ?å?¯ä»¥æ??å®?ç?¶æ?¨æ??ä¸?ä¸? Applet æ??æ??ç?¢ç??ç??å??ä½?ï¼?</para>
-                  <itemizedlist>
-                    <listitem><para>建ç«?æ?°ç??便æ¢?ç´?</para></listitem>
-                    <listitem><para>顯示/é?±è??æ??æ??ç??便æ¢?ç´?</para></listitem>
-                    <listitem><para>é??å®?/解é?¤é??å®?æ??æ??ç??便æ¢?ç´?</para></listitem>
-                  </itemizedlist>
-               </listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å°?便æ¢?ç´?æ?¾å?¨æ??æ??å·¥ä½?å??ä¸?</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥æ??å®?å?¨æ¡?é?¢ä¸?ç??æ??æ??å·¥ä½?å??中é?½å?¯ä»¥ç??å?°é»?è²¼å¼?便æ¢?ç´?ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å¼·è¿«æ??æ??便æ¢?ç´?使ç?¨é ?設ç??è?²å½©å??å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥æ??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´? (å??æ?¬è?ªè¨?ç??便æ¢?ç´?) é?½å¿?é ?使ç?¨é ?設ç??樣å¼?ã??</para></listitem>
-	    </varlistentry>
-	</variablelist>
-    </sect2>
-    <sect2 id="stickynotes-settings-individual"> 
-	<title>å?? 人å??好</title>
-	<para>å¦?æ??è¦?é??ç½®å??å?¥é»?è²¼å¼?便æ¢?ç´?ç??設å®?ï¼?è«?å?¨ä¾¿æ¢?ç´? ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenu>屬æ?§</guimenu>ã??</para>
-	<variablelist>
-	    <varlistentry> 
-		<term>��</term> 
-		<listitem><para>使ç?¨é??å??æ??å­?æ?¹å¡?å?¯ä»¥æ??å®?é»?è²¼å¼?便æ¢?ç´?ç??æ¨?é¡?ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�彩</term> 
-		<listitem><para>æ??ä¸?ä¸?é¡?è?²é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºé¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨é¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨è?²è¼ªæ??æ??è½?æ?¹å¡?ä¾?é?¸æ??é??å??é»?è²¼å¼?便æ¢?ç´?ç??å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使��設�彩</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨é??å??é»?è²¼å¼?便æ¢?ç´?ç??å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å­?å??</term> 
-		<listitem><para>æ??ä¸?ä¸?å­?å??é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºå­?å??é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨å­?å??é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨æ¸?å?®æ?¹å¡?ä¾?é?¸æ??é??å??é»?è²¼å¼?便æ¢?ç´?ç??å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨é ?設å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨é??å??é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	</variablelist>
-    </sect2>
-    </sect1>
+  <sect1 id="stickynotes-settings-individual"> 
+    <title>å®?製å??å?¥ç??便æ¢?</title>
+  <figure id="stickynotes-note-prefs-fig">
+    <title>便æ¢? å??好設å®?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes-note-prefs.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>ä¸?å?? 便æ¢? ç??å??好設å®?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+    <para>You can customize the look of each individual sticky note.  This
+    can be useful for visually distinguishing different types of notes
+    quickly.  To configure the settings for an individual sticky note,
+    right-click on the note's title, then choose <guimenu>Properties</guimenu>
+    from the popup menu.  The <application>Sticky Note Properties</application>
+    dialog is displayed.</para>
+    <variablelist> 
+      <varlistentry> 
+        <term><guilabel>��</guilabel></term> 
+        <listitem><para>Use this text box to specify the title of the sticky
+        note.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>使ç?¨é ?設ç??é¡?è?²</guilabel></term> 
+        <listitem><para>Select this option to use the default base color for
+        this sticky note.  For information on setting the default base color,
+        see <xref linkend="stickynotes-color"/>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><guilabel>å­?å??é¡?è?²</guilabel></term>
+       <listitem>
+        <para>Click on the color selector button to display the color selector
+	dialog. On the color selector dialog, use the color wheel or spin boxes
+	to choose the font color for this sticky note.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>便���</guilabel></term> 
+        <listitem><para>Click on the color selector button to display the
+        color selector dialog. On the color selector dialog, use the color
+        wheel or spin boxes to choose the base color for this sticky
+        note.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>使ç?¨é ?設å­?å??</guilabel></term> 
+        <listitem><para>Select this option to use the default font for this
+        sticky note.  For information on setting the default font, see
+        <xref linkend="stickynotes-color"/>.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>å­?å??</guilabel></term> 
+        <listitem><para>Click on the font selector button to display the font
+        selector dialog.  On the font selector dialog, use the list boxes to
+        choose the font for this sticky note.</para></listitem>
+      </varlistentry>
+    </variablelist> 
+</sect1>
 </article>
diff --git a/stickynotes/docs/zh_TW/stickynotes_applet.xml b/stickynotes/docs/zh_TW/stickynotes_applet.xml
index 575896c..b850fb0 100644
--- a/stickynotes/docs/zh_TW/stickynotes_applet.xml
+++ b/stickynotes/docs/zh_TW/stickynotes_applet.xml
@@ -1,34 +1,45 @@
-<?xml version="1.0"?><!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-  <!ENTITY legal SYSTEM "legal.xml">
-  <!ENTITY appletversion "2.3.6">
-  <!ENTITY manrevision "2.1.1">
-  <!ENTITY date "August 2003">
-  <!ENTITY applet "Sticky Notes">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appletversion "2.12">
+<!ENTITY applet "Sticky Notes">
 ]>
-
 <!-- (Do not remove this comment block.)
 Maintained by the GNOME Documentation Project
 http://developer.gnome.org/projects/gdp
 Template version: 2.0 beta
 Template last modified Mar 12, 2002
 -->
-
-<article id="index" lang="zh_tw">
+<article id="index" lang="zh_TW">
 <!-- please do not change the id; for translations, change lang to appropriate code -->
     
-    <articleinfo>
-	<title>&applet; Applet æ??å?? V&manrevision;</title>
-	<abstract role='description'><para/></abstract>
-	
-	<copyright> 
-	    <year>2003 å¹´</year>  
-	    <holder>Sun Microsystems</holder> 
-	</copyright> 
-	<copyright> 
-	    <year>2003 å¹´</year>  
-	    <holder>Loban A Rahman</holder> 
-	</copyright> 
+    <articleinfo> 
+      <title>便æ¢? 使ç?¨è??æ??å??</title> 
+      <abstract role="description">
+	<para>便æ¢? å??許æ?¨è£½ä½?ã??檢è¦?å??管ç??å?¨æ?¨æ¡?ä¸?ç??便æ¢?</para>
+      </abstract>
+
+      <copyright>
+        <year>2005</year>
+	<holder>Davyd Madeley</holder>
+      </copyright>
+      <copyright>
+        <year>2004</year>
+        <holder>Shaun McCance</holder>
+      </copyright>
+      <copyright>
+        <year>2004</year>
+        <holder>Angela Boyle</holder>
+      </copyright>
+      <copyright> 
+        <year>2003</year>  
+        <year>2004</year>  
+        <holder>Sun Microsystems</holder> 
+      </copyright> 
+      <copyright> 
+        <year>2003</year>  
+        <holder>Loban A Rahman</holder> 
+      </copyright><copyright><year>2008.Kevin_Wei_2 &lt;kevin_wei3 yahoo com tw&gt;, 2010.</year><holder>Chao-Hsiung Liao (j_h_liau yahoo com tw)</holder></copyright> 
 
 	<!-- Translators: uncomment this:
 	<copyright>
@@ -37,28 +48,57 @@ Template last modified Mar 12, 2002
 	</copyright>
 	-->
 
-	<publisher role='maintainer'> 
-	    <publishername>GNOME æ??件å°?æ¡?</publishername> 
+	<publisher role="maintainer"> 
+	    <publishername>GNOME æ??件è¨?å??</publishername> 
 	</publisher> 
 	
-	&legal;
+	   <legalnotice id="legalnotice">
+         <para>æ ¹æ??è?ªç?±è»?é«?å?ºé??æ?? (Free Software Foundation) æ??ç?¼ä½? ç?? GNU è?ªç?±æ??件æ??æ¬? (GNU Free Documentation License, GFDL) 1.1 (å?«) 以å¾?ç??æ?¬ï¼? 使ç?¨è??å?¯ä»¥è¤?製ã??æ?£ä½?ï¼?æ??ä¿®æ?¹æ?¬æ??件ï¼?ä½?ä¸?å¾?å¢?å?ªç« ç¯?ï¼?ä¸?å¾?å? ä¸?å°?é?¢æ??å­?ï¼? 亦ä¸?å¾?å? ä¸?å°?åº?æ??å­?ã?? å¦?è¦?å??å¾? GFDL ç??å?¯æ?¬ï¼?è«?å??é?±æ­¤<ulink type="help" url="ghelp:fdl">é?£çµ?</ulink>ï¼?æ??æ?¯å??é?±è??æ?¬æ??å??ä¸?å??é?¨é??ç?? COPYING-DOCS æª?æ¡?ã??</para>
+          <para>æ?¬æ??å??æ?¯å±¬æ?¼ä¾? GFDL æ??æ¬?æ??ç?¼ä½?ä¹? GNOME æ??å??é??中ç??ä¸?é?¨ä»½ã?? å¦?æ??æ?¨å?ªè¦?å?®ç?¨æ?£ä½?æ?¬æ??å??ï¼?ä¾?æ??æ??æ¬?è?²æ??第å?­ç¯?ä¹?æ??è¿°ï¼? æ?¨å¿?é ?å?¦å¤?å°?æ??æ¬?è?²æ??å? å?¥æ?¬æ??å??中ã??</para>
+ 
+         <para>許å¤?å?¬å?¸ç?ºäº?çª?顯å?¶ç?¢å??è??æ??å??ï¼?æ??使ç?¨ç?¹å?¥å??稱ï¼?並亦已è?²æ??é??äº? å??稱ç?ºå?¶å??æ¨?ã??ç?¶é??äº?å??稱å?ºç?¾å?¨ GNOME æ??件中ï¼?å??æ?? GNOME æ??件 å°?æ¡?å°?çµ?æ??å?¡äº¦æ??ç?½é??äº?å??稱ç?ºå??æ¨?æ??ï¼? é??äº?å??稱æ??以大寫å­?æ¯?æ??æ?¯é¦?å­?æ¯?大寫表示ã??</para>
+ 
+         <para>æ??件以å??æ­¤æ??件ç??ä¿®æ?¹ç??æ?¬å¿?é ?é?µå¾ª GNU è?ªç?±æ??件許å?¯è­?ï¼?é?²ä¸?æ­¥è³?è¨?è«?è¦?ï¼? <orderedlist>
+                 <listitem>
+                   <para>æ??件æ??ä¾?æ?¯ä»¥å?¶ã??å??樣ã??å??ç?¾ï¼?ä¸?管æ??示æ??æ??示ï¼?ç??ä¸?å?·ä»»ä½?ä¿?è­?ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) æ??件æ??修正ç??毫ç?¡é?¯èª¤ã??å?¯è²©å?®ã?? å?·ç?¹æ®?ç?¨é??ï¼?æ??ä¸?ä¾µæ¬?ã??é??æ?¼æ?¬æ??件è??修正ç??æ??件ä¹?å??質ã??正確æ?§å??å??ç?¨ï¼? å?¶é¢¨é?ªæ?¨å¿?é ?è?ªè¡?æ?¿æ??ã?? è?¥æ?¬æ??件æ??修正ç??æ??ä»»ä½?缺é?·ï¼?ä»»ä½?å¿?é ?ä¹?ä¿?é¤?ï¼?ä¿®ç??å??æ?´æ­£ï¼? æ??ç?±æ?¨è?ªè¡?æ?¿æ??ï¼?å??å§?ä½?è??ã??ä½?è??æ??ä»»ä½?æ?£ä½?è??ç?¡é ?負責ã?? æ?¬å??責è?²æ??æ?¯æ?¬æ??æ¬?è?²æ??極é??è¦?è??å¿?è¦?ç??ä¸?é?¨ä»½ï¼?å? æ­¤ä»»ä½?æ??件æ?? 修正ç??ç??æ??æ¬?ï¼?ç??é ?å?¨å??æ??æ?¬å??責è?²æ??ç??æ??æ³?ä¸?é?²è¡?ï¼?å??æ??</para>
+                 </listitem>
+                 <listitem>
+                   <para>å?¨ä»»ä½?æ??æ³?æ??æ³?å¾?ç??è«?ä¸?ï¼?亦å?³ä¸?管æ?¯å?¨ä¾µæ¬? (å??æ?¬ç??忽)ã??å¥?ç´?æ??å?¶ä»?æ??å½¢ï¼?æ??æ?¯å·²é ?å??å??ç?¥æ??æ??ä¸?å??æ??害ä¹?å?¯è?½æ??ï¼?æ?¬æ??件 æ??修正ç??ç??ä»»ä½?ä½?è??ã??å??å§?ä½?è??ã??æ??稿人以å??æ?£ä½?è??ï¼?æ??æ?¯ä»»ä½?æ??ä¾?å?®ä½?ï¼?å°?æ?¼å? ä½¿ç?¨æ?¬æ??件å??修正ç??ï¼?æ??è??æ?¬æ??件å??修正ç??使ç?¨ç?¸é??æ??é? æ??ç??ä»»ä½?ç?´æ?¥ã??é??æ?¥ã??ç?¹æ®?ã??å?¶ç?¶æ??å¿?ç?¶ä¹?æ??害ï¼?å??æ?¬ (ä½?ä¸?é??æ?¼) ä¿¡è­½å??æ??ã??å·¥ä½?å??æ­¢ã??é?»è?¦ç?¶ æ©?æ??ä¸?正常é??ä½?ï¼?æ??ä»»ä½?æ??æ??å?¶ä»?æ??害ï¼?ä¸?述人ç­?ç??ä¸?é??è²  ä»»ä½?責任ã??</para>
+                 </listitem>
+           </orderedlist></para>
+   </legalnotice>
+ 
 
-	<authorgroup> 
-            <author>
-               <firstname>Sun</firstname>
-               <surname>GNOME æ??件å°?çµ?</surname>
-               <affiliation>
-                  <orgname>Sun Microsystems</orgname>
-              </affiliation>
-            </author>
-	    <author> 
-		<firstname>Loban</firstname> 
-		<surname>Rahman</surname> 
-		<affiliation> 
-		    <!-- <orgname></orgname> --> 
-		    <address> <email>loban earthling net</email> </address>
-		</affiliation>
-	    </author>
+	<authorgroup>
+          <author>
+            <firstname>Shaun</firstname>
+            <surname>McCance</surname>
+            <affiliation>
+              <orgname>GNOME æ??件è¨?å??</orgname>
+	      <address><email>shaunm gnome org</email></address>
+            </affiliation>
+          </author>
+          <author>
+            <firstname>Angela</firstname>
+            <surname>Boyle</surname>
+	    <affiliation>
+             <address><email>aboyle aboyle com</email></address>
+	    </affiliation>
+          </author>
+          <author> 
+            <firstname>Loban</firstname> 
+            <surname>Rahman</surname> 
+	    <affiliation>
+             <address><email>loban earthling net</email></address>
+	    </affiliation>
+          </author>
+	  <author>
+	    <firstname>Davyd</firstname><surname>Madeley</surname>
+	    <affiliation>
+	     <orgname>GNOME è¨?å??</orgname>
+	     <address><email>davyd madeley id au</email></address>
+	    </affiliation>
+	  </author>
 
 	    <!-- This is appropriate place for other contributors: translators, maintainers, etc. Commented out by default.
 	    <othercredit role="translator">
@@ -72,195 +112,360 @@ Template last modified Mar 12, 2002
 	    </othercredit>
 	    -->
 	</authorgroup>
+	
+	<releaseinfo revision="2.26" role="review"/>
 
 	<revhistory>
-	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V&manrevision;</revnumber> 
-		<date>&date;</date> 
+	    <revision>
+	      <revnumber>Version 2.12</revnumber>
+	      <date>2005å¹´9æ??</date>
+	      <revdescription>
+	       <para role="author">Davyd Madeley</para>
+	      </revdescription>
+	    </revision>
+	    <revision>
+	      <revnumber>Version 2.10</revnumber>
+	      <date>2005å¹´5æ??</date>
+	      <revdescription>
+	       <para role="author">Davyd Madeley</para>
+	      </revdescription>
+	    </revision>
+	    <revision>
+		<revnumber>Version 2.8</revnumber> 
+		<date>2004å¹´9æ??</date> 
 		<revdescription> 
-                    <para role="author">Sun GNOME æ??件å°?çµ?</para>
-                    <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		</revdescription>
+                    <para role="author">Angela Boyle</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
+	    </revision>
+	    <revision>
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.3</revnumber> 
+		<date>2004å¹´2æ??</date> 
+		<revdescription> 
+                    <para role="author">Sun GNOME æ??件å??é??</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
+	    </revision>
+	    <revision> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.2</revnumber> 
+		<date>2003å¹´å??ä¸?æ??</date> 
+		<revdescription>
+                    <para role="author">Sun GNOME æ??件å??é??</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
 	    </revision>
 	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V2.1</revnumber> 
-		<date>2003 å¹´ 8 æ??</date> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.1</revnumber> 
+		<date>2003å¹´8æ??</date> 
 		<revdescription> 
-                    <para role="author">Sun GNOME æ??件å°?çµ?</para>
-                    <para role="publisher">GNOME æ??件å°?æ¡?</para>
-		</revdescription>
+                    <para role="author">Sun GNOME æ??件å??é??</para>
+                    <para role="publisher">GNOME æ??件è¨?å??</para>
+		</revdescription> 
 	    </revision>
 	    <revision> 
-		<revnumber>&applet; Applet æ??å?? V2.0</revnumber> 
-		<date>2003 å¹´ 5 æ??</date> 
+		<revnumber>便æ¢?ç¨?å¼?使ç?¨è??æ??å?? V2.0</revnumber> 
+		<date>2003å¹´5æ??</date> 
 		<revdescription> 
-		    <para role="author">Loban A Rahman
-			<email>loban earthling net</email></para>
-		    <para role="publisher"></para>
-		</revdescription>
+		    <para role="author">Loban A Rahman <email>loban earthling net</email></para> 
+		    <para role="publisher"/> 
+		</revdescription> 
 	    </revision>
-	</revhistory>
+	</revhistory> 
 	
-	<releaseinfo>æ?¬æ??å??ç??å?§å®¹æ?¯èªªæ?? &appletversion; ç??ç?? &applet;ã??</releaseinfo>
+	<releaseinfo>é??份æ??件æ??è¿°ç??æ?¬æ?¯ 2.12 ç??便æ¢?ç¨?å¼?</releaseinfo> 
 	
 	<legalnotice> 
-	    <title>建議</title>
-	    <para>é??æ?¼æ?¬<application>&applet;</application> Applet æ??æ?¬æ??å??ã??å¦?æ??è¦?å ±å??é?¯èª¤æ??æ??å?ºå»ºè­°ã??è«?é?µç?§ <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>ç??æ??示ã??</para>
-	</legalnotice>
-    </articleinfo>
+	    <title>å??é¥?</title> 
+	    <para>æ?³è¦?å??報給<application>便æ¢?</application>æ??æ?¯æ?¬æ??å??ç??é?¯èª¤æ??æ?¯æ??ä¾?建議ï¼?è«?å??ç?§å?¨<ulink url="ghelp:gnome-feedback" type="help">GNOME å??é¥?é ?é?¢</ulink>ä¸?ç??æ??示</para>
+	</legalnotice> 
+    </articleinfo> 
     
     <indexterm> 
-	<primary>�貼�便��</primary> 
+	<primary>便�</primary> 
     </indexterm> 
 
-    <!-- ============= Document Body ============================= -->
-    
-    <!-- ============= Introduction ============================== -->
-    <sect1 id="stickynotes-introduction">
-	<title>ä»?ç´¹</title>
-	<figure id="stickynotes-fig"> 
-	    <title>&applet; Applet</title>
-	    <screenshot>
-		<mediaobject>
-		    <imageobject><imagedata fileref="figures/stickynotes_applet.png" format="PNG"/></imageobject>
-		    <textobject><phrase>顯示é»?è²¼å¼?便æ¢?ç´? Appletã??</phrase></textobject>
-		</mediaobject>
-	    </screenshot>
-	</figure>
-	<para>æ?¨å?¯ä»¥ä½¿ç?¨ <application>&applet;</application> Applet ä¾?建ç«?ã??檢è¦?å??管ç?? GNOME æ¡?é?¢ä¸?ç??é»?è²¼å¼?便æ¢?ç´?ã??æ?¨å?¯ä»¥ç·¨è¼¯é»?è²¼å¼?便æ¢?ç´?ç??æ¨?é¡?ã??å?§å®¹ ã??維æ?¸å??樣å¼?ã??ä¾?å¦?ï¼?ç?¶æ?¨ç?»å?ºå??ç?»å?¥è??é??æ?°å??å?? Applet å¾?ï¼?å?³æ??å?¨å??ä¸?ä½?置以ç?¸å??ç??維æ?¸å??樣å¼?é??æ?°é??å??æ??æ??å?²å­?ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-        <para>å¦?æ??è¦?å°? <application>&applet;</application> å? å?¥é?¢æ?¿ï¼?è«?å?¨é?¢æ?¿ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??
-            <menuchoice>
-                <guimenu>����</guimenu>
-                <guisubmenu>å?¨é??è£?ç½®</guisubmenu>
-                <guimenuitem>�貼�便��</guimenuitem>
-            </menuchoice>ã??
-        </para>
-    </sect1>
+<sect1 id="stickynotes-introduction">
+  <title>ä»?ç´¹</title>
+  <figure id="stickynotes-fig">
+    <title>便�</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes_applet.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>顯示 便�</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+
+  <para><application>便æ¢?</application>ï¼?é??å??ä½?å?¨GNOMEé?¢æ?¿ä¸?ç??ç¨?å¼?å??許æ?¨è£½ä½?ã??檢è¦?å??管ç??å?¨æ?¨æ¡?ä¸?ç??便æ¢?ï¼?æ?¨å?¯ä»¥ç·¨è¼¯æ¨?é¡?ã??å?§å®¹ã??大å°?å??便æ¢?ç??樣å¼?ã??ç?¶GNOMEé?¢æ?¿è¢«é??æ?°å??å??æ??ï¼?æ¯?å¦?說æ?¨ç?»å?ºå¾?å??ç?»å?¥ï¼?é??äº?便æ¢?å°?æ??è?ªå??å­?æª?並å?¨æ?¨ç?»å?¥æ??以ç?¸å??ç??大å°?å??樣å¼?é??æ?°é??å??ã??</para>
+
+  <para>è¦?å?¨é?¢æ?¿ä¸?æ?°å¢?<application>便æ¢?</application>ï¼?å?¨é?¢æ?¿ä¸?æ??å?³é?µä¸¦é?¸æ??<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>ã??å?¨<guimenuitem>å? å?¥é?¢æ?¿</guimenuitem>å°?話è¦?çª?中é?¸æ??<application>便æ¢?</application>ï¼?ç?¶å¾?é?¸æ??<guibutton>é??é??</guibutton></para>
+</sect1>
     
-    <!-- ============= Basic Usage ============================ -->
-    <sect1 id="stickynotes-usage"> 
-	<title>使�</title>
-    <sect2 id="stickynotes-create-note">
-        <title>建��貼�便��</title>
-	    <para>æ?¨å?¯ä»¥ä½¿ç?¨ä¸?å??æ?¹å¼?建ç«?é»?è²¼å¼?便æ¢?ç´?ï¼?</para>
-             <itemizedlist>
-               <listitem><para>é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>æ?°å¢?便æ¢?ç´?</guimenuitem>ã??</para></listitem>
-               <listitem><para>å?¨ç?¾æ??便æ¢?ç´?ç??æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>æ?°å¢?便æ¢?ç´?</guimenuitem>ã?? </para></listitem>
-             </itemizedlist>
-    </sect2>
-    <sect2 id="stickynotes-show-notes">
-        <title>顯示æ??é?±è??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é?±è??æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>顯示é»?è²¼å¼?便æ¢?ç´?</guimenuitem>ã??</para>
-	    <para>å¦?æ??è¦?顯示æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>顯示便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect2>
-    <sect2 id="stickynotes-lock-notes">
-        <title>é??å®?æ??解é?¤é??å®?é»?è²¼å¼?便æ¢?ç´?</title>
-            <para>æ?¨å?¯ä»¥å??æ??é??å®?æ??解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?æ??æ?¯é??å®?æ??解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-    <sect3 id="stickynotes-lock-notes-all">
-        <title>é??å®?æ??解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?使å?¶ç?¡æ³?被編輯ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-            <para>å¦?æ??è¦?解é?¤é??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>解é?¤é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    <sect3 id="stickynotes-lock-notes-individual">
-        <title>é??å®?æ??解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-            <para>å¦?æ??è¦?解é?¤é??å®?å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>é??å®?便æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    </sect2>
-    <sect2 id="stickynotes-delete-notes">
-        <title>���貼�便��</title>
-            <para>æ?¨å?¯ä»¥å??æ??å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?æ??å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ã??</para>
-    <sect3 id="stickynotes-delete-notes-all">
-        <title>å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?å?ªé?¤æ??æ??ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?·è¡?ä¸?å??ç??æ­¥é©?ï¼?</para>
-              <orderedlist>
-                <listitem><para>é?¸æ?? Applet å??è?½è¡¨ä¸?ç??<guimenuitem>å?ªé?¤ä¾¿æ¢?ç´?</guimenuitem>ã??</para></listitem>
-                <listitem><para>æ??ä¸?ä¸?<guibutton>å?¨é?¨å?ªé?¤</guibutton>æ??é??ï¼?確èª?å?ªé?¤ã??</para></listitem>
-              </orderedlist>
-    </sect3>
-    <sect3 id="stickynotes-delete-notes-individual">
-        <title>å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?</title>
-	    <para>å¦?æ??è¦?å?ªé?¤å??å?¥ç??é»?è²¼å¼?便æ¢?ç´?ï¼?è«?å?¨ä¾¿æ¢?ç´?æ¨?é¡?ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenuitem>å?ªé?¤ä¾¿æ¢?ç´?</guimenuitem>ã??</para>
-    </sect3>
-    </sect2>
-    </sect1>
+<sect1 id="stickynotes-usage"> 
+  <title>使� 便�</title>
+
+  <sect2 id="stickynotes-show-hide">
+   <title>顯示å??é?±è?? 便æ¢?</title>
+   <para>è¦?é?±è??æ?¨å?¨é?¨ç??便æ¢?ï¼?æ?¨å?¯ä»¥å??æ??æ¡?é?¢ä¸?ä¸?ï¼?æ??æ?¯å?¨<application>便æ¢?</application>ç¨?å¼?ä¸?æ??å?³é?µä¸¦é?¸æ??guimenuitem&gt;é?±è??便æ¢?</para>
+    <para>è¦?顯示æ?¨æ??æ??ç??便æ¢?ï¼?å?¨<application>便æ¢?</application>ç¨?å¼?ä¸?é?¢æ??ä¸?ä¸?</para>
+  </sect2>
+
+  <sect2 id="stickynotes-create-note">
+    <title>建ç«?ä¸?å??便æ¢?</title>
+  <figure id="stickynotes-using-right-new-fig">
+    <title>建ç«?ä¸?å??æ?°ç??便æ¢?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynote-right-menu-new.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>建ç«?ä¸?å??æ?°ç??便æ¢?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+   </figure>
+    <para>You can create a sticky note by right-clicking on the sticky note icon and
+    selecting <guilabel>New Note</guilabel>, or by double-clicking the applet.</para>
+    <para>Creating a note causes all hidden notes to be shown.</para>
+  </sect2>
+
+  <sect2 id="stickynotes-lock-notes">
+    <title>é??å®?å??解é??便æ¢?</title>
+    <para>You can lock or unlock all sticky notes at the same time, or you can
+    lock or unlock individual sticky notes.  Locking a sticky note prevents you
+    from accidentally changing the contents of the note.</para>
+    <variablelist>
+      <varlistentry>
+        <term><phrase>æ?³è¦?é??å®?å??解é??å?¨é?¨ç??便æ¢?</phrase></term>
+        <listitem>
+  <figure id="stickynotes-using-right-lock-fig">
+    <title>å?¨å??示ä¸?é?¢æ??å?³é?µ</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynote-right-menu-lock.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>å?¨å??示ä¸?é?¢æ??å?³é?µ</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+          <para>To lock all sticky notes so that the notes cannot be edited,
+          choose <guimenuitem>Lock Notes</guimenuitem> from the icon
+          right-click menu so that there is a check mark next to it.  To
+          unlock all sticky notes, choose <guimenuitem>Lock Notes</guimenuitem>
+          from the icon right-click menu again so that there is not a check
+          mark next to it.</para>
+          <para>Note that all panel applications have the
+	  <guimenuitem>Lock to Panel</guimenuitem>
+          item in the right-click menu, which locks the position of the panel
+	  application
+          on the panel.  Do not confuse this with the
+          <guimenuitem>Lock Notes</guimenuitem> item.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><phrase>è¦?é??å®?æ??解é??å??å?¥ç??便æ¢?</phrase></term>
+        <listitem><para>To lock an individual sticky note, right-click on the
+        title of the note, then choose <guimenuitem>Lock Note</guimenuitem>
+        from the popup menu.  To unlock an individual note, right-click on the
+        title of the note, then choose <guimenuitem>Lock Note</guimenuitem>
+        from the popup menu again. You can also toggle the lock/unlock state of
+	a sticky note by clicking the lock button in the top left corner of the
+	sticky note.
+	</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+  <sect2 id="stickynotes-delete-notes">
+    <title>����</title>
+    <para>You can delete all sticky notes at the same time, or you can delete
+    individual sticky notes.</para>
+    <variablelist>
+      <varlistentry>
+        <term>è¦?å?ªé?¤æ??æ??便æ¢?</term>
+        <listitem><para>To delete all sticky notes, choose <guimenuitem>Delete
+        Notes</guimenuitem> from the icon right-click menu.  A confirmation
+        dialog will appear; click on the <guibutton>Delete All</guibutton>
+        button to confirm the deletion.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>è¦?å?ªé?¤å??å?¥ç??便æ¢?</term>
+        <listitem><para>To delete an individual sticky note, right-click on the
+        title of the note, then choose <guimenuitem>Delete Note</guimenuitem>
+        from the popup menu. You can also delete a sticky note by clicking the
+	<guibutton>x</guibutton> in the top right corner.
+	</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+</sect1>
+
+<sect1 id="stickynotes-advanced-settings"> 
+  <title>å??好設å®?</title>
+  
+  <figure id="stickynotes-prefs-fig">
+    <title>便æ¢? å??好設å®?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes-prefs.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>顯示便æ¢?ç??å??好設å®?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+
+  <sect2 id="stickynotes-size">
+    <title>調�大�</title> 
+    <para>To configure the default size for all sticky notes, right-click on the
+    sticky notes icon, then choose <guimenu>Preferences</guimenu> from the popup menu. The
+    <application>Sticky Notes Preferences</application> dialog is displayed.</para>
+    <variablelist> 
+      <varlistentry> 
+        <term><guilabel>寬度</guilabel></term> 
+        <listitem><para>Use this spin box to specify the default width of new
+        sticky notes, in pixels.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>�度</guilabel></term> 
+        <listitem><para>Use this spin box to specify the default height of new
+        sticky notes, in pixels.</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+  <sect2 id="stickynotes-color">
+    <title>è®?æ?´é¡?è?²å??å­?å??</title>
+    <para>To configure the color and font for all sticky notes, right-click on
+    the icon, then choose <guimenu>Preferences</guimenu> from the popup menu.
+    The <application>Sticky Notes Preferences</application> dialog is
+    displayed.</para>
+    <variablelist>
+      <varlistentry>
+        <term><guilabel>å­?å??é¡?è?²</guilabel></term>
+	<listitem>
+	 <para>
+	  Click on the color selector button to display the color selector
+	  dialog. On the color selector dialog, use the color wheel or spin
+	  boxes to choose the default font color for stickynotes.
+	 </para>
+	 <para>
+	  If you have selected, <guilabel>Use color from the system
+	  theme</guilabel>, then the current theme colors will be used and you
+	  will not be able to select new defaults.
+	 </para>
+	</listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>便���</guilabel></term> 
+        <listitem>
+          <para>Click on the color selector button to display the color
+          selector dialog. On the color selector dialog, use the color wheel or
+          spin boxes to choose the default base color for sticky notes.</para>
+          <para>If you have selected, <guilabel>Use color from the system
+	  theme</guilabel>, then the current theme colors will be used and you
+	  will not able to select new defaults.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>å­?å??</guilabel></term> 
+        <listitem>
+          <para>Click on the font selector button to display the font selector
+          dialog. On the font selector dialog, use the list boxes to choose the
+          default font for sticky notes.</para>
+	  <para>
+	   If you have selected, <guilabel>Use font from the system
+	   theme</guilabel>, then the current Application Font set in Font Preferences will be
+	   used and you will not be able to select new defaults.
+	  </para>
+        </listitem>
+      </varlistentry>
+    </variablelist> 
+  </sect2>
+  <sect2 id="stickynotes-behavior">
+    <title>�製��</title>
+    <para>To customize the behavior of <application>Sticky Notes</application>,
+    right-click on the icon, then choose <guimenu>Preferences</guimenu>
+    from the popup menu.  The <application>Sticky Notes Preferences</application>
+    dialog is displayed.</para>
+    <para>To specify that sticky notes are visible on all workspaces on the
+    desktop, select <guilabel>Put notes on all workspaces</guilabel> in the
+    <guilabel>Sticky Notes Preferences</guilabel> dialog.  If you are using
+    multiple workspaces, this will cause all sticky notes to be visible on
+    all workspaces.</para>
+
+    <para>
+     The option, <guilabel>Force default color and font on notes</guilabel>,
+     will force all sticky notes on your desktop to use the color and font
+     settings specified in the <guilabel>Default Note Properties</guilabel>
+     above (see <xref linkend="stickynotes-color"/>).
+    </para>
+  </sect2>
+
+  </sect1>
 
-    <!-- ============= Advanced Settings ============================ -->
-    <sect1 id="stickynotes-advanced-settings"> 
-	<title>å??好設å®?</title>
-    <sect2 id="stickynotes-settings-all"> 
-	<title>ä¸?è?¬å??好設å®?</title>
-	<para>å¦?æ??è¦?é??ç½®æ??æ??é»?è²¼å¼?便æ¢?ç´?ç??設å®?ï¼?è«?å?¨ Applet ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ?? Applet è?½è¡¨ä¸?ç??<guimenu>å??好設å®?</guimenu>ã??</para>
-	<variablelist>
-	    <varlistentry> 
-		<term>寬度</term> 
-		<listitem><para>使ç?¨é??å??æ??è½?æ?¹å¡?å?¯ä»¥å??ç´ ç?ºå?®ä½?æ??å®?æ?°é»?è²¼å¼?便æ¢?ç´?ç??é ?設寬度ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�度</term> 
-		<listitem><para>使ç?¨é??å??æ??è½?æ?¹å¡?å?¯ä»¥å??ç´ ç?ºå?®ä½?æ??å®?æ?°é»?è²¼å¼?便æ¢?ç´?ç??é ?設é«?度ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�彩</term> 
-		<listitem><para>æ??ä¸?ä¸?é¡?è?²é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºé¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨é¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨è?²è¼ªæ??æ??è½?æ?¹å¡?ä¾?é?¸æ??æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨ç³»çµ±é??è?²ç??è?²å½©</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨ç?®å??系統é??è?²ç??è?²å½©ï¼?決å®?æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å­?å??</term> 
-		<listitem><para>æ??ä¸?ä¸?å­?å??é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºå­?å??é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨å­?å??é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨æ¸?å?®æ?¹å¡?ä¾?é?¸æ??æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨ç³»çµ±é??è?²ç??å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨ç?®å??系統ç??é??è?²ï¼?決å®?æ?ªè?ªè¨?é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>æ??ä¸?ä¸?</term> 
-		<listitem><para>é?¸å??ä¸?å??ä»»ä¸?é?¸é ?å?¯ä»¥æ??å®?ç?¶æ?¨æ??ä¸?ä¸? Applet æ??æ??ç?¢ç??ç??å??ä½?ï¼?</para>
-                  <itemizedlist>
-                    <listitem><para>建ç«?æ?°ç??便æ¢?ç´?</para></listitem>
-                    <listitem><para>顯示/é?±è??æ??æ??ç??便æ¢?ç´?</para></listitem>
-                    <listitem><para>é??å®?/解é?¤é??å®?æ??æ??ç??便æ¢?ç´?</para></listitem>
-                  </itemizedlist>
-               </listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å°?便æ¢?ç´?æ?¾å?¨æ??æ??å·¥ä½?å??ä¸?</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥æ??å®?å?¨æ¡?é?¢ä¸?ç??æ??æ??å·¥ä½?å??中é?½å?¯ä»¥ç??å?°é»?è²¼å¼?便æ¢?ç´?ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å¼·è¿«æ??æ??便æ¢?ç´?使ç?¨é ?設ç??è?²å½©å??å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥æ??å®?æ??æ??ç??é»?è²¼å¼?便æ¢?ç´? (å??æ?¬è?ªè¨?ç??便æ¢?ç´?) é?½å¿?é ?使ç?¨é ?設ç??樣å¼?ã??</para></listitem>
-	    </varlistentry>
-	</variablelist>
-    </sect2>
-    <sect2 id="stickynotes-settings-individual"> 
-	<title>å?? 人å??好</title>
-	<para>å¦?æ??è¦?é??ç½®å??å?¥é»?è²¼å¼?便æ¢?ç´?ç??設å®?ï¼?è«?å?¨ä¾¿æ¢?ç´? ä¸?æ??æ»?é¼ å?³é?µï¼?ç?¶å¾?é?¸æ??快顯è?½è¡¨ä¸?ç??<guimenu>屬æ?§</guimenu>ã??</para>
-	<variablelist>
-	    <varlistentry> 
-		<term>��</term> 
-		<listitem><para>使ç?¨é??å??æ??å­?æ?¹å¡?å?¯ä»¥æ??å®?é»?è²¼å¼?便æ¢?ç´?ç??æ¨?é¡?ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>�彩</term> 
-		<listitem><para>æ??ä¸?ä¸?é¡?è?²é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºé¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨é¡?è?²é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨è?²è¼ªæ??æ??è½?æ?¹å¡?ä¾?é?¸æ??é??å??é»?è²¼å¼?便æ¢?ç´?ç??å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使��設�彩</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨é??å??é»?è²¼å¼?便æ¢?ç´?ç??å?ºåº?è?²å½©ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>å­?å??</term> 
-		<listitem><para>æ??ä¸?ä¸?å­?å??é?¸æ??å?¨æ??é??å?¯ä»¥é¡¯ç¤ºå­?å??é?¸æ??å?¨å°?話æ?¹å¡?ã??å?¨å­?å??é?¸æ??å?¨å°?話æ?¹å¡?中ï¼?è«?使ç?¨æ¸?å?®æ?¹å¡?ä¾?é?¸æ??é??å??é»?è²¼å¼?便æ¢?ç´?ç??å­?å??ã??</para></listitem>
-	    </varlistentry>
-	    <varlistentry> 
-		<term>使ç?¨é ?設å­?å??</term> 
-		<listitem><para>é?¸å??é??å??é?¸é ?å?¯ä»¥ä½¿ç?¨é??å??é»?è²¼å¼?便æ¢?ç´?ç??é ?設å­?å??ã??</para></listitem>
-	    </varlistentry>
-	</variablelist>
-    </sect2>
-    </sect1>
+  <sect1 id="stickynotes-settings-individual"> 
+    <title>å®?製å??å?¥ç??便æ¢?</title>
+  <figure id="stickynotes-note-prefs-fig">
+    <title>便æ¢? å??好設å®?</title>
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/stickynotes-note-prefs.png" format="PNG"/>
+        </imageobject>
+        <textobject><phrase>ä¸?å?? 便æ¢? ç??å??好設å®?</phrase></textobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+    <para>You can customize the look of each individual sticky note.  This
+    can be useful for visually distinguishing different types of notes
+    quickly.  To configure the settings for an individual sticky note,
+    right-click on the note's title, then choose <guimenu>Properties</guimenu>
+    from the popup menu.  The <application>Sticky Note Properties</application>
+    dialog is displayed.</para>
+    <variablelist> 
+      <varlistentry> 
+        <term><guilabel>��</guilabel></term> 
+        <listitem><para>Use this text box to specify the title of the sticky
+        note.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>使ç?¨é ?設ç??é¡?è?²</guilabel></term> 
+        <listitem><para>Select this option to use the default base color for
+        this sticky note.  For information on setting the default base color,
+        see <xref linkend="stickynotes-color"/>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><guilabel>å­?å??é¡?è?²</guilabel></term>
+       <listitem>
+        <para>Click on the color selector button to display the color selector
+	dialog. On the color selector dialog, use the color wheel or spin boxes
+	to choose the font color for this sticky note.</para>
+       </listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>便���</guilabel></term> 
+        <listitem><para>Click on the color selector button to display the
+        color selector dialog. On the color selector dialog, use the color
+        wheel or spin boxes to choose the base color for this sticky
+        note.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>使ç?¨é ?設å­?å??</guilabel></term> 
+        <listitem><para>Select this option to use the default font for this
+        sticky note.  For information on setting the default font, see
+        <xref linkend="stickynotes-color"/>.</para></listitem>
+      </varlistentry>
+      <varlistentry> 
+        <term><guilabel>å­?å??</guilabel></term> 
+        <listitem><para>Click on the font selector button to display the font
+        selector dialog.  On the font selector dialog, use the list boxes to
+        choose the font for this sticky note.</para></listitem>
+      </varlistentry>
+    </variablelist> 
+</sect1>
 </article>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]