Network: display more detailed status for unavailable devices

If NetworkManager knows that firmware is missing, say so.
This matches recent changes in the gnome-shell network menu.
It adds one new string, "Firmware missing", for which I have
pulled existing translations from the similar "firmware missing"
string in gnome-shell.
https://bugzilla.gnome.org/show_bug.cgi?id=646027
This commit is contained in:
Matthias Clasen 2011-03-31 10:38:31 -04:00
parent ecd99dc1f3
commit 23f239e461
23 changed files with 94 additions and 5 deletions

View file

@ -1203,7 +1203,7 @@ refresh_header_ui (CcNetworkPanel *panel, NMDevice *device, const char *page_nam
wid_name = g_strdup_printf ("label_%s_status", page_name); wid_name = g_strdup_printf ("label_%s_status", page_name);
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, wid_name)); widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, wid_name));
g_free (wid_name); g_free (wid_name);
str = panel_device_state_to_localized_string (type, state); str = panel_device_state_to_localized_string (device);
gtk_label_set_label (GTK_LABEL (widget), str); gtk_label_set_label (GTK_LABEL (widget), str);

View file

@ -26,6 +26,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "panel-common.h" #include "panel-common.h"
#include "nm-device-ethernet.h"
#include "nm-device-modem.h" #include "nm-device-modem.h"
/** /**
@ -174,8 +175,14 @@ panel_ap_mode_to_localized_string (NM80211Mode mode)
* panel_device_state_to_localized_string: * panel_device_state_to_localized_string:
**/ **/
const gchar * const gchar *
panel_device_state_to_localized_string (NMDeviceType type, NMDeviceState state) panel_device_state_to_localized_string (NMDevice *device)
{ {
NMDeviceType type;
NMDeviceState state;
type = nm_device_get_device_type (device);
state = nm_device_get_state (device);
const gchar *value = NULL; const gchar *value = NULL;
switch (state) { switch (state) {
case NM_DEVICE_STATE_UNKNOWN: case NM_DEVICE_STATE_UNKNOWN:
@ -188,7 +195,10 @@ panel_device_state_to_localized_string (NMDeviceType type, NMDeviceState state)
break; break;
case NM_DEVICE_STATE_UNAVAILABLE: case NM_DEVICE_STATE_UNAVAILABLE:
/* TRANSLATORS: device status */ /* TRANSLATORS: device status */
if (type == NM_DEVICE_TYPE_ETHERNET) if (nm_device_get_firmware_missing (device))
value = _("Firmware missing");
else if (type == NM_DEVICE_TYPE_ETHERNET &&
!nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device)))
value = _("Cable unplugged"); value = _("Cable unplugged");
else else
value = _("Unavailable"); value = _("Unavailable");

View file

@ -33,8 +33,7 @@ const gchar *panel_device_to_icon_name (NMDevice *device);
const gchar *panel_device_to_localized_string (NMDevice *device); const gchar *panel_device_to_localized_string (NMDevice *device);
const gchar *panel_device_to_sortable_string (NMDevice *device); const gchar *panel_device_to_sortable_string (NMDevice *device);
const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode); const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
const gchar *panel_device_state_to_localized_string (NMDeviceType type, const gchar *panel_device_state_to_localized_string (NMDevice *device);
NMDeviceState state);
const gchar *panel_vpn_state_to_localized_string (NMVPNConnectionState type); const gchar *panel_vpn_state_to_localized_string (NMVPNConnectionState type);
G_END_DECLS G_END_DECLS

View file

@ -3981,3 +3981,7 @@ msgstr "_كل الإعدادات"
#~ msgid "aterm" #~ msgid "aterm"
#~ msgstr "aterm" #~ msgstr "aterm"
msgid "Firmware missing"
msgstr "البرمجية المغروسة غير متاحة"

View file

@ -3645,3 +3645,7 @@ msgstr ""
#~ msgid "Remove from System Items" #~ msgid "Remove from System Items"
#~ msgstr "Премахване от системните елементи" #~ msgstr "Премахване от системните елементи"
msgid "Firmware missing"
msgstr "липсва фърмуер"

View file

@ -3608,3 +3608,7 @@ msgstr "_Tots els paràmetres"
#~ msgid "LowContrast" #~ msgid "LowContrast"
#~ msgstr "ContrastBaix" #~ msgstr "ContrastBaix"
msgid "Firmware missing"
msgstr "manca el microprogramari"

View file

@ -3634,3 +3634,7 @@ msgstr "_Alle Einstellungen"
#~ msgid "Failed" #~ msgid "Failed"
#~ msgstr "Fehlgeschlagen" #~ msgstr "Fehlgeschlagen"
msgid "Firmware missing"
msgstr "Firmware fehlt"

View file

@ -6321,3 +6321,7 @@ msgstr "_Todas las configuraciones"
#~ msgid "No application with name '%s' registered a bookmark for '%s'" #~ msgid "No application with name '%s' registered a bookmark for '%s'"
#~ msgstr "" #~ msgstr ""
#~ "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»" #~ "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»"
msgid "Firmware missing"
msgstr "falta el «firmware»"

View file

@ -3547,3 +3547,7 @@ msgstr "Centre de contrôle"
msgid "_All Settings" msgid "_All Settings"
msgstr "_Tous les paramètres" msgstr "_Tous les paramètres"
msgid "Firmware missing"
msgstr "micrologiciel absent"

View file

@ -4931,3 +4931,7 @@ msgstr "_Todas as configuracións"
#~ msgid "FONT-FILE OUTPUT-FILE" #~ msgid "FONT-FILE OUTPUT-FILE"
#~ msgstr "FICHEIRO-FONTE FICHEIRO-DE-SAÍDA" #~ msgstr "FICHEIRO-FONTE FICHEIRO-DE-SAÍDA"
msgid "Firmware missing"
msgstr "falta o «firmware»"

View file

@ -5790,3 +5790,7 @@ msgstr "_כל ההגדרות"
#~ msgid "Unknown login ID, the user database might be corrupted" #~ msgid "Unknown login ID, the user database might be corrupted"
#~ msgstr "פרטי הגישה לא ידועים, ייתכן שמאגר המשתמשים שבור." #~ msgstr "פרטי הגישה לא ידועים, ייתכן שמאגר המשתמשים שבור."
msgid "Firmware missing"
msgstr "הקושחה חסרה"

View file

@ -3672,3 +3672,7 @@ msgstr "Visi iest_atījumi"
#~ msgid "Disable _Fingerprint Login..." #~ msgid "Disable _Fingerprint Login..."
#~ msgstr "Atslēgt pieteikšanos ar _pirkstu nospiedumu..." #~ msgstr "Atslēgt pieteikšanos ar _pirkstu nospiedumu..."
msgid "Firmware missing"
msgstr "trūkst aparātprogrammatūras"

View file

@ -3528,3 +3528,7 @@ msgstr "<b>%s उघडा</b>"
msgid "Remove from System Items" msgid "Remove from System Items"
msgstr "प्रणाली घटक पासून काढूण टाका" msgstr "प्रणाली घटक पासून काढूण टाका"
msgid "Firmware missing"
msgstr "फर्मवेअर आढळले नाही"

View file

@ -5526,3 +5526,7 @@ msgstr ""
#~ msgid "<b>Work</b>" #~ msgid "<b>Work</b>"
#~ msgstr "<b>Werk</b>" #~ msgstr "<b>Werk</b>"
msgid "Firmware missing"
msgstr "firmware ontbreekt"

View file

@ -6895,3 +6895,7 @@ msgstr "ਸਭ ਸੈਟਿੰਗ(_A)"
#~ msgid "Start screensaver" #~ msgid "Start screensaver"
#~ msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਸ਼ੁਰੂ ਕਰੋ" #~ msgstr "ਸਕਰੀਨ-ਸੇਵਰ ਸ਼ੁਰੂ ਕਰੋ"
msgid "Firmware missing"
msgstr "ਫਿਰਮਵੇਅਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"

View file

@ -3524,3 +3524,7 @@ msgstr "Centrum sterowania"
#: ../shell/shell.ui.h:2 #: ../shell/shell.ui.h:2
msgid "_All Settings" msgid "_All Settings"
msgstr "_Wszystkie ustawienia" msgstr "_Wszystkie ustawienia"
msgid "Firmware missing"
msgstr "brak oprogramowania wbudowanego"

View file

@ -3559,3 +3559,7 @@ msgstr "Tod_as as configurações"
#~ msgid "Mouse Orientation" #~ msgid "Mouse Orientation"
#~ msgstr "Orientação do mouse" #~ msgstr "Orientação do mouse"
msgid "Firmware missing"
msgstr "firmware faltando"

View file

@ -3463,3 +3463,7 @@ msgstr "Центр управления"
msgid "_All Settings" msgid "_All Settings"
msgstr "_Все параметры" msgstr "_Все параметры"
msgid "Firmware missing"
msgstr "отсутствует прошивка"

View file

@ -4855,3 +4855,7 @@ msgstr "_Vse nastavitve"
#~ msgid "Don't check whether the notification area exists" #~ msgid "Don't check whether the notification area exists"
#~ msgstr "Brez preverjanja ali opozorilni pult obstaja" #~ msgstr "Brez preverjanja ali opozorilni pult obstaja"
msgid "Firmware missing"
msgstr "manjka strojna programska oprema"

View file

@ -5514,3 +5514,7 @@ msgstr "_Alla inställningar"
#~ "Godtag endast tangenter då de har tryckts ned och hållits nedtryckta " #~ "Godtag endast tangenter då de har tryckts ned och hållits nedtryckta "
#~ "under en användardefinierad tid." #~ "under en användardefinierad tid."
msgid "Firmware missing"
msgstr "fast programvara saknas"

View file

@ -3852,3 +3852,7 @@ msgstr "_Усі параметри"
#~ msgid "Show password hints" #~ msgid "Show password hints"
#~ msgstr "Показувати підказки до паролів" #~ msgstr "Показувати підказки до паролів"
msgid "Firmware missing"
msgstr "Бракує мікропрограми"

View file

@ -5536,3 +5536,7 @@ msgstr "_Tất cả thiết lập"
#~ msgid "FONT-FILE OUTPUT-FILE" #~ msgid "FONT-FILE OUTPUT-FILE"
#~ msgstr "TẬP-TIN-PHÔNG TẬP-TIN-XUẤT" #~ msgstr "TẬP-TIN-PHÔNG TẬP-TIN-XUẤT"
msgid "Firmware missing"
msgstr "thiếu firmware"

View file

@ -3735,3 +3735,7 @@ msgstr "全部设置(_A)"
#~ msgid "Show password hints" #~ msgid "Show password hints"
#~ msgstr "显示密码提示" #~ msgstr "显示密码提示"
msgid "Firmware missing"
msgstr "固件缺失"