Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4

Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.am gtk-config.m4 gtk.m4: Move
	gtk-config to gtk-config-2.0 move gtk_.m4 to
	gtk-2.0.m4

	* Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am
	gdk/Makefile.am demos/Makefile.am: Change
	library names to libgtk-1.3.la, etc, so that we
	can distinguish gtk-1.2 and gtk-2.0 on the linkline.

	* Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am
	gdk/Makefile.am gdk/x11/Makfile.am
	Move include files into /usr/include/gtk-2.0,
	/usr/lib/gtk-2.0/include/

	* autogen.sh acconfig.h configure.in gtk/gtkmain.c
	gtk/gtkintl.h: Change package for gettext from
	gtk+ to gtk20. Put hack in autogen.sh to modify
	po/Makefile.in.in after gettextize to make this
	possible.

	* gtk+.spec: Some updates, not tested.

	* gdk-pixbuf/Makefile.am: Move loaders into
	$(libdir)/gtk-2.0/$(GTK_VERSION)/loaders.

	* gtk/Makefile.am gtk/gtkrc.c: Move RC file locations
	$(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir
	to THEMENAME/gtk-2.0/. Move engine directory  to
	$(libdir)/gtk-2.0/$(GTK_VERSION)/engines.

1 files changed, 23 insertions, 20 deletions

diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 6d0a447b98..76fd8138b1 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 1.2.6 \n"
-"POT-Creation-Date: 2000-07-03 17:11-0400\n"
+"POT-Creation-Date: 2000-07-14 14:48-0400\n"
 "PO-Revision-Date: 1999-01-31 19:33+0800\n"
 "Last-Translator: 辛立仁 <hsin@med.cgu.edu.tw>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -63,6 +63,26 @@ msgstr "自訂色板"
 msgid "Set Color"
 msgstr "設定色彩"
 
+# gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3785 gtk/gtkgamma.c:415

+#. The OK button
+#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952
+#: gtk/gtkgamma.c:415
+msgid "OK"
+msgstr "確定"
+
+# gtk/gtkfilesel.c:572 gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1060

+# gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3798 gtk/gtkgamma.c:423

+#. The Cancel button
+#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963
+#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965
+#: gtk/gtkgamma.c:423
+msgid "Cancel"
+msgstr "取消"
+
+#: gtk/gtkcolorseldialog.c:116
+msgid "Help"
+msgstr "求助"
+
 # gtk/gtkfilesel.c:514

 #. The directories clist
 #: gtk/gtkfilesel.c:514
@@ -75,20 +95,6 @@ msgstr "目錄"
 msgid "Files"
 msgstr "檔案"
 
-# gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3785 gtk/gtkgamma.c:415

-#. The OK button
-#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415
-msgid "OK"
-msgstr "確定"
-
-# gtk/gtkfilesel.c:572 gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1060

-# gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3798 gtk/gtkgamma.c:423

-#. The Cancel button
-#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067
-#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423
-msgid "Cancel"
-msgstr "取消"
-
 # gtk/gtkfilesel.c:603 gtk/gtkfilesel.c:1642

 #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621
 #, c-format
@@ -313,13 +319,13 @@ msgid "Page %u"
 msgstr "第 %u 頁"
 
 # gtk/gtkrc.c:1801

-#: gtk/gtkrc.c:1824
+#: gtk/gtkrc.c:1903
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
 msgstr "無法由 pixmap_path 找到圖檔: \"%s\" 第 %d 行"
 
 # gtk/gtkrc.c:1804

-#: gtk/gtkrc.c:1827
+#: gtk/gtkrc.c:1906
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "無法由 pixmap_path 找到圖檔: \"%s\""
@@ -563,6 +569,3 @@ msgstr "--- 已無提示 ---"
 # gtk/gtkfontsel.c:2905

 #~ msgid "MAX_FONTS exceeded. Some fonts may be missing."
 #~ msgstr "已超出 MAX_FONTS ,可能遺失某些字型。"
-
-#~ msgid "Help"
-#~ msgstr "求助"