networkAgent: Use shorter title strings

Since the headlines of the dialogs now use a much larger font, the
strings need to be shorter so they won't be ellipsized. So use a shorter
strings for those titles and also adjust the title-strings of the
notifications sent by the NetworkAgent to be consistent.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/942
This commit is contained in:
Jonas Dreßler 2020-01-21 10:27:36 +01:00 committed by Florian Müllner
parent dbaf5687dd
commit 3c47923953

View File

@ -303,7 +303,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
case '802-11-wireless': case '802-11-wireless':
wirelessSetting = this._connection.get_setting_wireless(); wirelessSetting = this._connection.get_setting_wireless();
ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data()); ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
content.title = _("Authentication required by wireless network"); content.title = _('Authentication required');
content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid); content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
this._getWirelessSecrets(content.secrets, wirelessSetting); this._getWirelessSecrets(content.secrets, wirelessSetting);
break; break;
@ -331,7 +331,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
// fall through // fall through
case 'cdma': case 'cdma':
case 'bluetooth': case 'bluetooth':
content.title = _("Mobile broadband network password"); content.title = _('Authentication required');
content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id()); content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
this._getMobileSecrets(content.secrets, connectionType); this._getMobileSecrets(content.secrets, connectionType);
break; break;
@ -678,7 +678,7 @@ var NetworkAgent = class {
case '802-11-wireless': { case '802-11-wireless': {
let wirelessSetting = connection.get_setting_wireless(); let wirelessSetting = connection.get_setting_wireless();
let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data()); let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
title = _("Authentication required by wireless network"); title = _('Authentication required');
body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid); body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
break; break;
} }
@ -699,7 +699,7 @@ var NetworkAgent = class {
// fall through // fall through
case 'cdma': case 'cdma':
case 'bluetooth': case 'bluetooth':
title = _("Mobile broadband network password"); title = _('Authentication required');
body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id()); body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
break; break;
case 'vpn': case 'vpn':