[Xfce4-commits] <xfce4-weather-plugin:master> Replace "medium clouds" with "middle clouds".
Harald Judt
noreply at xfce.org
Thu Jan 10 16:34:16 CET 2013
Updating branch refs/heads/master
to 583524a61d8b407a049b3f54e4bef47bffec6735 (commit)
from b56b9b92e5980d1313aa199955eba1f152ba397f (commit)
commit 583524a61d8b407a049b3f54e4bef47bffec6735
Author: Harald Judt <h.judt at gmx.at>
Date: Wed Jan 9 00:30:21 2013 +0100
Replace "medium clouds" with "middle clouds".
While the XML source uses "medium", the proper term is "middle",
which becomes obvious when looking at various other references.
panel-plugin/weather-config.c | 4 ++--
panel-plugin/weather-data.c | 6 +++---
panel-plugin/weather-data.h | 2 +-
panel-plugin/weather-debug.c | 2 +-
panel-plugin/weather-parsers.c | 6 +++---
panel-plugin/weather-parsers.h | 2 +-
panel-plugin/weather-summary.c | 4 ++--
panel-plugin/weather.c | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 5893a0e..343de44 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -102,7 +102,7 @@ static const labeloption labeloptions[OPTIONS_N] = {
{N_("Dew point (D)"), DEWPOINT},
{N_("Apparent temperature (A)"), APPARENT_TEMPERATURE},
{N_("Low clouds (CL)"), CLOUDS_LOW},
- {N_("Medium clouds (CM)"), CLOUDS_MED},
+ {N_("Middle clouds (CM)"), CLOUDS_MID},
{N_("High clouds (CH)"), CLOUDS_HIGH},
{N_("Cloudiness (C)"), CLOUDINESS},
{N_("Fog (F)"), FOG},
@@ -1513,7 +1513,7 @@ options_datatypes_set_tooltip(GtkWidget *optmenu)
"(6,500 ft). They are mainly composed of water droplets or "
"ice particles and snow, when temperatures are cold enough.");
break;
- case CLOUDS_MED:
+ case CLOUDS_MID:
text = _("This specifies the mid-level cloud cover in percent. "
"According to WMO definition, mid-level clouds form in "
"heights of 4,000-8,000 m (13,000-26,000 ft), or 5,000-"
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index ba1e2de..e8d434f 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -381,8 +381,8 @@ get_data(const xml_time *timeslice,
return LOCALE_DOUBLE(loc->clouds_percent[CLOUDS_PERC_LOW],
ROUND_TO_INT("%.1f"));
- case CLOUDS_MED:
- return LOCALE_DOUBLE(loc->clouds_percent[CLOUDS_PERC_MED],
+ case CLOUDS_MID:
+ return LOCALE_DOUBLE(loc->clouds_percent[CLOUDS_PERC_MID],
ROUND_TO_INT("%.1f"));
case CLOUDS_HIGH:
@@ -456,7 +456,7 @@ get_unit(const units_config *units,
return "°";
case HUMIDITY:
case CLOUDS_LOW:
- case CLOUDS_MED:
+ case CLOUDS_MID:
case CLOUDS_HIGH:
case CLOUDINESS:
case FOG:
diff --git a/panel-plugin/weather-data.h b/panel-plugin/weather-data.h
index a6a0982..37794f4 100644
--- a/panel-plugin/weather-data.h
+++ b/panel-plugin/weather-data.h
@@ -35,7 +35,7 @@ typedef enum {
DEWPOINT,
APPARENT_TEMPERATURE,
CLOUDS_LOW,
- CLOUDS_MED,
+ CLOUDS_MID,
CLOUDS_HIGH,
CLOUDINESS,
FOG,
diff --git a/panel-plugin/weather-debug.c b/panel-plugin/weather-debug.c
index fce55d7..6f0937c 100644
--- a/panel-plugin/weather-debug.c
+++ b/panel-plugin/weather-debug.c
@@ -292,7 +292,7 @@ weather_dump_location(const xml_location *loc,
loc->fog_percent,
loc->clouds_percent[CLOUDS_PERC_CLOUDINESS],
loc->clouds_percent[CLOUDS_PERC_LOW],
- loc->clouds_percent[CLOUDS_PERC_MED],
+ loc->clouds_percent[CLOUDS_PERC_MID],
loc->clouds_percent[CLOUDS_PERC_HIGH]);
return out;
}
diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
index 3e7edc5..273f6cb 100644
--- a/panel-plugin/weather-parsers.c
+++ b/panel-plugin/weather-parsers.c
@@ -181,8 +181,8 @@ parse_location(xmlNode *cur_node,
loc->clouds_percent[CLOUDS_PERC_LOW] = PROP(child_node, "percent");
}
if (NODE_IS_TYPE(child_node, "mediumClouds")) {
- g_free(loc->clouds_percent[CLOUDS_PERC_MED]);
- loc->clouds_percent[CLOUDS_PERC_MED] = PROP(child_node, "percent");
+ g_free(loc->clouds_percent[CLOUDS_PERC_MID]);
+ loc->clouds_percent[CLOUDS_PERC_MID] = PROP(child_node, "percent");
}
if (NODE_IS_TYPE(child_node, "highClouds")) {
g_free(loc->clouds_percent[CLOUDS_PERC_HIGH]);
@@ -599,7 +599,7 @@ xml_location_free(xml_location *loc)
g_free(loc->pressure_value);
g_free(loc->pressure_unit);
g_free(loc->clouds_percent[CLOUDS_PERC_LOW]);
- g_free(loc->clouds_percent[CLOUDS_PERC_MED]);
+ g_free(loc->clouds_percent[CLOUDS_PERC_MID]);
g_free(loc->clouds_percent[CLOUDS_PERC_HIGH]);
g_free(loc->clouds_percent[CLOUDS_PERC_CLOUDINESS]);
g_free(loc->fog_percent);
diff --git a/panel-plugin/weather-parsers.h b/panel-plugin/weather-parsers.h
index 53b23d8..4824823 100644
--- a/panel-plugin/weather-parsers.h
+++ b/panel-plugin/weather-parsers.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
enum {
CLOUDS_PERC_LOW = 0,
- CLOUDS_PERC_MED,
+ CLOUDS_PERC_MID,
CLOUDS_PERC_HIGH,
CLOUDS_PERC_CLOUDINESS,
CLOUDS_PERC_NUM
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 9cc05a9..781af42 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -486,7 +486,7 @@ create_summary_tab(plugin_data *data)
APPEND_BTEXT(_("\nClouds\n"));
APPEND_TEXT_ITEM(_("Fog"), FOG);
APPEND_TEXT_ITEM(_("Low clouds"), CLOUDS_LOW);
- APPEND_TEXT_ITEM(_("Medium clouds"), CLOUDS_MED);
+ APPEND_TEXT_ITEM(_("Middle clouds"), CLOUDS_MID);
APPEND_TEXT_ITEM(_("High clouds"), CLOUDS_HIGH);
APPEND_TEXT_ITEM(_("Cloudiness"), CLOUDINESS);
@@ -586,7 +586,7 @@ forecast_cell_get_tooltip_text(plugin_data *data,
g_string_append(text, _("<b>Clouds</b>\n"));
APPEND_TOOLTIP_ITEM(_("Fog:\t\t%s%s%s\n"), FOG);
APPEND_TOOLTIP_ITEM(_("Low:\t\t%s%s%s\n"), CLOUDS_LOW);
- APPEND_TOOLTIP_ITEM(_("Medium\t\t%s%s%s\n"), CLOUDS_MED);
+ APPEND_TOOLTIP_ITEM(_("Middle:\t\t%s%s%s\n"), CLOUDS_MID);
APPEND_TOOLTIP_ITEM(_("High:\t\t%s%s%s\n"), CLOUDS_HIGH);
APPEND_TOOLTIP_ITEM(_("Cloudiness:\t%s%s%s"), CLOUDINESS);
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 5bb2e9c..23fa4af 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -142,7 +142,7 @@ make_label(const plugin_data *data,
case CLOUDS_LOW:
lbl = _("CL");
break;
- case CLOUDS_MED:
+ case CLOUDS_MID:
lbl = _("CM");
break;
case CLOUDS_HIGH:
More information about the Xfce4-commits
mailing list