# HG changeset patch # User Sean Egan # Date 1169672600 0 # Node ID deeaffeda047bc14a219fa3694be4fba2ccda6dc # Parent 3a943f4af57efe88eb392dc2003f24488f606d63# Parent 1ec72a759b5c8e772e4235ba73dadf922fba2b6f merge of '7daaf59bc033f5665ab67b267aa5b270469e3ead' and 'eac90dc3715014deec3d806ac48c6c6be16a4c4d' diff -r 1ec72a759b5c -r deeaffeda047 ChangeLog --- a/ChangeLog Wed Jan 24 19:04:45 2007 +0000 +++ b/ChangeLog Wed Jan 24 21:03:20 2007 +0000 @@ -1,3 +1,8 @@ +2007-01-24 gettextize + + * Makefile.am (ACLOCAL_AMFLAGS): New variable. + (EXTRA_DIST): Add config.rpath, m4/ChangeLog. + Gaim: The Pimpin' Penguin IM Client that's good for the soul! version 2.0.0: diff -r 1ec72a759b5c -r deeaffeda047 Makefile.am --- a/Makefile.am Wed Jan 24 19:04:45 2007 +0000 +++ b/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -1,4 +1,4 @@ -EXTRA_DIST = \ +EXTRA_DIST = config.rpath m4/ChangeLog \ COPYRIGHT \ ChangeLog.API \ ChangeLog.win32 \ @@ -71,3 +71,5 @@ DISTCLEANFILES= gaim.desktop libpurple/gconf/gaim.schemas intltool-extract \ intltool-merge intltool-update + +ACLOCAL_AMFLAGS = -I m4 diff -r 1ec72a759b5c -r deeaffeda047 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/gtkblist.c Wed Jan 24 21:03:20 2007 +0000 @@ -4239,7 +4239,7 @@ "cell-background-gdk", BGCOLOR_COLUMN, #endif NULL); - g_object_set(rend, "xalign", 0.0, "ypad", 0, NULL); + g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL); gtkblist->text_rend = rend = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start (column, rend, TRUE); diff -r 1ec72a759b5c -r deeaffeda047 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/gtkstatusbox.c Wed Jan 24 21:03:20 2007 +0000 @@ -968,7 +968,7 @@ if (status_box->account == NULL) { - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_ONLINE, + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_AVAILABLE, icon_size, "GtkGaimStatusBox"); /* Do all the currently enabled accounts have the same statuses? * If so, display them instead of our global list. diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/emotes/default/22/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -56,6 +56,7 @@ film.png \ fingers-crossed.png \ flag.png \ + foot-in-mouth.png \ freaked-out.png \ ghost.png \ girl.png \ @@ -88,6 +89,7 @@ meeting.png \ mobile.png \ monkey.png \ + moneymouth.png \ moon.png \ msn-away.png \ msn-busy.png \ diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/emotes/default/22/theme --- a/pidgin/pixmaps/emotes/default/22/theme Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Wed Jan 24 21:03:20 2007 +0000 @@ -1,5 +1,5 @@ Name=Default -Description=Emotes from each protocol's official client, restyled. +Description=Default Pidgin smileys Icon=smile.png Author=Hylke Bons @@ -17,6 +17,8 @@ thinking.png :-/ :-\\ angel.png O:-) shut-mouth.png :-X +moneymouth.png :-$ +foot-in-mouth.png :-! [MSN] smile.png :) diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/emotes/default/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/scalable/Makefile.am Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/scalable/Makefile.am Wed Jan 24 21:03:20 2007 +0000 @@ -55,6 +55,7 @@ film.svg \ fingers-crossed.svg \ flag.svg \ + foot-in-mouth.svg \ freaked-out.svg \ ghost.svg \ girl.svg \ @@ -85,6 +86,7 @@ meeting.svg \ mobile.svg \ monkey.svg \ + moneymouth.png moon.svg \ msn-away.svg \ msn-busy.svg \ diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/16/person.png Binary file pidgin/pixmaps/status/16/person.png has changed diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/16/scalable/person.svg --- a/pidgin/pixmaps/status/16/scalable/person.svg Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/status/16/scalable/person.svg Wed Jan 24 21:03:20 2007 +0000 @@ -7,53 +7,62 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16" - height="16" - id="svg2" + width="16px" + height="16px" + id="svg7380" sodipodi:version="0.32" - inkscape:version="0.43" - version="1.0" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/16/person16.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/16/scalable" - sodipodi:docname="person16.svg"> + inkscape:version="0.44.1" + sodipodi:docbase="/home/hbons/GUI/Tango/Gaim Refresh/status/16/scalable" + sodipodi:docname="person.svg"> + id="defs7382"> + + + + + - - - - - + id="linearGradient7300"> + id="stop7302" /> + id="stop7304" /> + @@ -69,14 +78,13 @@ + r="8.6620579" /> + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="1274" + inkscape:window-height="972" + inkscape:window-x="3" + inkscape:window-y="23" /> + id="metadata7385"> @@ -108,46 +116,48 @@ + inkscape:groupmode="layer"> + + + + - - - + transform="matrix(0.404061,0,0,0.404061,-4.571431,-2.680644)" /> diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/22/person.png Binary file pidgin/pixmaps/status/22/person.png has changed diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/22/scalable/person.svg --- a/pidgin/pixmaps/status/22/scalable/person.svg Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/status/22/scalable/person.svg Wed Jan 24 21:03:20 2007 +0000 @@ -7,44 +7,63 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="24" - height="24" - id="svg2" + width="22" + height="22" + id="svg7348" sodipodi:version="0.32" - inkscape:version="0.43" + inkscape:version="0.44.1" version="1.0" - inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/status/22/available22.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/22/scalable" + sodipodi:docbase="/home/hbons/GUI/Tango/Gaim Refresh/status/22/scalable" sodipodi:docname="person.svg"> + id="defs7350"> + id="linearGradient3800"> + - + style="stop-color:#df9725;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop3804" /> + + id="linearGradient7300"> + id="stop7302" /> + id="stop7304" /> + @@ -60,31 +79,13 @@ - - + r="8.6620579" /> + inkscape:grid-bbox="true" + inkscape:document-units="px" + width="22px" + height="22px" + inkscape:window-width="1274" + inkscape:window-height="972" + inkscape:window-x="3" + inkscape:window-y="23" /> + id="metadata7353"> @@ -116,38 +119,84 @@ + inkscape:groupmode="layer"> + + + + + + transform="matrix(0.634953,0,0,0.634953,-8.755092,-5.069579)" /> + style="opacity:1;fill:none;fill-opacity:1;stroke:#5c3566;stroke-width:1.02789998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path7292" + sodipodi:cx="15.996282" + sodipodi:cy="20.334204" + sodipodi:rx="2.3861856" + sodipodi:ry="5.1847987" + d="M 14.176248,23.687254 A 2.3861856,5.1847987 0 0 1 14.22429,16.861786" + transform="matrix(1.614994,0,0,0.58604,-8.472143,4.618319)" + sodipodi:start="2.4383323" + sodipodi:end="3.8754384" + sodipodi:open="true" /> + style="opacity:1;fill:none;fill-opacity:1;stroke:#5c3566;stroke-width:1.02789998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path7378" + sodipodi:cx="15.996282" + sodipodi:cy="20.334204" + sodipodi:rx="2.3861856" + sodipodi:ry="5.1847987" + d="M 14.176248,23.687254 A 2.3861856,5.1847987 0 0 1 14.22429,16.861786" + transform="matrix(-1.614994,0,0,0.58604,30.47214,4.618312)" + sodipodi:start="2.4383323" + sodipodi:end="3.8754384" + sodipodi:open="true" /> diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/32/person.png Binary file pidgin/pixmaps/status/32/person.png has changed diff -r 1ec72a759b5c -r deeaffeda047 pidgin/pixmaps/status/32/scalable/person.svg --- a/pidgin/pixmaps/status/32/scalable/person.svg Wed Jan 24 19:04:45 2007 +0000 +++ b/pidgin/pixmaps/status/32/scalable/person.svg Wed Jan 24 21:03:20 2007 +0000 @@ -7,32 +7,64 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" - id="svg2" + width="32px" + height="32px" + id="svg7254" sodipodi:version="0.32" - inkscape:version="0.43" - version="1.0" - inkscape:export-filename="/home/hbons/Desktop/tray.png" + inkscape:version="0.44.1" + sodipodi:docbase="/home/hbons/Desktop" + sodipodi:docname="person.svg" + inkscape:export-filename="/home/hbons/Desktop/person.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/status/32" - sodipodi:docname="person.svg"> + inkscape:export-ydpi="90"> + id="defs7256"> + id="linearGradient7300"> + id="stop7302" /> + id="stop7304" /> + + + + + + + + + - + + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="1274" + inkscape:window-height="972" + inkscape:window-x="3" + inkscape:window-y="23" /> + id="metadata7259"> @@ -97,53 +130,107 @@ + inkscape:groupmode="layer"> + + + + + + + - + transform="matrix(0.981291,0,0,0.981291,-14.53061,-7.652982)" /> + style="opacity:1;fill:none;fill-opacity:1;stroke:#5c3566;stroke-width:0.83708477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path7292" + sodipodi:cx="15.996282" + sodipodi:cy="20.334204" + sodipodi:rx="2.3861856" + sodipodi:ry="5.1847987" + d="M 14.176248,23.687254 A 2.3861856,5.1847987 0 0 1 14.22429,16.861786" + transform="matrix(-1.623464,0,0,0.87906,34.58738,7.677484)" + sodipodi:start="2.4383323" + sodipodi:end="3.8754384" + sodipodi:open="true" /> - + style="opacity:1;fill:none;fill-opacity:1;stroke:#5c3566;stroke-width:0.83708477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path7294" + sodipodi:cx="15.996282" + sodipodi:cy="20.334204" + sodipodi:rx="2.3861856" + sodipodi:ry="5.1847987" + d="M 14.176248,23.687254 A 2.3861856,5.1847987 0 0 1 14.22429,16.861786" + transform="matrix(1.623464,0,0,0.87906,-2.592621,7.677484)" + sodipodi:start="2.4383323" + sodipodi:end="3.8754384" + sodipodi:open="true" /> diff -r 1ec72a759b5c -r deeaffeda047 po/ChangeLog --- a/po/ChangeLog Wed Jan 24 19:04:45 2007 +0000 +++ b/po/ChangeLog Wed Jan 24 21:03:20 2007 +0000 @@ -1,3 +1,14 @@ +2007-01-24 gettextize + + * Makefile.in.in: Upgrade to gettext-0.14.5. + * Rules-quot: New file, from gettext-0.14.5. + * boldquot.sed: New file, from gettext-0.14.5. + * en@boldquot.header: New file, from gettext-0.14.5. + * en@quot.header: New file, from gettext-0.14.5. + * insert-header.sin: New file, from gettext-0.14.5. + * quot.sed: New file, from gettext-0.14.5. + * remove-potcdate.sin: New file, from gettext-0.14.5. + Gaim: The Pimpin' Penguin IM Clone that's good for the soul! version 2.0.0: