Index: po/lv.po
===================================================================
RCS file: /cvs/gnome/pan/po/lv.po,v
retrieving revision 1.6
diff -u -u -r1.6 lv.po
--- po/lv.po	9 Feb 2003 20:38:53 -0000	1.6
+++ po/lv.po	24 Mar 2005 15:58:21 -0000
@@ -2960,7 +2960,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Izvēlieties Krāsu"
 
@@ -2969,11 +2969,11 @@
 msgstr "_Pārlūkot"
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Izvēlieties Fontu"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Fontu Saime"
 
Index: po/mk.po
===================================================================
RCS file: /cvs/gnome/pan/po/mk.po,v
retrieving revision 1.1
diff -u -u -r1.1 mk.po
--- po/mk.po	18 Jun 2003 10:40:12 -0000	1.1
+++ po/mk.po	24 Mar 2005 15:58:21 -0000
@@ -2933,7 +2933,7 @@
 msgstr ""
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 #, exfuzzy (по грешка беа обележани како fuzzy   --стојмир)
 msgid "Select Color"
 msgstr "Избери боја"
@@ -2944,12 +2944,12 @@
 msgstr "_Барај..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 #, exfuzzy (по грешка беа обележани како fuzzy   --стојмир)
 msgid "Select Font"
 msgstr "Избери фонт"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 #, exfuzzy (по грешка беа обележани како fuzzy   --стојмир)
 msgid "Font Family"
 msgstr "Фонт фамилија"
Index: po/ml.po
===================================================================
RCS file: /cvs/gnome/pan/po/ml.po,v
retrieving revision 1.1
diff -u -u -r1.1 ml.po
--- po/ml.po	2 Aug 2003 14:56:49 -0000	1.1
+++ po/ml.po	24 Mar 2005 15:58:21 -0000
@@ -2872,7 +2872,7 @@
 msgstr ""
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr ""
 
@@ -2881,12 +2881,12 @@
 msgstr "അന്വേഷണം..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 #, fuzzy
 msgid "Select Font"
 msgstr "തെരഞ്ഞെടുക്കല്"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "അച്ച് കുടുബം"
 
Index: po/ms.po
===================================================================
RCS file: /cvs/gnome/pan/po/ms.po,v
retrieving revision 1.2
diff -u -u -r1.2 ms.po
--- po/ms.po	3 Nov 2003 14:50:55 -0000	1.2
+++ po/ms.po	24 Mar 2005 15:58:21 -0000
@@ -2970,7 +2970,7 @@
 msgstr "Unikod, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Pilih Warna"
 
@@ -2979,11 +2979,11 @@
 msgstr "_Layari..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Pilih Fon"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Keluarga Fon"
 
Index: po/nb.po
===================================================================
RCS file: /cvs/gnome/pan/po/nb.po,v
retrieving revision 1.4
diff -u -u -r1.4 nb.po
--- po/nb.po	15 Feb 2005 16:53:41 -0000	1.4
+++ po/nb.po	24 Mar 2005 15:58:21 -0000
@@ -3005,7 +3005,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Velg farge"
 
@@ -3014,11 +3014,11 @@
 msgstr "_Bla gjennom..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Velg skrift"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Skriftfamilie"
 
Index: po/nl.po
===================================================================
RCS file: /cvs/gnome/pan/po/nl.po,v
retrieving revision 1.31
diff -u -u -r1.31 nl.po
--- po/nl.po	17 Feb 2005 22:22:29 -0000	1.31
+++ po/nl.po	24 Mar 2005 15:58:21 -0000
@@ -2889,7 +2889,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Selecteer een kleur"
 
@@ -2898,11 +2898,11 @@
 msgstr "_Bladeren..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Selecteer een lettertype"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Lettertypefamilie"
 
Index: po/no.po
===================================================================
RCS file: /cvs/gnome/pan/po/no.po,v
retrieving revision 1.85
diff -u -u -r1.85 no.po
--- po/no.po	15 Feb 2005 16:53:16 -0000	1.85
+++ po/no.po	24 Mar 2005 15:58:21 -0000
@@ -3005,7 +3005,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Velg farge"
 
@@ -3014,11 +3014,11 @@
 msgstr "_Bla gjennom..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Velg skrift"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Skriftfamilie"
 
Index: po/pa.po
===================================================================
RCS file: /cvs/gnome/pan/po/pa.po,v
retrieving revision 1.1
diff -u -u -r1.1 pa.po
--- po/pa.po	5 Oct 2004 09:13:55 -0000	1.1
+++ po/pa.po	24 Mar 2005 15:58:21 -0000
@@ -3091,7 +3091,7 @@
 msgstr "ਯੂਨੀਕੋਡ, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
@@ -3100,11 +3100,11 @@
 msgstr "ਝਲਕ...."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "ਫੋਂਟ ਚੁਣੋ"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "ਫੋਂਟ ਸਮੂਹ"
 
Index: po/pl.po
===================================================================
RCS file: /cvs/gnome/pan/po/pl.po,v
retrieving revision 1.66
diff -u -u -r1.66 pl.po
--- po/pl.po	22 Apr 2004 07:28:49 -0000	1.66
+++ po/pl.po	24 Mar 2005 15:58:21 -0000
@@ -3025,7 +3025,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Wybór koloru"
 
@@ -3034,11 +3034,11 @@
 msgstr "_Przeglądaj..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Wybór czcionki"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Rodzina czcionek"
 
Index: po/pt.po
===================================================================
RCS file: /cvs/gnome/pan/po/pt.po,v
retrieving revision 1.37
diff -u -u -r1.37 pt.po
--- po/pt.po	8 Mar 2005 00:37:37 -0000	1.37
+++ po/pt.po	24 Mar 2005 15:58:22 -0000
@@ -2873,7 +2873,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Seleccionar a Cor"
 
@@ -2882,11 +2882,11 @@
 msgstr "Nave_gar..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Seleccionar a Fonte"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Família de Fonte"
 
Index: po/pt_BR.po
===================================================================
RCS file: /cvs/gnome/pan/po/pt_BR.po,v
retrieving revision 1.24
diff -u -u -r1.24 pt_BR.po
--- po/pt_BR.po	15 Apr 2004 22:09:17 -0000	1.24
+++ po/pt_BR.po	24 Mar 2005 15:58:22 -0000
@@ -3007,7 +3007,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Selecionar Cor"
 
@@ -3016,11 +3016,11 @@
 msgstr "_Navegar..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Selecionar Fonte"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Família da Fonte"
 
Index: po/ro.po
===================================================================
RCS file: /cvs/gnome/pan/po/ro.po,v
retrieving revision 1.3
diff -u -u -r1.3 ro.po
--- po/ro.po	13 Oct 2004 14:52:31 -0000	1.3
+++ po/ro.po	24 Mar 2005 15:58:22 -0000
@@ -3009,7 +3009,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Selectează culoarea"
 
@@ -3018,11 +3018,11 @@
 msgstr "_Navighează..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Alege tipul de caractere"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Familia de caractere"
 
Index: po/sk.po
===================================================================
RCS file: /cvs/gnome/pan/po/sk.po,v
retrieving revision 1.61
diff -u -u -r1.61 sk.po
--- po/sk.po	14 Mar 2005 19:52:48 -0000	1.61
+++ po/sk.po	24 Mar 2005 15:58:22 -0000
@@ -2897,7 +2897,7 @@
 msgstr "Unikód, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Vybrať farbu"
 
@@ -2906,11 +2906,11 @@
 msgstr "_Prezerať..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Vybrať písmo"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Rodina písma"
 
Index: po/sl.po
===================================================================
RCS file: /cvs/gnome/pan/po/sl.po,v
retrieving revision 1.46
diff -u -u -r1.46 sl.po
--- po/sl.po	21 Jan 2003 10:59:54 -0000	1.46
+++ po/sl.po	24 Mar 2005 15:58:22 -0000
@@ -3186,7 +3186,7 @@
 msgid "Cancelling message \"%s\""
 msgstr "Razveljavljam sporočilo \"%s\""
 
-#: pan/pan-color-picker.c:55
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Izberi barvo"
 
@@ -3194,11 +3194,11 @@
 msgid "Browse..."
 msgstr "Brskaj..."
 
-#: pan/pan-font-picker.c:52
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Izberi pisavo"
 
-#: pan/pan-font-picker.c:71
+#: pan/pan-font-button.c:81
 msgid "Family"
 msgstr "Družina"
 
Index: po/sq.po
===================================================================
RCS file: /cvs/gnome/pan/po/sq.po,v
retrieving revision 1.1
diff -u -u -r1.1 sq.po
--- po/sq.po	3 Sep 2004 11:16:41 -0000	1.1
+++ po/sq.po	24 Mar 2005 15:58:22 -0000
@@ -3441,7 +3441,7 @@
 msgstr "Unicode 8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 #, fuzzy
 msgid "Select Color"
 msgstr "Zgjidh ngjyrën"
@@ -3452,12 +3452,12 @@
 msgstr "_Shfleto..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 #, fuzzy
 msgid "Select Font"
 msgstr "Zgjidh gërmat"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 #, fuzzy
 msgid "Font Family"
 msgstr "Familja e gërmave"
Index: po/sr.po
===================================================================
RCS file: /cvs/gnome/pan/po/sr.po,v
retrieving revision 1.39
diff -u -u -r1.39 sr.po
--- po/sr.po	26 Mar 2004 15:52:02 -0000	1.39
+++ po/sr.po	24 Mar 2005 15:58:22 -0000
@@ -3003,7 +3003,7 @@
 msgstr "Јуникодм, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Изаберите боју"
 
@@ -3012,11 +3012,11 @@
 msgstr "_Изаберите..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Изаберите фонт"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Фамилија фонта"
 
Index: po/address@hidden
===================================================================
RCS file: /cvs/gnome/pan/po/address@hidden,v
retrieving revision 1.12
diff -u -u -r1.12 address@hidden
--- po/address@hidden	26 Mar 2004 15:52:02 -0000	1.12
+++ po/address@hidden	24 Mar 2005 15:58:22 -0000
@@ -3003,7 +3003,7 @@
 msgstr "Junikodm, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Izaberite boju"
 
@@ -3012,11 +3012,11 @@
 msgstr "_Izaberite..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Izaberite font"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Familija fonta"
 
Index: po/sv.po
===================================================================
RCS file: /cvs/gnome/pan/po/sv.po,v
retrieving revision 1.110
diff -u -u -r1.110 sv.po
--- po/sv.po	25 Mar 2004 17:37:15 -0000	1.110
+++ po/sv.po	24 Mar 2005 15:58:23 -0000
@@ -3003,7 +3003,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Välj färg"
 
@@ -3012,11 +3012,11 @@
 msgstr "_Bläddra..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Typsnittsfamilj"
 
Index: po/tr.po
===================================================================
RCS file: /cvs/gnome/pan/po/tr.po,v
retrieving revision 1.22
diff -u -u -r1.22 tr.po
--- po/tr.po	28 Dec 2003 21:05:15 -0000	1.22
+++ po/tr.po	24 Mar 2005 15:58:23 -0000
@@ -3046,7 +3046,7 @@
 msgstr "Uluslararası, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Renk Seçin"
 
@@ -3055,11 +3055,11 @@
 msgstr "_Tara..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Yazıtipi Seçin"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Yazıtipi Ailesi"
 
Index: po/uk.po
===================================================================
RCS file: /cvs/gnome/pan/po/uk.po,v
retrieving revision 1.37
diff -u -u -r1.37 uk.po
--- po/uk.po	3 Oct 2003 07:24:29 -0000	1.37
+++ po/uk.po	24 Mar 2005 15:58:23 -0000
@@ -2952,7 +2952,7 @@
 msgstr "Унікод, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Вибір кольору"
 
@@ -2961,11 +2961,11 @@
 msgstr "_Вибрати..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Вибір шрифту"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Гарнітура"
 
Index: po/vi.po
===================================================================
RCS file: /cvs/gnome/pan/po/vi.po,v
retrieving revision 1.5
diff -u -u -r1.5 vi.po
--- po/vi.po	22 Oct 2002 15:40:06 -0000	1.5
+++ po/vi.po	24 Mar 2005 15:58:23 -0000
@@ -3125,7 +3125,7 @@
 msgid "Western, New"
 msgstr ""
 
-#: pan/pan-color-picker.c:55
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "Chọn màu"
 
@@ -3133,11 +3133,11 @@
 msgid "Browse..."
 msgstr "Duyệt..."
 
-#: pan/pan-font-picker.c:52
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "Chọn font"
 
-#: pan/pan-font-picker.c:71
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "Họ Font"
 
Index: po/zh_CN.po
===================================================================
RCS file: /cvs/gnome/pan/po/zh_CN.po,v
retrieving revision 1.6
diff -u -u -r1.6 zh_CN.po
--- po/zh_CN.po	28 Aug 2002 05:03:51 -0000	1.6
+++ po/zh_CN.po	24 Mar 2005 15:58:23 -0000
@@ -3500,8 +3500,7 @@
 msgid "Unicode, UTF-8"
 msgstr "Unicode, UTF-8"
 
-# pan/pan-color-picker.c:55
-#: pan/pan-color-picker.c:52
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "选择颜色"
 
@@ -3510,13 +3509,11 @@
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
-# pan/pan-font-picker.c:52
-#: pan/pan-font-picker.c:49
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "选择字体"
 
-# pan/pan-font-picker.c:71
-#: pan/pan-font-picker.c:68
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "字体集"
 
Index: po/zh_TW.po
===================================================================
RCS file: /cvs/gnome/pan/po/zh_TW.po,v
retrieving revision 1.1
diff -u -u -r1.1 zh_TW.po
--- po/zh_TW.po	8 Sep 2004 22:18:49 -0000	1.1
+++ po/zh_TW.po	24 Mar 2005 15:58:23 -0000
@@ -2968,7 +2968,7 @@
 msgstr "Unicode, UTF-8"
 
 #. create the dialog
-#: pan/pan-color-picker.c:58
+#: pan/pan-color-button.c:61
 msgid "Select Color"
 msgstr "選擇色彩"
 
@@ -2977,11 +2977,11 @@
 msgstr "瀏覽(_B)..."
 
 #. create the dialog
-#: pan/pan-font-picker.c:51
+#: pan/pan-font-button.c:55
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: pan/pan-font-picker.c:77
+#: pan/pan-font-button.c:81
 msgid "Font Family"
 msgstr "字族"