[gnome-power-manager/gnome-2-32] Backport various translation fixes and translator comments from git master
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager/gnome-2-32] Backport various translation fixes and translator comments from git master
- Date: Fri, 6 Aug 2010 15:03:02 +0000 (UTC)
commit ebad1f2667dbef27285dbf4e0cc4bee5184facfe
Author: Richard Hughes <richard hughsie com>
Date: Fri Aug 6 15:52:35 2010 +0100
Backport various translation fixes and translator comments from git master
src/gpm-manager.c | 43 ++++++++++++++-------------
src/gpm-statistics.c | 80 ++++++++++++++++++++++++++++++++++++++------------
src/gpm-upower.c | 44 ++++++++++++++++++++++++++-
src/gpm-upower.h | 1 +
4 files changed, 126 insertions(+), 42 deletions(-)
---
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 0f3c0bb..4c4c547 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -570,20 +570,20 @@ gpm_manager_sleep_failure (GpmManager *manager, gboolean is_suspend, const gchar
string = g_string_new ("");
if (is_suspend) {
/* TRANSLATORS: message text */
- g_string_append (string, _("Your computer failed to suspend."));
+ g_string_append (string, _("Computer failed to suspend."));
/* TRANSLATORS: title text */
title = _("Failed to suspend");
icon = GPM_STOCK_SUSPEND;
} else {
/* TRANSLATORS: message text */
- g_string_append (string, _("Your computer failed to hibernate."));
+ g_string_append (string, _("Computer failed to hibernate."));
/* TRANSLATORS: title text */
title = _("Failed to hibernate");
icon = GPM_STOCK_HIBERNATE;
}
/* TRANSLATORS: message text */
- g_string_append_printf (string, "\n\n%s %s", _("The failure was reported as:"), detail);
+ g_string_append_printf (string, "\n\n%s %s", _("Failure was reported as:"), detail);
/* show modal dialog */
dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1183,7 +1183,7 @@ gpm_manager_perhaps_recall_delay_cb (GpmManager *manager)
/* TRANSLATORS: the battery may be recalled by it's vendor */
title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled"));
- message = g_strdup_printf (_("The battery in your computer may have been "
+ message = g_strdup_printf (_("A battery in your computer may have been "
"recalled by %s and you may be at risk.\n\n"
"For more information visit the battery recall website."), oem_vendor);
dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1284,7 +1284,7 @@ gpm_manager_engine_low_capacity_cb (GpmEngine *engine, UpDevice *device, GpmMana
title = _("Battery may be broken");
/* TRANSLATORS: notify the user that that battery is broken as the capacity is very low */
- message = g_strdup_printf (_("Your battery has a very low capacity (%1.1f%%), "
+ message = g_strdup_printf (_("Battery has a very low capacity (%1.1f%%), "
"which means that it may be old or broken."), capacity);
gpm_manager_notify (manager, &manager->priv->notification_general, title, message, GPM_MANAGER_NOTIFY_TIMEOUT_SHORT,
GTK_STOCK_DIALOG_INFO, NOTIFY_URGENCY_LOW);
@@ -1332,8 +1332,8 @@ gpm_manager_engine_fully_charged_cb (GpmEngine *engine, UpDevice *device, GpmMan
gpm_manager_notify_close (manager, manager->priv->notification_warning_low);
gpm_manager_notify_close (manager, manager->priv->notification_discharging);
- /* TRANSLATORS: show the fully charged notification */
- title = ngettext ("Battery Fully Charged", "Batteries Fully Charged", plural);
+ /* TRANSLATORS: show the charged notification */
+ title = ngettext ("Battery Charged", "Batteries Charged", plural);
gpm_manager_notify (manager, &manager->priv->notification_fully_charged,
title, NULL, GPM_MANAGER_NOTIFY_TIMEOUT_SHORT,
GTK_STOCK_DIALOG_INFO, NOTIFY_URGENCY_LOW);
@@ -1383,10 +1383,10 @@ gpm_manager_engine_discharging_cb (GpmEngine *engine, UpDevice *device, GpmManag
if (remaining_text != NULL) {
/* TRANSLATORS: tell the user how much time they have got */
- message = g_strdup_printf (_("%s of battery power remaining (%.1f%%)"), remaining_text, percentage);
+ message = g_strdup_printf (_("%s of battery power remaining (%.0f%%)"), remaining_text, percentage);
} else {
/* TRANSLATORS: the device is discharging, but we only have a percentage */
- message = g_strdup_printf (_("%s discharging (%.1f%%)"),
+ message = g_strdup_printf (_("%s discharging (%.0f%%)"),
kind_desc, percentage);
}
} else if (kind == UP_DEVICE_KIND_UPS) {
@@ -1395,10 +1395,10 @@ gpm_manager_engine_discharging_cb (GpmEngine *engine, UpDevice *device, GpmManag
if (remaining_text != NULL) {
/* TRANSLATORS: tell the user how much time they have got */
- message = g_strdup_printf (_("%s of UPS backup power remaining (%.1f%%)"), remaining_text, percentage);
+ message = g_strdup_printf (_("%s of UPS backup power remaining (%.0f%%)"), remaining_text, percentage);
} else {
/* TRANSLATORS: the device is discharging, but we only have a percentage */
- message = g_strdup_printf (_("%s discharging (%.1f%%)"),
+ message = g_strdup_printf (_("%s discharging (%.0f%%)"),
kind_desc, percentage);
}
} else {
@@ -1488,7 +1488,7 @@ gpm_manager_engine_charge_low_cb (GpmEngine *engine, UpDevice *device, GpmManage
remaining_text = gpm_get_timestring (time_to_empty);
/* TRANSLATORS: tell the user how much time they have got */
- message = g_strdup_printf (_("Approximately <b>%s</b> remaining (%.1f%%)"), remaining_text, percentage);
+ message = g_strdup_printf (_("Approximately <b>%s</b> remaining (%.0f%%)"), remaining_text, percentage);
} else if (kind == UP_DEVICE_KIND_UPS) {
/* TRANSLATORS: UPS is starting to get a little low */
@@ -1496,28 +1496,28 @@ gpm_manager_engine_charge_low_cb (GpmEngine *engine, UpDevice *device, GpmManage
remaining_text = gpm_get_timestring (time_to_empty);
/* TRANSLATORS: tell the user how much time they have got */
- message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining UPS backup power (%.1f%%)"),
+ message = g_strdup_printf (_("Approximately <b>%s</b> of remaining UPS backup power (%.0f%%)"),
remaining_text, percentage);
} else if (kind == UP_DEVICE_KIND_MOUSE) {
/* TRANSLATORS: mouse is getting a little low */
title = _("Mouse battery low");
/* TRANSLATORS: tell user more details */
- message = g_strdup_printf (_("The wireless mouse attached to this computer is low in power (%.1f%%)"), percentage);
+ message = g_strdup_printf (_("Wireless mouse is low in power (%.0f%%)"), percentage);
} else if (kind == UP_DEVICE_KIND_KEYBOARD) {
/* TRANSLATORS: keyboard is getting a little low */
title = _("Keyboard battery low");
/* TRANSLATORS: tell user more details */
- message = g_strdup_printf (_("The wireless keyboard attached to this computer is low in power (%.1f%%)"), percentage);
+ message = g_strdup_printf (_("Wireless keyboard is low in power (%.0f%%)"), percentage);
} else if (kind == UP_DEVICE_KIND_PDA) {
/* TRANSLATORS: PDA is getting a little low */
title = _("PDA battery low");
/* TRANSLATORS: tell user more details */
- message = g_strdup_printf (_("The PDA attached to this computer is low in power (%.1f%%)"), percentage);
+ message = g_strdup_printf (_("PDA is low in power (%.0f%%)"), percentage);
} else if (kind == UP_DEVICE_KIND_PHONE) {
/* TRANSLATORS: cell phone (mobile) is getting a little low */
@@ -1610,7 +1610,7 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
remaining_text = gpm_get_timestring (time_to_empty);
/* TRANSLATORS: give the user a ultimatum */
- message = g_strdup_printf (_("You have approximately <b>%s</b> of remaining UPS power (%.1f%%). "
+ message = g_strdup_printf (_("Approximately <b>%s</b> of remaining UPS power (%.0f%%). "
"Restore AC power to your computer to avoid losing data."),
remaining_text, percentage);
g_free (remaining_text);
@@ -1619,7 +1619,7 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
title = _("Mouse battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("The wireless mouse attached to this computer is very low in power (%.1f%%). "
+ message = g_strdup_printf (_("Wireless mouse is very low in power (%.0f%%). "
"This device will soon stop functioning if not charged."),
percentage);
} else if (kind == UP_DEVICE_KIND_KEYBOARD) {
@@ -1627,7 +1627,7 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
title = _("Keyboard battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("The wireless keyboard attached to this computer is very low in power (%.1f%%). "
+ message = g_strdup_printf (_("Wireless keyboard is very low in power (%.0f%%). "
"This device will soon stop functioning if not charged."),
percentage);
} else if (kind == UP_DEVICE_KIND_PDA) {
@@ -1636,16 +1636,17 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
title = _("PDA battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("The PDA attached to this computer is very low in power (%.1f%%). "
+ message = g_strdup_printf (_("PDA is very low in power (%.0f%%). "
"This device will soon stop functioning if not charged."),
percentage);
+
} else if (kind == UP_DEVICE_KIND_PHONE) {
/* TRANSLATORS: the cell battery is very low */
title = _("Cell phone battery low");
/* TRANSLATORS: the device is just going to stop working */
- message = g_strdup_printf (_("Your cell phone is very low in power (%.1f%%). "
+ message = g_strdup_printf (_("Cell phone is very low in power (%.0f%%). "
"This device will soon stop functioning if not charged."),
percentage);
}
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 907341c..6da3723 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -99,9 +99,11 @@ enum {
#define GPM_HISTORY_DAY_VALUE 24*60*60
#define GPM_HISTORY_WEEK_VALUE 7*24*60*60
+/* TRANSLATORS: what we've observed about the device */
#define GPM_STATS_CHARGE_DATA_TEXT _("Charge profile")
-#define GPM_STATS_CHARGE_ACCURACY_TEXT _("Charge accuracy")
#define GPM_STATS_DISCHARGE_DATA_TEXT _("Discharge profile")
+/* TRANSLATORS: how accurately we can predict the time remaining of the battery */
+#define GPM_STATS_CHARGE_ACCURACY_TEXT _("Charge accuracy")
#define GPM_STATS_DISCHARGE_ACCURACY_TEXT _("Discharge accuracy")
#define GPM_STATS_CHARGE_DATA_VALUE "charge-data"
@@ -398,6 +400,7 @@ gpm_stats_update_info_page_details (UpDevice *device)
/* remove prefix */
device_path = gpm_stats_get_printable_device_path (device);
+ /* TRANSLATORS: the device ID of the current device, e.g. "battery0" */
gpm_stats_add_info_data (_("Device"), device_path);
g_free (device_path);
@@ -408,26 +411,42 @@ gpm_stats_update_info_page_details (UpDevice *device)
gpm_stats_add_info_data (_("Model"), model);
if (serial != NULL && serial[0] != '\0')
gpm_stats_add_info_data (_("Serial number"), serial);
+
+ /* TRANSLATORS: a boolean attribute that means if the device is supplying the
+ * main power for the computer. For instance, an AC adapter or laptop battery
+ * would be TRUE, but a mobile phone or mouse taking power is FALSE */
gpm_stats_add_info_data (_("Supply"), gpm_stats_bool_to_string (power_supply));
refreshed = (int) (time (NULL) - update_time);
text = g_strdup_printf (ngettext ("%d second", "%d seconds", refreshed), refreshed);
+
+ /* TRANSLATORS: when the device was last updated with new data. It's
+ * usually a few seconds when a device is discharging or charging. */
gpm_stats_add_info_data (_("Refreshed"), text);
g_free (text);
if (kind == UP_DEVICE_KIND_BATTERY ||
kind == UP_DEVICE_KIND_MOUSE ||
kind == UP_DEVICE_KIND_KEYBOARD ||
- kind == UP_DEVICE_KIND_UPS)
+ kind == UP_DEVICE_KIND_UPS) {
+ /* TRANSLATORS: Present is whether the device is currently attached
+ * to the computer, as some devices (e.g. laptop batteries) can
+ * be removed, but still observed as devices on the system */
gpm_stats_add_info_data (_("Present"), gpm_stats_bool_to_string (is_present));
+ }
if (kind == UP_DEVICE_KIND_BATTERY ||
kind == UP_DEVICE_KIND_MOUSE ||
- kind == UP_DEVICE_KIND_KEYBOARD)
+ kind == UP_DEVICE_KIND_KEYBOARD) {
+ /* TRANSLATORS: If the device can be recharged, e.g. lithium
+ * batteries rather than alkaline ones */
gpm_stats_add_info_data (_("Rechargeable"), gpm_stats_bool_to_string (is_rechargeable));
+ }
if (kind == UP_DEVICE_KIND_BATTERY ||
kind == UP_DEVICE_KIND_MOUSE ||
- kind == UP_DEVICE_KIND_KEYBOARD)
- gpm_stats_add_info_data (_("State"), up_device_state_to_string (state));
+ kind == UP_DEVICE_KIND_KEYBOARD) {
+ /* TRANSLATORS: The state of the device, e.g. "Changing" or "Fully charged" */
+ gpm_stats_add_info_data (_("State"), gpm_device_state_to_localised_string (state));
+ }
if (kind == UP_DEVICE_KIND_BATTERY) {
text = g_strdup_printf ("%.1f Wh", energy);
gpm_stats_add_info_data (_("Energy"), text);
@@ -445,6 +464,7 @@ gpm_stats_update_info_page_details (UpDevice *device)
if (kind == UP_DEVICE_KIND_BATTERY ||
kind == UP_DEVICE_KIND_MONITOR) {
text = g_strdup_printf ("%.1f W", energy_rate);
+ /* TRANSLATORS: the rate of discharge for the device */
gpm_stats_add_info_data (_("Rate"), text);
g_free (text);
}
@@ -473,18 +493,26 @@ gpm_stats_update_info_page_details (UpDevice *device)
kind == UP_DEVICE_KIND_KEYBOARD ||
kind == UP_DEVICE_KIND_UPS) {
text = g_strdup_printf ("%.1f%%", percentage);
+ /* TRANSLATORS: the amount of charge the cell contains */
gpm_stats_add_info_data (_("Percentage"), text);
g_free (text);
}
if (kind == UP_DEVICE_KIND_BATTERY) {
text = g_strdup_printf ("%.1f%%", capacity);
+ /* TRANSLATORS: the capacity of the device, which is basically a measure
+ * of how full it can get, relative to the design capacity */
gpm_stats_add_info_data (_("Capacity"), text);
g_free (text);
}
- if (kind == UP_DEVICE_KIND_BATTERY)
+ if (kind == UP_DEVICE_KIND_BATTERY) {
+ /* TRANSLATORS: the type of battery, e.g. lithium or nikel metal hydroxide */
gpm_stats_add_info_data (_("Technology"), gpm_device_technology_to_localised_string (technology));
- if (kind == UP_DEVICE_KIND_LINE_POWER)
+ }
+ if (kind == UP_DEVICE_KIND_LINE_POWER) {
+ /* TRANSLATORS: this is when the device is plugged in, typically
+ * only shown for the ac adaptor device */
gpm_stats_add_info_data (_("Online"), gpm_stats_bool_to_string (online));
+ }
g_free (vendor);
g_free (serial);
@@ -883,43 +911,57 @@ gpm_stats_format_details (UpWakeupItem *item)
/* try to make the wakeup type nicer */
} else if (g_str_has_prefix (data, "__mod_timer")) {
- /* TRANSLATORS: a timer is something that fires periodically */
+ /* TRANSLATORS: a timer is something that fires periodically.
+ * The parameter is a process name, e.g. "firefox-bin".
+ * This is shown when the timer wakes up. */
details = g_strdup_printf (_("Timer %s"), data+12);
} else if (g_str_has_prefix (data, "mod_timer")) {
- /* TRANSLATORS: a timer is something that fires periodically */
+ /* TRANSLATORS: a timer is something that fires periodically.
+ * The parameter is a process name, e.g. "firefox-bin".
+ * This is shown when the timer wakes up. */
details = g_strdup_printf (_("Timer %s"), data+10);
} else if (g_str_has_prefix (data, "hrtimer_start_expires")) {
- /* TRANSLATORS: a timer is something that fires periodically */
+ /* TRANSLATORS: a timer is something that fires periodically.
+ * The parameter is a process name, e.g. "firefox-bin".
+ * This is shown when the timer wakes up. */
details = g_strdup_printf (_("Timer %s"), data+22);
} else if (g_str_has_prefix (data, "hrtimer_start")) {
- /* TRANSLATORS: a timer is something that fires periodically */
+ /* TRANSLATORS: a timer is something that fires periodically.
+ * The parameter is a process name, e.g. "firefox-bin".
+ * This is shown when the timer wakes up. */
details = g_strdup_printf (_("Timer %s"), data+14);
} else if (g_str_has_prefix (data, "do_setitimer")) {
- /* TRANSLATORS: a timer is something that fires periodically */
+ /* TRANSLATORS: a timer is something that fires periodically.
+ * The parameter is a process name, e.g. "firefox-bin".
+ * This is shown when the timer wakes up. */
details = g_strdup_printf (_("Timer %s"), data+10);
} else if (g_str_has_prefix (data, "do_nanosleep")) {
- /* TRANSLATORS: this is a task that's woken up from sleeping */
+ /* TRANSLATORS: the parameter is the name of task that's woken up from sleeping.
+ * This is shown when the task wakes up. */
details = g_strdup_printf (_("Sleep %s"), data+13);
} else if (g_str_has_prefix (data, "enqueue_task_rt")) {
- /* TRANSLATORS: this is a new realtime task */
+ /* TRANSLATORS: this is the name of a new realtime task. */
details = g_strdup_printf (_("New task %s"), data+16);
} else if (g_str_has_prefix (data, "futex_wait")) {
- /* TRANSLATORS: this is a task thats woken to check state */
+ /* TRANSLATORS: this is the name of a task that's woken to check state.
+ * This is shown when the task wakes up. */
details = g_strdup_printf (_("Wait %s"), data+11);
} else if (g_str_has_prefix (data, "queue_delayed_work_on")) {
- /* TRANSLATORS: a work queue is a list of work that has to be done */
+ /* TRANSLATORS: this is the name of a work queue.
+ * A work queue is a list of work that has to be done. */
details = g_strdup_printf (_("Work queue %s"), data+22);
} else if (g_str_has_prefix (data, "queue_delayed_work")) {
- /* TRANSLATORS: a work queue is a list of work that has to be done */
+ /* TRANSLATORS: this is the name of a work queue.
+ * A work queue is a list of work that has to be done. */
details = g_strdup_printf (_("Work queue %s"), data+19);
} else if (g_str_has_prefix (data, "dst_run_gc")) {
/* TRANSLATORS: this is when the networking subsystem clears out old entries */
details = g_strdup_printf (_("Network route flush %s"), data+11);
} else if (g_str_has_prefix (data, "usb_hcd_poll_rh_status")) {
- /* TRANSLATORS: activity on the USB bus */
+ /* TRANSLATORS: this is the name of an activity on the USB bus */
details = g_strdup_printf (_("USB activity %s"), data+23);
} else if (g_str_has_prefix (data, "schedule_hrtimeout_range")) {
- /* TRANSLATORS: we've timed out of an aligned timer */
+ /* TRANSLATORS: we've timed out of an aligned timer, with the name */
details = g_strdup_printf (_("Wakeup %s"), data+25);
} else if (g_str_has_prefix (data, "Local timer interrupts")) {
/* TRANSLATORS: interupts on the system required for basic operation */
diff --git a/src/gpm-upower.c b/src/gpm-upower.c
index af1ac91..4fe47ea 100644
--- a/src/gpm-upower.c
+++ b/src/gpm-upower.c
@@ -491,11 +491,11 @@ gpm_device_kind_to_localised_text (UpDeviceKind kind, guint number)
break;
case UP_DEVICE_KIND_MOUSE:
/* TRANSLATORS: wireless mice with internal batteries */
- text = ngettext ("Wireless mouse", "Wireless mice", number);
+ text = ngettext ("Mouse", "Mice", number);
break;
case UP_DEVICE_KIND_KEYBOARD:
/* TRANSLATORS: wireless keyboard with internal battery */
- text = ngettext ("Wireless keyboard", "Wireless keyboards", number);
+ text = ngettext ("Keyboard", "Keyboards", number);
break;
case UP_DEVICE_KIND_PDA:
/* TRANSLATORS: portable device */
@@ -594,3 +594,43 @@ gpm_device_technology_to_localised_string (UpDeviceTechnology technology_enum)
return technology;
}
+/**
+ * gpm_device_state_to_localised_string:
+ **/
+const gchar *
+gpm_device_state_to_localised_string (UpDeviceState state)
+{
+ const gchar *state_string = NULL;
+
+ switch (state) {
+ case UP_DEVICE_STATE_CHARGING:
+ /* TRANSLATORS: battery state */
+ state_string = _("Charging");
+ break;
+ case UP_DEVICE_STATE_DISCHARGING:
+ /* TRANSLATORS: battery state */
+ state_string = _("Discharging");
+ break;
+ case UP_DEVICE_STATE_EMPTY:
+ /* TRANSLATORS: battery state */
+ state_string = _("Empty");
+ break;
+ case UP_DEVICE_STATE_FULLY_CHARGED:
+ /* TRANSLATORS: battery state */
+ state_string = _("Charged");
+ break;
+ case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: battery state */
+ state_string = _("Waiting to charge");
+ break;
+ case UP_DEVICE_STATE_PENDING_DISCHARGE:
+ /* TRANSLATORS: battery state */
+ state_string = _("Waiting to discharge");
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+ return state_string;
+}
+
diff --git a/src/gpm-upower.h b/src/gpm-upower.h
index 7b0580a..3f43e64 100644
--- a/src/gpm-upower.h
+++ b/src/gpm-upower.h
@@ -31,6 +31,7 @@ const gchar *gpm_device_kind_to_localised_text (UpDeviceKind kind,
guint number);
const gchar *gpm_device_kind_to_icon (UpDeviceKind kind);
const gchar *gpm_device_technology_to_localised_string (UpDeviceTechnology technology_enum);
+const gchar *gpm_device_state_to_localised_string (UpDeviceState state);
gchar *gpm_upower_get_device_icon (UpDevice *device);
gchar *gpm_upower_get_device_summary (UpDevice *device);
gchar *gpm_upower_get_device_description (UpDevice *device);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]