[Xfce4-commits] <xfce4-weather-plugin:master> Fix untranslatable strings, revise descriptions, fix accelerators (bug #9770).
Harald Judt
noreply at xfce.org
Sun Jan 20 20:22:02 CET 2013
Updating branch refs/heads/master
to 497cfbefa445da38127b4e40413c226342efcb51 (commit)
from c4f4738178e6cea201c1f89528b42aafe0e8ff1a (commit)
commit 497cfbefa445da38127b4e40413c226342efcb51
Author: Harald Judt <h.judt at gmx.at>
Date: Wed Jan 16 14:00:20 2013 +0100
Fix untranslatable strings, revise descriptions, fix accelerators (bug #9770).
panel-plugin/weather-config.c | 90 ++++++++++++++++++++++-----------------
panel-plugin/weather-data.c | 8 +++-
panel-plugin/weather-icon.c | 2 +-
panel-plugin/weather-search.c | 8 ++--
panel-plugin/weather-summary.c | 31 +++++++++++---
panel-plugin/weather.c | 10 ++--
6 files changed, 91 insertions(+), 58 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 4943324..3325585 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -584,24 +584,31 @@ combo_unit_temperature_set_tooltip(GtkWidget *combo)
"and 1 °C difference in temperature is exactly the same "
"difference as 1 K. It is defined with the melting point "
"of water being roughly at 0 °C and its boiling point at "
- "100 °C at one standard atmosphere (1 atm = 1013.5 hPa)."
- "Until 1948, the unit was known as <i>centigrade</i> (from "
- "Latin <i>centum</i> (100) and <i>gradus</i> (steps).");
+ "100 °C at one standard atmosphere (1 atm = 1013.5 hPa). "
+ "Until 1948, the unit was known as <i>centigrade</i> - from "
+ "Latin <i>centum</i> (100) and <i>gradus</i> (steps).\n"
+ "In meteorology and everyday life the Celsius scale is "
+ "very convenient for expressing temperatures because its "
+ "numbers can be an easy indicator for the formation of "
+ "black ice and snow.");
break;
case FAHRENHEIT:
text = _("The current Fahrenheit temperature scale is based on one "
- "proposed in 1724 by the physicist Daniel Gabriel Fahrenheit. "
- "0 °F was the freezing point of brine on the original scale "
- "at standard atmospheric pressure, which was the lowest "
- "temperature achievable with this mixture of ice, salt and "
- "ammonium chloride.\n"
- "The melting point of water on the current is at 32 °F and "
- "its boiling point at 212 °F, and the interval between these "
- "two points can be divided into 180 equal parts. 180 is a "
- "highly composite number, which can be evenly divided into "
- "many fractions. The Fahrenheit and Celsius scale intersect "
- "at -40 degrees."
- );
+ "proposed in 1724 by the physicist Daniel Gabriel "
+ "Fahrenheit. 0 °F was the freezing point of brine on the "
+ "original scale at standard atmospheric pressure, which "
+ "was the lowest temperature achievable with this mixture "
+ "of ice, salt and ammonium chloride. The melting point of "
+ "water is at 32 °F and its boiling point at 212 °F. "
+ "The Fahrenheit and Celsius scales intersect at -40 "
+ "degrees. Even in cold winters, the temperatures usually "
+ "do not fall into negative ranges on the Fahrenheit scale.\n"
+ "With its inventor being a member of the Royal Society in "
+ "London and having a high reputation, the Fahrenheit scale "
+ "enjoyed great popularity in many English-speaking countries, "
+ "but was replaced by the Celsius scale in most of these "
+ "countries during the metrification process in the mid to "
+ "late 20th century.");
break;
}
gtk_widget_set_tooltip_markup(GTK_WIDGET(combo), text);
@@ -838,6 +845,11 @@ combo_apparent_temperature_set_tooltip(GtkWidget *combo)
switch (value) {
case WINDCHILL_HEATINDEX:
+ /*
+ * TRANSLATORS: The Summer Simmer Index is similar to the heat
+ * index, but usually used at night because of its better accuracy
+ * at that time.
+ */
text = _("Used in North America, wind chill will be reported for low "
"temperatures and heat index for higher ones. At night, heat "
"index will be replaced by the Summer Simmer Index. For wind "
@@ -910,7 +922,7 @@ create_units_page(xfceweather_dialog *dialog)
hbox = gtk_hbox_new(FALSE, BORDER);
ADD_LABEL(_("_Temperature:"), sg_label);
ADD_COMBO(dialog->combo_unit_temperature);
- ADD_COMBO_VALUE(dialog->combo_unit_temperature, _("Celcius (°C)"));
+ ADD_COMBO_VALUE(dialog->combo_unit_temperature, _("Celsius (°C)"));
ADD_COMBO_VALUE(dialog->combo_unit_temperature, _("Fahrenheit (°F)"));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, BORDER);
@@ -941,7 +953,7 @@ create_units_page(xfceweather_dialog *dialog)
ADD_COMBO_VALUE(dialog->combo_unit_windspeed,
_("Feet per second (ft/s)"));
ADD_COMBO_VALUE(dialog->combo_unit_windspeed,
- _("International knots (kt)"));
+ _("Knots (kt)"));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, BORDER);
/* precipitations */
@@ -1174,7 +1186,7 @@ create_appearance_page(xfceweather_dialog *dialog)
/* number of days shown in forecast */
hbox = gtk_hbox_new(FALSE, BORDER);
- ADD_LABEL(_("_Number of forecast _days:"), sg);
+ ADD_LABEL(_("_Number of forecast days:"), sg);
ADD_SPIN(dialog->spin_forecast_days, 1, MAX_FORECAST_DAYS, 1,
(dialog->pd->forecast_days ? dialog->pd->forecast_days : 5),
0, NULL);
@@ -1414,14 +1426,14 @@ options_datatypes_set_tooltip(GtkWidget *optmenu)
"moisture.");
break;
case PRESSURE:
- text = _("The air that makes up the atmosphere exerts a pressure "
- "on the surface below it, which is known as atmospheric "
- "pressure. To make it easier to compare the value to "
- "other values for locations with different altitudes, "
- "atmospheric pressure is adjusted to the equivalent "
- "sea-level pressure and called barometric pressure. "
- "Rising barometric pressures generally indicate an "
- "improvement in weather conditions, while falling "
+ text = _("The weight of the air that makes up the atmosphere exerts "
+ "a pressure on the surface of the Earth, which is known as "
+ "atmospheric pressure. To make it easier to compare the "
+ "value to other values for locations with different "
+ "altitudes, atmospheric pressure is adjusted to the "
+ "equivalent sea-level pressure and called barometric "
+ "pressure. Rising barometric pressures generally indicate "
+ "an improvement in weather conditions, while falling "
"pressures mean deterioration.");
break;
case WIND_SPEED:
@@ -1505,8 +1517,8 @@ options_datatypes_set_tooltip(GtkWidget *optmenu)
"18,000 m (59,000 ft) at the equator, where temperatures "
"are so low that they are mainly composed of ice crystals. "
"While typically thin and white in appearance, they can be "
- "seen in a magnicient array of colors when the sun is low on "
- "the horizon.");
+ "seen in a magnificent array of colors when the sun is low "
+ "on the horizon.");
break;
case CLOUDINESS:
text = _("Cloudiness, or cloud cover, defines the fraction of the "
@@ -1683,9 +1695,9 @@ create_scrollbox_page(xfceweather_dialog *dialog)
/* show scrollbox */
hbox = gtk_hbox_new(FALSE, BORDER);
dialog->check_scrollbox_show =
- gtk_check_button_new_with_mnemonic("Show scroll_box");
+ gtk_check_button_new_with_mnemonic(_("Show scroll_box"));
SET_TOOLTIP(dialog->check_scrollbox_show,
- _("Hide the scrollbox to save valueable space on the panel. "
+ _("Hide the scrollbox to save valuable space on the panel. "
"Most interesting information is also provided in the "
"tooltip - provided you choose an appropriate tooltip "
"style - that is shown when hovering over the icon."));
@@ -1696,7 +1708,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
dialog->pd->show_scrollbox);
/* values to show at once (multiple lines) */
- label = gtk_label_new_with_mnemonic(_("L_ines:"));
+ label = gtk_label_new_with_mnemonic(_("Li_nes:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
ADD_SPIN(dialog->spin_scrollbox_lines, 1, MAX_SCROLLBOX_LINES, 1,
@@ -1751,7 +1763,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model_datatypes));
renderer = gtk_cell_renderer_text_new();
column =
- gtk_tree_view_column_new_with_attributes(_("Labels to _display"),
+ gtk_tree_view_column_new_with_attributes(_("Labels to d_isplay"),
renderer, "text", 0, NULL);
SET_TOOLTIP(dialog->list_datatypes,
_("These are the values that will be shown in the scrollbox. "
@@ -1761,7 +1773,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
gtk_widget_set_size_request(dialog->options_datatypes, 300, -1);
/* button "add" */
- ADD_LABEL_EDIT_BUTTON(button_add, _("_Add"),
+ ADD_LABEL_EDIT_BUTTON(button_add, _("A_dd"),
GTK_STOCK_ADD, button_add_option_clicked);
SET_TOOLTIP(button_add,
_("Add the selected value to the labels that should be "
@@ -1787,7 +1799,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
gtk_table_attach_defaults(GTK_TABLE(table), button_del, 0, 1, 0, 1);
/* button "move up" */
- ADD_LABEL_EDIT_BUTTON(button_up, _("Move _up"),
+ ADD_LABEL_EDIT_BUTTON(button_up, _("Move u_p"),
GTK_STOCK_GO_UP, button_up_option_clicked);
SET_TOOLTIP(button_up,
_("Move the selected value up in the list of labels "
@@ -1795,7 +1807,7 @@ create_scrollbox_page(xfceweather_dialog *dialog)
gtk_table_attach_defaults(GTK_TABLE(table), button_up, 0, 1, 2, 3);
/* button "move down" */
- ADD_LABEL_EDIT_BUTTON(button_down, _("Move _down"),
+ ADD_LABEL_EDIT_BUTTON(button_down, _("Move do_wn"),
GTK_STOCK_GO_DOWN, button_down_option_clicked);
SET_TOOLTIP(button_down,
_("Move the selected value down in the list of labels "
@@ -1954,16 +1966,16 @@ create_config_dialog(plugin_data *data,
dialog->notebook = gtk_notebook_new();
gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook),
create_location_page(dialog),
- gtk_label_new_with_mnemonic("_Location"));
+ gtk_label_new_with_mnemonic(_("_Location")));
gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook),
create_units_page(dialog),
- gtk_label_new_with_mnemonic("_Units"));
+ gtk_label_new_with_mnemonic(_("_Units")));
gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook),
create_appearance_page(dialog),
- gtk_label_new_with_mnemonic("_Appearance"));
+ gtk_label_new_with_mnemonic(_("_Appearance")));
gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook),
create_scrollbox_page(dialog),
- gtk_label_new_with_mnemonic("_Scrollbox"));
+ gtk_label_new_with_mnemonic(_("_Scrollbox")));
setup_notebook_signals(dialog);
gtk_box_pack_start(GTK_BOX(vbox), dialog->notebook, TRUE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(vbox));
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index fbf00a0..74e0839 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -447,14 +447,18 @@ get_unit(const units_config *units,
case WIND_DIRECTION_DEG:
case LATITUDE:
case LONGITUDE:
- return "°";
+ /* TRANSLATORS: The degree sign is used like a unit for
+ latitude, longitude, wind direction */
+ return _("°");
case HUMIDITY:
case CLOUDS_LOW:
case CLOUDS_MID:
case CLOUDS_HIGH:
case CLOUDINESS:
case FOG:
- return "%";
+ /* TRANSLATORS: Percentage sign is used like a unit for
+ clouds, fog, humidity */
+ return _("%");
case PRECIPITATIONS:
return (units->precipitations == INCHES) ? _("in") : _("mm");
case SYMBOL:
diff --git a/panel-plugin/weather-icon.c b/panel-plugin/weather-icon.c
index 9f87b20..6305782 100644
--- a/panel-plugin/weather-icon.c
+++ b/panel-plugin/weather-icon.c
@@ -131,7 +131,7 @@ get_icon(const icon_theme *theme,
g_assert(theme != NULL);
if (G_UNLIKELY(!theme)) {
- g_warning("No icon theme!");
+ g_warning(_("No icon theme!"));
return NULL;
}
diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
index 2831533..d2c0bd1 100644
--- a/panel-plugin/weather-search.c
+++ b/panel-plugin/weather-search.c
@@ -166,7 +166,7 @@ search_cb(GtkWidget *widget,
g_free(sane_str);
gtk_tree_view_column_set_title(dialog->column, _("Searching..."));
- g_message("getting %s", url);
+ g_message(_("getting %s"), url);
weather_http_queue_request(dialog->session, url, cb_searchdone, dialog);
g_free(url);
}
@@ -423,6 +423,7 @@ void weather_search_by_ip(SoupSession *session,
gpointer user_data)
{
geolocation_data *data;
+ const gchar *url = "http://geoip.xfce.org/";
if (!gui_cb)
return;
@@ -431,7 +432,6 @@ void weather_search_by_ip(SoupSession *session,
data->cb = gui_cb;
data->user_data = user_data;
- g_message("getting http://geoip.xfce.org/");
- weather_http_queue_request(session, "http://geoip.xfce.org/",
- cb_geolocation, data);
+ g_message(_("getting %s"), url);
+ weather_http_queue_request(session, url, cb_geolocation, data);
}
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 295006b..9dea769 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -49,11 +49,26 @@ lnk_clicked(GtkTextTag *tag,
&iter, text, -1); \
g_free(value);
+/*
+ * TRANSLATORS: This format string belongs to the macro used for
+ * printing the "Label: Value Unit" lines on the details tab, e.g.
+ * "Temperature: 10 °C" or "Latitude: 95.7°".
+ * The %s stand for:
+ * - label
+ * - ": " if label is not empty, else empty
+ * - value
+ * - space if unit is not degree "°" (but this is not °C or °F!)
+ * - unit
+ * Usually, you should leave this unchanged, BUT...
+ * RTL TRANSLATORS: In case you did not translate the measurement
+ * unit, use LRM (left-to-right mark) etc. to align it properly with
+ * its numeric value.
+ */
#define APPEND_TEXT_ITEM(text, item) \
rawvalue = get_data(conditions, data->units, item, \
FALSE, data->night_time); \
unit = get_unit(data->units, item); \
- value = g_strdup_printf("\t%s%s%s%s%s\n", \
+ value = g_strdup_printf(_("\t%s%s%s%s%s\n"), \
text, text ? ": " : "", \
rawvalue, \
strcmp(unit, "°") ? " " : "", \
@@ -243,8 +258,9 @@ logo_fetched(SoupSession *session,
GdkPixbuf *pixbuf = NULL;
if (!g_file_set_contents(path, msg->response_body->data,
msg->response_body->length, &error)) {
- g_warning("Error downloading met.no logo image to %s, "
- "err %s\n", path, error ? error->message : "?");
+ g_warning(_("Error downloading met.no logo image to %s, "
+ "reason: %s\n"), path,
+ error ? error->message : _("unknown"));
g_error_free(error);
g_free(path);
return;
@@ -452,9 +468,8 @@ create_summary_tab(plugin_data *data)
FALSE, data->night_time);
rawvalue = get_data(conditions, data->units, WIND_BEAUFORT,
FALSE, data->night_time);
- value = g_strdup_printf(_("\t%s: %s %s (%s on the Beaufort scale)\n"),
- _("Speed"), wind,
- get_unit(data->units, WIND_SPEED),
+ value = g_strdup_printf(_("\tSpeed: %s %s (%s on the Beaufort scale)\n"),
+ wind, get_unit(data->units, WIND_SPEED),
rawvalue);
g_free(rawvalue);
g_free(wind);
@@ -466,7 +481,9 @@ create_summary_tab(plugin_data *data)
g_free(rawvalue);
rawvalue = get_data(conditions, data->units, WIND_DIRECTION_DEG,
FALSE, data->night_time);
- value = g_strdup_printf("\t%s: %s (%s%s)\n", _("Direction"),
+
+ /* wind direction */
+ value = g_strdup_printf(_("\tDirection: %s (%s%s)\n"),
wind, rawvalue,
get_unit(data->units, WIND_DIRECTION_DEG));
g_free(rawvalue);
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index e051e8c..e5ac2fe 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -575,7 +575,7 @@ update_handler(plugin_data *data)
now_tm.tm_mday);
/* start receive thread */
- g_message("getting %s", url);
+ g_message(_("getting %s"), url);
weather_http_queue_request(data->session, url, cb_astro_update, data);
g_free(url);
}
@@ -593,7 +593,7 @@ update_handler(plugin_data *data)
data->lat, data->lon, data->msl);
/* start receive thread */
- g_message("getting %s", url);
+ g_message(_("getting %s"), url);
weather_http_queue_request(data->session, url,
cb_weather_update, data);
g_free(url);
@@ -1037,7 +1037,7 @@ write_cache_file(plugin_data *data)
}
if (!g_file_set_contents(file, out->str, -1, NULL))
- g_warning("Error writing cache file %s!", file);
+ g_warning(_("Error writing cache file %s!"), file);
else
weather_debug("Cache file %s has been written.", file);
@@ -1619,8 +1619,8 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
data->iconimage = gtk_image_new_from_pixbuf(icon);
g_object_unref(G_OBJECT(icon));
} else
- g_warning("No default icon theme? "
- "This should not happen, plugin will crash!");
+ g_warning(_("No default icon theme? "
+ "This should not happen, plugin will crash!"));
data->labels = g_array_new(FALSE, TRUE, sizeof(data_types));
More information about the Xfce4-commits
mailing list