Merging patches from 1-0-branch
svn path=/trunk/; revision=15109
This commit is contained in:
Iain Holmes
@ -1,3 +1,50 @@
|
||||
2001-12-14 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* Location-translation-script: shell script to convert Locations to
|
||||
Locations.h
|
||||
|
||||
* Locations.h: Translatable file for the weather stations.
|
||||
|
||||
* Makefile.am: Add these files to the dist.
|
||||
|
||||
2001-12-14 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* metar.c: Remove the degree symbol.
|
||||
|
||||
2001-12-14 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary.c (e_summary_init): Create a translatable string for the
|
||||
default HTML, that says "Please wait..."
|
||||
|
||||
2001-12-14 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary.c (e_summary_freeze): Check that priv != NULL
|
||||
(e_summary_thaw): Check that priv != NULL
|
||||
(e_summary_count_connections): Check that summary is a Summary.
|
||||
(e_summary_add_connections): Check that the summary is a Summary.
|
||||
(e_summary_set_online): Check that the summary is a Summary.
|
||||
|
||||
* e-summary-offline-handler.c (impl__get_isOffline): Only check
|
||||
summary if it's not NULL.
|
||||
(impl_prepareForOffline): Ditto.
|
||||
(impl_goOnline): Only go online if summary isn't NULL.
|
||||
|
||||
2001-12-13 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary-calendar.c (generate_html): Check that text.value isn't
|
||||
NULL.
|
||||
|
||||
2001-12-10 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary-rdf.c (e_summary_rdf_init): Set the initial sites to
|
||||
Linux Today and Salon.
|
||||
|
||||
* e-summary-preferences.c (make_initial_rdf_list): Ditto
|
||||
|
||||
2001-12-10 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary-calendar.c (generate_html): Apply damon's change.
|
||||
|
||||
2001-12-06 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* e-summary-preferences.c (rdfs): Remove the perl.com one.
|
||||
|
||||
8
my-evolution/Location-translation-script
Executable file
8
my-evolution/Location-translation-script
Executable file
@ -0,0 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
grep name Locations | cut -b 6- > Locations.h
|
||||
grep loc Locations | sed "s/ .... ...... ...$//"| sed "s/ .... :...... ...$//" | cut -d = -f 2 | sed "s/\\\\//g" >> Locations.h
|
||||
|
||||
sed -e "s/^/N_(\"/" -e "s/$/\")/" Locations.h > Locations.h.tmp
|
||||
sort Locations.h.tmp | uniq > Locations.h
|
||||
rm Locations.h.tmp
|
||||
@ -2827,7 +2827,7 @@ loc14=Merida SVMD ------ ---
|
||||
loc15=San\\ Antonio\\ Del\\ Tachira SVSA ------ ---
|
||||
loc16=San\\ Fernando\\ De\\ Apure SVSR ------ ---
|
||||
loc17=Valera* SVVL ------ ---
|
||||
loc18=Caracas\\ La\\ Carlota SVFM ----- ---
|
||||
loc18=Caracas\\ La\\ Carlota SVFM ------ ---
|
||||
|
||||
[M__MX]
|
||||
name=Mexico
|
||||
|
||||
2525
my-evolution/Locations.h
Normal file
2525
my-evolution/Locations.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -87,7 +87,7 @@ glade_DATA = my-evolution.glade
|
||||
|
||||
@XML_I18N_MERGE_OAF_RULE@
|
||||
|
||||
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(Location_DATA) $(glade_DATA)
|
||||
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(Location_DATA) $(glade_DATA) Locations.h Location-translation-script
|
||||
|
||||
if ENABLE_PURIFY
|
||||
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@ -364,19 +364,17 @@ generate_html (gpointer data)
|
||||
for (i = 0; i < uidarray->len; i++) {
|
||||
ESummaryCalEvent *event;
|
||||
CalComponentText text;
|
||||
time_t start_t;
|
||||
struct tm *start_tm;
|
||||
struct tm start_tm;
|
||||
char start_str[64], *start_str_utf, *img;
|
||||
|
||||
event = uidarray->pdata[i];
|
||||
cal_component_get_summary (event->comp, &text);
|
||||
start_t = icaltime_as_timet (*event->dt.value);
|
||||
|
||||
start_tm = localtime (&start_t);
|
||||
start_tm = icaltimetype_to_tm (event->dt.value);
|
||||
if (calendar->wants24hr == TRUE) {
|
||||
strftime (start_str, sizeof start_str, _("%k:%M %d %B"), start_tm);
|
||||
strftime (start_str, sizeof start_str, _("%k:%M %d %B"), &start_tm);
|
||||
} else {
|
||||
strftime (start_str, sizeof start_str, _("%l:%M %d %B"), start_tm);
|
||||
strftime (start_str, sizeof start_str, _("%l:%M %d %B"), &start_tm);
|
||||
}
|
||||
|
||||
if (cal_component_has_alarms (event->comp)) {
|
||||
@ -394,7 +392,7 @@ generate_html (gpointer data)
|
||||
"alt=\"\" width=\"16\" height=\"16\">   "
|
||||
"<font size=\"-1\"><a href=\"calendar:/%s\">%s, %s</a></font><br>",
|
||||
img,
|
||||
event->uid, start_str_utf, text.value);
|
||||
event->uid, start_str_utf, text.value ? text.value : _("No description"));
|
||||
g_free (start_str_utf);
|
||||
|
||||
g_string_append (string, tmp);
|
||||
|
||||
@ -80,7 +80,11 @@ impl__get_isOffline (PortableServer_Servant servant,
|
||||
ESummaryOfflineHandler *offline_handler;
|
||||
|
||||
offline_handler = E_SUMMARY_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
|
||||
return offline_handler->priv->summary->online;
|
||||
if (offline_handler->priv->summary != NULL) {
|
||||
return offline_handler->priv->summary->online;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -94,7 +98,9 @@ impl_prepareForOffline (PortableServer_Servant servant,
|
||||
offline_handler = E_SUMMARY_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
|
||||
priv = offline_handler->priv;
|
||||
|
||||
*active_connection_list = e_summary_offline_handler_create_connection_list (priv->summary);
|
||||
if (priv->summary != NULL) {
|
||||
*active_connection_list = e_summary_offline_handler_create_connection_list (priv->summary);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -136,9 +142,11 @@ impl_goOffline (PortableServer_Servant servant,
|
||||
offline_handler = E_SUMMARY_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
|
||||
priv = offline_handler->priv;
|
||||
|
||||
priv->listener_interface = CORBA_Object_duplicate (progress_listener, ev);
|
||||
|
||||
e_summary_set_online (priv->summary, progress_listener, FALSE, went_offline, offline_handler);
|
||||
if (priv->summary != NULL) {
|
||||
priv->listener_interface = CORBA_Object_duplicate (progress_listener, ev);
|
||||
|
||||
e_summary_set_online (priv->summary, progress_listener, FALSE, went_offline, offline_handler);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -148,7 +156,9 @@ impl_goOnline (PortableServer_Servant servant,
|
||||
ESummaryOfflineHandler *offline_handler;
|
||||
|
||||
offline_handler = E_SUMMARY_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
|
||||
e_summary_set_online (offline_handler->priv->summary, NULL, TRUE, NULL, NULL);
|
||||
if (offline_handler->priv->summary != NULL) {
|
||||
e_summary_set_online (offline_handler->priv->summary, NULL, TRUE, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
/* GtkObject methods */
|
||||
|
||||
@ -64,7 +64,8 @@ make_initial_rdf_list (ESummaryPrefs *prefs)
|
||||
{
|
||||
GList *rdfs;
|
||||
|
||||
rdfs = g_list_prepend (NULL, g_strdup ("http://www.cnn.com/cnn.rss"));
|
||||
rdfs = g_list_prepend (NULL, g_strdup ("http://linuxtoday.com/backend/my-netscape.rdf"));
|
||||
rdfs = g_list_append (rdfs, g_strdup ("http://www.salon.com/feed/RDF/salon_use.rdf"));
|
||||
|
||||
prefs->rdf_urls = rdfs;
|
||||
}
|
||||
|
||||
@ -641,7 +641,8 @@ e_summary_rdf_init (ESummary *summary)
|
||||
|
||||
e_summary_add_protocol_listener (summary, "rdf", e_summary_rdf_protocol, rdf);
|
||||
if (prefs == NULL) {
|
||||
e_summary_rdf_add_uri (summary, "http://www.cnn.com/cnn.rss");
|
||||
e_summary_rdf_add_uri (summary, "http://linuxtoday.com/backend/my-netscape.rdf");
|
||||
e_summary_rdf_add_uri (summary, "http://www.salon.com/feed/RDF/salon_use.rdf");
|
||||
timeout = 600;
|
||||
} else {
|
||||
GList *p;
|
||||
|
||||
@ -461,7 +461,7 @@ alarm_fn (gpointer alarm_id,
|
||||
e_summary_reconfigure (summary);
|
||||
}
|
||||
|
||||
#define DEFAULT_HTML "<html><head><title>Summary</title></head><body bgcolor=\"#ffffff\">hello</body></html>"
|
||||
#define DEFAULT_HTML "<html><head><title>Summary</title></head><body bgcolor=\"#ffffff\">%s</body></html>"
|
||||
|
||||
static void
|
||||
e_summary_init (ESummary *summary)
|
||||
@ -471,6 +471,7 @@ e_summary_init (ESummary *summary)
|
||||
ESummaryPrivate *priv;
|
||||
GdkColor bgcolor = {0, 0xffff, 0xffff, 0xffff};
|
||||
time_t t, day_end;
|
||||
char *def, *default_utf;
|
||||
|
||||
summary->priv = g_new (ESummaryPrivate, 1);
|
||||
|
||||
@ -489,8 +490,11 @@ e_summary_init (ESummary *summary)
|
||||
gtk_html_set_default_content_type (GTK_HTML (priv->html),
|
||||
"text/html; charset=utf-8");
|
||||
gtk_html_set_default_background_color (GTK_HTML (priv->html), &bgcolor);
|
||||
gtk_html_load_from_string (GTK_HTML (priv->html), DEFAULT_HTML,
|
||||
strlen (DEFAULT_HTML));
|
||||
def = g_strdup_printf (DEFAULT_HTML, _("Please wait..."));
|
||||
default_utf = e_utf8_from_locale_string (def);
|
||||
gtk_html_load_from_string (GTK_HTML (priv->html), default_utf, strlen (default_utf));
|
||||
g_free (def);
|
||||
g_free (default_utf);
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (priv->html), "url-requested",
|
||||
GTK_SIGNAL_FUNC (e_summary_url_requested), summary);
|
||||
@ -808,9 +812,7 @@ e_summary_count_connections (ESummary *summary)
|
||||
GList *p;
|
||||
int count = 0;
|
||||
|
||||
if (summary == NULL) {
|
||||
return 0;
|
||||
}
|
||||
g_return_val_if_fail (IS_E_SUMMARY (summary), 0);
|
||||
|
||||
for (p = summary->priv->connections; p; p = p->next) {
|
||||
ESummaryConnection *c;
|
||||
@ -829,9 +831,7 @@ e_summary_add_connections (ESummary *summary)
|
||||
GList *p;
|
||||
GList *connections = NULL;
|
||||
|
||||
if (summary == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
g_return_val_if_fail (IS_E_SUMMARY (summary), NULL);
|
||||
|
||||
for (p = summary->priv->connections; p; p = p->next) {
|
||||
ESummaryConnection *c;
|
||||
@ -855,9 +855,7 @@ e_summary_set_online (ESummary *summary,
|
||||
{
|
||||
GList *p;
|
||||
|
||||
if (summary == NULL) {
|
||||
return;
|
||||
}
|
||||
g_return_if_fail (IS_E_SUMMARY (summary));
|
||||
|
||||
for (p = summary->priv->connections; p; p = p->next) {
|
||||
ESummaryConnection *c;
|
||||
@ -908,6 +906,7 @@ void
|
||||
e_summary_freeze (ESummary *summary)
|
||||
{
|
||||
g_return_if_fail (IS_E_SUMMARY (summary));
|
||||
g_return_if_fail (summary->priv != NULL);
|
||||
|
||||
if (summary->priv->frozen == TRUE) {
|
||||
return;
|
||||
@ -920,6 +919,8 @@ void
|
||||
e_summary_thaw (ESummary *summary)
|
||||
{
|
||||
g_return_if_fail (IS_E_SUMMARY (summary));
|
||||
g_return_if_fail (summary->priv != NULL);
|
||||
|
||||
if (summary->priv->frozen == FALSE) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ static regex_t metar_re[RE_NUM];
|
||||
|
||||
#define TEMP_F_TO_C(f) (((f) - 32.0) * 0.555556)
|
||||
#define TEMP_C_TO_F(c) (((c) * 1.8) + 32.0)
|
||||
#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? _("\260F") : _("\260C"))
|
||||
#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? _(" F") : _(" C"))
|
||||
|
||||
#define WINDSPEED_KNOTS_TO_KPH(knots) ((knots) * 1.851965)
|
||||
#define WINDSPEED_KPH_TO_KNOTS(kph) ((kph) * 0.539967)
|
||||
|
||||
175
po/ChangeLog
175
po/ChangeLog
@ -1,3 +1,19 @@
|
||||
2001-12-17 Iain Holmes <iain@ximian.com>
|
||||
|
||||
* POFILES.in: Added my-evolution/Locations.h
|
||||
|
||||
2001-12-06 gettextize <bug-gnu-utils@gnu.org>
|
||||
|
||||
* Makefile.in.in: Upgrade to gettext-0.10.39.
|
||||
|
||||
2001-12-06 gettextize <bug-gnu-utils@gnu.org>
|
||||
|
||||
* Makefile.in.in: Upgrade to gettext-0.10.39.
|
||||
|
||||
2001-12-04 gettextize <bug-gnu-utils@gnu.org>
|
||||
|
||||
* Makefile.in.in: Upgrade to gettext-0.10.39.
|
||||
|
||||
2001-12-17 Roy-Magne Mo <rmo@sunnmore.net>
|
||||
|
||||
* nn.po: Updated Norwegian (nynorsk) translation.
|
||||
@ -85,6 +101,165 @@
|
||||
|
||||
* ru.po: updated russian translation.
|
||||
|
||||
2001-12-06 gettextize <bug-gnu-utils@gnu.org>
|
||||
|
||||
* Makefile.in.in: Upgrade to gettext-0.10.39.
|
||||
|
||||
2001-12-16 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-12-14 Andras Timar <timar@gnome.hu>
|
||||
|
||||
* hu.po: Updated Hungarian translation
|
||||
and fixed Bugzilla ID 17344.
|
||||
|
||||
2001-12-13 Damon Chaplin <damon@ximian.com>
|
||||
|
||||
* POTFILES.in: added calendar/zones.h
|
||||
|
||||
2001-12-12 Zbigniew Chyla <cyba@gnome.pl>
|
||||
|
||||
* pl.po: Updated Polish translation by
|
||||
GNOME PL Team <translators@gnome.pl>.
|
||||
|
||||
2001-12-12 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-12-12 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
2001-12-12 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
2001-12-11 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
|
||||
|
||||
* sk.po: Updated Slovak translation.
|
||||
|
||||
2001-12-07 Andras Timar <timar@gnome.hu>
|
||||
|
||||
* hu.po: Updated Hungarian translation.
|
||||
|
||||
2001-12-07 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-12-07 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
2001-12-06 Christian Meyer <chrisime@gnome.org>
|
||||
|
||||
* de.po: Minor update + fixes.
|
||||
|
||||
2001-12-04 Christian Meyer <chrisime@gnome.org>
|
||||
|
||||
* de.po: Updated German translation.
|
||||
|
||||
2001-12-04 Zbigniew Chyla <cyba@gnome.pl>
|
||||
|
||||
* pl.po: Updated Polish translation by
|
||||
GNOME PL Team <translators@gnome.pl>.
|
||||
|
||||
2001-12-03 Simos Xenitellis <simos@hellug.gr>
|
||||
|
||||
* el.po: Updated Greek translation.
|
||||
|
||||
2001-12-02 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-12-01 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
2001-11-30 Peteris Krisjanis <pecisk@inbox.lv>
|
||||
|
||||
* lv.po: Updated Latvian translation.
|
||||
|
||||
2001-11-28 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
2001-11-25 Matthias Warkus <mawarkus@gnome.org>
|
||||
|
||||
* de.po: Updated German translation for release.
|
||||
|
||||
2001-11-25 Christophe Merlet <redfox@eikonex.org>
|
||||
|
||||
* fr.po: Updated French translation from work of
|
||||
Frederic Riss <frederic.riss@laposte.net>.
|
||||
|
||||
2001-11-24 Zbigniew Chyla <cyba@gnome.pl>
|
||||
|
||||
* pl.po: Updated Polish translation by
|
||||
GNOME PL Team <translators@gnome.pl>.
|
||||
|
||||
2001-11-21 Jeffrey Stedfast <fejj@ximian.com>
|
||||
|
||||
* POTFILES.in: Remove camel/camel-tcp-stream-openssl.c
|
||||
|
||||
2001-11-21 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-11-20 Wang Jian <lark@linux.net.cn>
|
||||
|
||||
* zh_CN.po: Minor QA by Wang Jian.
|
||||
|
||||
2001-11-20 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* no.po: Updated Norwegian (bokm<6B>l) translation.
|
||||
|
||||
2001-11-20 Hector Garcia Alavrez <hector@scouts-es.org>
|
||||
|
||||
* es.po: Updated Spanish translation, last fuzzy string fixed
|
||||
|
||||
2001-11-20 Carlos Perell<6C> Mar<61>n <carlos@gnome-db.org>
|
||||
|
||||
* es.po: Some QA.
|
||||
|
||||
2001-11-20 Hector Garcia Alavrez <hector@scouts-es.org>
|
||||
|
||||
* es.po: Updated Spanish translation
|
||||
|
||||
2001-11-20 Wang Jian <lark@linux.net.cn>
|
||||
|
||||
* zh_CN.po: Converted to UTF-8.
|
||||
|
||||
2001-11-20 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
|
||||
|
||||
* sk.po: Updated Slovak translation.
|
||||
|
||||
2001-10-20 Wang Jian <lark@linux.net.cn>
|
||||
|
||||
* zh_CN.po: Updated by Wang Jian.
|
||||
|
||||
2001-11-19 Wang Jian <lark@linux.net.cn>
|
||||
|
||||
* zh_CN.po: Updated Simplified Chinese translation by
|
||||
Wang Jian(Merged from HEAD), and gettext-0.10.40 compatible.
|
||||
|
||||
2001-11-19 Zbigniew Chyla <cyba@gnome.pl>
|
||||
|
||||
* pl.po: Updated Polish translation by
|
||||
GNOME PL Team <translators@gnome.pl>.
|
||||
|
||||
2001-11-18 Simos Xenitellis <simos@hellug.gr>
|
||||
|
||||
* el.po: Updated + normalised Greek translation.
|
||||
|
||||
2001-11-18 Administrator <simos@hellug.gr>
|
||||
|
||||
* el.po: Updated Greek translation.
|
||||
|
||||
2001-11-16 Andras Timar <timar@gnome.hu>
|
||||
|
||||
* hu.po: Updated Hungarian translation.
|
||||
|
||||
2001-11-14 Christian Rose <menthos@menthos.com>
|
||||
|
||||
* sv.po: Updated Swedish translation.
|
||||
|
||||
@ -143,7 +143,6 @@ camel/camel-service.c
|
||||
camel/camel-session.c
|
||||
camel/camel-smime-context.c
|
||||
camel/camel-store.c
|
||||
camel/camel-tcp-stream-openssl.c
|
||||
camel/camel-tcp-stream-ssl.c
|
||||
camel/camel-url.c
|
||||
camel/camel-vee-folder.c
|
||||
@ -269,6 +268,7 @@ my-evolution/e-summary.c
|
||||
my-evolution/main.c
|
||||
my-evolution/metar.c
|
||||
my-evolution/my-evolution.glade
|
||||
my-evolution/Locations.h
|
||||
shell/GNOME_Evolution_Shell.oaf.in
|
||||
shell/e-activity-handler.c
|
||||
shell/e-local-storage.c
|
||||
|
||||
Reference in New Issue
Block a user